Merge branch 'NOAA-EMC:develop' into docs4csps

NOAA-EMC · Nov 25, 2024 · d23bd61 · d23bd61
2 parents 550d8d6 + 1ba8985
commit d23bd61
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 5 deletions.
diff --git a/ci/cases/gfsv17/ocnanal.yaml b/ci/cases/gfsv17/ocnanal.yaml
@@ -15,6 +15,7 @@ base:
   DO_VRFY_OCEANDA: "NO"
   FHMAX_GFS: 240
   ACCOUNT: {{ 'HPC_ACCOUNT' | getenv }}
+  DO_TEST_MODE: "YES"
 
 marineanl:
   SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca

diff --git a/ci/cases/yamls/atmaerosnowDA_defaults_ci.yaml b/ci/cases/yamls/atmaerosnowDA_defaults_ci.yaml
@@ -3,3 +3,4 @@ defaults:
 base:
   DO_JEDISNOWDA: "YES"
   ACCOUNT: {{ 'HPC_ACCOUNT' | getenv }}
+  DO_TEST_MODE: "YES"
diff --git a/ci/cases/yamls/gfs_defaults_ci.yaml b/ci/cases/yamls/gfs_defaults_ci.yaml
@@ -2,3 +2,4 @@ defaults:
   !INC {{ HOMEgfs }}/parm/config/gfs/yaml/defaults.yaml
 base:
   ACCOUNT: {{ 'HPC_ACCOUNT' | getenv }}
+  DO_TEST_MODE: "YES"
diff --git a/ci/cases/yamls/gfs_extended_ci.yaml b/ci/cases/yamls/gfs_extended_ci.yaml
@@ -12,3 +12,4 @@ base:
   FCST_BREAKPOINTS: 192
   FHMAX_GFS: 384
   FHMAX_HF_GFS: 120
+  DO_TEST_MODE: "YES"
diff --git a/ci/cases/yamls/soca_gfs_defaults_ci.yaml b/ci/cases/yamls/soca_gfs_defaults_ci.yaml
@@ -3,3 +3,4 @@ defaults:
 base:
   ACCOUNT: {{ 'HPC_ACCOUNT' | getenv }}
   DO_JEDIOCNVAR: "YES"
+  DO_TEST_MODE: "YES"
diff --git a/parm/config/gefs/config.base b/parm/config/gefs/config.base
@@ -65,6 +65,7 @@ export REALTIME="YES"
 # Experiment mode (cycled or forecast-only)
 export MODE="@MODE@" # cycled/forecast-only
 export SFS_POST="@SFS_POST@" # TODO, place holder until RUN=SFS is developed
+export DO_TEST_MODE="@DO_TEST_MODE@" # option to change configuration for automated testing
 
 ####################################################
 # DO NOT ADD MACHINE DEPENDENT STUFF BELOW THIS LINE

diff --git a/parm/config/gefs/yaml/defaults.yaml b/parm/config/gefs/yaml/defaults.yaml
@@ -21,6 +21,7 @@ base:
   HPSSARCH: "NO"
   LOCALARCH: "NO"
   SFS_POST: "NO"
+  DO_TEST_MODE: "NO"
 fcst:
   reforecast: "NO"
   FHZER: 6

diff --git a/parm/config/gfs/config.anal b/parm/config/gfs/config.anal
@@ -29,6 +29,11 @@ fi
 export lobsdiag_forenkf=".false."  # anal does not need to write out jacobians
                    # set to .true. in config.eobs and config.eupd
 
+# Reduce number of iterations for testing mode
+if [[ ${DO_TEST_MODE} = "YES" ]]; then
+  export SETUP="${SETUP:-}niter(1)=5,niter(2)=5,"
+fi
+
 # Do not process the following datasets
 export GSNDBF=${GSNDBF:-/dev/null}
 export AMSREBF=${AMSREBF:-/dev/null}

diff --git a/parm/config/gfs/config.base b/parm/config/gfs/config.base
@@ -88,6 +88,7 @@ export REALTIME="YES"
 
 # Experiment mode (cycled or forecast-only)
 export MODE="@MODE@" # cycled/forecast-only
+export DO_TEST_MODE="@DO_TEST_MODE@" # option to change configuration for automated testing
 
 ####################################################
 # DO NOT ADD MACHINE DEPENDENT STUFF BELOW THIS LINE

diff --git a/parm/config/gfs/yaml/defaults.yaml b/parm/config/gfs/yaml/defaults.yaml
@@ -21,6 +21,7 @@ base:
   GSI_SOILANAL: "NO"
   EUPD_CYC: "gdas"
   FHMAX_ENKF_GFS: 12
+  DO_TEST_MODE: "NO"
 
 atmanl:
   JCB_ALGO_YAML_VAR: "${PARMgfs}/gdas/atm/jcb-prototype_3dvar.yaml.j2"

diff --git a/scripts/exglobal_marine_analysis_checkpoint.py b/scripts/exglobal_marine_analysis_checkpoint.py
@@ -24,6 +24,5 @@
     # Prepare the SOCA increment for MOM6 IAU
     MarineAnl.checkpoint_mom6_iau('socaincr2mom6.yaml')
 
-    # Insert the seaice analysis into the CICE6 restarts in 2 sequential stages
-    MarineAnl.checkpoint_cice6('soca_2cice_arctic.yaml')
-    MarineAnl.checkpoint_cice6('soca_2cice_antarctic.yaml')
+    # Insert the seaice analysis into the CICE6 restart
+    MarineAnl.checkpoint_cice6('soca_2cice_global.yaml')
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
@@ -284,7 +284,7 @@ def _prep_checkpoint(self: Task) -> None:
 
         # render the SOCA to CICE YAML file for the Arctic and Antarctic
         logger.info("render the SOCA to CICE YAML file for the Arctic and Antarctic")
-        varchgyamls = ['soca_2cice_arctic.yaml', 'soca_2cice_antarctic.yaml']
+        varchgyamls = ['soca_2cice_global.yaml']
         for varchgyaml in varchgyamls:
             soca2cice_config = parse_j2yaml(path=os.path.join(self.task_config.MARINE_JCB_GDAS_ALGO, f'{varchgyaml}.j2'),
                                             data=soca2cice_param)