Skip to content

Updates to cp4 #9

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

Merged
guillaumevernieres merged 4 commits into from
Jan 9, 2025
Merged

Updates to cp4 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b565bef
Switch to using updating jedi hashes + soca and jcb-gdas changes for …
Dec 18, 2024
e1a4fd4
Bugfix some resources
Dec 18, 2024
e284329
change paths to hera + add dmpdir
Dec 18, 2024
7c37d0c
fix the DMPDIR specification
Dec 18, 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
3 changes: 2 additions & 1 deletion ci/cases/gfsv17/C384mx025_3DVarAOWCDA.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@ arguments:
idate: 2021063018
edate: 2021070306
#icsdir: /scratch1/NCEPDEV/climate/Jessica.Meixner/cycling/IC_2021063000_V2
icsdir: /work/noaa/da/gvernier/ensda/ictest/1440x1080x75/
#icsdir: /work/noaa/da/gvernier/ensda/ictest/1440x1080x75/
icsdir: /scratch2/NCEPDEV/ocean/Guillaume.Vernieres/data/prepics/hybrid-test/
yaml: {{ HOMEgfs }}/ci/cases/gfsv17/marine3dvar.yaml
3 changes: 2 additions & 1 deletion ci/cases/gfsv17/C384mx025_hybAOWCDA.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@ arguments:
expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
idate: 2021063018
edate: 2021070306
icsdir: /work/noaa/da/gvernier/ensda/ictest/1440x1080x75/
#icsdir: /work/noaa/da/gvernier/ensda/ictest/1440x1080x75/
icsdir: /scratch2/NCEPDEV/ocean/Guillaume.Vernieres/data/prepics/hybrid-test/
yaml: {{ HOMEgfs }}/ci/cases/gfsv17/marinehyb.yaml
4 changes: 4 additions & 0 deletions ci/cases/gfsv17/marine3dvar.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ base:
ACCOUNT: {{ 'HPC_ACCOUNT' | getenv }}
DO_TEST_MODE: "YES"

prepoceanobs:
use_exp_obs: "YES"
dmpdir_exp: /scratch1/NCEPDEV/da/common/

marineanl:
SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca
SOCA_OBS_LIST: {{ HOMEgfs }}/sorc/gdas.cd/parm/soca/obs/obs_list.yaml
Expand Down
4 changes: 4 additions & 0 deletions ci/cases/gfsv17/marinehyb.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ base:
FHMAX_GFS: 240
ACCOUNT: {{ 'HPC_ACCOUNT' | getenv }}

prepoceanobs:
use_exp_obs: "YES"
dmpdir_exp: /scratch1/NCEPDEV/da/common/

marineanl:
SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca
SOCA_NINNER: 20 # revert to ~100 after the memory leak is fixed
11 changes: 10 additions & 1 deletion parm/config/gfs/config.resources
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,13 +502,15 @@ case ${step} in
"marineanlinit")
walltime="00:10:00"
ntasks=1
threads_per_task=1
tasks_per_node=${max_tasks_per_node}
memory="24GB"
;;

"prepoceanobs")
walltime="00:10:00"
ntasks=1
threads_per_task=1
tasks_per_node=${max_tasks_per_node}
memory="48GB"
;;
Expand All @@ -518,8 +520,9 @@ case ${step} in
ntasks=16
case ${OCNRES} in
"025")
ntasks=480;;
ntasks=480
memory="256GB"
;;
"050") ntasks=16;;
"100") ntasks=16;;
"500") ntasks=16;;
Expand All @@ -529,6 +532,7 @@ case ${step} in
esac

walltime="00:30:00"
threads_per_task=1
export is_exclusive=True
tasks_per_node=$(( max_tasks_per_node / 2 ))
;;
Expand Down Expand Up @@ -558,6 +562,7 @@ case ${step} in
esac

walltime="00:30:00"
threads_per_task=1
export is_exclusive=True
tasks_per_node=$(( max_tasks_per_node / 2 ))
;;
Expand Down Expand Up @@ -588,6 +593,7 @@ case ${step} in

walltime="00:10:00"
export is_exclusive=True
threads_per_task=1
tasks_per_node=$(( max_tasks_per_node / 2 ))
;;

Expand Down Expand Up @@ -617,13 +623,15 @@ case ${step} in

walltime="00:30:00"
export is_exclusive=True
threads_per_task=1
tasks_per_node=$(( max_tasks_per_node / 2 ))
;;


"marineanlchkpt")
walltime="00:10:00"
ntasks=1
threads_per_task=1
tasks_per_node=${max_tasks_per_node}
case ${OCNRES} in
"025")
Expand All @@ -647,6 +655,7 @@ case ${step} in
"marineanlfinal")
walltime="00:30:00"
ntasks=${max_tasks_per_node}
threads_per_task=1
tasks_per_node=${max_tasks_per_node}
;;

Expand Down
2 changes: 1 addition & 1 deletion sorc/gdas.cd
Open in desktop
Submodule gdas.cd updated 31 files
+19 −19 parm/aero/berror/aero_diagb.yaml.j2
+6 −10 parm/io/fv3jedi_fieldmetadata_history.yaml
+1 −1 parm/jcb-algorithms
+1 −1 parm/jcb-gdas
+1 −1 sorc/da-utils
+1 −1 sorc/fv3-jedi
+1 −1 sorc/ioda
+1 −1 sorc/iodaconv
+1 −1 sorc/oops
+1 −1 sorc/saber
+1 −1 sorc/soca
+1 −1 sorc/ufo
+1 −1 sorc/vader
+17 −17 test/testreference/C96C48_ufs_hybatmDA_3dvar-fv3inc.ref
+34 −34 test/testreference/C96C48_ufs_hybatmDA_3dvar.ref
+4 −4 test/testreference/C96C48_ufs_hybatmDA_lgetkf_observer.ref
+8 −8 test/testreference/C96C48_ufs_hybatmDA_lgetkf_solver.ref
+31 −31 test/testreference/atm_jjob_3dvar.ref
+65 −65 test/testreference/atm_jjob_lgetkf.ref
+29 −29 test/testreference/atm_jjob_lgetkf_observer.ref
+48 −48 test/testreference/atm_jjob_lgetkf_solver.ref
+1 −1 utils/chem/chem_diagb.h
+1 −1 utils/fv3jedi/fv3jedi_fv3inc.h
+1 −1 utils/ioda_example/gdas_meanioda.h
+1 −1 utils/land/land_ensrecenter.h
+1 −1 utils/obsproc/applications/gdas_obsprovider2ioda.h
+1 −1 utils/soca/gdas_ens_handler.h
+1 −1 utils/soca/gdas_incr_handler.h
+1 −1 utils/soca/gdas_soca_diagb.h
+1 −1 utils/soca/gdas_socahybridweights.h
+1 −1 utils/soca/gdassoca_obsstats.h