diff --git a/ci/cases/gfsv17/C384mx025_3DVarAOWCDA.yaml b/ci/cases/gfsv17/C384mx025_3DVarAOWCDA.yaml index 4147249a4c..c47b53339e 100644 --- a/ci/cases/gfsv17/C384mx025_3DVarAOWCDA.yaml +++ b/ci/cases/gfsv17/C384mx025_3DVarAOWCDA.yaml @@ -8,7 +8,7 @@ arguments: resdetatmos: 384 resdetocean: 0.25 nens: 0 - interval: 6 + interval: 0 start: warm comroot: {{ 'RUNTESTS' | getenv }}/COMROOT expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR diff --git a/parm/config/gfs/config.resources b/parm/config/gfs/config.resources index e642082290..f17eb7cc50 100644 --- a/parm/config/gfs/config.resources +++ b/parm/config/gfs/config.resources @@ -502,16 +502,14 @@ case ${step} in "marineanlinit") walltime="00:10:00" ntasks=1 - threads_per_task=1 - tasks_per_node=$(( max_tasks_per_node / threads_per_task )) + 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 / threads_per_task )) + tasks_per_node=${max_tasks_per_node} memory="48GB" ;; @@ -519,7 +517,9 @@ case ${step} in npes=16 ntasks=16 case ${OCNRES} in - "025") ntasks=480;; + "025") + ntasks=480;; + memory="256GB" "050") ntasks=16;; "100") ntasks=16;; "500") ntasks=16;; @@ -529,9 +529,8 @@ case ${step} in esac walltime="00:30:00" - threads_per_task=1 export is_exclusive=True - tasks_per_node=$(( max_tasks_per_node / threads_per_task )) + tasks_per_node=$(( max_tasks_per_node / 2 )) ;; "marineanlvar") @@ -539,7 +538,7 @@ case ${step} in case ${OCNRES} in "025") ntasks=480 - memory="96GB" + memory="256GB" ;; "050") ntasks=16 @@ -558,10 +557,9 @@ case ${step} in exit 4 esac - walltime="00:15:00" - threads_per_task=1 + walltime="00:30:00" export is_exclusive=True - tasks_per_node=$(( max_tasks_per_node / threads_per_task )) + tasks_per_node=$(( max_tasks_per_node / 2 )) ;; "ocnanalecen") @@ -569,7 +567,7 @@ case ${step} in case ${OCNRES} in "025") ntasks=40 - memory="96GB" + memory="256GB" ;; "050") ntasks=16 @@ -589,9 +587,8 @@ case ${step} in esac walltime="00:10:00" - threads_per_task=1 export is_exclusive=True - tasks_per_node=$(( max_tasks_per_node / threads_per_task )) + tasks_per_node=$(( max_tasks_per_node / 2 )) ;; "marineanlletkf") @@ -599,7 +596,7 @@ case ${step} in case ${OCNRES} in "025") ntasks=480 - memory="96GB" + memory="256GB" ;; "050") ntasks=16 @@ -618,18 +615,16 @@ case ${step} in exit 4 esac - walltime="00:10:00" - threads_per_task=1 + walltime="00:30:00" export is_exclusive=True - tasks_per_node=$(( max_tasks_per_node / threads_per_task )) + 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 / threads_per_task )) + tasks_per_node=${max_tasks_per_node} case ${OCNRES} in "025") memory="128GB" @@ -652,8 +647,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 / threads_per_task )) + tasks_per_node=${max_tasks_per_node} ;; "ocnanalvrfy") diff --git a/sorc/gdas.cd b/sorc/gdas.cd index a2ea3770ae..92750bedb5 160000 --- a/sorc/gdas.cd +++ b/sorc/gdas.cd @@ -1 +1 @@ -Subproject commit a2ea3770aeb9d4308bde51bb1d8c9c94cc9534c8 +Subproject commit 92750bedb5ec650fc77fdb305ae6021e23b841af diff --git a/ush/python/pygfs/task/marine_analysis.py b/ush/python/pygfs/task/marine_analysis.py index dd48c9f80f..31aece713e 100644 --- a/ush/python/pygfs/task/marine_analysis.py +++ b/ush/python/pygfs/task/marine_analysis.py @@ -206,7 +206,7 @@ def _prep_variational_yaml(self: Task) -> None: envconfig_jcb['PARMgfs'] = self.task_config.PARMgfs envconfig_jcb['NMEM_ENS'] = self.task_config.NMEM_ENS envconfig_jcb['berror_model'] = 'marine_background_error_static_diffusion' - if self.task_config.NMEM_ENS >= 3: + if self.task_config.NMEM_ENS >= 2: envconfig_jcb['berror_model'] = 'marine_background_error_hybrid_diffusion_diffusion' envconfig_jcb['DATA'] = self.task_config.DATA envconfig_jcb['OPREFIX'] = self.task_config.OPREFIX