Update checks for MOM6 restarts when performing a re-run on failure

ush/forecast_det.sh

@@ -26,7 +26,7 @@ UFS_det(){
     IAU_OFFSET=0
     model_start_date_current_cycle=${current_cycle}
 
-    DO_LAND_IAU=".false."           
+    DO_LAND_IAU=".false."
 
     # It is still possible that a restart is available from a previous forecast attempt
     # So we have to continue checking for restarts
@@ -35,7 +35,7 @@ UFS_det(){
   # Lets assume this is was not run before and hence this is not a RERUN
   RERUN="NO"
 
-  # RERUN is only available for RUN=gfs|gefs It is not available for RUN=gdas|enkfgdas|enkfgfs
+  # RERUN is only available for RUN=gfs|gefs.  It is not available for RUN=gdas|enkfgdas|enkfgfs
   if [[ "${RUN}" =~ "gdas" ]] || [[ "${RUN}" == "enkfgfs" ]]; then
     echo "RERUN is not available for RUN='${RUN}'"
     return 0
@@ -46,15 +46,19 @@ UFS_det(){
   # shellcheck disable=SC2312
   mapfile -t file_array < <(find "${DATArestart}/FV3_RESTART" -name "????????.??0000.coupler.res" | sort)
   nrestarts=${#file_array[@]}
-  if (( nrestarts == 0 )); then
+  if [[ ${nrestarts} -eq 0 ]]; then
     echo "No restarts found in '${DATArestart}/FV3_RESTART', RERUN='${RERUN}'"
     return 0
+  else
+    echo "Found ${nrestarts} restarts in '${DATArestart}/FV3_RESTART' to check for RERUN"
+    ls -1 "${DATArestart}/FV3_RESTART/"????????.??0000.coupler.res
   fi
 
   # Look in reverse order of file_array to determine available restart times
   local ii filepath filename
   local rdate seconds
   local fv3_rst_ok cmeps_rst_ok mom6_rst_ok cice6_rst_ok ww3_rst_ok
+  local hdate hdatep1 fhout_ocn_by_2
   for (( ii=nrestarts-1; ii>=0; ii-- )); do
 
     filepath="${file_array[ii]}"
@@ -80,9 +84,22 @@ UFS_det(){
       if [[ ! -f "${DATArestart}/CMEPS_RESTART/ufs.cpld.cpl.r.${rdate:0:4}-${rdate:4:2}-${rdate:6:2}-${seconds}.nc" ]]; then
         cmeps_rst_ok="NO"
       fi
-      if [[ ! -f "${DATArestart}/MOM6_RESTART/${rdate:0:8}.${rdate:8:2}0000.MOM.res.nc" ]]; then
       # TODO: add checks for other MOM6 restarts as well
+      if [[ ! -f "${DATArestart}/MOM6_RESTART/${rdate:0:8}.${rdate:8:2}0000.MOM.res.nc" ]]; then
         mom6_rst_ok="NO"
+      else
+        # Also check for MOM6 history file availability
+        fhout_ocn_by_2=$((FHOUT_OCN / 2))
+        hdate=$(date -u -d "${rdate:0:8} ${rdate:8:2} + ${fhout_ocn_by_2} hours" +"%Y%m%d%H")
+        if [[ ! -f "${DATAoutput}/MOM6_OUTPUT/ocn_${hdate:0:4}_${hdate:4:2}_${hdate:6:2}_${hdate:8:2}.nc" ]]; then
+          mom6_rst_ok="NO"
+        else
+          # Also check for the next MOM6 history file (hdate + FHOUT_OCN hours)
+          hdatep1=$(date -u -d "${hdate:0:8} ${hdate:8:2} + ${FHOUT_OCN} hours" +"%Y%m%d%H")
+          if [[ ! -f "${DATAoutput}/MOM6_OUTPUT/ocn_${hdatep1:0:4}_${hdatep1:4:2}_${hdatep1:6:2}_${hdatep1:8:2}.nc" ]]; then
+            mom6_rst_ok="NO"
+          fi
+        fi
       fi
       MOM6_RESTART_SETTING='r'
       MOM6_INIT_FROM_Z=True

ush/preamble.sh

@@ -1,13 +1,13 @@
 #! /usr/bin/env bash
 
 #######
-# Preamble script to be SOURCED at the beginning of every script. Sets 
-#   useful PS4 and optionally turns on set -x and set -eu. Also sets up 
+# Preamble script to be SOURCED at the beginning of every script. Sets
+#   useful PS4 and optionally turns on set -x and set -eu. Also sets up
 #   crude script timing and provides a postamble that runs on exit.
 #
 # Syntax:
 #   preamble.sh
-#   
+#
 # Input environment variables:
 #   TRACE (YES/NO): Whether to echo every command (set -x) [default: "YES"]
 #   STRICT (YES/NO): Whether to exit immediately on error or undefined variable
@@ -26,7 +26,7 @@ start_time=$(date +%s)
 _calling_script=${_calling_script:-$(basename "${BASH_SOURCE[1]}")}
 
 # Announce the script has begun
-start_time_human=$(date -d"@${start_time}" -u)
+start_time_human=$(date -d"@${start_time}" -u +%H:%M:%S)
 echo "Begin ${_calling_script} at ${start_time_human}"
 
 declare -x PS4='+ $(basename ${BASH_SOURCE[0]:-${FUNCNAME[0]:-"Unknown"}})[${LINENO}]'
@@ -39,16 +39,16 @@ set_strict() {
 }
 
 set_trace() {
-    # Print the script name and line number of each command as it is 
-    #   executed when using trace. 
+    # Print the script name and line number of each command as it is
+    #   executed when using trace.
     if [[ ${TRACE:-"YES"} == "YES" ]]; then
         set -x
     fi
 }
 
 postamble() {
     #
-    # Commands to execute when a script ends. 
+    # Commands to execute when a script ends.
     #
     # Syntax:
     #   postamble script start_time rc
@@ -98,7 +98,7 @@ function err_exit() {
     # Taken from NCO prod_util v2.1.0
     # SCRIPT NAME:  err_exit
     #
-    # ABSTRACT:  This script is to be used when a fatal error or condition 
+    # ABSTRACT:  This script is to be used when a fatal error or condition
     # has been reached and you want to terminate the job.
     #
     # USAGE:  To use this script one must export the following variables to the