Update ufs-waether-model hash (NOAA-EMC#2338)

Routine update of ufs-weather-model hash. Other small updates: * removes comment referencing closed issue. * Updates the CICE diag frequency to once per day as recommend here: NOAA-EMC#1810 (comment) * Updated amount of time for C384 gdas forecast as it was running out of time * Removed unused variable wave_sys_ver
kayeekayee · Feb 27, 2024 · 2693810 · 2693810
1 parent 9608852
commit 2693810
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 11 deletions.
diff --git a/parm/config/gefs/config.wave b/parm/config/gefs/config.wave
@@ -7,9 +7,6 @@ echo "BEGIN: config.wave"
 
 # Parameters that are common to all wave model steps
 
-# System and version
-export wave_sys_ver=v1.0.0
-
 export EXECwave="${HOMEgfs}/exec"
 export PARMwave="${HOMEgfs}/parm/wave"
 export USHwave="${HOMEgfs}/ush"

diff --git a/parm/config/gfs/config.base.emc.dyn b/parm/config/gfs/config.base.emc.dyn
@@ -247,7 +247,7 @@ export gfs_cyc=@gfs_cyc@ # 0: no GFS cycle, 1: 00Z only, 2: 00Z and 12Z only, 4:
 # GFS output and frequency
 export FHMIN_GFS=0
 export FHMAX_GFS=@FHMAX_GFS@
-export FHOUT_GFS=3 # Must be 6 for S2S until #1629 is addressed; 3 for ops
+export FHOUT_GFS=3 
 export FHMAX_HF_GFS=0
 export FHOUT_HF_GFS=1
 export FHOUT_OCNICE_GFS=6

diff --git a/parm/config/gfs/config.resources b/parm/config/gfs/config.resources
@@ -633,7 +633,7 @@ case ${step} in
         declare -x "wtime_${step}_gfs"="03:00:00"
         ;;
       "C384")
-        declare -x "wtime_${step}"="00:10:00"
+        declare -x "wtime_${step}"="00:30:00"
         declare -x "wtime_${step}_gfs"="06:00:00"
         ;;
       "C768" | "C1152")

diff --git a/parm/config/gfs/config.wave b/parm/config/gfs/config.wave
@@ -7,9 +7,6 @@ echo "BEGIN: config.wave"
 
 # Parameters that are common to all wave model steps
 
-# System and version
-export wave_sys_ver=v1.0.0
-
 export EXECwave="${HOMEgfs}/exec"
 export PARMwave="${HOMEgfs}/parm/wave"
 export USHwave="${HOMEgfs}/ush"

diff --git a/sorc/ufs_model.fd b/sorc/ufs_model.fd
diff --git a/ush/parsing_namelists_CICE.sh b/ush/parsing_namelists_CICE.sh
@@ -61,7 +61,7 @@ local CICE_RESTART_DIR="./CICE_RESTART/"
 local CICE_RESTART_FILE="cice_model.res"
 local CICE_DUMPFREQ="y"  # "h","d","m" or "y" for restarts at intervals of "hours", "days", "months" or "years"
 local CICE_DUMPFREQ_N=10000  # Set this to a really large value, as cice, mom6 and cmeps restart interval is controlled by ufs.configure
-local CICE_DIAGFREQ=6
+local CICE_DIAGFREQ=$(( 86400 / DT_CICE ))  # frequency of diagnostic output in timesteps, recommended for 1x per day 
 local CICE_HISTFREQ_N="0, 0, ${FHOUT_OCNICE}, 1, 1"
 if [[ "${RUN}" =~ "gdas" ]]; then
   local CICE_HIST_AVG=".false., .false., .false., .false., .false."   # DA needs instantaneous

diff --git a/ush/wave_grid_moddef.sh b/ush/wave_grid_moddef.sh
@@ -59,7 +59,7 @@ source "$HOMEgfs/ush/preamble.sh"
 # 0.c Define directories and the search path.
 #     The tested variables should be exported by the postprocessor script.
 
-  if [ -z "$grdID" ] || [ -z "$EXECwave" ] || [ -z "$wave_sys_ver" ]
+  if [ -z "$grdID" ] || [ -z "$EXECwave" ]
   then
     set +x
     echo ' '