Make consistent use of restart_interval across UFS applications

parm/config/gfs/config.base.emc.dyn

@@ -181,7 +181,7 @@ case "${CASE}" in
         export OCNRES=025
         export waveGRD='mx025'
         ;;
-    *) 
+    *)
         export OCNRES=025
         export waveGRD='mx025'
         ;;
@@ -273,9 +273,6 @@ else
 fi
 export ILPOST=1           # gempak output frequency up to F120
 
-# GFS restart interval in hours
-export restart_interval_gfs=0
-
 export QUILTING=".true."
 export OUTPUT_GRID="gaussian_grid"
 export WRITE_DOPOST=".true." # WRITE_DOPOST=true, use inline POST

parm/config/gfs/config.efcs

@@ -72,12 +72,11 @@ else
     export DIAG_TABLE="$HOMEgfs/parm/parm_fv3diag/diag_table_da_orig"
 fi
 
-# FV3 model namelist parameters to over-ride
-export restart_interval=${restart_interval:-6}
-
 # For IAU, write restarts at beginning of window also
-if [ $DOIAU_ENKF = "YES" ]; then
-    export restart_interval="3 -1"
+if [[ "${DOIAU_ENKF:-}" = "YES" ]]; then
+  export restart_interval="3"
+else
+  export restart_interval="6"
 fi
 
 # wave model

parm/config/gfs/config.fcst

@@ -282,19 +282,11 @@ if [[ "${CDUMP}" =~ "gdas" ]] ; then # GDAS cycle specific parameters
     # Variables used in DA cycling
     export DIAG_TABLE="${HOMEgfs}/parm/parm_fv3diag/diag_table_da"
 
-    # Write restart files, where $number is current model start time.
-    # restart_interval:        $number
-    #    number=0, writes out restart files at the end of forecast.
-    #    number>0, writes out restart files at the frequency of $number and at the end of forecast.
-    # restart_interval:        "$number -1"
-    #    writes out restart files only once at $number forecast hour.
-    # restart_interval:        "$number1 $number2 $number3 ..."
-    #    writes out restart file at the specified forecast hours
-    export restart_interval=${restart_interval:-6}
-
-    # For IAU, write restarts at beginning of window also
+
     if [[ "${DOIAU}" == "YES" ]]; then
-       export restart_interval="3 6"
+      export restart_interval="3"
+    else
+      export restart_interval="6"
     fi
 
     # Choose coupling with wave
@@ -309,27 +301,7 @@ elif [[ "${CDUMP}" =~ "gfs" ]] ; then # GFS cycle specific parameters
     export DIAG_TABLE="${HOMEgfs}/parm/parm_fv3diag/diag_table"
 
     # Write gfs restart files to rerun fcst from any break point
-    export restart_interval_gfs=${restart_interval_gfs:-0}
-    if (( restart_interval_gfs >= 0 )); then
-        export restart_interval="${FHMAX_GFS}"
-    else
-        rst_list=""
-        IAU_OFFSET=${IAU_OFFSET:-0}
-        [[ ${DOIAU} == "NO" ]] && export IAU_OFFSET=0
-
-        for ((xfh=restart_interval_gfs+(IAU_OFFSET/2); xfh <= FHMAX_GFS; xfh=xfh+restart_interval_gfs )); do
-          rst_list="${rst_list} ${xfh}"
-          xfh=$((xfh+restart_interval_gfs))
-        done
-        export restart_interval="${rst_list}"
-    fi
-
-    if [[ "${DO_AERO}" == "YES" ]]; then
-        # Make sure a restart file is written at the cadence time
-        if [[ ! "${restart_interval[*]}" =~ ${STEP_GFS}  ]]; then
-            export restart_interval="${STEP_GFS} ${restart_interval}"
-        fi
-    fi
+    export restart_interval=12
 
     # Choose coupling with wave
     if [[ "${DO_WAVE}" = "YES" && "${WAVE_CDUMP}" != "gdas" ]]; then