resources, no gfs, gdas dev

guillaumevernieres · Dec 18, 2024 · edbd0c9 · edbd0c9
1 parent b6936ee
commit edbd0c9
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 25 deletions.
diff --git 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
@@ -502,24 +502,24 @@ 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"
     ;;
 
   "marinebmat")
     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,17 +529,16 @@ 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")
     ntasks=16
     case ${OCNRES} in
       "025")
         ntasks=480
-        memory="96GB"
+        memory="256GB"
         ;;
       "050")
         ntasks=16
@@ -558,18 +557,17 @@ 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")
     ntasks=16
     case ${OCNRES} in
       "025")
         ntasks=40
-        memory="96GB"
+        memory="256GB"
         ;;
       "050")
         ntasks=16
@@ -589,17 +587,16 @@ 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")
     ntasks=16
     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
diff --git 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
+24 −0		.github/pull_request_template.md
+6 −0		ci/ci_tests.sh
+123 −47		ci/driver.sh
+0 −169		ci/gw_driver.sh
+1 −0		ci/hera.sh
+13 −0		ci/hercules.sh
+3 −1		ci/orion.sh
+52 −10		ci/run_ci.sh
+0 −80		ci/run_gw_ci.sh
+24 −10		ci/stable_driver.sh
+1 −1		parm/jcb-algorithms
+1 −1		parm/jcb-gdas
+0 −0		parm/snow/apply_incr_nml.j2
+2 −2		parm/snow/ens_apply_incr_nml.j2
+48 −55		parm/snow/jcb-base.yaml.j2
+12 −0		parm/snow/jcb-prototype_2dvar.yaml.j2
+0 −66		parm/snow/letkfoi/letkfoi.yaml.j2
+0 −109		parm/snow/obs/config/adpsfc_snow.yaml.j2
+0 −53		parm/snow/obs/config/ghcn_snow.yaml.j2
+0 −46		parm/snow/obs/config/ims_snow.yaml.j2
+0 −110		parm/snow/obs/config/sfcsno_snow.yaml.j2
+0 −103		parm/snow/obs/config/snocvr_snow.yaml.j2
+1 −1		parm/snow/prep/fims.nml.j2
+2 −2		parm/snow/prep/prep_ims.yaml.j2
+10 −2		parm/soca/marine-jcb-base.yaml
+1 −1		sorc/land-imsproc
+3 −3		test/atm/global-workflow/CMakeLists.txt
+1 −8		test/gw-ci/CMakeLists.txt
+25 −25		test/testreference/C96C48_ufs_hybatmDA_3dvar-fv3inc.ref
+81 −81		test/testreference/C96C48_ufs_hybatmDA_3dvar.ref
+50 −50		test/testreference/C96C48_ufs_hybatmDA_lgetkf-fv3inc.ref
+68 −68		test/testreference/C96C48_ufs_hybatmDA_lgetkf_observer.ref
+104 −104		test/testreference/C96C48_ufs_hybatmDA_lgetkf_solver.ref
+3 −3		utils/soca/gdas_ens_handler.h
+13 −7		utils/soca/gdas_incr_handler.h
+26 −18		utils/soca/gdas_postprocincr.h