Skip to content

Commit b30a436

Browse files
KateFriedman-NOAAKateFriedman-NOAA
authored
Updates for AOWCDA and hybatmaerosnowDA cases on Gaea C6 (NOAA-EMC#3487)
Turn on AOWCDA and hybatmaerosnowDA CI tests and related case functionality on Gaea C6. Some updates are also made for Gaea C5 but these CI tests are not turned on there yet. Some alignment fixes are also made to several env files. Resolves NOAA-EMC#3261
1 parent d0824cb commit b30a436

6 files changed

+59
-54
lines changed

Diff for: ‎ci/cases/pr/C48mx500_3DVarAOWCDA.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ arguments:
1818
yaml: {{ HOMEgfs }}/ci/cases/yamls/soca_gfs_defaults_ci.yaml
1919

2020
skip_ci_on_hosts:
21-
- gaeac6
2221
- gaeac5
2322
- orion
2423
- awsepicglobalworkflow

Diff for: ‎ci/cases/pr/C48mx500_hybAOWCDA.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,5 @@ arguments:
2020

2121
skip_ci_on_hosts:
2222
- gaeac5
23-
- gaeac6
2423
- orion
2524
- awsepicglobalworkflow

Diff for: ‎ci/cases/pr/C96C48_hybatmaerosnowDA.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,5 @@ arguments:
2020
skip_ci_on_hosts:
2121
- orion
2222
- gaeac5
23-
- gaeac6
2423
- hercules
2524
- awsepicglobalworkflow

Diff for: ‎env/GAEAC5.env

+28-23
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ case ${step} in
9797
export NTHREADS_AEROANL=${NTHREADSmax}
9898
export APRUN_AEROANL="${APRUN_default} --cpus-per-task=${NTHREADS_AEROANL}"
9999
;;
100-
"aeroanlgenb")
100+
"aeroanlgenb")
101101

102102
export NTHREADS_AEROANLGENB=${NTHREADSmax}
103103
export APRUN_AEROANLGENB="${APRUN_default} --cpus-per-task=${NTHREADS_AEROANLGENB}"
@@ -106,7 +106,7 @@ case ${step} in
106106

107107
export NTHREADS_PREPOBSAERO=${NTHREADS1}
108108
export APRUN_PREPOBSAERO="${APRUN_default} --cpus-per-task=${NTHREADS_PREPOBSAERO}"
109-
;;
109+
;;
110110
"snowanl")
111111

112112
export APRUN_CALCFIMS="${launcher} -n 1"
@@ -116,14 +116,15 @@ case ${step} in
116116

117117
export APRUN_APPLY_INCR="${launcher} -n 6"
118118
;;
119-
"esnowrecen")
119+
"esnowanl")
120+
121+
export APRUN_CALCFIMS="${launcher} -n 1"
120122

121-
export NTHREADS_ESNOWRECEN=${NTHREADSmax}
122-
export APRUN_ESNOWRECEN="${APRUN_default} --cpus-per-task=${NTHREADS_ESNOWRECEN}"
123+
export NTHREADS_ESNOWANL=${NTHREADSmax}
124+
export APRUN_ESNOWANL="${APRUN_default} --cpus-per-task=${NTHREADS_ESNOWANL}"
123125

124126
export APRUN_APPLY_INCR="${launcher} -n 6"
125127
;;
126-
127128
"marinebmat")
128129

129130
export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
@@ -134,25 +135,33 @@ case ${step} in
134135
export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
135136
export APRUN_MARINEANLVAR="${APRUN_default}"
136137
;;
137-
"ocnanalecen")
138-
139-
export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
140-
141-
max_threads_per_task=$((max_tasks_per_node / tasks_per_node_ocnanalecen))
138+
"ocnanalecen")
142139

143-
export NTHREADS_OCNANALECEN=${threads_per_task_ocnanalecen:-${max_threads_per_task}}
144-
if [[ ${NTHREADS_OCNANALECEN} -gt ${max_threads_per_task} ]]; then
145-
export NTHREADS_OCNANALECEN=${max_threads_per_task}
146-
fi
147-
export APRUN_OCNANALECEN="${launcher} -n ${ntasks_ocnanalecen} --cpus-per-task=${NTHREADS_OCNANALECEN}"
148-
;;
140+
export APRUN_OCNANALECEN="${APRUN_default}"
141+
;;
149142
"marineanlchkpt")
150143

151144
export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
152145

153146
export NTHREADS_OCNANAL=${NTHREADSmax}
154147
export APRUN_MARINEANLCHKPT="${APRUN_default} --cpus-per-task=${NTHREADS_OCNANAL}"
155148
;;
149+
"marineanlletkf")
150+
151+
export NTHREADS_MARINEANLLETKF=${NTHREADSmax}
152+
export APRUN_MARINEANLLETKF="${APRUN_default}"
153+
;;
154+
"ecen_fv3jedi")
155+
156+
export NTHREADS_ECEN_FV3JEDI=${NTHREADSmax}
157+
export APRUN_CORRECTION_INCREMENT="${launcher} -n ${ntasks_correction_increment} --cpus-per-task=${NTHREADS_ECEN_FV3JEDI}"
158+
export APRUN_ENSEMBLE_RECENTER="${launcher} -n ${ntasks_ensemble_recenter} --cpus-per-task=${NTHREADS_ECEN_FV3JEDI}"
159+
;;
160+
"analcalc_fv3jedi")
161+
162+
export NTHREADS_ANALCALC_FV3JEDI=${NTHREADSmax}
163+
export APRUN_ANALCALC_FV3JEDI="${APRUN_default} --cpus-per-task=${NTHREADS_ANALCALC_FV3JEDI}"
164+
;;
156165
"anal" | "analcalc")
157166

158167
export MKL_NUM_THREADS=4
@@ -235,24 +244,20 @@ case ${step} in
235244
export APRUN_UFS="${launcher} -n ${ufs_ntasks}"
236245
unset nnodes ufs_ntasks
237246
;;
238-
239247
"upp")
240248

241249
export NTHREADS_UPP=${NTHREADS1}
242250
export APRUN_UPP="${APRUN_default} --cpus-per-task=${NTHREADS_UPP}"
243251
;;
244-
245252
"atmos_products")
246253

247254
export USE_CFP="YES" # Use MPMD for downstream product generation
248255
;;
249-
250-
"oceanice_products")
256+
"oceanice_products")
251257

252258
export NTHREADS_OCNICEPOST=${NTHREADS1}
253259
export APRUN_OCNICEPOST="${launcher} -n 1 --cpus-per-task=${NTHREADS_OCNICEPOST}"
254-
;;
255-
260+
;;
256261
"ecen")
257262

258263
export NTHREADS_ECEN=${NTHREADSmax}

Diff for: ‎env/GAEAC6.env

+28-23
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ case ${step} in
9797
export NTHREADS_AEROANL=${NTHREADSmax}
9898
export APRUN_AEROANL="${APRUN_default} --cpus-per-task=${NTHREADS_AEROANL}"
9999
;;
100-
"aeroanlgenb")
100+
"aeroanlgenb")
101101

102102
export NTHREADS_AEROANLGENB=${NTHREADSmax}
103103
export APRUN_AEROANLGENB="${APRUN_default} --cpus-per-task=${NTHREADS_AEROANLGENB}"
@@ -106,7 +106,7 @@ case ${step} in
106106

107107
export NTHREADS_PREPOBSAERO=${NTHREADS1}
108108
export APRUN_PREPOBSAERO="${APRUN_default} --cpus-per-task=${NTHREADS_PREPOBSAERO}"
109-
;;
109+
;;
110110
"snowanl")
111111

112112
export APRUN_CALCFIMS="${launcher} -n 1"
@@ -116,14 +116,15 @@ case ${step} in
116116

117117
export APRUN_APPLY_INCR="${launcher} -n 6"
118118
;;
119-
"esnowrecen")
119+
"esnowanl")
120+
121+
export APRUN_CALCFIMS="${launcher} -n 1"
120122

121-
export NTHREADS_ESNOWRECEN=${NTHREADSmax}
122-
export APRUN_ESNOWRECEN="${APRUN_default} --cpus-per-task=${NTHREADS_ESNOWRECEN}"
123+
export NTHREADS_ESNOWANL=${NTHREADSmax}
124+
export APRUN_ESNOWANL="${APRUN_default} --cpus-per-task=${NTHREADS_ESNOWANL}"
123125

124126
export APRUN_APPLY_INCR="${launcher} -n 6"
125127
;;
126-
127128
"marinebmat")
128129

129130
export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
@@ -134,25 +135,33 @@ case ${step} in
134135
export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
135136
export APRUN_MARINEANLVAR="${APRUN_default}"
136137
;;
137-
"ocnanalecen")
138-
139-
export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
140-
141-
max_threads_per_task=$((max_tasks_per_node / tasks_per_node_ocnanalecen))
138+
"ocnanalecen")
142139

143-
export NTHREADS_OCNANALECEN=${threads_per_task_ocnanalecen:-${max_threads_per_task}}
144-
if [[ ${NTHREADS_OCNANALECEN} -gt ${max_threads_per_task} ]]; then
145-
export NTHREADS_OCNANALECEN=${max_threads_per_task}
146-
fi
147-
export APRUN_OCNANALECEN="${launcher} -n ${ntasks_ocnanalecen} --cpus-per-task=${NTHREADS_OCNANALECEN}"
148-
;;
140+
export APRUN_OCNANALECEN="${APRUN_default}"
141+
;;
149142
"marineanlchkpt")
150143

151144
export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
152145

153146
export NTHREADS_OCNANAL=${NTHREADSmax}
154147
export APRUN_MARINEANLCHKPT="${APRUN_default} --cpus-per-task=${NTHREADS_OCNANAL}"
155148
;;
149+
"marineanlletkf")
150+
151+
export NTHREADS_MARINEANLLETKF=${NTHREADSmax}
152+
export APRUN_MARINEANLLETKF="${APRUN_default}"
153+
;;
154+
"ecen_fv3jedi")
155+
156+
export NTHREADS_ECEN_FV3JEDI=${NTHREADSmax}
157+
export APRUN_CORRECTION_INCREMENT="${launcher} -n ${ntasks_correction_increment} --cpus-per-task=${NTHREADS_ECEN_FV3JEDI}"
158+
export APRUN_ENSEMBLE_RECENTER="${launcher} -n ${ntasks_ensemble_recenter} --cpus-per-task=${NTHREADS_ECEN_FV3JEDI}"
159+
;;
160+
"analcalc_fv3jedi")
161+
162+
export NTHREADS_ANALCALC_FV3JEDI=${NTHREADSmax}
163+
export APRUN_ANALCALC_FV3JEDI="${APRUN_default} --cpus-per-task=${NTHREADS_ANALCALC_FV3JEDI}"
164+
;;
156165
"anal" | "analcalc")
157166

158167
export MKL_NUM_THREADS=4
@@ -242,24 +251,20 @@ case ${step} in
242251
export APRUN_UFS="${launcher} -n ${ufs_ntasks}"
243252
unset nnodes ufs_ntasks
244253
;;
245-
246254
"upp")
247255

248256
export NTHREADS_UPP=${NTHREADS1}
249257
export APRUN_UPP="${APRUN_default} --cpus-per-task=${NTHREADS_UPP}"
250258
;;
251-
252259
"atmos_products")
253260

254261
export USE_CFP="YES" # Use MPMD for downstream product generation
255262
;;
256-
257-
"oceanice_products")
263+
"oceanice_products")
258264

259265
export NTHREADS_OCNICEPOST=${NTHREADS1}
260266
export APRUN_OCNICEPOST="${launcher} -n 1 --cpus-per-task=${NTHREADS_OCNICEPOST}"
261-
;;
262-
267+
;;
263268
"ecen")
264269

265270
export NTHREADS_ECEN=${NTHREADSmax}

Diff for: ‎env/HERCULES.env

+3-5
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ case ${step} in
114114

115115
export NTHREADS_PREPOBSAERO=${NTHREADS1}
116116
export APRUN_PREPOBSAERO="${APRUN_default} --cpus-per-task=${NTHREADS_PREPOBSAERO}"
117-
;;
117+
;;
118118
"snowanl")
119119

120120
export APRUN_CALCFIMS="${launcher} -n 1"
@@ -133,7 +133,6 @@ case ${step} in
133133

134134
export APRUN_APPLY_INCR="${launcher} -n 6"
135135
;;
136-
137136
"marinebmat")
138137

139138
export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
@@ -144,11 +143,10 @@ case ${step} in
144143
export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
145144
export APRUN_MARINEANLVAR="${APRUN_default}"
146145
;;
147-
"ocnanalecen")
146+
"ocnanalecen")
148147

149148
export APRUN_OCNANALECEN="${APRUN_default}"
150-
;;
151-
149+
;;
152150
"marineanlchkpt")
153151

154152
export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"

0 commit comments

Comments
 (0)