-
Notifications
You must be signed in to change notification settings - Fork 214
Splitting up the archive task #3242
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
WalterKolczynski-NOAA
merged 120 commits into
NOAA-EMC:develop
from
AntonMFernando-NOAA:feature/arch-split
Feb 3, 2025
Merged
Changes from 116 commits
Commits
Show all changes
120 commits
Select commit
Hold shift + click to select a range
12696d7
initial modification to split arch job to two parts
AntonMFernando-NOAA 183a303
modified workflow\applications\gefs.py
AntonMFernando-NOAA c585fe1
modified arch_vrfy var
AntonMFernando-NOAA 8ac2162
modified arch_vrfy vars in gefs config files
AntonMFernando-NOAA b903470
modified config files
AntonMFernando-NOAA c74910d
modified exglobal_archive_vrfy.py
AntonMFernando-NOAA c9d414d
modified defaults and JJOB
AntonMFernando-NOAA 7d42e36
modified jobs\JGLOBAL_ARCHIVE_TARS
AntonMFernando-NOAA fc69dcd
modified jobs\JGLOBAL_ARCHIVE_TARS
AntonMFernando-NOAA 8e523a1
modified config files
AntonMFernando-NOAA 5cafe8a
modified parm\config\gefs\config.base
AntonMFernando-NOAA 3b2074f
modify jjobs
AntonMFernando-NOAA 3008b33
correct a typo
AntonMFernando-NOAA 4c145ca
modified gefs.py
AntonMFernando-NOAA cdd5acf
modified workflow\applications\gefs.py
AntonMFernando-NOAA 5c9b3f5
modified gefs.py
AntonMFernando-NOAA 260354e
modified workflow\applications\gefs.py
AntonMFernando-NOAA e880082
modifed gefs.py
AntonMFernando-NOAA 4fab72f
modified gefs.py
AntonMFernando-NOAA 9e54cc0
modified workflow\applications\gefs.py
AntonMFernando-NOAA 0f0c7c2
modifed gefs.py
AntonMFernando-NOAA 1b73697
modifed workflow\applications\gefs.py
AntonMFernando-NOAA 14fc710
modified workflow\rocoto\gefs_tasks.py
AntonMFernando-NOAA 4493271
modifed workflow\rocoto\gefs_tasks.py
AntonMFernando-NOAA 4d6ad0c
change permission
AntonMFernando-NOAA 8d97a78
modified archive.py functions
AntonMFernando-NOAA 913188f
Merge branch 'feature/arch-split' of https://github.com/AntonMFernand…
AntonMFernando-NOAA a07e405
modified archive.py
AntonMFernando-NOAA 95c0eb2
modified configure function
AntonMFernando-NOAA c0cdcb6
modified ush\python\pygfs\task\archive.py
AntonMFernando-NOAA da45368
modified ush\python\pygfs\task\archive.py
AntonMFernando-NOAA e7c3fc4
modified ush\python\pygfs\task\archive.py
AntonMFernando-NOAA a005761
modified ush\python\pygfs\task\archive.py
AntonMFernando-NOAA 5542a18
modified ush\python\pygfs\task\archive.py
AntonMFernando-NOAA 7c1a012
added inital changes to arch_vrfy and arch_tars of gfs job
AntonMFernando-NOAA b48d39d
modified gefs_tasks.py
AntonMFernando-NOAA be5e8e0
modified workflow\rocoto\gfs_tasks.py
AntonMFernando-NOAA e70fd60
modified tasks pys
AntonMFernando-NOAA 6049f91
modified gfs_tasks
AntonMFernando-NOAA 2dc1463
modified arch_tars var
AntonMFernando-NOAA ee8f6b1
corrected a typo
AntonMFernando-NOAA d4ae8fc
modified earc job
AntonMFernando-NOAA 1dfcaba
modified permssion
AntonMFernando-NOAA c57bf12
modified jobs\JGDAS_ENKF_ARCHIVE_VRFY
AntonMFernando-NOAA 1822c17
added a blank line to workflow\rocoto\gfs_tasks.py
AntonMFernando-NOAA 4ee399c
modified workflow\rocoto\gfs_tasks.py
AntonMFernando-NOAA 2de3866
modified earc jobs
AntonMFernando-NOAA 43055d6
changed permission to files
AntonMFernando-NOAA a579358
changed earc var
AntonMFernando-NOAA 8fa12b8
modified workflow\applications\gfs_cycled.py
AntonMFernando-NOAA c5b95c8
modified workflow\applications\gfs_cycled.py
AntonMFernando-NOAA bd20dfd
directory changed of JJOB
AntonMFernando-NOAA 6a8c09e
modified jjob
AntonMFernando-NOAA 924a8a1
change permission
AntonMFernando-NOAA fae7f3c
modified workflow\rocoto\gfs_tasks.py
AntonMFernando-NOAA e0fff97
modify workflow\rocoto\gfs_tasks.py
AntonMFernando-NOAA 6f2d008
modified workflow\rocoto\gfs_tasks.py
AntonMFernando-NOAA 65571aa
modified workflow\rocoto\gfs_tasks.py
AntonMFernando-NOAA c283e87
modified config files
AntonMFernando-NOAA 2cc52f3
modified config files
AntonMFernando-NOAA 2657164
modified config files for gfs job
AntonMFernando-NOAA ed807e4
modified parm\config\gfs\config.arch_vrfy
AntonMFernando-NOAA cb836f8
modify config files for gfs
AntonMFernando-NOAA 1b77466
added exglobal_archive.py
AntonMFernando-NOAA a596632
added two dleted files to merge with a dev branch
AntonMFernando-NOAA 46ff542
Merge branch 'NOAA-EMC:develop' into feature/arch-split
AntonMFernando-NOAA 0467994
modified JJOB archive scripts
AntonMFernando-NOAA 622713c
edited exscripts for arch
AntonMFernando-NOAA e37b692
changed a var to string in config files
AntonMFernando-NOAA 6ea9289
changed comments
AntonMFernando-NOAA d87dceb
modified workflow\rocoto\gfs_tasks.py
AntonMFernando-NOAA db51aea
modified workflow\rocoto\gfs_tasks.py
AntonMFernando-NOAA 1946c57
modified workflow\applications\gfs_cycled.py
AntonMFernando-NOAA c1a51c6
modified workflow\applications\gfs_cycled.py
AntonMFernando-NOAA a5b63fa
added a blank line
AntonMFernando-NOAA 755ba7c
modified workflow\applications\gfs_cycled.py
AntonMFernando-NOAA 58e3140
modify workflow\rocoto\gfs_tasks.py
AntonMFernando-NOAA 44987f0
Merge branch 'NOAA-EMC:develop' into feature/arch-split
AntonMFernando-NOAA 93baf25
modifed earc_vrfy task
AntonMFernando-NOAA bc38f08
removed white space
AntonMFernando-NOAA 6764985
modified workflow\rocoto\gfs_tasks.py
AntonMFernando-NOAA 04c20d0
modified workflow\rocoto\gfs_tasks.py
AntonMFernando-NOAA 7e16fcc
modified workflow\rocoto\gfs_tasks.py
AntonMFernando-NOAA 4036f67
modified workflow\applications\gfs_cycled.py
AntonMFernando-NOAA 604b026
modified workflow\applications\gfs_cycled.py
AntonMFernando-NOAA e9969dc
modified workflow\applications\gfs_cycled.py
AntonMFernando-NOAA e0acd9a
Merge branch 'NOAA-EMC:develop' into feature/arch-split
AntonMFernando-NOAA c5e611b
Walters suggestions
AntonMFernando-NOAA 19fab0e
permission change
AntonMFernando-NOAA 5814f59
modified workflow\rocoto\gfs_tasks.py
AntonMFernando-NOAA 6db7a6d
modified workflow\rocoto\gfs_tasks.py
AntonMFernando-NOAA bba8fb4
Merge branch 'feature/arch-split' of https://github.com/AntonMFernand…
AntonMFernando-NOAA 44eecf0
Merge branch 'NOAA-EMC:develop' into feature/arch-split
AntonMFernando-NOAA 58c07a3
Merge branch 'develop' into feature/arch-split
AntonMFernando-NOAA 80c9821
modified parm\config\gfs\config.resources
AntonMFernando-NOAA 5594f9d
change permission
AntonMFernando-NOAA b89bd15
modified jobs\JGDAS_ENKF_ARCHIVE_VRFY
AntonMFernando-NOAA c5529e9
modified Jscripts
AntonMFernando-NOAA e0f7047
modified scripts\exglobal_archive_vrfy.py
AntonMFernando-NOAA 1fcaf9b
modified scripts\exglobal_archive_vrfy.py
AntonMFernando-NOAA ce5355f
modified scripts\exglobal_archive_vrfy.py
AntonMFernando-NOAA 05d2333
Merge branch 'NOAA-EMC:develop' into feature/arch-split
AntonMFernando-NOAA 813249e
Merge branch 'develop' into feature/arch-split
AntonMFernando-NOAA a1744b3
Merge branch 'develop' into feature/arch-split
AntonMFernando-NOAA e470ff8
modified jobs\JGLOBAL_ARCHIVE_TARS
AntonMFernando-NOAA de4ee2b
Merge branch 'feature/arch-split' of https://github.com/AntonMFernand…
AntonMFernando-NOAA 5cd8730
modified scripts\exgdas_enkf_earc_vrfy.py
AntonMFernando-NOAA b2bf61c
Merge branch 'develop' into feature/arch-split
AntonMFernando-NOAA c7814d9
modified workflow\applications\gefs.py
AntonMFernando-NOAA fb7187c
modify workflow\rocoto\gefs_tasks.py
AntonMFernando-NOAA b4c3148
modified workflow\rocoto\gefs_tasks.py
AntonMFernando-NOAA 3db17b8
modified ARCH jscripts
AntonMFernando-NOAA 5c50e6a
modified scripts\exglobal_archive_vrfy.py
AntonMFernando-NOAA b4eee81
Merge branch 'develop' into feature/arch-split
AntonMFernando-NOAA 62892b5
added updated that failed 3DVar job
AntonMFernando-NOAA 5da1889
modified workflow\rocoto\gfs_tasks.py
AntonMFernando-NOAA 541286b
modified workflow\rocoto\gfs_tasks.py
AntonMFernando-NOAA 8fac576
modified parm\config\gefs\config.resources
AntonMFernando-NOAA 3e48dfc
Merge branch 'NOAA-EMC:develop' into feature/arch-split
AntonMFernando-NOAA 400ae07
Merge branch 'develop' into feature/arch-split
AntonMFernando-NOAA File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| #! /usr/bin/env bash | ||
|
|
||
| source "${HOMEgfs}/ush/preamble.sh" | ||
| source "${HOMEgfs}/ush/jjob_header.sh" -e "earc_vrfy" -c "base earc_vrfy" | ||
|
|
||
|
|
||
| ############################################## | ||
| # Set variables used in the script | ||
| ############################################## | ||
| YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COM_TOP | ||
| MEMDIR="ensstat" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ | ||
| COMIN_ATMOS_ANALYSIS_ENSSTAT:COM_ATMOS_ANALYSIS_TMPL \ | ||
| COMIN_ATMOS_HISTORY_ENSSTAT:COM_ATMOS_HISTORY_TMPL \ | ||
| COMIN_SNOW_ANALYSIS_ENSSTAT:COM_SNOW_ANALYSIS_TMPL | ||
|
|
||
| ############################################################### | ||
| # Run archive script | ||
| ############################################################### | ||
|
|
||
| "${SCRgfs}/exgdas_enkf_earc_vrfy.py" | ||
| status=$? | ||
| [[ ${status} -ne 0 ]] && exit "${status}" | ||
|
|
||
| ############################################################### | ||
|
|
||
| ############################################## | ||
| # End JOB SPECIFIC work | ||
| ############################################## | ||
|
|
||
| ############################################## | ||
| # Final processing | ||
| ############################################## | ||
| if [[ -e "${pgmout}" ]] ; then | ||
| cat "${pgmout}" | ||
| fi | ||
|
|
||
| ########################################## | ||
| # Remove the Temporary working directory | ||
| ########################################## | ||
| cd "${DATAROOT}" || (echo "${DATAROOT} does not exist. ABORT!"; exit 1) | ||
| [[ ${KEEPDATA} = "NO" ]] && rm -rf "${DATA}" | ||
|
|
||
| exit 0 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| #! /usr/bin/env bash | ||
|
|
||
| source "${HOMEgfs}/ush/preamble.sh" | ||
| source "${HOMEgfs}/ush/jjob_header.sh" -e "arch_vrfy" -c "base arch_vrfy wave" | ||
|
|
||
|
|
||
| ############################################## | ||
| # Set variables used in the script | ||
| ############################################## | ||
| YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ | ||
|
WalterKolczynski-NOAA marked this conversation as resolved.
|
||
| COMIN_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL \ | ||
| COMIN_ATMOS_GENESIS:COM_ATMOS_GENESIS_TMPL \ | ||
| COMIN_ATMOS_HISTORY:COM_ATMOS_HISTORY_TMPL \ | ||
| COMIN_ATMOS_TRACK:COM_ATMOS_TRACK_TMPL \ | ||
| COMIN_CHEM_ANALYSIS:COM_CHEM_ANALYSIS_TMPL \ | ||
| COMIN_SNOW_ANALYSIS:COM_SNOW_ANALYSIS_TMPL \ | ||
| COMIN_OBS:COM_OBS_TMPL \ | ||
| COMOUT_ATMOS_TRACK:COM_ATMOS_TRACK_TMPL | ||
|
|
||
| for grid in "0p25" "0p50" "1p00"; do | ||
| YMD=${PDY} HH=${cyc} GRID=${grid} declare_from_tmpl -rx \ | ||
| "COMIN_ATMOS_GRIB_${grid}:COM_ATMOS_GRIB_GRID_TMPL" | ||
| done | ||
|
|
||
| ############################################################### | ||
| # Run archive script | ||
| ############################################################### | ||
|
|
||
| ${GLOBALARCHIVESH:-${SCRgfs}/exglobal_archive_vrfy.py} | ||
| status=$? | ||
| [[ ${status} -ne 0 ]] && exit "${status}" | ||
|
|
||
| ############################################## | ||
| # End JOB SPECIFIC work | ||
| ############################################## | ||
|
|
||
| ############################################## | ||
| # Final processing | ||
| ############################################## | ||
| if [[ -e "${pgmout}" ]] ; then | ||
| cat "${pgmout}" | ||
| fi | ||
|
|
||
| ########################################## | ||
| # Remove the Temporary working directory | ||
| ########################################## | ||
| cd "${DATAROOT}" || (echo "${DATAROOT} does not exist. ABORT!"; exit 1) | ||
| [[ ${KEEPDATA} = "NO" ]] && rm -rf "${DATA}" | ||
|
|
||
| exit 0 | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| #! /usr/bin/env bash | ||
|
|
||
| source "${HOMEgfs}/ush/preamble.sh" | ||
|
|
||
| ############################################################### | ||
| # Source FV3GFS workflow modules | ||
| . "${HOMEgfs}"/ush/load_fv3gfs_modules.sh | ||
| status=$? | ||
| [[ ${status} -ne 0 ]] && exit "${status}" | ||
|
|
||
| ############################################################### | ||
| # setup python path for workflow utilities and tasks | ||
| PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}${HOMEgfs}/ush/python" | ||
| export PYTHONPATH | ||
|
|
||
| export job="arch_vrfy" | ||
| export jobid="${job}.$$" | ||
|
|
||
| ############################################################### | ||
| # Execute the JJOB | ||
| "${HOMEgfs}"/jobs/JGLOBAL_ARCHIVE_VRFY | ||
| status=$? | ||
|
|
||
| exit "${status}" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| #! /usr/bin/env bash | ||
|
|
||
| source "${HOMEgfs}/ush/preamble.sh" | ||
|
|
||
| ############################################################### | ||
| # Source FV3GFS workflow modules | ||
| . "${HOMEgfs}/ush/load_fv3gfs_modules.sh" | ||
| status=$? | ||
| [[ ${status} -ne 0 ]] && exit "${status}" | ||
|
|
||
| ############################################################### | ||
| # setup python path for workflow utilities and tasks | ||
| PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}${HOMEgfs}/ush/python" | ||
| export PYTHONPATH | ||
|
|
||
| export job="earc_vrfy" | ||
| export jobid="${job}.$$" | ||
|
|
||
| ############################################################### | ||
| # Execute the JJOB | ||
| "${HOMEgfs}/jobs/JGDAS_ENKF_ARCHIVE_VRFY" | ||
| status=$? | ||
|
|
||
| exit "${status}" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 4 additions & 4 deletions
8
parm/config/gefs/config.arch → parm/config/gefs/config.arch_tars
|
WalterKolczynski-NOAA marked this conversation as resolved.
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,15 @@ | ||
| #! /usr/bin/env bash | ||
|
|
||
| ########## config.arch ########## | ||
| ########## config.arch_tars ########## | ||
| # Archive specific | ||
|
|
||
| echo "BEGIN: config.arch" | ||
| echo "BEGIN: config.arch_tars" | ||
|
|
||
| # Get task specific resources | ||
| . "${EXPDIR}/config.resources" arch | ||
| . "${EXPDIR}/config.resources" arch_tars | ||
|
|
||
| export ARCH_GAUSSIAN="YES" | ||
| export ARCH_GAUSSIAN_FHMAX=${FHMAX_GFS} | ||
| export ARCH_GAUSSIAN_FHINC=${FHOUT_GFS} | ||
|
|
||
| echo "END: config.arch" | ||
| echo "END: config.arch_tars" |
8 changes: 4 additions & 4 deletions
8
parm/config/gfs/config.arch → parm/config/gefs/config.arch_vrfy
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,15 @@ | ||
| #! /usr/bin/env bash | ||
|
|
||
| ########## config.arch ########## | ||
| ########## config.arch_vrfy ########## | ||
| # Archive specific | ||
|
|
||
| echo "BEGIN: config.arch" | ||
| echo "BEGIN: config.arch_vrfy" | ||
|
|
||
| # Get task specific resources | ||
| . "${EXPDIR}/config.resources" arch | ||
| . "${EXPDIR}/config.resources" arch_vrfy | ||
|
|
||
| export ARCH_GAUSSIAN="YES" | ||
| export ARCH_GAUSSIAN_FHMAX=${FHMAX_GFS} | ||
| export ARCH_GAUSSIAN_FHINC=${FHOUT_GFS} | ||
|
|
||
| echo "END: config.arch" | ||
| echo "END: config.arch_vrfy" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.