Skip to content

Commit 3c6954e

Browse files
ClaraDraper-NOAAClaraDraper-NOAA
authored
(develop) Zero-diff changes to sfc updates, to speed up v17 (develop branch) (NOAA-EMC#4745)
1 parent c2cf14a commit 3c6954e

42 files changed

Lines changed: 572 additions & 215 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎dev/ci/cases/yamls/ufs_hybatmDA_defaults.ci.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ atmensanl:
2121
OBS_JEDI_TEST_YAML: "${HOMEglobal}/sorc/gdas.cd/test/gw-ci/atm/jedi-test_lgetkf-observer_ufs_hybatmDA.yaml.j2"
2222
SOL_JEDI_TEST_YAML: "${HOMEglobal}/sorc/gdas.cd/test/gw-ci/atm/jedi-test_lgetkf-solver_ufs_hybatmDA.yaml.j2"
2323
FV3INC_JEDI_TEST_YAML: "${HOMEglobal}/sorc/gdas.cd/test/gw-ci/atm/jedi-test_lgetkf-fv3inc_ufs_hybatmDA.yaml.j2"
24-
esfc:
24+
esfc_gcycle:
2525
DONST: "NO"
2626
nsst:
2727
NST_MODEL: "1"
2828
prepatmiodaobs:
2929
DO_CONVERT_IODA: "YES"
30-
sfcanl:
30+
sfcanl_gcycle:
3131
DONST: "NO"

‎dev/ci/cases/yamls/ufsgsi_hybatmDA_defaults.ci.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ atmanl:
1818
NUMBER_OUTER_LOOPS: 2
1919
NINNER_LOOP1: 2
2020
NINNER_LOOP2: 4
21-
esfc:
21+
esfc_gcycle:
2222
DONST: "NO"
2323
nsst:
2424
NST_MODEL: "1"
@@ -28,5 +28,5 @@ prep:
2828
CONVERT_BIASCOR: "YES"
2929
prepatmiodaobs:
3030
DO_CONVERT_IODA: "YES"
31-
sfcanl:
31+
sfcanl_gcycle:
3232
DONST: "NO"

dev/job_cards/rocoto/esfc.sh renamed to dev/job_cards/rocoto/esfc_gcycle.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ if [[ ${status} -ne 0 ]]; then
1010
exit "${status}"
1111
fi
1212

13-
export job="esfc"
13+
export job="esfcg"
1414
export jobid="${job}.$$"
1515

1616
###############################################################
1717
# Execute the JJOB
18-
"${HOMEglobal}/dev/jobs/JGLOBAL_ENKF_SFC"
18+
"${HOMEglobal}/dev/jobs/JGLOBAL_ENKF_SFC_GCYCLE"
1919
status=$?
2020

2121
exit "${status}"

‎dev/job_cards/rocoto/esfc_regrid.sh‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#! /usr/bin/env bash
2+
3+
set -x
4+
5+
###############################################################
6+
# Source GSI workflow modules
7+
source "${HOMEglobal}/dev/ush/load_modules.sh" gsi
8+
status=$?
9+
if [[ ${status} -ne 0 ]]; then
10+
exit "${status}"
11+
fi
12+
13+
export job="esfcr"
14+
export jobid="${job}.$$"
15+
16+
###############################################################
17+
# Execute the JJOB
18+
"${HOMEglobal}/dev/jobs/JGLOBAL_ENKF_SFC_REGRID"
19+
status=$?
20+
21+
exit "${status}"

dev/job_cards/rocoto/sfcanl.sh renamed to dev/job_cards/rocoto/sfcanl_gcycle.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ if [[ ${status} -ne 0 ]]; then
1010
exit "${status}"
1111
fi
1212

13-
export job="sfcanl"
13+
export job="sfcanlg"
1414
export jobid="${job}.$$"
1515

1616
###############################################################
1717
# Execute the JJOB
18-
"${HOMEglobal}/dev/jobs/JGLOBAL_ATMOS_SFCANL"
18+
"${HOMEglobal}/dev/jobs/JGLOBAL_ATMOS_SFCANL_GCYCLE"
1919
status=$?
2020

2121
exit "${status}"

‎dev/job_cards/rocoto/sfcanl_regrid.sh‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#! /usr/bin/env bash
2+
3+
set -x
4+
5+
###############################################################
6+
# Source FV3GFS workflow modules
7+
source "${HOMEglobal}/dev/ush/load_modules.sh" run
8+
status=$?
9+
if [[ ${status} -ne 0 ]]; then
10+
exit "${status}"
11+
fi
12+
13+
export job="sfcanlr"
14+
export jobid="${job}.$$"
15+
16+
###############################################################
17+
# Execute the JJOB
18+
"${HOMEglobal}/dev/jobs/JGLOBAL_ATMOS_SFCANL_REGRID"
19+
status=$?
20+
21+
exit "${status}"

‎dev/jobs/JGLOBAL_ATMOS_ANALYSIS_CALC‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ if [[ ${err} -ne 0 ]]; then
6666
err_exit "Failed to get LEVS from ${ATMGES}"
6767
fi
6868

69-
# Generate Gaussian surface analysis # TODO: Should this be removed now that sfcanl is its own job?
7069
export DOGAUSFCANL=${DOGAUSFCANL:-"YES"}
7170

7271
###############################################################

dev/jobs/JGLOBAL_ATMOS_SFCANL renamed to dev/jobs/JGLOBAL_ATMOS_SFCANL_GCYCLE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /usr/bin/env bash
22
set -x
3-
source "${HOMEglobal}/ush/jjob_header.sh" -e "sfcanl" -c "base sfcanl"
3+
source "${HOMEglobal}/ush/jjob_header.sh" -e "sfcanl_gcycle" -c "base sfcanl_gcycle"
44

55
#{% if false %}
66
source "${HOMEglobal}/ush/jjob_standard_vars.sh"
@@ -43,7 +43,7 @@ export USE_CFP=YES
4343
###############################################################
4444
# Run relevant script
4545

46-
${SFCANALSH:-${SCRglobal}/exglobal_atmos_sfcanl.sh} && true
46+
${SFCANALSH:-${SCRglobal}/exglobal_atmos_sfcanl_gcycle.sh} && true
4747
export err=$?
4848
if [[ ${err} -ne 0 ]]; then
4949
err_exit "Failed to calculate the surface analysis"

‎dev/jobs/JGLOBAL_ATMOS_SFCANL_REGRID‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
#! /usr/bin/env bash
2+
set -x
3+
source "${HOMEglobal}/ush/jjob_header.sh" -e "sfcanl_regrid" -c "base sfcanl_regrid"
4+
5+
#{% if false %}
6+
source "${HOMEglobal}/ush/jjob_standard_vars.sh"
7+
#{% else %}
8+
#{% include jjob_var_setup.j2 %}
9+
#{% endif %}
10+
11+
source "${USHglobal}/jjob_shell_setup.sh"
12+
# Set strict mode which will exit on error or undefined variable
13+
# and exit on error in a pipeline (e.g. if a command in "cmd | cmd2" fails)
14+
source "${USHglobal}/set_strict.sh"
15+
16+
##############################################
17+
# Begin JOB SPECIFIC work
18+
##############################################
19+
# Ignore possible spelling error (nothing is misspelled)
20+
# shellcheck disable=SC2153
21+
GDATE=$(date --utc -d "${PDY} ${cyc} - ${assim_freq} hours" +%Y%m%d%H)
22+
export GDATE
23+
24+
BKG_RUN="gdas"
25+
if [[ "${RUN}" == "gcafs" || "${RUN}" == "gcdas" ]]; then
26+
BKG_RUN="gcdas"
27+
fi
28+
29+
declare -rx COMIN_OBS_PREV="${ROTDIR}/${BKG_RUN}.${GDATE:0:8}/${GDATE:8:2}/obs"
30+
declare -rx COMIN_ATMOS_RESTART_PREV="${ROTDIR}/${BKG_RUN}.${GDATE:0:8}/${GDATE:8:2}/model/atmos/restart"
31+
32+
declare -rx COMIN_OBS="${ROTDIR}/${RUN}.${PDY}/${cyc}/obs"
33+
declare -rx COMIN_ATMOS_ANALYSIS="${ROTDIR}/${RUN}.${PDY}/${cyc}/analysis/atmos"
34+
declare -rx COMIN_SNOW_ANALYSIS="${ROTDIR}/${RUN}.${PDY}/${cyc}/analysis/snow"
35+
36+
declare -rx COMOUT_ATMOS_RESTART="${ROTDIR}/${RUN}.${PDY}/${cyc}/model/atmos/restart"
37+
38+
declare -rx COMIN_ATMOS_ENKF_ANALYSIS_STAT="${ROTDIR}/enkfgdas.${PDY}/${cyc}/ensstat/analysis/atmos"
39+
40+
mkdir -p "${COMOUT_ATMOS_RESTART}"
41+
42+
# Use CFP to stage and save files in parallel
43+
export USE_CFP=YES
44+
45+
###############################################################
46+
# Run relevant script
47+
48+
${SFCANALSH:-${SCRglobal}/exglobal_atmos_sfcanl_regrid.sh} && true
49+
export err=$?
50+
if [[ ${err} -ne 0 ]]; then
51+
err_exit
52+
fi
53+
54+
##############################################
55+
# End JOB SPECIFIC work
56+
##############################################
57+
58+
##############################################
59+
# Final processing
60+
##############################################
61+
if [[ -e "${pgmout}" ]]; then
62+
cat "${pgmout}"
63+
fi
64+
65+
##########################################
66+
# Remove the Temporary working directory
67+
##########################################
68+
cd "${DATAROOT}" || true
69+
if [[ "${KEEPDATA}" == "NO" ]]; then
70+
rm -rf "${DATA}"
71+
fi
72+
73+
exit 0

dev/jobs/JGLOBAL_ENKF_SFC renamed to dev/jobs/JGLOBAL_ENKF_SFC_GCYCLE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#! /usr/bin/env bash
22
set -x
33

4-
source "${HOMEglobal}/ush/jjob_header.sh" -e "esfc" -c "base esfc"
4+
source "${HOMEglobal}/ush/jjob_header.sh" -e "esfc_gcycle" -c "base esfc_gcycle"
55

66
#{% if false %}
77
source "${HOMEglobal}/ush/jjob_standard_vars.sh"
@@ -52,7 +52,7 @@ export USE_CFP=YES
5252
###############################################################
5353
# Run relevant script
5454

55-
${ENKFRESFCSH:-${SCRglobal}/exglobal_enkf_sfc.sh} && true
55+
${ENKFSFCGCYCLESH:-${SCRglobal}/exglobal_enkf_sfc_gcycle.sh} && true
5656
export err=$?
5757
if [[ ${err} -ne 0 ]]; then
5858
err_exit "Failed to calculate the ensemble surface analysis"

0 commit comments

Comments
 (0)