From b565befef9a6b02b4fc552ddd2a9d368fa5c706f Mon Sep 17 00:00:00 2001 From: Anna Shlyaeva Date: Wed, 18 Dec 2024 17:46:21 +0000 Subject: [PATCH 1/4] Switch to using updating jedi hashes + soca and jcb-gdas changes for soca2cice --- sorc/gdas.cd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/gdas.cd b/sorc/gdas.cd index 92750bedb5e..31e477d9b86 160000 --- a/sorc/gdas.cd +++ b/sorc/gdas.cd @@ -1 +1 @@ -Subproject commit 92750bedb5ec650fc77fdb305ae6021e23b841af +Subproject commit 31e477d9b865a08e01727786ff6d16ba51a1d2ef From e1a4fd4007f7e2eeeae9d2420c08ae2d0fbc5163 Mon Sep 17 00:00:00 2001 From: Anna Shlyaeva Date: Wed, 18 Dec 2024 19:09:02 +0000 Subject: [PATCH 2/4] Bugfix some resources --- parm/config/gfs/config.resources | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/parm/config/gfs/config.resources b/parm/config/gfs/config.resources index f17eb7cc500..562ea8467a8 100644 --- a/parm/config/gfs/config.resources +++ b/parm/config/gfs/config.resources @@ -502,6 +502,7 @@ case ${step} in "marineanlinit") walltime="00:10:00" ntasks=1 + threads_per_task=1 tasks_per_node=${max_tasks_per_node} memory="24GB" ;; @@ -509,6 +510,7 @@ case ${step} in "prepoceanobs") walltime="00:10:00" ntasks=1 + threads_per_task=1 tasks_per_node=${max_tasks_per_node} memory="48GB" ;; @@ -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;; @@ -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 )) ;; @@ -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 )) ;; @@ -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 )) ;; @@ -617,6 +623,7 @@ case ${step} in walltime="00:30:00" export is_exclusive=True + threads_per_task=1 tasks_per_node=$(( max_tasks_per_node / 2 )) ;; @@ -624,6 +631,7 @@ case ${step} in "marineanlchkpt") walltime="00:10:00" ntasks=1 + threads_per_task=1 tasks_per_node=${max_tasks_per_node} case ${OCNRES} in "025") @@ -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} ;; From e284329fdc4a67be6185c96089011e20edb39d34 Mon Sep 17 00:00:00 2001 From: Anna Shlyaeva Date: Wed, 18 Dec 2024 19:55:10 +0000 Subject: [PATCH 3/4] change paths to hera + add dmpdir --- ci/cases/gfsv17/C384mx025_3DVarAOWCDA.yaml | 3 ++- ci/cases/gfsv17/C384mx025_hybAOWCDA.yaml | 3 ++- ci/cases/gfsv17/marine3dvar.yaml | 3 +++ ci/cases/gfsv17/marinehyb.yaml | 3 +++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ci/cases/gfsv17/C384mx025_3DVarAOWCDA.yaml b/ci/cases/gfsv17/C384mx025_3DVarAOWCDA.yaml index c47b53339ea..21aece76a55 100644 --- a/ci/cases/gfsv17/C384mx025_3DVarAOWCDA.yaml +++ b/ci/cases/gfsv17/C384mx025_3DVarAOWCDA.yaml @@ -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 diff --git a/ci/cases/gfsv17/C384mx025_hybAOWCDA.yaml b/ci/cases/gfsv17/C384mx025_hybAOWCDA.yaml index f0e0b42c288..57680ffd023 100644 --- a/ci/cases/gfsv17/C384mx025_hybAOWCDA.yaml +++ b/ci/cases/gfsv17/C384mx025_hybAOWCDA.yaml @@ -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 diff --git a/ci/cases/gfsv17/marine3dvar.yaml b/ci/cases/gfsv17/marine3dvar.yaml index abf86f0aa80..54258b1e4b4 100644 --- a/ci/cases/gfsv17/marine3dvar.yaml +++ b/ci/cases/gfsv17/marine3dvar.yaml @@ -17,6 +17,9 @@ base: ACCOUNT: {{ 'HPC_ACCOUNT' | getenv }} DO_TEST_MODE: "YES" +prepoceanobs: + DMPDIR: /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 diff --git a/ci/cases/gfsv17/marinehyb.yaml b/ci/cases/gfsv17/marinehyb.yaml index ed62e607a85..f7b94eb9711 100644 --- a/ci/cases/gfsv17/marinehyb.yaml +++ b/ci/cases/gfsv17/marinehyb.yaml @@ -16,6 +16,9 @@ base: FHMAX_GFS: 240 ACCOUNT: {{ 'HPC_ACCOUNT' | getenv }} +prepoceanobs: + DMPDIR: /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 From 7c37d0c75d36093885cfec5ab509be8e551a3458 Mon Sep 17 00:00:00 2001 From: Anna Shlyaeva Date: Wed, 18 Dec 2024 21:37:30 +0000 Subject: [PATCH 4/4] fix the DMPDIR specification --- ci/cases/gfsv17/marine3dvar.yaml | 3 ++- ci/cases/gfsv17/marinehyb.yaml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ci/cases/gfsv17/marine3dvar.yaml b/ci/cases/gfsv17/marine3dvar.yaml index 54258b1e4b4..24380dffd2a 100644 --- a/ci/cases/gfsv17/marine3dvar.yaml +++ b/ci/cases/gfsv17/marine3dvar.yaml @@ -18,7 +18,8 @@ base: DO_TEST_MODE: "YES" prepoceanobs: - DMPDIR: /scratch1/NCEPDEV/da/common/ + use_exp_obs: "YES" + dmpdir_exp: /scratch1/NCEPDEV/da/common/ marineanl: SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca diff --git a/ci/cases/gfsv17/marinehyb.yaml b/ci/cases/gfsv17/marinehyb.yaml index f7b94eb9711..20614ad290a 100644 --- a/ci/cases/gfsv17/marinehyb.yaml +++ b/ci/cases/gfsv17/marinehyb.yaml @@ -17,7 +17,8 @@ base: ACCOUNT: {{ 'HPC_ACCOUNT' | getenv }} prepoceanobs: - DMPDIR: /scratch1/NCEPDEV/da/common/ + use_exp_obs: "YES" + dmpdir_exp: /scratch1/NCEPDEV/da/common/ marineanl: SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca