Change back to resens and nens because GEFS may

use the same resolution with ENKF On branch feature/gefs_v13_789_setupexp modified: parm/config/config.base.emc.dyn modified: ush/rocoto/setup_expt.py Refs: NOAA-EMC#789
XianwuXue-NOAA · Jun 22, 2022 · aee83c0 · aee83c0
1 parent 38733db
commit aee83c0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 17 deletions.
diff --git a/parm/config/config.base.emc.dyn b/parm/config/config.base.emc.dyn
@@ -207,8 +207,7 @@ export OPS_RES="C768" # Do not change
 # Resolution specific parameters
 export LEVS=128
 export CASE="@CASECTL@"
-export CASE_ENKF="@CASEENS_ENKF@"
-export CASE_GEFS="@CASEENS_GEFS@"
+export CASE_ENKF="@CASEENS@"
 case "$CASE" in
     "C48") export OCNRES=400;;
     "C96") export OCNRES=100;;
@@ -325,8 +324,7 @@ export imp_physics=8
 # Shared parameters
 # Hybrid related
 export DOHYBVAR="YES"
-export NMEM_ENKF=@NMEM_ENKF@
-export NMEM_GEFS=@NMEM_GEFS@
+export NMEM_ENKF=@NMEM@
 export SMOOTH_ENKF="NO"
 export l4densvar=".true."
 export lwrite4danl=".true."

diff --git a/ush/rocoto/setup_expt.py b/ush/rocoto/setup_expt.py
@@ -56,9 +56,9 @@ def fill_COMROT_cycled(host, inputs):
         # Link ensemble member initial conditions
         enkfdir = f'enkf{inputs.cdump}.{idatestr[:8]}/{idatestr[8:]}'
         makedirs_if_missing(os.path.join(comrot, enkfdir))
-        for ii in range(1, inputs.nens_enkf + 1):
+        for ii in range(1, inputs.nens + 1):
             makedirs_if_missing(os.path.join(comrot, enkfdir, f'mem{ii:03d}'))
-            os.symlink(os.path.join(inputs.icsdir, idatestr, f'C{inputs.resens_enkf}', f'mem{ii:03d}', 'RESTART'),
+            os.symlink(os.path.join(inputs.icsdir, idatestr, f'C{inputs.resens}', f'mem{ii:03d}', 'RESTART'),
                        os.path.join(comrot, enkfdir, f'mem{ii:03d}', 'RESTART'))
 
         # Link deterministic initial conditions
@@ -157,13 +157,13 @@ def edit_baseconfig(host, inputs):
 
     if inputs.mode in ['cycled']:
         extend_dict = {
-            "@CASEENS_ENKF@": f'C{inputs.resens_enkf}',
-            "@NMEM_ENKF@": inputs.nens_enkf,
+            "@CASEENSF@": f'C{inputs.resens}',
+            "@NMEM@": inputs.nens,
         }
     elif inputs.mode in ['gefs']:
         extend_dict = {
-            "@CASEENS_GEFS@": f'C{inputs.resens_gefs}',
-            "@NMEM_GEFS@": inputs.nens_gefs,
+            "@CASEENS@": f'C{inputs.resens}',
+            "@NMEM@": inputs.nens,
         }
     elif inputs.mode in ['forecast-only', 'gefs']:
         extend_dict = {
@@ -246,20 +246,19 @@ def input_args():
                           choices=['warm', 'cold'], required=False, default='cold')
 
     # cycled mode additional arguments
-    cycled.add_argument('--resens_enkf', help='resolution of the ensemble model forecast',
+    cycled.add_argument('--resens', help='resolution of the ensemble model forecast',
                         type=int, required=False, default=192)
-    cycled.add_argument('--nens_enkf', help='number of ensemble members',
+    cycled.add_argument('--nens', help='number of ensemble members',
                         type=int, required=False, default=20)
 
     cycled.add_argument('--app', help='UFS application', type=str,
                         choices=['ATM', 'ATMW'], required=False, default='ATM')
 
     # gefs mode additional arguments
-    for subp in [gefs]:
-        subp.add_argument('--resens_gefs', help='resolution of the ensemble model forecast',
-                            type=int, required=False, default=192)
-        subp.add_argument('--nens_gefs', help='number of ensemble members',
-                            type=int, required=False, default=0)
+    gefs.add_argument('--resens', help='resolution of the ensemble model forecast',
+                      type=int, required=False, default=192)
+    gefs.add_argument('--nens', help='number of ensemble members',
+                      type=int, required=False, default=30)
 
     # forecast only mode additional arguments
     for subp in [forecasts, gefs]: