Skip to content

Commit c6db1e0

Browse files
DavidHuber-NOAADavidHuber-NOAA
committed
Merge remote-tracking branch 'emc/develop' into feature/sven_globus_hpss
2 parents 4cb6ae0 + c902645 commit c6db1e0

30 files changed

+155
-134
lines changed

‎ci/cases/gfsv17/C384mx025_3DVarAOWCDA.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@ arguments:
88
resdetatmos: 384
99
resdetocean: 0.25
1010
nens: 0
11-
interval: 6
11+
interval: 0
1212
start: warm
1313
comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
1414
expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
1515
idate: 2021063018
1616
edate: 2021070306
1717
#icsdir: /scratch1/NCEPDEV/climate/Jessica.Meixner/cycling/IC_2021063000_V2
18-
icsdir: /work/noaa/da/gvernier/ensda/ictest/1440x1080x75/
18+
#icsdir: /work/noaa/da/gvernier/ensda/ictest/1440x1080x75/
19+
icsdir: /scratch2/NCEPDEV/ocean/Guillaume.Vernieres/data/prepics/hybrid-test/
1920
yaml: {{ HOMEgfs }}/ci/cases/gfsv17/marine3dvar.yaml

‎ci/cases/gfsv17/C384mx025_hybAOWCDA.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@ arguments:
1515
expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
1616
idate: 2021063018
1717
edate: 2021070306
18-
icsdir: /work/noaa/da/gvernier/ensda/ictest/1440x1080x75/
18+
#icsdir: /work/noaa/da/gvernier/ensda/ictest/1440x1080x75/
19+
icsdir: /scratch2/NCEPDEV/ocean/Guillaume.Vernieres/data/prepics/hybrid-test/
1920
yaml: {{ HOMEgfs }}/ci/cases/gfsv17/marinehyb.yaml

‎ci/cases/gfsv17/marine3dvar.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,12 @@ base:
1616
ACCOUNT: {{ 'HPC_ACCOUNT' | getenv }}
1717
DO_TEST_MODE: "YES"
1818

19+
prepoceanobs:
20+
use_exp_obs: "YES"
21+
dmpdir_exp: /scratch1/NCEPDEV/da/common/
22+
1923
marineanl:
2024
SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca
25+
SOCA_ANL_GEOM: {{ HOMEgfs }}/fix/gdas/soca/720x540x75/soca
2126
SOCA_OBS_LIST: {{ HOMEgfs }}/sorc/gdas.cd/parm/soca/obs/obs_list.yaml
2227
SOCA_NINNER: 100

‎ci/cases/gfsv17/marinehyb.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ base:
1515
FHMAX_GFS: 240
1616
ACCOUNT: {{ 'HPC_ACCOUNT' | getenv }}
1717

18+
prepoceanobs:
19+
use_exp_obs: "YES"
20+
dmpdir_exp: /scratch1/NCEPDEV/da/common/
21+
1822
marineanl:
1923
SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca
20-
SOCA_NINNER: 20 # revert to ~100 after the memory leak is fixed
24+
SOCA_ANL_GEOM: {{ HOMEgfs }}/fix/gdas/soca/720x540x75/soca
25+
SOCA_NINNER: 100

‎ci/cases/pr/C48mx500_3DVarAOWCDA.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ arguments:
99
resdetocean: 5.0
1010
comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
1111
expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
12-
icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C48mx500/20241120
12+
icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C48mx500/20250218
1313
idate: 2021032418
1414
edate: 2021032500
1515
nens: 0

‎env/HERCULES.env

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ case ${step} in
214214
"fcst" | "efcs")
215215

216216
export OMP_STACKSIZE=512M
217+
export FI_MLX_INJECT_LIMIT=0
217218

218219
(( nnodes = (ntasks+tasks_per_node-1)/tasks_per_node ))
219220
(( ufs_ntasks = nnodes*tasks_per_node ))

‎env/ORION.env

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,8 @@ elif [[ "${step}" = "eupd" ]]; then
208208

209209
elif [[ "${step}" = "fcst" ]] || [[ "${step}" = "efcs" ]]; then
210210

211+
export FI_MLX_INJECT_LIMIT=0
212+
211213
(( nnodes = (ntasks+tasks_per_node-1)/tasks_per_node ))
212214
(( ufs_ntasks = nnodes*tasks_per_node ))
213215
# With ESMF threading, the model wants to use the full node

‎jobs/JGDAS_ENKF_UPDATE

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,13 @@ export APREFIX="${RUN}.t${cyc}z."
2525
export GPREFIX="${GDUMP_ENS}.t${gcyc}z."
2626

2727
MEMDIR="ensstat" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
28-
COM_ATMOS_ANALYSIS_STAT:COM_ATMOS_ANALYSIS_TMPL
28+
COMIN_ATMOS_ANALYSIS_STAT:COM_ATMOS_ANALYSIS_TMPL
29+
30+
MEMDIR="ensstat" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
31+
COMOUT_ATMOS_ANALYSIS_STAT:COM_ATMOS_ANALYSIS_TMPL
2932

3033
MEMDIR="ensstat" RUN="enkfgdas" YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \
31-
COM_ATMOS_HISTORY_STAT_PREV:COM_ATMOS_HISTORY_TMPL
34+
COMIN_ATMOS_HISTORY_STAT_PREV:COM_ATMOS_HISTORY_TMPL
3235

3336

3437
###############################################################
@@ -43,7 +46,7 @@ status=$?
4346
# Send Alerts
4447
##############################################
4548
if [ ${SENDDBN} = YES ] ; then
46-
"${DBNROOT}/bin/dbn_alert" "MODEL" "ENKF1_MSC_enkfstat" "${job}" "${COM_ATMOS_ANALYSIS_STAT}/${APREFIX}enkfstat"
49+
"${DBNROOT}/bin/dbn_alert" "MODEL" "ENKF1_MSC_enkfstat" "${job}" "${COMOUT_ATMOS_ANALYSIS_STAT}/${APREFIX}enkfstat"
4750
fi
4851

4952

‎jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_ECEN

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
2020
COMIN_ICE_RESTART:COM_ICE_RESTART_TMPL \
2121
COMOUT_ICE_ANALYSIS:COM_ICE_ANALYSIS_TMPL
2222

23+
export DATAjob="${DATAROOT}/${RUN}marineanalysis.${PDY:-}${cyc}"
24+
export DATAens="${DATAjob}/ensdata"
25+
export GDUMP="gdas"
26+
export GDUMP_ENS="enkf${GDUMP}"
27+
2328
##############################################
2429
# Begin JOB SPECIFIC work
2530
##############################################

‎jobs/JGLOBAL_WAVE_POST_SBS

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,9 @@ export MP_PULSE=0
1313
YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
1414
COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \
1515
COMIN_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
16-
COMOUT_WAVE_PREP:COM_WAVE_PREP_TMPL \
1716
COMOUT_WAVE_GRID:COM_WAVE_GRID_TMPL
1817

19-
for out_dir in "${COMOUT_WAVE_PREP}" "${COMOUT_WAVE_GRID}"; do
20-
if [[ ! -d "${out_dir}" ]]; then mkdir -p "${out_dir}"; fi
21-
done
18+
if [[ ! -d "${COMOUT_WAVE_GRID}" ]]; then mkdir -p "${COMOUT_WAVE_GRID}"; fi
2219

2320
if [[ -n "${wavepostGRD}" || -n "${waveinterpGRD}" ]]; then
2421
for grdID in ${wavepostGRD} ${waveinterpGRD}; do

‎parm/config/gfs/config.marineanl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ export JCB_ALGO_YAML_VAR=@JCB_ALGO_YAML_VAR@
1111
export MARINE_OBS_YAML_DIR="${PARMgfs}/gdas/soca/obs/config"
1212
export MARINE_OBS_LIST_YAML=@SOCA_OBS_LIST@
1313
export SOCA_INPUT_FIX_DIR=@SOCA_INPUT_FIX_DIR@
14+
export SOCA_ANL_GEOM=@SOCA_ANL_GEOM@
1415
export SOCA_NINNER=@SOCA_NINNER@
1516
export DOMAIN_STACK_SIZE=116640000 #TODO: Make the stack size resolution dependent
1617
export SOCA_ENS_BKG_STAGE_YAML_TMPL="${PARMgfs}/gdas/soca/soca_ens_bkg_stage.yaml.j2"

‎parm/config/gfs/config.resources

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -509,23 +509,26 @@ case ${step} in
509509
walltime="00:10:00"
510510
ntasks=1
511511
threads_per_task=1
512-
tasks_per_node=$(( max_tasks_per_node / threads_per_task ))
512+
tasks_per_node=${max_tasks_per_node}
513513
memory="24GB"
514514
;;
515515

516516
"prepoceanobs")
517517
walltime="00:10:00"
518518
ntasks=1
519519
threads_per_task=1
520-
tasks_per_node=$(( max_tasks_per_node / threads_per_task ))
520+
tasks_per_node=${max_tasks_per_node}
521521
memory="48GB"
522522
;;
523523

524524
"marinebmat")
525525
npes=16
526526
ntasks=16
527527
case ${OCNRES} in
528-
"025") ntasks=480;;
528+
"025")
529+
ntasks=480
530+
memory="256GB"
531+
;;
529532
"050") ntasks=16;;
530533
"100") ntasks=16;;
531534
"500") ntasks=16;;
@@ -537,15 +540,15 @@ case ${step} in
537540
walltime="00:30:00"
538541
threads_per_task=1
539542
export is_exclusive=True
540-
tasks_per_node=$(( max_tasks_per_node / threads_per_task ))
543+
tasks_per_node=$(( max_tasks_per_node / 2 ))
541544
;;
542545

543546
"marineanlvar")
544547
ntasks=16
545548
case ${OCNRES} in
546549
"025")
547550
ntasks=480
548-
memory="96GB"
551+
memory="256GB"
549552
;;
550553
"050")
551554
ntasks=16
@@ -564,18 +567,18 @@ case ${step} in
564567
exit 4
565568
esac
566569

567-
walltime="00:15:00"
570+
walltime="00:30:00"
568571
threads_per_task=1
569572
export is_exclusive=True
570-
tasks_per_node=$(( max_tasks_per_node / threads_per_task ))
573+
tasks_per_node=$(( max_tasks_per_node / 2 ))
571574
;;
572575

573576
"ocnanalecen")
574577
ntasks=16
575578
case ${OCNRES} in
576579
"025")
577580
ntasks=40
578-
memory="96GB"
581+
memory="256GB"
579582
;;
580583
"050")
581584
ntasks=16
@@ -595,17 +598,17 @@ case ${step} in
595598
esac
596599

597600
walltime="00:10:00"
598-
threads_per_task=1
599601
export is_exclusive=True
600-
tasks_per_node=$(( max_tasks_per_node / threads_per_task ))
602+
threads_per_task=1
603+
tasks_per_node=$(( max_tasks_per_node / 2 ))
601604
;;
602605

603606
"marineanlletkf")
604607
ntasks=16
605608
case ${OCNRES} in
606609
"025")
607610
ntasks=480
608-
memory="96GB"
611+
memory="256GB"
609612
;;
610613
"050")
611614
ntasks=16
@@ -624,18 +627,18 @@ case ${step} in
624627
exit 4
625628
esac
626629

627-
walltime="00:10:00"
628-
threads_per_task=1
630+
walltime="00:30:00"
629631
export is_exclusive=True
630-
tasks_per_node=$(( max_tasks_per_node / threads_per_task ))
632+
threads_per_task=1
633+
tasks_per_node=$(( max_tasks_per_node / 2 ))
631634
;;
632635

633636

634637
"marineanlchkpt")
635638
walltime="00:10:00"
636639
ntasks=1
637640
threads_per_task=1
638-
tasks_per_node=$(( max_tasks_per_node / threads_per_task ))
641+
tasks_per_node=${max_tasks_per_node}
639642
case ${OCNRES} in
640643
"025")
641644
memory="128GB"
@@ -659,7 +662,7 @@ case ${step} in
659662
walltime="00:30:00"
660663
ntasks=${max_tasks_per_node}
661664
threads_per_task=1
662-
tasks_per_node=$(( max_tasks_per_node / threads_per_task ))
665+
tasks_per_node=${max_tasks_per_node}
663666
;;
664667

665668
"ocnanalvrfy")

‎parm/config/gfs/yaml/defaults.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ snowanl:
5353

5454
marineanl:
5555
SOCA_INPUT_FIX_DIR: "${FIXgfs}/gdas/soca/72x35x25/soca"
56+
SOCA_ANL_GEOM: "${FIXgfs}/gdas/soca/72x35x25/soca"
5657
SOCA_OBS_LIST: "${PARMgfs}/gdas/soca/obs/obs_list.yaml" # TODO: This is also repeated in oceanprepobs
5758
SOCA_NINNER: 100
5859
JCB_ALGO_YAML_VAR: "${PARMgfs}/gdas/soca/marine-jcb-3dfgat.yaml.j2"

‎parm/gdas/soca_bmat_jedi_config.yaml.j2

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,35 +8,42 @@ soca_diagb:
88
rundir: '{{ DATA }}'
99
exe_src: '{{ EXECgfs }}/gdas_soca_diagb.x'
1010
mpi_cmd: '{{ APRUN_MARINEBMAT }}'
11-
jcb_base_yaml: '{{ PARMgfs }}/gdas/soca/marine-jcb-base.yaml'
11+
jcb_base_yaml: '{{ PARMgfs }}/gdas/soca/marine-jcb-base.yaml'
1212
jcb_algo: soca_diagb
13+
soca_chgres:
14+
rundir: '{{ DATA }}'
15+
exe_src: '{{ EXECgfs }}/gdas.x'
16+
mpi_cmd: '{{ APRUN_MARINEBMAT }}'
17+
jedi_args: ['soca', 'convertstate']
18+
jcb_base_yaml: '{{ PARMgfs }}/gdas/soca/marine-jcb-base.yaml'
19+
jcb_algo: soca_chgres
1320
soca_parameters_diffusion_vt:
1421
rundir: '{{ DATA }}'
1522
exe_src: '{{ EXECgfs }}/gdas_soca_error_covariance_toolbox.x'
16-
mpi_cmd: '{{ APRUN_MARINEBMAT }}'
17-
jcb_base_yaml: '{{ PARMgfs }}/gdas/soca/marine-jcb-base.yaml'
23+
mpi_cmd: '{{ APRUN_MARINEBMAT }}'
24+
jcb_base_yaml: '{{ PARMgfs }}/gdas/soca/marine-jcb-base.yaml'
1825
jcb_algo: soca_parameters_diffusion_vt
1926
soca_setcorscales:
2027
rundir: '{{ DATA }}'
2128
exe_src: '{{ EXECgfs }}/gdas_soca_setcorscales.x'
22-
mpi_cmd: '{{ APRUN_MARINEBMAT }}'
23-
jcb_base_yaml: '{{ PARMgfs }}/gdas/soca/marine-jcb-base.yaml'
29+
mpi_cmd: '{{ APRUN_MARINEBMAT }}'
30+
jcb_base_yaml: '{{ PARMgfs }}/gdas/soca/marine-jcb-base.yaml'
2431
jcb_algo: soca_setcorscales
2532
soca_parameters_diffusion_hz:
2633
rundir: '{{ DATA }}'
2734
exe_src: '{{ EXECgfs }}/gdas_soca_error_covariance_toolbox.x'
28-
mpi_cmd: '{{ APRUN_MARINEBMAT }}'
29-
jcb_base_yaml: '{{ PARMgfs }}/gdas/soca/marine-jcb-base.yaml'
35+
mpi_cmd: '{{ APRUN_MARINEBMAT }}'
36+
jcb_base_yaml: '{{ PARMgfs }}/gdas/soca/marine-jcb-base.yaml'
3037
jcb_algo: soca_parameters_diffusion_hz
3138
soca_ensb:
3239
rundir: '{{ DATA }}'
3340
exe_src: '{{ EXECgfs }}/gdas_ens_handler.x'
34-
mpi_cmd: '{{ APRUN_MARINEBMAT }}'
35-
jcb_base_yaml: '{{ PARMgfs }}/gdas/soca/marine-jcb-base.yaml'
41+
mpi_cmd: '{{ APRUN_MARINEBMAT }}'
42+
jcb_base_yaml: '{{ PARMgfs }}/gdas/soca/marine-jcb-base.yaml'
3643
jcb_algo: soca_ensb
3744
soca_ensweights:
3845
rundir: '{{ DATA }}'
3946
exe_src: '{{ EXECgfs }}/gdas_socahybridweights.x'
40-
mpi_cmd: '{{ APRUN_MARINEBMAT }}'
41-
jcb_base_yaml: '{{ PARMgfs }}/gdas/soca/marine-jcb-base.yaml'
42-
jcb_algo: soca_ensweights
47+
mpi_cmd: '{{ APRUN_MARINEBMAT }}'
48+
jcb_base_yaml: '{{ PARMgfs }}/gdas/soca/marine-jcb-base.yaml'
49+
jcb_algo: soca_ensweights

‎parm/wave/bull_awips_gfswave

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ export b55020=AGPS40_KWBJ_OSBM01
181181
export b55033=AGPS40_KWBJ_OSBM02
182182
export b55035=AGPS40_KWBJ_OSBM03
183183
export b55039=AGPS40_KWBJ_OSBM04
184-
# Gulf of Mexico (GX) spectra (4) south from NC and Puerto Rico (2)
184+
# Gulf of America (GX) spectra (4) south from NC and Puerto Rico (2)
185185
export b42001=AGGX42_KWBJ_OSBM01
186186
export b42002=AGGX42_KWBJ_OSBM02
187187
export b42003=AGGX42_KWBJ_OSBM03

‎parm/wave/wave_gfs.buoys.dat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ $ South Pacific (PS) in Pacific Ocean and Pacific Isles (0)
254254
$AGPS40
255255
$
256256
$AGGX42
257-
$ Gulf of Mexico (GX) spectra (4) south from NC and Puerto Rico (2)
257+
$ Gulf of America (GX) spectra (4) south from NC and Puerto Rico (2)
258258
-89.67 25.90 '42001 ' 10.0 DAT NDBC 360
259259
-94.42 25.17 '42002 ' 10.0 DAT NDBC 360
260260
-85.94 26.07 '42003 ' 10.0 DAT NDBC 360

‎parm/wave/wave_gfs.buoys.full

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ $ South Pacific (PS) in Pacific Ocean and Pacific Isles (0)
339339
$AGPS40
340340
$
341341
$AGGX42
342-
$ Gulf of Mexico (GX) spectra (4) south from NC and Puerto Rico (2)
342+
$ Gulf of America (GX) spectra (4) south from NC and Puerto Rico (2)
343343
-89.67 25.90 '42001 ' 10.0 DAT NDBC 360
344344
-94.42 25.17 '42002 ' 10.0 DAT NDBC 360
345345
-85.94 26.07 '42003 ' 10.0 DAT NDBC 360
@@ -1190,7 +1190,7 @@ $
11901190
-65.50 32.00 'BER73 ' 999. IBP NCEP 45
11911191
-65.50 31.75 'BER74 ' 999. IBP NCEP 45
11921192
$
1193-
$ Gulf of Mexico boundary data
1193+
$ Gulf of America boundary data
11941194
$
11951195
-97. 23. 'SRH51 ' 999. IBP NCEP 45
11961196
-96. 23. 'SRH52 ' 999. IBP NCEP 45

0 commit comments

Comments
 (0)