Skip to content
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.

Sign up for GitHub

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

New "atmanlfv3inc" Rocoto job #2420

Merged
merged 57 commits into from
Apr 23, 2024
Merged

New "atmanlfv3inc" Rocoto job #2420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
bbc238e
Adding rocoto job for converting JEDI increment to FV3 increment
DavidNew-NOAA Mar 18, 2024
afc57a9
Added HPC environments and bug fixes
DavidNew-NOAA Mar 19, 2024
f63ecad
Merge branch 'develop' into feature/jediinc2fv3
DavidNew-NOAA Mar 19, 2024
051d08f
Remove jediinc2fv3.py from link_workflow.sh
DavidNew-NOAA Mar 20, 2024
5bf1b25
Fixed small omission
DavidNew-NOAA Mar 21, 2024
a5d04d3
Merge branch 'develop' into feature/jediinc2fv3
DavidNew-NOAA Mar 21, 2024
c0fed8d
Merge branch 'develop' into feature/jediinc2fv3
DavidNew-NOAA Mar 21, 2024
57caeec
Rename atmanlrun and atmanlinc to atmanlvar and atmanlfv3 respectively
DavidNew-NOAA Mar 21, 2024
f9f111e
Merge branch 'feature/jediinc2fv3' of https://github.com/DavidNew-NOA…
DavidNew-NOAA Mar 21, 2024
c8f63e3
Merge branch 'develop' into feature/jediinc2fv3
DavidNew-NOAA Mar 21, 2024
1c5b2be
Merge branch 'develop' into feature/jediinc2fv3
DavidNew-NOAA Mar 25, 2024
b72ccfd
Finalized HPC environment file changes and bugs in analysis scripts
DavidNew-NOAA Mar 25, 2024
98d297c
Minor documentation update
DavidNew-NOAA Mar 25, 2024
88c414c
Undo change
DavidNew-NOAA Mar 25, 2024
df4ebf9
Merge branch 'develop' into feature/jediinc2fv3
DavidNew-NOAA Mar 26, 2024
8aa9ffc
Fix trailing whitespace
DavidNew-NOAA Mar 26, 2024
47dde9f
Revert changes that completely eliminate jediinc2fv3.py interactions …
DavidNew-NOAA Mar 26, 2024
91c358a
Merge branch 'develop' into feature/jediinc2fv3
DavidNew-NOAA Mar 27, 2024
8fe51fb
Update GDASApp submodule with PR #983
DavidNew-NOAA Mar 28, 2024
c23c743
Merge branch 'develop' into feature/jediinc2fv3
DavidNew-NOAA Mar 28, 2024
32d6e76
Reverting accidental renaming
DavidNew-NOAA Mar 29, 2024
31dc53c
Reverting some changes and revising some things.
DavidNew-NOAA Mar 29, 2024
c40a668
Merge branch 'develop' into feature/jediinc2fv3
DavidNew-NOAA Mar 29, 2024
63d2b63
Update GDASApp develop
DavidNew-NOAA Mar 29, 2024
a736d7c
Merge branch 'develop' into feature/jediinc2fv3
DavidNew-NOAA Apr 2, 2024
5218b65
Merge branch 'develop' into feature/jediinc2fv3
DavidNew-NOAA Apr 2, 2024
114a054
Update name of FV3 increment converter YAML for variational job
DavidNew-NOAA Apr 4, 2024
fe4b5d0
Merge branch 'develop' into feature/jediinc2fv3
DavidNew-NOAA Apr 5, 2024
2ec1d30
Slight refactoring of analysis jobs
DavidNew-NOAA Apr 9, 2024
cbf7da7
Merge branch 'develop' into feature/jediinc2fv3
DavidNew-NOAA Apr 9, 2024
7b40fce
Move executable linking to executation functions in analysis jobs
DavidNew-NOAA Apr 9, 2024
da041db
Merge branch 'develop' into feature/jediinc2fv3
DavidNew-NOAA Apr 11, 2024
f098e55
Coding norms
DavidNew-NOAA Apr 11, 2024
2fcc64b
Revert some things
DavidNew-NOAA Apr 11, 2024
2d757c0
Hopefully final changes and reversions
DavidNew-NOAA Apr 11, 2024
a4a8c7d
Fix calcanl_gfs.py to allow time dimension in increment. Also, update…
DavidNew-NOAA Apr 12, 2024
70019c7
Merge branch 'develop' into feature/jediinc2fv3
DavidNew-NOAA Apr 12, 2024
90673ba
Coding norms
DavidNew-NOAA Apr 12, 2024
7c2d787
Merge branch 'develop' into feature/jediinc2fv3
DavidNew-NOAA Apr 12, 2024
cbedaef
Update GDASApp hash
DavidNew-NOAA Apr 15, 2024
333a52d
Add atmanlfv3inc to HERCULES.env
DavidNew-NOAA Apr 15, 2024
fda5345
Merge branch 'develop' into feature/jediinc2fv3
DavidNew-NOAA Apr 15, 2024
44b9f33
Update GSI Utils hash
DavidNew-NOAA Apr 15, 2024
06eca74
Make placeholder in AWSPW.env and CONTAINER.env for atmanlfv3inc job
DavidNew-NOAA Apr 15, 2024
3993e0b
Merge branch 'develop' into feature/jediinc2fv3
DavidNew-NOAA Apr 15, 2024
0cd40a1
Merge branch 'develop' into feature/jediinc2fv3
DavidNew-NOAA Apr 16, 2024
84f059c
Merge branch 'develop' into feature/jediinc2fv3
DavidNew-NOAA Apr 16, 2024
f4ed194
Merge branch 'develop' into feature/jediinc2fv3
DavidNew-NOAA Apr 17, 2024
a1c66a8
Merge branch 'develop' into feature/jediinc2fv3
DavidNew-NOAA Apr 18, 2024
42ef96c
Merge branch 'feature/jediinc2fv3' of https://github.com/DavidNew-NOA…
DavidNew-NOAA Apr 18, 2024
a1de802
Update GDASApp hash
DavidNew-NOAA Apr 18, 2024
d2d587c
Merge branch 'develop' into feature/jediinc2fv3
DavidNew-NOAA Apr 18, 2024
b032f66
Merge branch 'develop' into feature/jediinc2fv3
aerorahul Apr 22, 2024
5d98365
Update GDASApp hash
DavidNew-NOAA Apr 22, 2024
94d28d5
Merge branch 'develop' into feature/jediinc2fv3
WalterKolczynski-NOAA Apr 22, 2024
015aec2
Merge branch 'develop' into feature/jediinc2fv3
aerorahul Apr 23, 2024
bdac578
Merge branch 'develop' into feature/jediinc2fv3
aerorahul Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion env/AWSPW.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ if [[ $# -ne 1 ]]; then

echo "Must specify an input argument to set runtime environment variables!"
echo "argument can be any one of the following:"
echo "atmanlrun atmensanlrun aeroanlrun snowanl"
echo "atmanlvar atmanlfv3inc atmensanlrun aeroanlrun snowanl"
echo "anal sfcanl fcst post metp"
echo "eobs eupd ecen efcs epos"
echo "postsnd awips gempak"
Expand Down
2 changes: 1 addition & 1 deletion env/CONTAINER.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ if [[ $# -ne 1 ]]; then

echo "Must specify an input argument to set runtime environment variables!"
echo "argument can be any one of the following:"
echo "atmanlrun atmensanlrun aeroanlrun snowanl"
echo "atmanlvar atmanlfv3inc atmensanlrun aeroanlrun snowanl"
echo "anal sfcanl fcst post metp"
echo "eobs eupd ecen efcs epos"
echo "postsnd awips gempak"
Expand Down
20 changes: 14 additions & 6 deletions env/HERA.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ if [[ $# -ne 1 ]]; then

echo "Must specify an input argument to set runtime environment variables!"
echo "argument can be any one of the following:"
echo "atmanlrun atmensanlrun aeroanlrun snowanl"
echo "atmanlvar atmensanlrun aeroanlrun snowanl atmanlfv3inc"
echo "anal sfcanl fcst post metp"
echo "eobs eupd ecen efcs epos"
echo "postsnd awips gempak"
Expand Down Expand Up @@ -56,13 +56,13 @@ elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}
export wavempexec=${launcher}
export wave_mpmd=${mpmd_opt}

elif [[ "${step}" = "atmanlrun" ]]; then
elif [[ "${step}" = "atmanlvar" ]]; then

nth_max=$((npe_node_max / npe_node_atmanlrun))
nth_max=$((npe_node_max / npe_node_atmanlvar))

export NTHREADS_ATMANL=${nth_atmanlrun:-${nth_max}}
[[ ${NTHREADS_ATMANL} -gt ${nth_max} ]] && export NTHREADS_ATMANL=${nth_max}
export APRUN_ATMANL="${launcher} -n ${npe_atmanlrun} --cpus-per-task=${NTHREADS_ATMANL}"
export NTHREADS_ATMANLVAR=${nth_atmanlvar:-${nth_max}}
[[ ${NTHREADS_ATMANLVAR} -gt ${nth_max} ]] && export NTHREADS_ATMANLVAR=${nth_max}
export APRUN_ATMANLVAR="${launcher} -n ${npe_atmanlvar} --cpus-per-task=${NTHREADS_ATMANLVAR}"

elif [[ "${step}" = "atmensanlrun" ]]; then

Expand All @@ -82,6 +82,14 @@ elif [[ "${step}" = "aeroanlrun" ]]; then
[[ ${NTHREADS_AEROANL} -gt ${nth_max} ]] && export NTHREADS_AEROANL=${nth_max}
export APRUN_AEROANL="${launcher} -n ${npe_aeroanlrun} --cpus-per-task=${NTHREADS_AEROANL}"

elif [[ "${step}" = "atmanlfv3inc" ]]; then

nth_max=$((npe_node_max / npe_node_atmanlfv3inc))

export NTHREADS_ATMANLFV3INC=${nth_atmanlfv3inc:-${nth_max}}
[[ ${NTHREADS_ATMANLFV3INC} -gt ${nth_max} ]] && export NTHREADS_ATMANLFV3INC=${nth_max}
export APRUN_ATMANLFV3INC="${launcher} -n ${npe_atmanlfv3inc} --cpus-per-task=${NTHREADS_ATMANLFV3INC}"

elif [[ "${step}" = "snowanl" ]]; then

nth_max=$((npe_node_max / npe_node_snowanl))
Expand Down
18 changes: 13 additions & 5 deletions env/HERCULES.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,21 @@ case ${step} in
export wave_mpmd=${mpmd_opt}

;;
"atmanlrun")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CI test C96C48_ufs_hybatmDA failed on Hercules because HERCULES.env does not contain a section for atmanlfv3inc.

@AndrewEichmann-NOAA , ocnanalecen is also missing from HERCULES.env.

"atmanlvar")

nth_max=$((npe_node_max / npe_node_atmanlrun))
nth_max=$((npe_node_max / npe_node_atmanlvar))

export NTHREADS_ATMANL=${nth_atmanlrun:-${nth_max}}
[[ ${NTHREADS_ATMANL} -gt ${nth_max} ]] && export NTHREADS_ATMANL=${nth_max}
export APRUN_ATMANL="${launcher} -n ${npe_atmanlrun} --cpus-per-task=${NTHREADS_ATMANL}"
export NTHREADS_ATMANLVAR=${nth_atmanlvar:-${nth_max}}
[[ ${NTHREADS_ATMANLVAR} -gt ${nth_max} ]] && export NTHREADS_ATMANLVAR=${nth_max}
export APRUN_ATMANLVAR="${launcher} -n ${npe_atmanlvar} --cpus-per-task=${NTHREADS_ATMANLVAR}"
;;
"atmanlfv3inc")

nth_max=$((npe_node_max / npe_node_atmanlfv3inc))

export NTHREADS_ATMANLFV3INC=${nth_atmanlfv3inc:-${nth_max}}
[[ ${NTHREADS_ATMANLFV3INC} -gt ${nth_max} ]] && export NTHREADS_ATMANLFV3INC=${nth_max}
export APRUN_ATMANLFV3INC="${launcher} -n ${npe_atmanlfv3inc} --cpus-per-task=${NTHREADS_ATMANLFV3INC}"
;;
"atmensanlrun")

Expand Down
20 changes: 14 additions & 6 deletions env/JET.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ if [[ $# -ne 1 ]]; then

echo "Must specify an input argument to set runtime environment variables!"
echo "argument can be any one of the following:"
echo "atmanlrun atmensanlrun aeroanlrun snowanl"
echo "atmanlvar atmensanlrun aeroanlrun snowanl atmanlfv3inc"
echo "anal sfcanl fcst post metp"
echo "eobs eupd ecen efcs epos"
echo "postsnd awips gempak"
Expand Down Expand Up @@ -44,13 +44,13 @@ elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}
export wavempexec=${launcher}
export wave_mpmd=${mpmd_opt}

elif [[ "${step}" = "atmanlrun" ]]; then
elif [[ "${step}" = "atmanlvar" ]]; then

nth_max=$((npe_node_max / npe_node_atmanlrun))
nth_max=$((npe_node_max / npe_node_atmanlvar))

export NTHREADS_ATMANL=${nth_atmanlrun:-${nth_max}}
[[ ${NTHREADS_ATMANL} -gt ${nth_max} ]] && export NTHREADS_ATMANL=${nth_max}
export APRUN_ATMANL="${launcher} -n ${npe_atmanlrun}"
export NTHREADS_ATMANLVAR=${nth_atmanlvar:-${nth_max}}
[[ ${NTHREADS_ATMANLVAR} -gt ${nth_max} ]] && export NTHREADS_ATMANLVAR=${nth_max}
export APRUN_ATMANLVAR="${launcher} -n ${npe_atmanlvar}"

elif [[ "${step}" = "atmensanlrun" ]]; then

Expand Down Expand Up @@ -80,6 +80,14 @@ elif [[ "${step}" = "snowanl" ]]; then

export APRUN_APPLY_INCR="${launcher} -n 6"

elif [[ "${step}" = "atmanlfv3inc" ]]; then

nth_max=$((npe_node_max / npe_node_atmanlfv3inc))

export NTHREADS_ATMANLFV3INC=${nth_atmanlfv3inc:-${nth_max}}
[[ ${NTHREADS_ATMANLFV3INC} -gt ${nth_max} ]] && export NTHREADS_ATMANLFV3INC=${nth_max}
export APRUN_ATMANLFV3INC="${launcher} -n ${npe_atmanlfv3inc}"

elif [[ "${step}" = "ocnanalbmat" ]]; then

export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
Expand Down
20 changes: 14 additions & 6 deletions env/ORION.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ if [[ $# -ne 1 ]]; then

echo "Must specify an input argument to set runtime environment variables!"
echo "argument can be any one of the following:"
echo "atmanlrun atmensanlrun aeroanlrun snowanl"
echo "atmanlvar atmensanlrun aeroanlrun snowanl atmanlfv3inc"
echo "anal sfcanl fcst post metp"
echo "eobs eupd ecen efcs epos"
echo "postsnd awips gempak"
Expand Down Expand Up @@ -52,13 +52,13 @@ elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}
export wavempexec=${launcher}
export wave_mpmd=${mpmd_opt}

elif [[ "${step}" = "atmanlrun" ]]; then
elif [[ "${step}" = "atmanlvar" ]]; then

nth_max=$((npe_node_max / npe_node_atmanlrun))
nth_max=$((npe_node_max / npe_node_atmanlvar))

export NTHREADS_ATMANL=${nth_atmanlrun:-${nth_max}}
[[ ${NTHREADS_ATMANL} -gt ${nth_max} ]] && export NTHREADS_ATMANL=${nth_max}
export APRUN_ATMANL="${launcher} -n ${npe_atmanlrun} --cpus-per-task=${NTHREADS_ATMANL}"
export NTHREADS_ATMANLVAR=${nth_atmanlvar:-${nth_max}}
[[ ${NTHREADS_ATMANLVAR} -gt ${nth_max} ]] && export NTHREADS_ATMANLVAR=${nth_max}
export APRUN_ATMANLVAR="${launcher} -n ${npe_atmanlvar} --cpus-per-task=${NTHREADS_ATMANLVAR}"

elif [[ "${step}" = "atmensanlrun" ]]; then

Expand Down Expand Up @@ -88,6 +88,14 @@ elif [[ "${step}" = "snowanl" ]]; then

export APRUN_APPLY_INCR="${launcher} -n 6"

elif [[ "${step}" = "atmanlfv3inc" ]]; then

nth_max=$((npe_node_max / npe_node_atmanlfv3inc))

export NTHREADS_ATMANLFV3INC=${nth_atmanlfv3inc:-${nth_max}}
[[ ${NTHREADS_ATMANLFV3INC} -gt ${nth_max} ]] && export NTHREADS_ATMANLFV3INC=${nth_max}
export APRUN_ATMANLFV3INC="${launcher} -n ${npe_atmanlfv3inc} --cpus-per-task=${NTHREADS_ATMANLFV3INC}"

elif [[ "${step}" = "ocnanalbmat" ]]; then

export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
Expand Down
20 changes: 14 additions & 6 deletions env/S4.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ if [[ $# -ne 1 ]]; then

echo "Must specify an input argument to set runtime environment variables!"
echo "argument can be any one of the following:"
echo "atmanlrun atmensanlrun aeroanlrun snowanl"
echo "atmanlvar atmensanlrun aeroanlrun snowanl atmanlfv3inc"
echo "anal sfcanl fcst post metp"
echo "eobs eupd ecen efcs epos"
echo "postsnd awips gempak"
Expand Down Expand Up @@ -44,13 +44,13 @@ elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}
export wavempexec=${launcher}
export wave_mpmd=${mpmd_opt}

elif [[ "${step}" = "atmanlrun" ]]; then
elif [[ "${step}" = "atmanlvar" ]]; then

nth_max=$((npe_node_max / npe_node_atmanlrun))
nth_max=$((npe_node_max / npe_node_atmanlvar))

export NTHREADS_ATMANL=${nth_atmanlrun:-${nth_max}}
[[ ${NTHREADS_ATMANL} -gt ${nth_max} ]] && export NTHREADS_ATMANL=${nth_max}
export APRUN_ATMANL="${launcher} -n ${npe_atmanlrun}"
export NTHREADS_ATMANLVAR=${nth_atmanlvar:-${nth_max}}
[[ ${NTHREADS_ATMANLVAR} -gt ${nth_max} ]] && export NTHREADS_ATMANLVAR=${nth_max}
export APRUN_ATMANLVAR="${launcher} -n ${npe_atmanlvar}"

elif [[ "${step}" = "atmensanlrun" ]]; then

Expand Down Expand Up @@ -80,6 +80,14 @@ elif [[ "${step}" = "snowanl" ]]; then

export APRUN_APPLY_INCR="${launcher} -n 6"

elif [[ "${step}" = "atmanlfv3inc" ]]; then

nth_max=$((npe_node_max / npe_node_atmanlfv3inc))

export NTHREADS_ATMANLFV3INC=${nth_atmanlfv3inc:-${nth_max}}
[[ ${NTHREADS_ATMANLFV3INC} -gt ${nth_max} ]] && export NTHREADS_ATMANLFV3INC=${nth_max}
export APRUN_ATMANLFV3INC="${launcher} -n ${npe_atmanlfv3inc}"

elif [[ "${step}" = "ocnanalbmat" ]]; then
echo "WARNING: ${step} is not enabled on S4!"

Expand Down
20 changes: 14 additions & 6 deletions env/WCOSS2.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ if [[ $# -ne 1 ]]; then

echo "Must specify an input argument to set runtime environment variables!"
echo "argument can be any one of the following:"
echo "atmanlrun atmensanlrun aeroanlrun snowanl"
echo "atmanlvar atmensanlrun aeroanlrun snowanl atmanlfv3inc"
echo "anal sfcanl fcst post metp"
echo "eobs eupd ecen esfc efcs epos"
echo "postsnd awips gempak"
Expand Down Expand Up @@ -38,13 +38,13 @@ elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}
export wavempexec="${launcher} -np"
export wave_mpmd=${mpmd_opt}

elif [[ "${step}" = "atmanlrun" ]]; then
elif [[ "${step}" = "atmanlvar" ]]; then

nth_max=$((npe_node_max / npe_node_atmanlrun))
nth_max=$((npe_node_max / npe_node_atmanlvar))

export NTHREADS_ATMANL=${nth_atmanlrun:-${nth_max}}
[[ ${NTHREADS_ATMANL} -gt ${nth_max} ]] && export NTHREADS_ATMANL=${nth_max}
export APRUN_ATMANL="${launcher} -n ${npe_atmanlrun}"
export NTHREADS_ATMANLVAR=${nth_atmanlvar:-${nth_max}}
[[ ${NTHREADS_ATMANLVAR} -gt ${nth_max} ]] && export NTHREADS_ATMANLVAR=${nth_max}
export APRUN_ATMANLVAR="${launcher} -n ${npe_atmanlvar}"

elif [[ "${step}" = "atmensanlrun" ]]; then

Expand Down Expand Up @@ -74,6 +74,14 @@ elif [[ "${step}" = "snowanl" ]]; then

export APRUN_APPLY_INCR="${launcher} -n 6"

elif [[ "${step}" = "atmanlfv3inc" ]]; then

nth_max=$((npe_node_max / npe_node_atmanlfv3inc))

export NTHREADS_ATMANLFV3INC=${nth_atmanlfv3inc:-${nth_max}}
[[ ${NTHREADS_ATMANLFV3INC} -gt ${nth_max} ]] && export NTHREADS_ATMANLFV3INC=${nth_max}
export APRUN_ATMANLFV3INC="${launcher} -n ${npe_atmanlfv3inc}"

elif [[ "${step}" = "anal" ]] || [[ "${step}" = "analcalc" ]]; then

export OMP_PLACES=cores
Expand Down
37 changes: 37 additions & 0 deletions jobs/JGLOBAL_ATM_ANALYSIS_FV3_INCREMENT
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
#! /usr/bin/env bash

source "${HOMEgfs}/ush/preamble.sh"
export WIPE_DATA="NO"
export DATA=${DATA:-${DATAROOT}/${RUN}atmanl_${cyc}}
source "${HOMEgfs}/ush/jjob_header.sh" -e "atmanlfv3inc" -c "base atmanl atmanlfv3inc"

##############################################
# Set variables used in the script
##############################################


##############################################
# Begin JOB SPECIFIC work
##############################################


###############################################################
# Run relevant script

EXSCRIPT=${GDASATMRUNSH:-${SCRgfs}/exglobal_atm_analysis_fv3_increment.py}
${EXSCRIPT}
status=$?
[[ ${status} -ne 0 ]] && exit "${status}"

##############################################
# End JOB SPECIFIC work
##############################################

##############################################
# Final processing
##############################################
if [[ -e "${pgmout}" ]] ; then
cat "${pgmout}"
fi

exit 0
4 changes: 2 additions & 2 deletions jobs/JGLOBAL_ATM_ANALYSIS_RUN → jobs/JGLOBAL_ATM_ANALYSIS_VARIATIONAL
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
source "${HOMEgfs}/ush/preamble.sh"
export WIPE_DATA="NO"
export DATA=${DATA:-${DATAROOT}/${RUN}atmanl_${cyc}}
source "${HOMEgfs}/ush/jjob_header.sh" -e "atmanlrun" -c "base atmanl atmanlrun"
source "${HOMEgfs}/ush/jjob_header.sh" -e "atmanlvar" -c "base atmanl atmanlvar"

##############################################
# Set variables used in the script
Expand All @@ -18,7 +18,7 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "atmanlrun" -c "base atmanl atmanlrun"
###############################################################
# Run relevant script

EXSCRIPT=${GDASATMRUNSH:-${SCRgfs}/exglobal_atm_analysis_run.py}
EXSCRIPT=${GDASATMRUNSH:-${SCRgfs}/exglobal_atm_analysis_variational.py}
${EXSCRIPT}
status=$?
[[ ${status} -ne 0 ]] && exit "${status}"
Expand Down
24 changes: 24 additions & 0 deletions jobs/rocoto/atmanlfv3inc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#! /usr/bin/env bash

source "${HOMEgfs}/ush/preamble.sh"

###############################################################
# Source UFSDA workflow modules
. "${HOMEgfs}/ush/load_ufsda_modules.sh"
status=$?
[[ ${status} -ne 0 ]] && exit "${status}"

export job="atmanlfv3inc"
export jobid="${job}.$$"

###############################################################
# setup python path for workflow utilities and tasks
wxflowPATH="${HOMEgfs}/ush/python:${HOMEgfs}/ush/python/wxflow/src"
PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}${wxflowPATH}"
export PYTHONPATH

###############################################################
# Execute the JJOB
"${HOMEgfs}/jobs/JGLOBAL_ATM_ANALYSIS_FV3_INCREMENT"
status=$?
exit "${status}"
4 changes: 2 additions & 2 deletions jobs/rocoto/atmanlrun.sh → jobs/rocoto/atmanlvar.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ source "${HOMEgfs}/ush/preamble.sh"
status=$?
[[ ${status} -ne 0 ]] && exit "${status}"

export job="atmanlrun"
export job="atmanlvar"
export jobid="${job}.$$"

###############################################################
Expand All @@ -19,6 +19,6 @@ export PYTHONPATH

###############################################################
# Execute the JJOB
"${HOMEgfs}/jobs/JGLOBAL_ATM_ANALYSIS_RUN"
"${HOMEgfs}/jobs/JGLOBAL_ATM_ANALYSIS_VARIATIONAL"
status=$?
exit "${status}"
14 changes: 14 additions & 0 deletions parm/config/gfs/config.atmanlfv3inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#! /usr/bin/env bash

########## config.atmanlfv3inc ##########
# Atm Var Analysis specific

echo "BEGIN: config.atmanlfv3inc"

# Get task specific resources
. "${EXPDIR}/config.resources" atmanlfv3inc

export JEDIYAML=${PARMgfs}/gdas/atm/utils/fv3jedi_fv3inc_variational.yaml.j2
export JEDIEXE=${EXECgfs}/fv3jedi_fv3inc.x

echo "END: config.atmanlfv3inc"
11 changes: 0 additions & 11 deletions parm/config/gfs/config.atmanlrun
View file
Open in desktop

This file was deleted.

11 changes: 11 additions & 0 deletions parm/config/gfs/config.atmanlvar
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#! /usr/bin/env bash

########## config.atmanlvar ##########
# Atm Var Analysis specific

echo "BEGIN: config.atmanlvar"

# Get task specific resources
. "${EXPDIR}/config.resources" atmanlvar

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did we not discuss moving the JEDI_YAML and JEDI_EXE for the variational executable here from config.atmanl?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@aerorahul We did, but I reverted a bunch of changes that weren't directly related to the atmanlfv3inc job, because this PR was becoming pretty unwieldy. I can change that line back though if you want.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@aerorahul Additionally though, recall from our discussion that only the JEDIEXE can be moved, not the JEDIYAML, because both the init and var run job need the variational YAML.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lets keep this as is for now, but make an issue to discuss and hash this out sooner (rather than later).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will do

echo "END: config.atmanlvar"
Loading
Loading