editing for USE of ENS PERTURBATION FILES is under config.base

NeilBarton-NOAA · Jan 3, 2025 · 9357590 · 9357590
1 parent fa75e27
commit 9357590
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 17 deletions.
diff --git a/ci/cases/yamls/gefs_defaults_ci.yaml b/ci/cases/yamls/gefs_defaults_ci.yaml
@@ -4,7 +4,6 @@ base:
   ACCOUNT: {{ 'HPC_ACCOUNT' | getenv }}
   SFS_POST: "NO"
   FHOUT_GFS: 6
-stage_ic:
   USE_OCN_ENS_PERTURB_FILES: "NO"
   USE_ATM_ENS_PERTURB_FILES: "NO"
 ocn:

diff --git a/ci/cases/yamls/gefs_replay_ci.yaml b/ci/cases/yamls/gefs_replay_ci.yaml
@@ -12,7 +12,4 @@ base:
   FHOUT_ICE_GFS: 24
   HOMEDIR: {{ 'RUNTESTS' | getenv }}/GLOBAL
   SFS_POST: "NO"
-stage_ic:
-  USE_OCN_ENS_PERTURB_FILES: "YES"
-  USE_ATM_ENS_PERTURB_FILES: "YES"
 
diff --git a/parm/config/gefs/config.base b/parm/config/gefs/config.base
@@ -234,8 +234,13 @@ export gfs_cyc=@gfs_cyc@ # 0: no GFS cycle, 1: 00Z only, 2: 00Z and 12Z only, 4:
 export REPLAY_ICS=@REPLAY_ICS@
 if [[ "${REPLAY_ICS:-NO}" == "YES" ]]; then
     export OFFSET_START_HOUR=$(( assim_freq / 2 ))
+    echo "WARNING: Replay ICs require perturbation files, ignoring any previous settings"
+    export USE_OCN_ENS_PERTURB_FILES="YES"
+    export USE_ATM_ENS_PERTURB_FILES="YES"
 else
     export OFFSET_START_HOUR=0
+    export USE_OCN_ENS_PERTURB_FILES=@USE_OCN_ENS_PERTURB_FILES@
+    export USE_ATM_ENS_PERTURB_FILES=@USE_ATM_ENS_PERTURB_FILES@
 fi
 
 # GFS output and frequency

diff --git a/parm/config/gefs/config.efcs b/parm/config/gefs/config.efcs
@@ -67,7 +67,7 @@ export EPBL="0.8,0.4,0.2,0.08,0.04"
 export EPBL_TAU="2.16E4,2.592E5,2.592E6,7.776E6,3.1536E7"
 export EPBL_LSCALE="500.E3,1000.E3,2000.E3,2000.E3,2000.E3"
 
-if [[ "${REPLAY_ICS:-NO}" == "YES" ]]; then
+if [[ "${USE_OCN_ENS_PERTURB_FILES:-NO}" == "YES" ]]; then
     export ODA_INCUPD="True"
     export ODA_TEMPINC_VAR='t_pert'
     export ODA_SALTINC_VAR='s_pert'

diff --git a/parm/config/gefs/config.stage_ic b/parm/config/gefs/config.stage_ic
@@ -30,8 +30,4 @@ if [[ -z "${ICSDIR}" ]] ; then
 
 fi
 
-#use of perturbations files for ensembles
-export USE_OCN_ENS_PERTURB_FILES=@USE_OCN_ENS_PERTURB_FILES@
-export USE_ATM_ENS_PERTURB_FILES=@USE_ATM_ENS_PERTURB_FILES@
-
 echo "END: config.stage_ic"
diff --git a/parm/config/gefs/yaml/defaults.yaml b/parm/config/gefs/yaml/defaults.yaml
@@ -14,7 +14,8 @@ base:
   FHOUT_HF_GFS: 1
   FCST_BREAKPOINTS: "48"
   REPLAY_ICS: "NO"
-  USE_OCN_PERTURB_FILES: "false"
+  USE_OCN_ENS_PERTURB_FILES: "NO"
+  USE_ATM_ENS_PERTURB_FILES: "NO"
   FHOUT_GFS: 6
   FHOUT_OCN_GFS: 6
   FHOUT_ICE_GFS: 6
@@ -26,9 +27,6 @@ fcst:
   FHZER: 6
   TYPE: "nh"
   MONO: "non-mono"
-stage_ic:
-  USE_OCN_ENS_PERTURB_FILES: "NO"
-  USE_ATM_ENS_PERTURB_FILES: "NO"
 ocn:
   MOM6_INTERP_ICS: "NO"
 
diff --git a/parm/config/gfs/config.base b/parm/config/gfs/config.base
@@ -502,4 +502,8 @@ if [[ "${machine}" == "ORION" || "${machine}" == "HERCULES" ]]; then
    export DO_GENESIS="NO"
 fi
 
+#use of perturbations files for ensembles
+export USE_OCN_ENS_PERTURB_FILES="NO"
+export USE_ATM_ENS_PERTURB_FILES="NO"
+
 echo "END: config.base"
diff --git a/parm/config/gfs/config.stage_ic b/parm/config/gfs/config.stage_ic
@@ -29,8 +29,4 @@ if [[ -z "${ICSDIR}" ]] ; then
 
 fi
 
-#use of perturbations files for ensembles
-export USE_OCN_ENS_PERTURB_FILES="NO"
-export USE_ATM_ENS_PERTURB_FILES="NO"
-
 echo "END: config.stage_ic"