From 63c47abf1f02d5bb0f291dc2b454ea0638661808 Mon Sep 17 00:00:00 2001
From: henrywinterbottom-wxdev <henry.winterbottom.wxdev@gmail.com>
Date: Fri, 24 May 2024 12:45:06 -0600
Subject: [PATCH 01/51] ../jobs/JGLOBAL_WAVE_POST_BNDPNT

---
 scripts/exgfs_wave_post_pnt.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/exgfs_wave_post_pnt.sh b/scripts/exgfs_wave_post_pnt.sh
index 6e456e2aec6..f6f49e6d52f 100755
--- a/scripts/exgfs_wave_post_pnt.sh
+++ b/scripts/exgfs_wave_post_pnt.sh
@@ -117,12 +117,12 @@ source "${USHgfs}/preamble.sh"
 # Copy model definition files
   iloop=0
   for grdID in ${waveuoutpGRD}; do
-    if [[ -f "${COM_WAVE_PREP}/${RUN}wave.mod_def.${grdID}" ]]; then
+    if [[ -f "${COMIN_WAVE_PREP}/${RUN}wave.mod_def.${grdID}" ]]; then
       set +x
-      echo " Mod def file for ${grdID} found in ${COM_WAVE_PREP}. copying ...."
+      echo " Mod def file for ${grdID} found in ${COMIN_WAVE_PREP}. copying ...."
       set_trace
 
-      cp -f "${COM_WAVE_PREP}/${RUN}wave.mod_def.${grdID}" "mod_def.${grdID}"
+      cp -f "${COMIN_WAVE_PREP}/${RUN}wave.mod_def.${grdID}" "mod_def.${grdID}"
       iloop=$((iloop + 1))
     fi
   done
@@ -249,8 +249,8 @@ source "${USHgfs}/preamble.sh"
 
     ${NLN} mod_def.$waveuoutpGRD mod_def.ww3
     HMS="${cyc}0000"
-    if [[ -f "${COM_WAVE_HISTORY}/${WAV_MOD_TAG}.out_pnt.${waveuoutpGRD}.${PDY}.${HMS}" ]]; then
-      ${NLN} "${COM_WAVE_HISTORY}/${WAV_MOD_TAG}.out_pnt.${waveuoutpGRD}.${PDY}.${HMS}" \
+    if [[ -f "${COMOUT_WAVE_HISTORY}/${WAV_MOD_TAG}.out_pnt.${waveuoutpGRD}.${PDY}.${HMS}" ]]; then
+      ${NLN} "${COMOUT_WAVE_HISTORY}/${WAV_MOD_TAG}.out_pnt.${waveuoutpGRD}.${PDY}.${HMS}" \
         "./out_pnt.${waveuoutpGRD}"
     else
       echo '*************************************************** '
@@ -368,7 +368,7 @@ source "${USHgfs}/preamble.sh"
     export BULLDATA=${DATA}/output_$YMDHMS
     cp $DATA/mod_def.${waveuoutpGRD} mod_def.${waveuoutpGRD}
 
-    pfile="${COM_WAVE_HISTORY}/${WAV_MOD_TAG}.out_pnt.${waveuoutpGRD}.${YMD}.${HMS}"
+    pfile="${COMOUT_WAVE_HISTORY}/${WAV_MOD_TAG}.out_pnt.${waveuoutpGRD}.${YMD}.${HMS}"
     if [ -f  ${pfile} ]
     then
       ${NLN} ${pfile} ./out_pnt.${waveuoutpGRD}

From 74370c4bbb6f908635a2d5fcf6e5be2fcb042223 Mon Sep 17 00:00:00 2001
From: henrywinterbottom-wxdev <henry.winterbottom.wxdev@gmail.com>
Date: Fri, 24 May 2024 13:20:50 -0600
Subject: [PATCH 02/51] Update.

---
 jobs/JGLOBAL_WAVE_POST_BNDPNT | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/jobs/JGLOBAL_WAVE_POST_BNDPNT b/jobs/JGLOBAL_WAVE_POST_BNDPNT
index d1c92278954..27686b608a9 100755
--- a/jobs/JGLOBAL_WAVE_POST_BNDPNT
+++ b/jobs/JGLOBAL_WAVE_POST_BNDPNT
@@ -9,9 +9,13 @@ export errchk=${errchk:-err_chk}
 export MP_PULSE=0
 
 # Set COM Paths and GETGES environment
-YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COM_WAVE_PREP COM_WAVE_HISTORY COM_WAVE_STATION
+YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
+   COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \
+   COMIN_WAVE_STATION:COM_WAVE_STATION_TMPL \
+   COMOUT_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
 
-if [[ ! -d ${COM_WAVE_STATION} ]]; then mkdir -p "${COM_WAVE_STATION}"; fi
+
+if [[ ! -d ${COMIN_WAVE_STATION} ]]; then mkdir -p "${COMIN_WAVE_STATION}"; fi
 
 # Set wave model ID tag to include member number
 # if ensemble; waveMEMB var empty in deterministic
@@ -36,7 +40,7 @@ if [ ${err} -ne 0 ]; then
 fi
 
 ##########################################
-# Remove the Temporary working directory
+# Remove the Temporary working directory 
 ##########################################
 cd ${DATAROOT}
 [[ ${KEEPDATA} = "NO" ]] && rm -rf ${DATA}

From 47f873ce36835b39b171a9bc1429133981fccaea Mon Sep 17 00:00:00 2001
From: henrywinterbottom-wxdev <henry.winterbottom.wxdev@gmail.com>
Date: Sat, 25 May 2024 11:35:27 -0600
Subject: [PATCH 03/51] Wave post-processing script fixes.

---
 jobs/JGLOBAL_WAVE_POST_BNDPNT    | 1 -
 jobs/JGLOBAL_WAVE_POST_BNDPNTBLL | 7 +++++--
 jobs/JGLOBAL_WAVE_POST_PNT       | 7 +++++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/jobs/JGLOBAL_WAVE_POST_BNDPNT b/jobs/JGLOBAL_WAVE_POST_BNDPNT
index 27686b608a9..1ad61752440 100755
--- a/jobs/JGLOBAL_WAVE_POST_BNDPNT
+++ b/jobs/JGLOBAL_WAVE_POST_BNDPNT
@@ -14,7 +14,6 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
    COMIN_WAVE_STATION:COM_WAVE_STATION_TMPL \
    COMOUT_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
 
-
 if [[ ! -d ${COMIN_WAVE_STATION} ]]; then mkdir -p "${COMIN_WAVE_STATION}"; fi
 
 # Set wave model ID tag to include member number
diff --git a/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL b/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL
index ea4bb30cfba..00c59690d36 100755
--- a/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL
+++ b/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL
@@ -13,9 +13,12 @@ export CDATE=${PDY}${cyc}
 export MP_PULSE=0
 
 # Set COM Paths and GETGES environment
-YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COM_WAVE_PREP COM_WAVE_HISTORY COM_WAVE_STATION
+YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
+   COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \
+   COMIN_WAVE_STATION:COM_WAVE_STATION_TMPL \
+   COMOUT_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
 
-if [[ ! -d ${COM_WAVE_STATION} ]]; then mkdir -p "${COM_WAVE_STATION}"; fi
+if [[ ! -d ${COMIN_WAVE_STATION} ]]; then mkdir -p "${COMIN_WAVE_STATION}"; fi
 
 # Set wave model ID tag to include member number
 # if ensemble; waveMEMB var empty in deterministic
diff --git a/jobs/JGLOBAL_WAVE_POST_PNT b/jobs/JGLOBAL_WAVE_POST_PNT
index a946ae537d1..348255f787f 100755
--- a/jobs/JGLOBAL_WAVE_POST_PNT
+++ b/jobs/JGLOBAL_WAVE_POST_PNT
@@ -9,9 +9,12 @@ export errchk=${errchk:-err_chk}
 export MP_PULSE=0
 
 # Set COM Paths and GETGES environment
-YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COM_WAVE_PREP COM_WAVE_HISTORY COM_WAVE_STATION
+YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
+   COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \
+   COMIN_WAVE_STATION:COM_WAVE_STATION_TMPL \
+   COMOUT_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
 
-if [[ ! -d ${COM_WAVE_STATION} ]]; then mkdir -p "${COM_WAVE_STATION}"; fi
+if [[ ! -d ${COMIN_WAVE_STATION} ]]; then mkdir -p "${COMIN_WAVE_STATION}"; fi
 
 # Set wave model ID tag to include member number
 # if ensemble; waveMEMB var empty in deterministic

From 8427e46a44af3984685bb6fb36fbae1cf65f068b Mon Sep 17 00:00:00 2001
From: henrywinterbottom-wxdev <henry.winterbottom.wxdev@gmail.com>
Date: Mon, 27 May 2024 13:06:50 -0600
Subject: [PATCH 04/51] Updates for COMIN/COMOUT.

---
 jobs/JGLOBAL_WAVE_INIT     |  4 +++-
 scripts/exgfs_wave_init.sh | 18 +++++++++---------
 ush/wave_tar.sh            | 10 +++++-----
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/jobs/JGLOBAL_WAVE_INIT b/jobs/JGLOBAL_WAVE_INIT
index 7cadfe9f879..37a3d5f2317 100755
--- a/jobs/JGLOBAL_WAVE_INIT
+++ b/jobs/JGLOBAL_WAVE_INIT
@@ -10,7 +10,9 @@ export errchk=${errchk:-err_chk}
 export MP_PULSE=0
 
 # Set COM Paths
-YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COM_WAVE_PREP
+YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
+   COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \
+   COMOUT_WAVE_PREP:COM_WAVE_PREP_TMPL
 
 mkdir -m 775 -p ${COM_WAVE_PREP}
 
diff --git a/scripts/exgfs_wave_init.sh b/scripts/exgfs_wave_init.sh
index 9e3ca0b4972..f0f1dfe9991 100755
--- a/scripts/exgfs_wave_init.sh
+++ b/scripts/exgfs_wave_init.sh
@@ -83,15 +83,15 @@ source "${USHgfs}/preamble.sh"
   grdALL=$(printf "%s\n" "${array[@]}" | sort -u | tr '\n' ' ')
 
   for grdID in ${grdALL}; do
-    if [[ -f "${COM_WAVE_PREP}/${RUN}wave.mod_def.${grdID}" ]]; then
+    if [[ -f "${COMIN_WAVE_PREP}/${RUN}wave.mod_def.${grdID}" ]]; then
       set +x
-      echo " Mod def file for ${grdID} found in ${COM_WAVE_PREP}. copying ...."
+      echo " Mod def file for ${grdID} found in ${COMIN_WAVE_PREP}. copying ...."
       set_trace
-      cp "${COM_WAVE_PREP}/${RUN}wave.mod_def.${grdID}" "mod_def.${grdID}"
+      cp "${COMIN_WAVE_PREP}/${RUN}wave.mod_def.${grdID}" "mod_def.${grdID}"
 
     else
       set +x
-      echo " Mod def file for ${grdID} not found in ${COM_WAVE_PREP}. Setting up to generate ..."
+      echo " Mod def file for ${grdID} not found in ${COMIN_WAVE_PREP}. Setting up to generate ..."
       echo ' '
       set_trace
       if [ -f ${FIXgfs}/wave/ww3_grid.inp.$grdID ]
@@ -125,7 +125,7 @@ source "${USHgfs}/preamble.sh"
       fi
       #TO DO: how do we say "it's unstructured, and therefore need to have error check here" 
 
-      [[ ! -d "${COM_WAVE_PREP}" ]] && mkdir -m 775 -p "${COM_WAVE_PREP}"
+      [[ ! -d "${COMOUT_WAVE_PREP}" ]] && mkdir -m 775 -p "${COMOUT_WAVE_PREP}"
       if [ ${CFP_MP:-"NO"} = "YES" ]; then
         echo "$nmoddef ${USHgfs}/wave_grid_moddef.sh $grdID > $grdID.out 2>&1" >> cmdfile
       else
@@ -190,7 +190,7 @@ source "${USHgfs}/preamble.sh"
 # 1.a.3 File check
 
   for grdID in ${grdALL}; do
-    if [[ -f "${COM_WAVE_PREP}/${RUN}wave.mod_def.${grdID}" ]]; then
+    if [[ -f "${COMOUT_WAVE_PREP}/${RUN}wave.mod_def.${grdID}" ]]; then
       set +x
       echo ' '
       echo " mod_def.$grdID succesfully created/copied "
@@ -213,10 +213,10 @@ source "${USHgfs}/preamble.sh"
 # Copy to other members if needed
 if (( NMEM_ENS > 0 )); then
   for mem in $(seq -f "%03g" 1 "${NMEM_ENS}"); do
-    MEMDIR="mem${mem}" YMD=${PDY} HH=${cyc} declare_from_tmpl COM_WAVE_PREP_MEM:COM_WAVE_PREP_TMPL
-    mkdir -p "${COM_WAVE_PREP_MEM}"
+    MEMDIR="mem${mem}" YMD=${PDY} HH=${cyc} declare_from_tmpl COMOUT_WAVE_PREP_MEM:COM_WAVE_PREP_TMPL
+    mkdir -p "${COMOUT_WAVE_PREP_MEM}"
     for grdID in ${grdALL}; do
-      ${NLN} "${COM_WAVE_PREP}/${RUN}wave.mod_def.${grdID}" "${COM_WAVE_PREP_MEM}/${RUN}wave.mod_def.${grdID}"
+      ${NLN} "${COMOUT_WAVE_PREP}/${RUN}wave.mod_def.${grdID}" "${COMOUT_WAVE_PREP_MEM}/${RUN}wave.mod_def.${grdID}"
     done
   done
 fi
diff --git a/ush/wave_tar.sh b/ush/wave_tar.sh
index bb8836df2cb..e8b4540b969 100755
--- a/ush/wave_tar.sh
+++ b/ush/wave_tar.sh
@@ -76,7 +76,7 @@ source "${USHgfs}/preamble.sh"
 # 0.c Define directories and the search path.
 #     The tested variables should be exported by the postprocessor script.
 
-  if [[ -z "${cycle}" ]] || [[ -z "${COM_WAVE_STATION}" ]] || [[ -z "${WAV_MOD_TAG}" ]] ||  \
+  if [[ -z "${cycle}" ]] || [[ -z "${COMIN_WAVE_STATION}" ]] || [[ -z "${WAV_MOD_TAG}" ]] ||  \
      [[ -z "${SENDDBN}" ]] || [[ -z "${STA_DIR}" ]]; then
     set +x
     echo ' '
@@ -179,10 +179,10 @@ source "${USHgfs}/preamble.sh"
 
   set +x
   echo ' '
-  echo "   Moving tar file ${file_name} to ${COM_WAVE_STATION} ..."
+  echo "   Moving tar file ${file_name} to ${COMOUT_WAVE_STATION} ..."
   set_trace
 
-  cp "${file_name}" "${COM_WAVE_STATION}/."
+  cp "${file_name}" "${COMOUT_WAVE_STATION}/."
 
   exit=$?
 
@@ -202,11 +202,11 @@ source "${USHgfs}/preamble.sh"
   then
     set +x
     echo ' '
-    echo "   Alerting TAR file as ${COM_WAVE_STATION}/${file_name}"
+    echo "   Alerting TAR file as ${COMOUT_WAVE_STATION}/${file_name}"
     echo ' '
     set_trace
     "${DBNROOT}/bin/dbn_alert MODEL" "${alertName}_WAVE_TAR" "${job}" \
-      "${COM_WAVE_STATION}/${file_name}"
+      "${COMOUT_WAVE_STATION}/${file_name}"
   fi
 
 # --------------------------------------------------------------------------- #

From 5bafc6bb224e7e949ad3b3f397ed2b2db895cd34 Mon Sep 17 00:00:00 2001
From: HenryWinterbottom-NOAA <henry.winterbottom@noaa.gov>
Date: Wed, 29 May 2024 23:08:58 +0000
Subject: [PATCH 05/51] Bringing branch UTD with WIP.

---
 jobs/JGLOBAL_WAVE_INIT                 |  3 ++-
 jobs/JGLOBAL_WAVE_POST_BNDPNT          |  1 +
 jobs/JGLOBAL_WAVE_POST_BNDPNTBLL       |  1 +
 jobs/JGLOBAL_WAVE_POST_PNT             |  1 +
 jobs/JGLOBAL_WAVE_POST_SBS             |  8 ++++++--
 jobs/JGLOBAL_WAVE_PREP                 |  8 +++++---
 scripts/exgfs_wave_post_gridded_sbs.sh | 10 ++++-----
 scripts/exgfs_wave_prep.sh             |  8 ++++----
 ush/wave_grib2_sbs.sh                  | 28 +++++++++++++-------------
 ush/wave_grid_interp_sbs.sh            |  8 ++++----
 ush/wave_grid_moddef.sh                |  2 +-
 11 files changed, 44 insertions(+), 34 deletions(-)

diff --git a/jobs/JGLOBAL_WAVE_INIT b/jobs/JGLOBAL_WAVE_INIT
index 37a3d5f2317..d42a675d74d 100755
--- a/jobs/JGLOBAL_WAVE_INIT
+++ b/jobs/JGLOBAL_WAVE_INIT
@@ -14,7 +14,8 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
    COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \
    COMOUT_WAVE_PREP:COM_WAVE_PREP_TMPL
 
-mkdir -m 775 -p ${COM_WAVE_PREP}
+mkdir -m 775 -p "${COMIN_WAVE_PREP}"
+mkdir -m 775 -p "${COMOUT_WAVE_PREP}"
 
 # Set mpi serial command
 export wavempexec=${wavempexec:-"mpirun -n"}
diff --git a/jobs/JGLOBAL_WAVE_POST_BNDPNT b/jobs/JGLOBAL_WAVE_POST_BNDPNT
index 1ad61752440..39efdc9aebf 100755
--- a/jobs/JGLOBAL_WAVE_POST_BNDPNT
+++ b/jobs/JGLOBAL_WAVE_POST_BNDPNT
@@ -13,6 +13,7 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
    COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \
    COMIN_WAVE_STATION:COM_WAVE_STATION_TMPL \
    COMOUT_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
+   COMOUT_WAVE_STATION:COM_WAVE_STATION_TMPL
 
 if [[ ! -d ${COMIN_WAVE_STATION} ]]; then mkdir -p "${COMIN_WAVE_STATION}"; fi
 
diff --git a/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL b/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL
index 00c59690d36..caf7b385aaa 100755
--- a/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL
+++ b/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL
@@ -17,6 +17,7 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
    COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \
    COMIN_WAVE_STATION:COM_WAVE_STATION_TMPL \
    COMOUT_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
+   COMOUT_WAVE_STATION:COM_WAVE_STATION_TMPL
 
 if [[ ! -d ${COMIN_WAVE_STATION} ]]; then mkdir -p "${COMIN_WAVE_STATION}"; fi
 
diff --git a/jobs/JGLOBAL_WAVE_POST_PNT b/jobs/JGLOBAL_WAVE_POST_PNT
index 348255f787f..3bc4c008379 100755
--- a/jobs/JGLOBAL_WAVE_POST_PNT
+++ b/jobs/JGLOBAL_WAVE_POST_PNT
@@ -13,6 +13,7 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
    COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \
    COMIN_WAVE_STATION:COM_WAVE_STATION_TMPL \
    COMOUT_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
+   COMOUT_WAVE_STATION:COM_WAVE_STATION_TMPL
 
 if [[ ! -d ${COMIN_WAVE_STATION} ]]; then mkdir -p "${COMIN_WAVE_STATION}"; fi
 
diff --git a/jobs/JGLOBAL_WAVE_POST_SBS b/jobs/JGLOBAL_WAVE_POST_SBS
index 89d8013ea17..5d6a429032e 100755
--- a/jobs/JGLOBAL_WAVE_POST_SBS
+++ b/jobs/JGLOBAL_WAVE_POST_SBS
@@ -9,9 +9,13 @@ export errchk=${errchk:-err_chk}
 export MP_PULSE=0
 
 # Set COM Paths and GETGES environment
-YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COM_WAVE_PREP COM_WAVE_HISTORY COM_WAVE_GRID
+YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
+	COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \
+	COMOUT_WAVE_PREP:COM_WAVE_PREP_TMPL \
+       	COMOUT_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
+       	COMOUT_WAVE_GRID:COM_WAVE_GRID_TMPL
 
-mkdir -p "${COM_WAVE_GRID}"
+mkdir -p "${COMOUT_WAVE_GRID}"
 
 
 # Set wave model ID tag to include member number
diff --git a/jobs/JGLOBAL_WAVE_PREP b/jobs/JGLOBAL_WAVE_PREP
index 866f3cb3189..0d89dfa8824 100755
--- a/jobs/JGLOBAL_WAVE_PREP
+++ b/jobs/JGLOBAL_WAVE_PREP
@@ -17,9 +17,11 @@ export MP_PULSE=0
 export CDO=${CDO_ROOT}/bin/cdo
 
 # Set COM Paths and GETGES environment
-YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COM_OBS COM_WAVE_PREP
-declare_from_tmpl -rx COM_RTOFS
-[[ ! -d ${COM_WAVE_PREP} ]] && mkdir -m 775 -p "${COM_WAVE_PREP}"
+YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
+	COMIN_OBS:COM_OBS_TMPL \
+	COMOUT_WAVE_PREP:COM_WAVE_PREP_TMPL \
+	COMIN_RTOFS:COM_RTOFS_TMPL
+[[ ! -d ${COMOUT_WAVE_PREP} ]] && mkdir -m 775 -p "${COMOUT_WAVE_PREP}"
 
 # Execute the Script
 ${SCRgfs}/exgfs_wave_prep.sh
diff --git a/scripts/exgfs_wave_post_gridded_sbs.sh b/scripts/exgfs_wave_post_gridded_sbs.sh
index 3b103b8dd30..28df2d76328 100755
--- a/scripts/exgfs_wave_post_gridded_sbs.sh
+++ b/scripts/exgfs_wave_post_gridded_sbs.sh
@@ -103,12 +103,12 @@ source "${USHgfs}/preamble.sh"
 
 # 1.a.1 Copy model definition files
   for grdID in ${waveGRD} ${wavepostGRD} ${waveinterpGRD}; do
-    if [[ -f "${COM_WAVE_PREP}/${RUN}wave.mod_def.${grdID}" ]]; then
+    if [[ -f "${COMIN_WAVE_PREP}/${RUN}wave.mod_def.${grdID}" ]]; then
       set +x
-      echo " Mod def file for ${grdID} found in ${COM_WAVE_PREP}. copying ...."
+      echo " Mod def file for ${grdID} found in ${COMIN_WAVE_PREP}. copying ...."
       set_trace
 
-      cp -f "${COM_WAVE_PREP}/${RUN}wave.mod_def.${grdID}" "mod_def.${grdID}"
+      cp -f "${COMIN_WAVE_PREP}/${RUN}wave.mod_def.${grdID}" "mod_def.${grdID}"
     fi
   done
 
@@ -258,7 +258,7 @@ source "${USHgfs}/preamble.sh"
     then
       iwait=0
       for wavGRD in ${waveGRD} ; do
-        gfile=${COM_WAVE_HISTORY}/${WAV_MOD_TAG}.out_grd.${wavGRD}.${YMD}.${HMS}
+        gfile=${COMOUT_WAVE_HISTORY}/${WAV_MOD_TAG}.out_grd.${wavGRD}.${YMD}.${HMS}
         while [ ! -s ${gfile} ]; do sleep 10; let iwait=iwait+1; done
         if [ $iwait -eq $iwaitmax ]; then
           echo '*************************************************** '
@@ -407,7 +407,7 @@ source "${USHgfs}/preamble.sh"
       ENSTAG=""
       if [ ${waveMEMB} ]; then ENSTAG=".${membTAG}${waveMEMB}" ; fi
       gribchk="${RUN}wave.${cycle}${ENSTAG}.${GRDNAME}.${GRDRES}.f${FH3}.grib2"
-      if [ ! -s ${COM_WAVE_GRID}/${gribchk} ]; then
+      if [ ! -s ${COMOUT_WAVE_GRID}/${gribchk} ]; then
         set +x
         echo ' '
         echo '********************************************'
diff --git a/scripts/exgfs_wave_prep.sh b/scripts/exgfs_wave_prep.sh
index 1fbe7dd767e..0f578045d05 100755
--- a/scripts/exgfs_wave_prep.sh
+++ b/scripts/exgfs_wave_prep.sh
@@ -162,12 +162,12 @@ source "${USHgfs}/preamble.sh"
 
   for grdID in $grdINP $waveGRD
   do
-    if [ -f "${COM_WAVE_PREP}/${RUN}wave.mod_def.${grdID}" ]
+    if [ -f "${COMIN_WAVE_PREP}/${RUN}wave.mod_def.${grdID}" ]
     then
       set +x
-      echo " Mod def file for $grdID found in ${COM_WAVE_PREP}. copying ...."
+      echo " Mod def file for $grdID found in ${COMIN_WAVE_PREP}. copying ...."
       set_trace
-      cp ${COM_WAVE_PREP}/${RUN}wave.mod_def.${grdID} mod_def.$grdID
+      cp ${COMIN_WAVE_PREP}/${RUN}wave.mod_def.${grdID} mod_def.$grdID
 
     else
       set +x
@@ -322,7 +322,7 @@ source "${USHgfs}/preamble.sh"
       ymdh_rtofs=$ymdh_beg
 
       if [  "$FHMAX_WAV_CUR" -le 72 ]; then 
-        rtofsfile1="${COM_RTOFS}/${WAVECUR_DID}.${RPDY}/rtofs_glo_2ds_f024_prog.nc"
+        rtofsfile1="${COMIN_RTOFS}/${WAVECUR_DID}.${RPDY}/rtofs_glo_2ds_f024_prog.nc"
         rtofsfile2="${COM_RTOFS}/${WAVECUR_DID}.${RPDY}/rtofs_glo_2ds_f048_prog.nc"
         rtofsfile3="${COM_RTOFS}/${WAVECUR_DID}.${RPDY}/rtofs_glo_2ds_f072_prog.nc"
         if [ ! -f $rtofsfile1 ] || [ ! -f $rtofsfile2 ] || [ ! -f $rtofsfile3 ]; then 
diff --git a/ush/wave_grib2_sbs.sh b/ush/wave_grib2_sbs.sh
index 431387cccd4..99f89f3f37d 100755
--- a/ush/wave_grib2_sbs.sh
+++ b/ush/wave_grib2_sbs.sh
@@ -72,7 +72,7 @@ if [[ -n ${waveMEMB} ]]; then ENSTAG=".${membTAG}${waveMEMB}" ; fi
 outfile="${WAV_MOD_TAG}.${cycle}${ENSTAG}.${grdnam}.${grdres}.f${FH3}.grib2"
 
 # Only create file if not present in COM
-if [[ ! -s "${COM_WAVE_GRID}/${outfile}.idx" ]]; then
+if [[ ! -s "${COMOUT_WAVE_GRID}/${outfile}.idx" ]]; then
 
   set +x
   echo ' '
@@ -83,7 +83,7 @@ if [[ ! -s "${COM_WAVE_GRID}/${outfile}.idx" ]]; then
   set_trace
 
   if [[ -z "${PDY}" ]] || [[ -z ${cyc} ]] || [[ -z "${cycle}" ]] || [[ -z "${EXECgfs}" ]] || \
-	 [[ -z "${COM_WAVE_GRID}" ]] || [[ -z "${WAV_MOD_TAG}" ]] || [[ -z "${gribflags}" ]] || \
+	 [[ -z "${COMOUT_WAVE_GRID}" ]] || [[ -z "${WAV_MOD_TAG}" ]] || [[ -z "${gribflags}" ]] || \
 	 [[ -z "${GRIDNR}" ]] || [[ -z "${MODNR}" ]] || \
      [[ -z "${SENDDBN}" ]]; then
     set +x
@@ -157,11 +157,11 @@ if [[ ! -s "${COM_WAVE_GRID}/${outfile}.idx" ]]; then
   fi
 
   if (( fhr > 0 )); then 
-    ${WGRIB2} gribfile -set_date "${PDY}${cyc}" -set_ftime "${fhr} hour fcst" -grib "${COM_WAVE_GRID}/${outfile}"
+    ${WGRIB2} gribfile -set_date "${PDY}${cyc}" -set_ftime "${fhr} hour fcst" -grib "${COMOUT_WAVE_GRID}/${outfile}"
     err=$?
   else
     ${WGRIB2} gribfile -set_date "${PDY}${cyc}" -set_ftime "${fhr} hour fcst" \
-      -set table_1.4 1 -set table_1.2 1 -grib "${COM_WAVE_GRID}/${outfile}"
+      -set table_1.4 1 -set table_1.2 1 -grib "${COMOUT_WAVE_GRID}/${outfile}"
     err=$?
   fi
 
@@ -177,7 +177,7 @@ if [[ ! -s "${COM_WAVE_GRID}/${outfile}.idx" ]]; then
   fi
 
   # Create index
-  ${WGRIB2} -s "${COM_WAVE_GRID}/${outfile}" > "${COM_WAVE_GRID}/${outfile}.idx"
+  ${WGRIB2} -s "${COMOUT_WAVE_GRID}/${outfile}" > "${COMOUT_WAVE_GRID}/${outfile}.idx"
 
   # Create grib2 subgrid is this is the source grid
   if [[ "${grdID}" = "${WAV_SUBGRBSRC}" ]]; then
@@ -186,14 +186,14 @@ if [[ ! -s "${COM_WAVE_GRID}/${outfile}.idx" ]]; then
       subgrbnam=$(echo ${!subgrb} | cut -d " " -f 21)
       subgrbres=$(echo ${!subgrb} | cut -d " " -f 22)
       subfnam="${WAV_MOD_TAG}.${cycle}${ENSTAG}.${subgrbnam}.${subgrbres}.f${FH3}.grib2"
-      ${COPYGB2} -g "${subgrbref}" -i0 -x "${COM_WAVE_GRID}/${outfile}" "${COM_WAVE_GRID}/${subfnam}"
-      ${WGRIB2} -s "${COM_WAVE_GRID}/${subfnam}" > "${COM_WAVE_GRID}/${subfnam}.idx"
+      ${COPYGB2} -g "${subgrbref}" -i0 -x "${COMOUT_WAVE_GRID}/${outfile}" "${COMOUT_WAVE_GRID}/${subfnam}"
+      ${WGRIB2} -s "${COMOUT_WAVE_GRID}/${subfnam}" > "${COMOUT_WAVE_GRID}/${subfnam}.idx"
    done
   fi
 
   # 1.e Save in /com
 
-  if [[ ! -s "${COM_WAVE_GRID}/${outfile}" ]]; then
+  if [[ ! -s "${COMOUT_WAVE_GRID}/${outfile}" ]]; then
     set +x
     echo ' '
     echo '********************************************* '
@@ -205,7 +205,7 @@ if [[ ! -s "${COM_WAVE_GRID}/${outfile}.idx" ]]; then
     set_trace
     exit 4
   fi
-  if [[ ! -s "${COM_WAVE_GRID}/${outfile}.idx" ]]; then
+  if [[ ! -s "${COMOUT_WAVE_GRID}/${outfile}.idx" ]]; then
     set +x
     echo ' '
     echo '*************************************************** '
@@ -220,11 +220,11 @@ if [[ ! -s "${COM_WAVE_GRID}/${outfile}.idx" ]]; then
 
   if [[ "${SENDDBN}" = 'YES' ]] && [[ ${outfile} != *global.0p50* ]]; then
     set +x
-    echo "   Alerting GRIB file as ${COM_WAVE_GRID}/${outfile}"
-    echo "   Alerting GRIB index file as ${COM_WAVE_GRID}/${outfile}.idx"
+    echo "   Alerting GRIB file as ${COMOUT_WAVE_GRID}/${outfile}"
+    echo "   Alerting GRIB index file as ${COMOUT_WAVE_GRID}/${outfile}.idx"
     set_trace
-    "${DBNROOT}/bin/dbn_alert" MODEL "${alertName}_WAVE_GB2" "${job}" "${COM_WAVE_GRID}/${outfile}"
-    "${DBNROOT}/bin/dbn_alert" MODEL "${alertName}_WAVE_GB2_WIDX" "${job}" "${COM_WAVE_GRID}/${outfile}.idx"
+    "${DBNROOT}/bin/dbn_alert" MODEL "${alertName}_WAVE_GB2" "${job}" "${COMOUT_WAVE_GRID}/${outfile}"
+    "${DBNROOT}/bin/dbn_alert" MODEL "${alertName}_WAVE_GB2_WIDX" "${job}" "${COMOUT_WAVE_GRID}/${outfile}.idx"
   else
     echo "${outfile} is global.0p50 or SENDDBN is NO, no alert sent"
   fi
@@ -245,7 +245,7 @@ if [[ ! -s "${COM_WAVE_GRID}/${outfile}.idx" ]]; then
 else
   set +x
   echo ' '
-  echo " File ${COM_WAVE_GRID}/${outfile} found, skipping generation process"
+  echo " File ${COMOUT_WAVE_GRID}/${outfile} found, skipping generation process"
   echo ' '
   set_trace
 fi
diff --git a/ush/wave_grid_interp_sbs.sh b/ush/wave_grid_interp_sbs.sh
index e6f0a1a1aae..9fc80143d89 100755
--- a/ush/wave_grid_interp_sbs.sh
+++ b/ush/wave_grid_interp_sbs.sh
@@ -66,7 +66,7 @@ source "${USHgfs}/preamble.sh"
   set_trace
 
   if [[ -z "${PDY}" ]] || [[ -z "${cyc}" ]] || [[ -z "${cycle}" ]] || [[ -z "${EXECgfs}" ]] || \
-	 [[ -z "${COM_WAVE_PREP}" ]] || [[ -z "${WAV_MOD_TAG}" ]] || [[ -z "${SENDDBN}" ]] || \
+	 [[ -z "${COMIN_WAVE_PREP}" ]] || [[ -z "${WAV_MOD_TAG}" ]] || [[ -z "${SENDDBN}" ]] || \
 	 [ -z "${waveGRD}" ]
   then
     set +x
@@ -75,7 +75,7 @@ source "${USHgfs}/preamble.sh"
     echo '*** EXPORTED VARIABLES IN postprocessor NOT SET ***'
     echo '***************************************************'
     echo ' '
-    echo "${PDY}${cyc} ${cycle} ${EXECgfs} ${COM_WAVE_PREP} ${WAV_MOD_TAG} ${SENDDBN} ${waveGRD}"
+    echo "${PDY}${cyc} ${cycle} ${EXECgfs} ${COMIN_WAVE_PREP} ${WAV_MOD_TAG} ${SENDDBN} ${waveGRD}"
     set_trace
     exit 1
   fi
@@ -171,9 +171,9 @@ source "${USHgfs}/preamble.sh"
 # 1.c Save in /com
 
   set +x
-  echo "   Saving GRID file as ${COM_WAVE_PREP}/${WAV_MOD_TAG}.out_grd.${grdID}.${PDY}${cyc}"
+  echo "   Saving GRID file as ${COMOUT_WAVE_PREP}/${WAV_MOD_TAG}.out_grd.${grdID}.${PDY}${cyc}"
   set_trace
-  cp "${DATA}/output_${ymdh}0000/out_grd.${grdID}" "${COM_WAVE_PREP}/${WAV_MOD_TAG}.out_grd.${grdID}.${PDY}${cyc}"
+  cp "${DATA}/output_${ymdh}0000/out_grd.${grdID}" "${COMOUT_WAVE_PREP}/${WAV_MOD_TAG}.out_grd.${grdID}.${PDY}${cyc}"
 
 #    if [ "$SENDDBN" = 'YES' ]
 #    then
diff --git a/ush/wave_grid_moddef.sh b/ush/wave_grid_moddef.sh
index 2deb98ce9ca..1e8c44054a7 100755
--- a/ush/wave_grid_moddef.sh
+++ b/ush/wave_grid_moddef.sh
@@ -109,7 +109,7 @@ source "${USHgfs}/preamble.sh"
  
   if [[ -f mod_def.ww3 ]]
   then
-    cp mod_def.ww3 "${COM_WAVE_PREP}/${RUN}wave.mod_def.${grdID}"
+    cp mod_def.ww3 "${COMOUT_WAVE_PREP}/${RUN}wave.mod_def.${grdID}"
     mv mod_def.ww3 "../mod_def.${grdID}"
   else
     set +x

From 8432581933bd41e51c4e6b6d75d94b1e98361ebd Mon Sep 17 00:00:00 2001
From: HenryWinterbottom-NOAA <henry.winterbottom@noaa.gov>
Date: Thu, 30 May 2024 23:01:39 +0000
Subject: [PATCH 06/51] COMIN/COMOUT updates/corrections.

---
 jobs/JGLOBAL_WAVE_PRDGEN_BULLS       |  6 ++++--
 jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED     |  8 +++++---
 scripts/exgfs_wave_prdgen_bulls.sh   | 12 ++++++------
 scripts/exgfs_wave_prdgen_gridded.sh |  8 ++++----
 scripts/exgfs_wave_prep.sh           | 20 ++++++++++----------
 ush/wave_prnc_ice.sh                 | 10 +++++-----
 6 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/jobs/JGLOBAL_WAVE_PRDGEN_BULLS b/jobs/JGLOBAL_WAVE_PRDGEN_BULLS
index 86ad17e8b09..33baa1d733d 100755
--- a/jobs/JGLOBAL_WAVE_PRDGEN_BULLS
+++ b/jobs/JGLOBAL_WAVE_PRDGEN_BULLS
@@ -13,9 +13,11 @@ export SENDDBN_NTC=${SENDDBN_NTC:-YES}
 export SENDDBN=${SENDDBN:-NO}
 export DBNROOT=${DBNROOT:-${UTILROOT}/fakedbn}
 
-YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COM_WAVE_STATION COM_WAVE_WMO
+YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
+	COMIN_WAVE_STATION:COM_WAVE_STATION_TMPL \
+       	COMOUT_WAVE_WMO:COM_WAVE_WMO_TMPL
 
-if [[ ! -d ${COM_WAVE_WMO} ]]; then mkdir -p "${COM_WAVE_WMO}"; fi
+if [[ ! -d ${COMOUT_WAVE_WMO} ]]; then mkdir -p "${COMOUT_WAVE_WMO}"; fi
 
 ###################################
 # Execute the Script
diff --git a/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED b/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED
index 5a4250fb57c..a0dafcbf9ec 100755
--- a/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED
+++ b/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED
@@ -13,11 +13,13 @@ export SENDDBN_NTC=${SENDDBN_NTC:-YES}
 export SENDDBN=${SENDDBN:-NO}
 export DBNROOT=${DBNROOT:-${UTILROOT}/fakedbn}
 
-YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COM_WAVE_GRID COM_WAVE_WMO
+YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
+	COMIN_WAVE_GRID:COM_WAVE_GRID_TMPL \
+       	COMOUT_WAVE_WMO:COM_WAVE_WMO
 
-if [[ ! -d ${COM_WAVE_WMO} ]]; then mkdir -p "${COM_WAVE_WMO}"; fi
+if [[ ! -d ${COMOUT_WAVE_WMO} ]]; then mkdir -p "${COMOUT_WAVE_WMO}"; fi
 
-mkdir -p "${COM_WAVE_WMO}"
+mkdir -p "${COMOUT_WAVE_WMO}"
 
 ###################################
 # Execute the Script
diff --git a/scripts/exgfs_wave_prdgen_bulls.sh b/scripts/exgfs_wave_prdgen_bulls.sh
index 2bf90cdf2bc..1fc2d26ce07 100755
--- a/scripts/exgfs_wave_prdgen_bulls.sh
+++ b/scripts/exgfs_wave_prdgen_bulls.sh
@@ -52,11 +52,11 @@ source "${USHgfs}/preamble.sh"
 
 # 1.  Get necessary files
  set +x
- echo "   Copying bulletins from ${COM_WAVE_STATION}"
+ echo "   Copying bulletins from ${COMIN_WAVE_STATION}"
  set_trace
 
 # 1.a Link the input file and untar it
- BullIn="${COM_WAVE_STATION}/${RUNwave}.${cycle}.cbull_tar"
+ BullIn="${COMIN_WAVE_STATION}/${RUNwave}.${cycle}.cbull_tar"
  if [ -f $BullIn ]; then
    cp $BullIn cbull.tar
  else
@@ -170,7 +170,7 @@ source "${USHgfs}/preamble.sh"
    set_trace
    
    formbul.pl -d "${headr}" -f "${fname}" -j "${job}" -m "${RUNwave}" \
-              -p "${COM_WAVE_WMO}" -s "NO" -o "${oname}" > formbul.out 2>&1
+              -p "${COMOUT_WAVE_WMO}" -s "NO" -o "${oname}" > formbul.out 2>&1
    OK=$?
 
    if [ "$OK" != '0' ] || [ ! -f $oname ]; then
@@ -196,15 +196,15 @@ source "${USHgfs}/preamble.sh"
 
 # 3. Send output files to the proper destination
 set_trace
-cp "awipsbull.${cycle}.${RUNwave}" "${COM_WAVE_WMO}/awipsbull.${cycle}.${RUNwave}"
+cp "awipsbull.${cycle}.${RUNwave}" "${COMOUT_WAVE_WMO}/awipsbull.${cycle}.${RUNwave}"
 if [ "$SENDDBN_NTC" = YES ]; then
     make_ntc_bull.pl "WMOBH" "NONE" "KWBC" "NONE" "${DATA}/awipsbull.${cycle}.${RUNwave}" \
-		     "${COM_WAVE_WMO}/awipsbull.${cycle}.${RUNwave}"
+		     "${COMOUT_WAVE_WMO}/awipsbull.${cycle}.${RUNwave}"
 else
     if [ "${envir}" = "para" ] || [ "${envir}" = "test" ] || [ "${envir}" = "dev" ]; then
 	echo "Making NTC bulletin for parallel environment, but do not alert."
 	(export SENDDBN=NO; make_ntc_bull.pl "WMOBH" "NONE" "KWBC" "NONE" \
-					     "${DATA}/awipsbull.${cycle}.${RUNwave}" "${COM_WAVE_WMO}/awipsbull.${cycle}.${RUNwave}")
+					     "${DATA}/awipsbull.${cycle}.${RUNwave}" "${COMOUT_WAVE_WMO}/awipsbull.${cycle}.${RUNwave}")
     fi
 fi
 
diff --git a/scripts/exgfs_wave_prdgen_gridded.sh b/scripts/exgfs_wave_prdgen_gridded.sh
index c51ce60acc6..1579195b957 100755
--- a/scripts/exgfs_wave_prdgen_gridded.sh
+++ b/scripts/exgfs_wave_prdgen_gridded.sh
@@ -95,7 +95,7 @@ grids=${grids:-ak_10m at_10m ep_10m wc_10m glo_30m}
      esac
      #
 
-     GRIBIN="${COM_WAVE_GRID}/${RUNwave}.${cycle}.${grdID}.f${fhr}.grib2"
+     GRIBIN="${COMIN_WAVE_GRID}/${RUNwave}.${cycle}.${grdID}.f${fhr}.grib2"
      GRIBIN_chk=$GRIBIN.idx
 
      icnt=1
@@ -232,16 +232,16 @@ grids=${grids:-ak_10m at_10m ep_10m wc_10m glo_30m}
      #set_trace
      #set +x
      echo "      Saving $AWIPSGRB.$grdOut.f${fhr} as grib2.$cycle.awipsww3_${grdID}.f${fhr}"
-     echo "          in ${COM_WAVE_WMO}"
+     echo "          in ${COMOUT_WAVE_WMO}"
      #set_trace
-     cp "${AWIPSGRB}.${grdID}.f${fhr}" "${COM_WAVE_WMO}/grib2.${cycle}.f${fhr}.awipsww3_${grdOut}"
+     cp "${AWIPSGRB}.${grdID}.f${fhr}" "${COMOUT_WAVE_WMO}/grib2.${cycle}.f${fhr}.awipsww3_${grdOut}"
      #set +x
 
 
      if [ "$SENDDBN" = 'YES' ]
      then
        echo "      Sending $AWIPSGRB.$grdID.f${fhr} to DBRUN."
-       "${DBNROOT}/bin/dbn_alert" GRIB_LOW "${RUN}" "${job}" "${COM_WAVE_WMO}/grib2.${cycle}.f${fhr}.awipsww3_${grdOut}"
+       "${DBNROOT}/bin/dbn_alert" GRIB_LOW "${RUN}" "${job}" "${COMOUT_WAVE_WMO}/grib2.${cycle}.f${fhr}.awipsww3_${grdOut}"
      fi
      rm -f $AWIPSGRB.$grdID.f${fhr} tocgrib2.out
    done # For grids
diff --git a/scripts/exgfs_wave_prep.sh b/scripts/exgfs_wave_prep.sh
index 0f578045d05..91decf89146 100755
--- a/scripts/exgfs_wave_prep.sh
+++ b/scripts/exgfs_wave_prep.sh
@@ -323,18 +323,18 @@ source "${USHgfs}/preamble.sh"
 
       if [  "$FHMAX_WAV_CUR" -le 72 ]; then 
         rtofsfile1="${COMIN_RTOFS}/${WAVECUR_DID}.${RPDY}/rtofs_glo_2ds_f024_prog.nc"
-        rtofsfile2="${COM_RTOFS}/${WAVECUR_DID}.${RPDY}/rtofs_glo_2ds_f048_prog.nc"
-        rtofsfile3="${COM_RTOFS}/${WAVECUR_DID}.${RPDY}/rtofs_glo_2ds_f072_prog.nc"
+        rtofsfile2="${COMIN_RTOFS}/${WAVECUR_DID}.${RPDY}/rtofs_glo_2ds_f048_prog.nc"
+        rtofsfile3="${COMIN_RTOFS}/${WAVECUR_DID}.${RPDY}/rtofs_glo_2ds_f072_prog.nc"
         if [ ! -f $rtofsfile1 ] || [ ! -f $rtofsfile2 ] || [ ! -f $rtofsfile3 ]; then 
            #Needed current files are not available, so use RTOFS from previous day 
            export RPDY=$($NDATE -24 ${RPDY}00 | cut -c1-8)
         fi 
       else
-        rtofsfile1="${COM_RTOFS}/${WAVECUR_DID}.${RPDY}/rtofs_glo_2ds_f096_prog.nc"
-        rtofsfile2="${COM_RTOFS}/${WAVECUR_DID}.${RPDY}/rtofs_glo_2ds_f120_prog.nc"
-        rtofsfile3="${COM_RTOFS}/${WAVECUR_DID}.${RPDY}/rtofs_glo_2ds_f144_prog.nc"
-        rtofsfile4="${COM_RTOFS}/${WAVECUR_DID}.${RPDY}/rtofs_glo_2ds_f168_prog.nc"
-        rtofsfile5="${COM_RTOFS}/${WAVECUR_DID}.${RPDY}/rtofs_glo_2ds_f192_prog.nc"
+        rtofsfile1="${COMIN_RTOFS}/${WAVECUR_DID}.${RPDY}/rtofs_glo_2ds_f096_prog.nc"
+        rtofsfile2="${COMIN_RTOFS}/${WAVECUR_DID}.${RPDY}/rtofs_glo_2ds_f120_prog.nc"
+        rtofsfile3="${COMIN_RTOFS}/${WAVECUR_DID}.${RPDY}/rtofs_glo_2ds_f144_prog.nc"
+        rtofsfile4="${COMIN_RTOFS}/${WAVECUR_DID}.${RPDY}/rtofs_glo_2ds_f168_prog.nc"
+        rtofsfile5="${COMIN_RTOFS}/${WAVECUR_DID}.${RPDY}/rtofs_glo_2ds_f192_prog.nc"
         if [ ! -f $rtofsfile1 ] || [ ! -f $rtofsfile2 ] || [ ! -f $rtofsfile3 ] ||
             [ ! -f $rtofsfile4 ] || [ ! -f $rtofsfile5 ]; then
             #Needed current files are not available, so use RTOFS from previous day 
@@ -360,8 +360,8 @@ source "${USHgfs}/preamble.sh"
         fhr_rtofs=$(${NHOUR} ${ymdh_rtofs} ${RPDY}00)
         fh3_rtofs=$(printf "%03d" "${fhr_rtofs#0}")
 
-        curfile1h=${COM_RTOFS}/${WAVECUR_DID}.${RPDY}/rtofs_glo_2ds_${fext}${fh3_rtofs}_prog.nc
-        curfile3h=${COM_RTOFS}/${WAVECUR_DID}.${RPDY}/rtofs_glo_2ds_${fext}${fh3_rtofs}_prog.nc
+        curfile1h=${COMIN_RTOFS}/${WAVECUR_DID}.${RPDY}/rtofs_glo_2ds_${fext}${fh3_rtofs}_prog.nc
+        curfile3h=${COMIN_RTOFS}/${WAVECUR_DID}.${RPDY}/rtofs_glo_2ds_${fext}${fh3_rtofs}_prog.nc
 
         if [ -s ${curfile1h} ]  && [ "${FLGHF}" = "T" ] ; then
           curfile=${curfile1h}
@@ -465,7 +465,7 @@ source "${USHgfs}/preamble.sh"
         cat $file >> cur.${WAVECUR_FID}
       done
 
-      cp -f cur.${WAVECUR_FID} ${COM_WAVE_PREP}/${RUN}wave.${WAVECUR_FID}.$cycle.cur 
+      cp -f cur.${WAVECUR_FID} ${COMOUT_WAVE_PREP}/${RUN}wave.${WAVECUR_FID}.$cycle.cur 
 
     else
       echo ' '
diff --git a/ush/wave_prnc_ice.sh b/ush/wave_prnc_ice.sh
index 5e6ba82731e..0225f207107 100755
--- a/ush/wave_prnc_ice.sh
+++ b/ush/wave_prnc_ice.sh
@@ -55,8 +55,8 @@ source "${USHgfs}/preamble.sh"
   echo "Making ice fields."
 
   if [[ -z "${YMDH}" ]] || [[ -z "${cycle}" ]] || \
-     [[ -z "${COM_WAVE_PREP}" ]] || [[ -z "${FIXgfs}" ]] || [[ -z "${EXECgfs}" ]] || \
-     [[ -z "${WAV_MOD_TAG}" ]] || [[ -z "${WAVEICE_FID}" ]] || [[ -z "${COM_OBS}" ]]; then
+     [[ -z "${COMIN_WAVE_PREP}" ]] || [[ -z "${FIXgfs}" ]] || [[ -z "${EXECgfs}" ]] || \
+     [[ -z "${WAV_MOD_TAG}" ]] || [[ -z "${WAVEICE_FID}" ]] || [[ -z "${COMIN_OBS}" ]]; then
   
     set +x
     echo ' '
@@ -77,7 +77,7 @@ source "${USHgfs}/preamble.sh"
 # 1.  Get the necessary files
 # 1.a Copy the ice data file
 
-  file=${COM_OBS}/${WAVICEFILE}
+  file=${COMIN_OBS}/${WAVICEFILE}
 
   if [ -f $file ]
   then
@@ -178,9 +178,9 @@ source "${USHgfs}/preamble.sh"
   fi
  
   set +x
-  echo "   Saving ice.ww3 as ${COM_WAVE_PREP}/${icefile}"
+  echo "   Saving ice.ww3 as ${COMOUT_WAVE_PREP}/${icefile}"
   set_trace
-  cp ice.ww3 "${COM_WAVE_PREP}/${icefile}"
+  cp ice.ww3 "${COMOUT_WAVE_PREP}/${icefile}"
   rm -f ice.ww3
 
 # --------------------------------------------------------------------------- #

From 3118937da6bd9f69e48e91fa7f79d1cb742ec260 Mon Sep 17 00:00:00 2001
From: "Henry R. Winterbottom"
 <49202169+HenryWinterbottom-NOAA@users.noreply.github.com>
Date: Fri, 31 May 2024 08:46:14 -0600
Subject: [PATCH 07/51] Update jobs/JGLOBAL_WAVE_INIT

Addressing reviewer comment.

Co-authored-by: Walter Kolczynski - NOAA <Walter.Kolczynski@noaa.gov>
---
 jobs/JGLOBAL_WAVE_INIT | 1 -
 1 file changed, 1 deletion(-)

diff --git a/jobs/JGLOBAL_WAVE_INIT b/jobs/JGLOBAL_WAVE_INIT
index d42a675d74d..2d388616228 100755
--- a/jobs/JGLOBAL_WAVE_INIT
+++ b/jobs/JGLOBAL_WAVE_INIT
@@ -14,7 +14,6 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
    COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \
    COMOUT_WAVE_PREP:COM_WAVE_PREP_TMPL
 
-mkdir -m 775 -p "${COMIN_WAVE_PREP}"
 mkdir -m 775 -p "${COMOUT_WAVE_PREP}"
 
 # Set mpi serial command

From 31082aa83e0feab1dd830ce37a0932ac75d0546a Mon Sep 17 00:00:00 2001
From: "Henry R. Winterbottom"
 <49202169+HenryWinterbottom-NOAA@users.noreply.github.com>
Date: Fri, 31 May 2024 08:46:41 -0600
Subject: [PATCH 08/51] Update jobs/JGLOBAL_WAVE_POST_BNDPNT

Addressing reviewer comment.

Co-authored-by: Walter Kolczynski - NOAA <Walter.Kolczynski@noaa.gov>
---
 jobs/JGLOBAL_WAVE_POST_BNDPNT | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jobs/JGLOBAL_WAVE_POST_BNDPNT b/jobs/JGLOBAL_WAVE_POST_BNDPNT
index 39efdc9aebf..6c68c34bda5 100755
--- a/jobs/JGLOBAL_WAVE_POST_BNDPNT
+++ b/jobs/JGLOBAL_WAVE_POST_BNDPNT
@@ -40,7 +40,7 @@ if [ ${err} -ne 0 ]; then
 fi
 
 ##########################################
-# Remove the Temporary working directory 
+# Remove the Temporary working directory
 ##########################################
 cd ${DATAROOT}
 [[ ${KEEPDATA} = "NO" ]] && rm -rf ${DATA}

From a9a02587ac31a3fae72c240e9d2b8719394804e8 Mon Sep 17 00:00:00 2001
From: "Henry R. Winterbottom"
 <49202169+HenryWinterbottom-NOAA@users.noreply.github.com>
Date: Fri, 31 May 2024 08:54:25 -0600
Subject: [PATCH 09/51] Update jobs/JGLOBAL_WAVE_POST_BNDPNTBLL

Addressing reviewer suggestion.

Co-authored-by: Walter Kolczynski - NOAA <Walter.Kolczynski@noaa.gov>
---
 jobs/JGLOBAL_WAVE_POST_BNDPNTBLL | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL b/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL
index caf7b385aaa..56cf70ddb8a 100755
--- a/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL
+++ b/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL
@@ -19,7 +19,9 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
    COMOUT_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
    COMOUT_WAVE_STATION:COM_WAVE_STATION_TMPL
 
-if [[ ! -d ${COMIN_WAVE_STATION} ]]; then mkdir -p "${COMIN_WAVE_STATION}"; fi
+for out_dir in "${COMOUT_WAVE_HISTORY}" "${COMOUT_WAVE_STATION}"; do
+    if [[ ! -d ${out_dir} ]]; then mkdir -p "${out_dir}"; fi
+done
 
 # Set wave model ID tag to include member number
 # if ensemble; waveMEMB var empty in deterministic

From 94a96888bcddbdb2209ad2c3945c5227a2cfd563 Mon Sep 17 00:00:00 2001
From: "Henry R. Winterbottom"
 <49202169+HenryWinterbottom-NOAA@users.noreply.github.com>
Date: Fri, 31 May 2024 08:54:36 -0600
Subject: [PATCH 10/51] Update jobs/JGLOBAL_WAVE_POST_PNT

Addressing reviewer suggestion.

Co-authored-by: Walter Kolczynski - NOAA <Walter.Kolczynski@noaa.gov>
---
 jobs/JGLOBAL_WAVE_POST_PNT | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/jobs/JGLOBAL_WAVE_POST_PNT b/jobs/JGLOBAL_WAVE_POST_PNT
index 3bc4c008379..ac3ab753838 100755
--- a/jobs/JGLOBAL_WAVE_POST_PNT
+++ b/jobs/JGLOBAL_WAVE_POST_PNT
@@ -15,7 +15,9 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
    COMOUT_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
    COMOUT_WAVE_STATION:COM_WAVE_STATION_TMPL
 
-if [[ ! -d ${COMIN_WAVE_STATION} ]]; then mkdir -p "${COMIN_WAVE_STATION}"; fi
+for out_dir in "${COMOUT_WAVE_HISTORY}" "${COMOUT_WAVE_STATION}"; do
+    if [[ ! -d ${out_dir} ]]; then mkdir -p "${out_dir}"; fi
+done
 
 # Set wave model ID tag to include member number
 # if ensemble; waveMEMB var empty in deterministic

From cdb0e82c793d9339ac3612c63b9f14f9d37dc64f Mon Sep 17 00:00:00 2001
From: "Henry R. Winterbottom"
 <49202169+HenryWinterbottom-NOAA@users.noreply.github.com>
Date: Fri, 31 May 2024 08:55:03 -0600
Subject: [PATCH 11/51] Update jobs/JGLOBAL_WAVE_POST_SBS

Addressing reviewer suggestion.

Co-authored-by: Walter Kolczynski - NOAA <Walter.Kolczynski@noaa.gov>
---
 jobs/JGLOBAL_WAVE_POST_SBS | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/jobs/JGLOBAL_WAVE_POST_SBS b/jobs/JGLOBAL_WAVE_POST_SBS
index 5d6a429032e..121879faa97 100755
--- a/jobs/JGLOBAL_WAVE_POST_SBS
+++ b/jobs/JGLOBAL_WAVE_POST_SBS
@@ -10,10 +10,10 @@ export MP_PULSE=0
 
 # Set COM Paths and GETGES environment
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
-	COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \
-	COMOUT_WAVE_PREP:COM_WAVE_PREP_TMPL \
-       	COMOUT_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
-       	COMOUT_WAVE_GRID:COM_WAVE_GRID_TMPL
+    COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \
+    COMOUT_WAVE_PREP:COM_WAVE_PREP_TMPL \
+    COMOUT_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
+    COMOUT_WAVE_GRID:COM_WAVE_GRID_TMPL
 
 mkdir -p "${COMOUT_WAVE_GRID}"
 

From 883fa7cdf34bbc8a0feb98770fe4e2aa93485745 Mon Sep 17 00:00:00 2001
From: "Henry R. Winterbottom"
 <49202169+HenryWinterbottom-NOAA@users.noreply.github.com>
Date: Fri, 31 May 2024 08:55:26 -0600
Subject: [PATCH 12/51] Update jobs/JGLOBAL_WAVE_POST_SBS

Addressing reviewer suggestion.

Co-authored-by: Walter Kolczynski - NOAA <Walter.Kolczynski@noaa.gov>
---
 jobs/JGLOBAL_WAVE_POST_SBS | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/jobs/JGLOBAL_WAVE_POST_SBS b/jobs/JGLOBAL_WAVE_POST_SBS
index 121879faa97..9af82824409 100755
--- a/jobs/JGLOBAL_WAVE_POST_SBS
+++ b/jobs/JGLOBAL_WAVE_POST_SBS
@@ -15,7 +15,9 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
     COMOUT_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
     COMOUT_WAVE_GRID:COM_WAVE_GRID_TMPL
 
-mkdir -p "${COMOUT_WAVE_GRID}"
+for out_dir in "${COMOUT_WAVE_HISTORY}" "${COMOUT_WAVE_GRID}"; do
+    if [[ ! -d "${out_dir}" ]]; then mkdir -p "${out_dir}"; fi
+done
 
 
 # Set wave model ID tag to include member number

From 2a81ae845db93c7911c059f952c11ecbaf7ee26b Mon Sep 17 00:00:00 2001
From: "Henry R. Winterbottom"
 <49202169+HenryWinterbottom-NOAA@users.noreply.github.com>
Date: Fri, 31 May 2024 08:55:42 -0600
Subject: [PATCH 13/51] Update jobs/JGLOBAL_WAVE_PRDGEN_BULLS

Addressing reviewer suggestion.

Co-authored-by: Walter Kolczynski - NOAA <Walter.Kolczynski@noaa.gov>
---
 jobs/JGLOBAL_WAVE_PRDGEN_BULLS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jobs/JGLOBAL_WAVE_PRDGEN_BULLS b/jobs/JGLOBAL_WAVE_PRDGEN_BULLS
index 33baa1d733d..ebecf716afc 100755
--- a/jobs/JGLOBAL_WAVE_PRDGEN_BULLS
+++ b/jobs/JGLOBAL_WAVE_PRDGEN_BULLS
@@ -14,8 +14,8 @@ export SENDDBN=${SENDDBN:-NO}
 export DBNROOT=${DBNROOT:-${UTILROOT}/fakedbn}
 
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
-	COMIN_WAVE_STATION:COM_WAVE_STATION_TMPL \
-       	COMOUT_WAVE_WMO:COM_WAVE_WMO_TMPL
+    COMIN_WAVE_STATION:COM_WAVE_STATION_TMPL \
+    COMOUT_WAVE_WMO:COM_WAVE_WMO_TMPL
 
 if [[ ! -d ${COMOUT_WAVE_WMO} ]]; then mkdir -p "${COMOUT_WAVE_WMO}"; fi
 

From 87e2492517de0698b69c3de310ae91e1d1c48601 Mon Sep 17 00:00:00 2001
From: "Henry R. Winterbottom"
 <49202169+HenryWinterbottom-NOAA@users.noreply.github.com>
Date: Fri, 31 May 2024 08:55:54 -0600
Subject: [PATCH 14/51] Update jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED

Addressing reviewer suggestion.

Co-authored-by: Walter Kolczynski - NOAA <Walter.Kolczynski@noaa.gov>
---
 jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED | 1 -
 1 file changed, 1 deletion(-)

diff --git a/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED b/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED
index a0dafcbf9ec..990c9f0a990 100755
--- a/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED
+++ b/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED
@@ -19,7 +19,6 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
 
 if [[ ! -d ${COMOUT_WAVE_WMO} ]]; then mkdir -p "${COMOUT_WAVE_WMO}"; fi
 
-mkdir -p "${COMOUT_WAVE_WMO}"
 
 ###################################
 # Execute the Script

From 4d27a6ca03880467d1c815f791fb54b3e44ef78f Mon Sep 17 00:00:00 2001
From: "Henry R. Winterbottom"
 <49202169+HenryWinterbottom-NOAA@users.noreply.github.com>
Date: Fri, 31 May 2024 08:56:09 -0600
Subject: [PATCH 15/51] Update jobs/JGLOBAL_WAVE_PREP

Addressing reviewer suggestion.

Co-authored-by: Walter Kolczynski - NOAA <Walter.Kolczynski@noaa.gov>
---
 jobs/JGLOBAL_WAVE_PREP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jobs/JGLOBAL_WAVE_PREP b/jobs/JGLOBAL_WAVE_PREP
index 0d89dfa8824..8596a02b8ed 100755
--- a/jobs/JGLOBAL_WAVE_PREP
+++ b/jobs/JGLOBAL_WAVE_PREP
@@ -21,7 +21,7 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
 	COMIN_OBS:COM_OBS_TMPL \
 	COMOUT_WAVE_PREP:COM_WAVE_PREP_TMPL \
 	COMIN_RTOFS:COM_RTOFS_TMPL
-[[ ! -d ${COMOUT_WAVE_PREP} ]] && mkdir -m 775 -p "${COMOUT_WAVE_PREP}"
+if [[ ! -d ${COMOUT_WAVE_PREP} ]]; then mkdir -m 775 -p "${COMOUT_WAVE_PREP}"; fi
 
 # Execute the Script
 ${SCRgfs}/exgfs_wave_prep.sh

From cb1764cefd59c16087aaf4ab8d34f77191693abd Mon Sep 17 00:00:00 2001
From: "Henry R. Winterbottom"
 <49202169+HenryWinterbottom-NOAA@users.noreply.github.com>
Date: Fri, 31 May 2024 08:57:08 -0600
Subject: [PATCH 16/51] Update jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED

global-workflow.gwdev_issue_2444.r002.ci

Co-authored-by: Walter Kolczynski - NOAA <Walter.Kolczynski@noaa.gov>
---
 jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED b/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED
index 990c9f0a990..6f5af4aca3f 100755
--- a/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED
+++ b/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED
@@ -14,8 +14,8 @@ export SENDDBN=${SENDDBN:-NO}
 export DBNROOT=${DBNROOT:-${UTILROOT}/fakedbn}
 
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
-	COMIN_WAVE_GRID:COM_WAVE_GRID_TMPL \
-       	COMOUT_WAVE_WMO:COM_WAVE_WMO
+    COMIN_WAVE_GRID:COM_WAVE_GRID_TMPL \
+    COMOUT_WAVE_WMO:COM_WAVE_WMO
 
 if [[ ! -d ${COMOUT_WAVE_WMO} ]]; then mkdir -p "${COMOUT_WAVE_WMO}"; fi
 

From 1241ede573b98afb09efa20204eba45fc8bf1209 Mon Sep 17 00:00:00 2001
From: "Henry R. Winterbottom"
 <49202169+HenryWinterbottom-NOAA@users.noreply.github.com>
Date: Fri, 31 May 2024 08:57:22 -0600
Subject: [PATCH 17/51] Update scripts/exgfs_wave_init.sh

global-workflow.gwdev_issue_2444.r002.ci

Co-authored-by: Walter Kolczynski - NOAA <Walter.Kolczynski@noaa.gov>
---
 scripts/exgfs_wave_init.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/exgfs_wave_init.sh b/scripts/exgfs_wave_init.sh
index f0f1dfe9991..44d2a0aa242 100755
--- a/scripts/exgfs_wave_init.sh
+++ b/scripts/exgfs_wave_init.sh
@@ -125,7 +125,6 @@ source "${USHgfs}/preamble.sh"
       fi
       #TO DO: how do we say "it's unstructured, and therefore need to have error check here" 
 
-      [[ ! -d "${COMOUT_WAVE_PREP}" ]] && mkdir -m 775 -p "${COMOUT_WAVE_PREP}"
       if [ ${CFP_MP:-"NO"} = "YES" ]; then
         echo "$nmoddef ${USHgfs}/wave_grid_moddef.sh $grdID > $grdID.out 2>&1" >> cmdfile
       else

From b0c7badcac024ab28f0501934c63837dbad7aff3 Mon Sep 17 00:00:00 2001
From: "Henry R. Winterbottom"
 <49202169+HenryWinterbottom-NOAA@users.noreply.github.com>
Date: Fri, 31 May 2024 08:59:03 -0600
Subject: [PATCH 18/51] Update jobs/JGLOBAL_WAVE_INIT

Addressing reviewer comment.

Co-authored-by: Walter Kolczynski - NOAA <Walter.Kolczynski@noaa.gov>
---
 jobs/JGLOBAL_WAVE_INIT | 1 -
 1 file changed, 1 deletion(-)

diff --git a/jobs/JGLOBAL_WAVE_INIT b/jobs/JGLOBAL_WAVE_INIT
index 2d388616228..76e90df4a3c 100755
--- a/jobs/JGLOBAL_WAVE_INIT
+++ b/jobs/JGLOBAL_WAVE_INIT
@@ -11,7 +11,6 @@ export MP_PULSE=0
 
 # Set COM Paths
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
-   COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \
    COMOUT_WAVE_PREP:COM_WAVE_PREP_TMPL
 
 mkdir -m 775 -p "${COMOUT_WAVE_PREP}"

From 4b2f7ce10235f9c87a7e06202f5460ba3c83dc41 Mon Sep 17 00:00:00 2001
From: HenryWinterbottom-NOAA <henry.winterbottom@noaa.gov>
Date: Fri, 31 May 2024 15:03:01 +0000
Subject: [PATCH 19/51] Addressing reviewer suggestion.

---
 scripts/exgfs_wave_init.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/exgfs_wave_init.sh b/scripts/exgfs_wave_init.sh
index 44d2a0aa242..17e6cec0428 100755
--- a/scripts/exgfs_wave_init.sh
+++ b/scripts/exgfs_wave_init.sh
@@ -83,15 +83,15 @@ source "${USHgfs}/preamble.sh"
   grdALL=$(printf "%s\n" "${array[@]}" | sort -u | tr '\n' ' ')
 
   for grdID in ${grdALL}; do
-    if [[ -f "${COMIN_WAVE_PREP}/${RUN}wave.mod_def.${grdID}" ]]; then
+    if [[ -f "${COMOUT_WAVE_PREP}/${RUN}wave.mod_def.${grdID}" ]]; then
       set +x
-      echo " Mod def file for ${grdID} found in ${COMIN_WAVE_PREP}. copying ...."
+      echo " Mod def file for ${grdID} found in ${COMOUT_WAVE_PREP}. copying ...."
       set_trace
-      cp "${COMIN_WAVE_PREP}/${RUN}wave.mod_def.${grdID}" "mod_def.${grdID}"
+      cp "${COMOUT_WAVE_PREP}/${RUN}wave.mod_def.${grdID}" "mod_def.${grdID}"
 
     else
       set +x
-      echo " Mod def file for ${grdID} not found in ${COMIN_WAVE_PREP}. Setting up to generate ..."
+      echo " Mod def file for ${grdID} not found in ${COMOUT_WAVE_PREP}. Setting up to generate ..."
       echo ' '
       set_trace
       if [ -f ${FIXgfs}/wave/ww3_grid.inp.$grdID ]

From cc4b28104ef3f9dcb207b54706457f4cbab6115c Mon Sep 17 00:00:00 2001
From: "Henry R. Winterbottom"
 <49202169+HenryWinterbottom-NOAA@users.noreply.github.com>
Date: Tue, 4 Jun 2024 08:28:47 -0600
Subject: [PATCH 20/51] Update ush/wave_tar.sh

Addressing reviewer comment(s).

Co-authored-by: Walter Kolczynski - NOAA <Walter.Kolczynski@noaa.gov>
---
 ush/wave_tar.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ush/wave_tar.sh b/ush/wave_tar.sh
index e8b4540b969..ac02d57758f 100755
--- a/ush/wave_tar.sh
+++ b/ush/wave_tar.sh
@@ -76,7 +76,7 @@ source "${USHgfs}/preamble.sh"
 # 0.c Define directories and the search path.
 #     The tested variables should be exported by the postprocessor script.
 
-  if [[ -z "${cycle}" ]] || [[ -z "${COMIN_WAVE_STATION}" ]] || [[ -z "${WAV_MOD_TAG}" ]] ||  \
+  if [[ -z "${cycle}" ]] || [[ -z "${COMOUT_WAVE_STATION}" ]] || [[ -z "${WAV_MOD_TAG}" ]] ||  \
      [[ -z "${SENDDBN}" ]] || [[ -z "${STA_DIR}" ]]; then
     set +x
     echo ' '

From d17d6881eca20180b25343b6bd316b2b98bcabef Mon Sep 17 00:00:00 2001
From: "Henry R. Winterbottom"
 <49202169+HenryWinterbottom-NOAA@users.noreply.github.com>
Date: Tue, 4 Jun 2024 08:29:11 -0600
Subject: [PATCH 21/51] Update ush/wave_prnc_ice.sh

Addressing reviewer comment(s).

Co-authored-by: Walter Kolczynski - NOAA <Walter.Kolczynski@noaa.gov>
---
 ush/wave_prnc_ice.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ush/wave_prnc_ice.sh b/ush/wave_prnc_ice.sh
index 0225f207107..be089c30bd3 100755
--- a/ush/wave_prnc_ice.sh
+++ b/ush/wave_prnc_ice.sh
@@ -55,7 +55,7 @@ source "${USHgfs}/preamble.sh"
   echo "Making ice fields."
 
   if [[ -z "${YMDH}" ]] || [[ -z "${cycle}" ]] || \
-     [[ -z "${COMIN_WAVE_PREP}" ]] || [[ -z "${FIXgfs}" ]] || [[ -z "${EXECgfs}" ]] || \
+     [[ -z "${COMOUT_WAVE_PREP}" ]] || [[ -z "${FIXgfs}" ]] || [[ -z "${EXECgfs}" ]] || \
      [[ -z "${WAV_MOD_TAG}" ]] || [[ -z "${WAVEICE_FID}" ]] || [[ -z "${COMIN_OBS}" ]]; then
   
     set +x

From 74389150b01151abbfc81132289cf3f73c776087 Mon Sep 17 00:00:00 2001
From: "Henry R. Winterbottom"
 <49202169+HenryWinterbottom-NOAA@users.noreply.github.com>
Date: Tue, 4 Jun 2024 08:29:25 -0600
Subject: [PATCH 22/51] Update ush/wave_grid_interp_sbs.sh

Addressing reviewer comment(s).

Co-authored-by: Walter Kolczynski - NOAA <Walter.Kolczynski@noaa.gov>
---
 ush/wave_grid_interp_sbs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ush/wave_grid_interp_sbs.sh b/ush/wave_grid_interp_sbs.sh
index 9fc80143d89..13297d46c07 100755
--- a/ush/wave_grid_interp_sbs.sh
+++ b/ush/wave_grid_interp_sbs.sh
@@ -66,7 +66,7 @@ source "${USHgfs}/preamble.sh"
   set_trace
 
   if [[ -z "${PDY}" ]] || [[ -z "${cyc}" ]] || [[ -z "${cycle}" ]] || [[ -z "${EXECgfs}" ]] || \
-	 [[ -z "${COMIN_WAVE_PREP}" ]] || [[ -z "${WAV_MOD_TAG}" ]] || [[ -z "${SENDDBN}" ]] || \
+	 [[ -z "${COMOUT_WAVE_PREP}" ]] || [[ -z "${WAV_MOD_TAG}" ]] || [[ -z "${SENDDBN}" ]] || \
 	 [ -z "${waveGRD}" ]
   then
     set +x

From 226e11219e8ca815cb042bd245a790fddb915656 Mon Sep 17 00:00:00 2001
From: "Henry R. Winterbottom"
 <49202169+HenryWinterbottom-NOAA@users.noreply.github.com>
Date: Tue, 4 Jun 2024 08:29:40 -0600
Subject: [PATCH 23/51] Update ush/wave_grid_interp_sbs.sh

Addressing reviewer comment(s).

Co-authored-by: Walter Kolczynski - NOAA <Walter.Kolczynski@noaa.gov>
---
 ush/wave_grid_interp_sbs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ush/wave_grid_interp_sbs.sh b/ush/wave_grid_interp_sbs.sh
index 13297d46c07..31b7808c168 100755
--- a/ush/wave_grid_interp_sbs.sh
+++ b/ush/wave_grid_interp_sbs.sh
@@ -75,7 +75,7 @@ source "${USHgfs}/preamble.sh"
     echo '*** EXPORTED VARIABLES IN postprocessor NOT SET ***'
     echo '***************************************************'
     echo ' '
-    echo "${PDY}${cyc} ${cycle} ${EXECgfs} ${COMIN_WAVE_PREP} ${WAV_MOD_TAG} ${SENDDBN} ${waveGRD}"
+    echo "${PDY}${cyc} ${cycle} ${EXECgfs} ${COMOUT_WAVE_PREP} ${WAV_MOD_TAG} ${SENDDBN} ${waveGRD}"
     set_trace
     exit 1
   fi

From 2acd4ccd25a45f2bc164e18eeaef2686fef44dcf Mon Sep 17 00:00:00 2001
From: "Henry R. Winterbottom"
 <49202169+HenryWinterbottom-NOAA@users.noreply.github.com>
Date: Tue, 4 Jun 2024 08:30:11 -0600
Subject: [PATCH 24/51] Update jobs/JGLOBAL_WAVE_POST_SBS

Addressing reviewer comment(s).

Co-authored-by: Walter Kolczynski - NOAA <Walter.Kolczynski@noaa.gov>
---
 jobs/JGLOBAL_WAVE_POST_SBS | 1 -
 1 file changed, 1 deletion(-)

diff --git a/jobs/JGLOBAL_WAVE_POST_SBS b/jobs/JGLOBAL_WAVE_POST_SBS
index 9af82824409..8f12248d22a 100755
--- a/jobs/JGLOBAL_WAVE_POST_SBS
+++ b/jobs/JGLOBAL_WAVE_POST_SBS
@@ -11,7 +11,6 @@ export MP_PULSE=0
 # Set COM Paths and GETGES environment
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
     COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \
-    COMOUT_WAVE_PREP:COM_WAVE_PREP_TMPL \
     COMOUT_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
     COMOUT_WAVE_GRID:COM_WAVE_GRID_TMPL
 

From 52bfa614d2bae8d53ed500e08a4d9165123b6ad7 Mon Sep 17 00:00:00 2001
From: "Henry R. Winterbottom"
 <49202169+HenryWinterbottom-NOAA@users.noreply.github.com>
Date: Tue, 4 Jun 2024 08:31:03 -0600
Subject: [PATCH 25/51] Update jobs/JGLOBAL_WAVE_POST_BNDPNT

Addressing reviewer comment(s).

Co-authored-by: Walter Kolczynski - NOAA <Walter.Kolczynski@noaa.gov>
---
 jobs/JGLOBAL_WAVE_POST_BNDPNT | 1 -
 1 file changed, 1 deletion(-)

diff --git a/jobs/JGLOBAL_WAVE_POST_BNDPNT b/jobs/JGLOBAL_WAVE_POST_BNDPNT
index 6c68c34bda5..f67b69761f5 100755
--- a/jobs/JGLOBAL_WAVE_POST_BNDPNT
+++ b/jobs/JGLOBAL_WAVE_POST_BNDPNT
@@ -11,7 +11,6 @@ export MP_PULSE=0
 # Set COM Paths and GETGES environment
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
    COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \
-   COMIN_WAVE_STATION:COM_WAVE_STATION_TMPL \
    COMOUT_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
    COMOUT_WAVE_STATION:COM_WAVE_STATION_TMPL
 

From 31e3e88efe886b7a4231c513e3cd1d96b8986235 Mon Sep 17 00:00:00 2001
From: "Henry R. Winterbottom"
 <49202169+HenryWinterbottom-NOAA@users.noreply.github.com>
Date: Tue, 4 Jun 2024 08:31:28 -0600
Subject: [PATCH 26/51] Update jobs/JGLOBAL_WAVE_POST_PNT

Addressing reviewer comment(s).

Co-authored-by: Walter Kolczynski - NOAA <Walter.Kolczynski@noaa.gov>
---
 jobs/JGLOBAL_WAVE_POST_PNT | 1 -
 1 file changed, 1 deletion(-)

diff --git a/jobs/JGLOBAL_WAVE_POST_PNT b/jobs/JGLOBAL_WAVE_POST_PNT
index ac3ab753838..ded882335da 100755
--- a/jobs/JGLOBAL_WAVE_POST_PNT
+++ b/jobs/JGLOBAL_WAVE_POST_PNT
@@ -11,7 +11,6 @@ export MP_PULSE=0
 # Set COM Paths and GETGES environment
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
    COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \
-   COMIN_WAVE_STATION:COM_WAVE_STATION_TMPL \
    COMOUT_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
    COMOUT_WAVE_STATION:COM_WAVE_STATION_TMPL
 

From 6be0cef3d2c02481f47840dfb98c6527b76777c3 Mon Sep 17 00:00:00 2001
From: "Henry R. Winterbottom"
 <49202169+HenryWinterbottom-NOAA@users.noreply.github.com>
Date: Tue, 4 Jun 2024 08:32:24 -0600
Subject: [PATCH 27/51] Update jobs/JGLOBAL_WAVE_POST_SBS

Addressing reviewer comment(s).

Co-authored-by: Walter Kolczynski - NOAA <Walter.Kolczynski@noaa.gov>
---
 jobs/JGLOBAL_WAVE_POST_SBS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jobs/JGLOBAL_WAVE_POST_SBS b/jobs/JGLOBAL_WAVE_POST_SBS
index 8f12248d22a..b977c71c353 100755
--- a/jobs/JGLOBAL_WAVE_POST_SBS
+++ b/jobs/JGLOBAL_WAVE_POST_SBS
@@ -14,7 +14,7 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
     COMOUT_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
     COMOUT_WAVE_GRID:COM_WAVE_GRID_TMPL
 
-for out_dir in "${COMOUT_WAVE_HISTORY}" "${COMOUT_WAVE_GRID}"; do
+for out_dir in "${COMOUT_WAVE_PREP}" "${COMOUT_WAVE_HISTORY}" "${COMOUT_WAVE_GRID}"; do
     if [[ ! -d "${out_dir}" ]]; then mkdir -p "${out_dir}"; fi
 done
 

From 4ce3fe554c8aa51a9a18196b3f73e97fa2a62efe Mon Sep 17 00:00:00 2001
From: "Henry R. Winterbottom"
 <49202169+HenryWinterbottom-NOAA@users.noreply.github.com>
Date: Tue, 4 Jun 2024 08:33:06 -0600
Subject: [PATCH 28/51] Update jobs/JGLOBAL_WAVE_POST_BNDPNT

Addressing reviewer comment(s).

Co-authored-by: Walter Kolczynski - NOAA <Walter.Kolczynski@noaa.gov>
---
 jobs/JGLOBAL_WAVE_POST_BNDPNT | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/jobs/JGLOBAL_WAVE_POST_BNDPNT b/jobs/JGLOBAL_WAVE_POST_BNDPNT
index f67b69761f5..3ceee3b9369 100755
--- a/jobs/JGLOBAL_WAVE_POST_BNDPNT
+++ b/jobs/JGLOBAL_WAVE_POST_BNDPNT
@@ -14,7 +14,9 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
    COMOUT_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
    COMOUT_WAVE_STATION:COM_WAVE_STATION_TMPL
 
-if [[ ! -d ${COMIN_WAVE_STATION} ]]; then mkdir -p "${COMIN_WAVE_STATION}"; fi
+for out_dir in "${COMOUT_WAVE_HISTORY}" "${COMOUT_WAVE_STATION}"; do
+    if [[ ! -d ${out_dir} ]]; then mkdir -p "${out_dir}"; fi
+done
 
 # Set wave model ID tag to include member number
 # if ensemble; waveMEMB var empty in deterministic

From 96e3b42c2b848dcf9f2c3d8e395cfd720df5f4d2 Mon Sep 17 00:00:00 2001
From: "Henry R. Winterbottom"
 <49202169+HenryWinterbottom-NOAA@users.noreply.github.com>
Date: Tue, 4 Jun 2024 08:33:36 -0600
Subject: [PATCH 29/51] Update jobs/JGLOBAL_WAVE_INIT

Addressing reviewer comment(s).

Co-authored-by: Walter Kolczynski - NOAA <Walter.Kolczynski@noaa.gov>
---
 jobs/JGLOBAL_WAVE_INIT | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jobs/JGLOBAL_WAVE_INIT b/jobs/JGLOBAL_WAVE_INIT
index 76e90df4a3c..f2149cee71b 100755
--- a/jobs/JGLOBAL_WAVE_INIT
+++ b/jobs/JGLOBAL_WAVE_INIT
@@ -13,7 +13,7 @@ export MP_PULSE=0
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
    COMOUT_WAVE_PREP:COM_WAVE_PREP_TMPL
 
-mkdir -m 775 -p "${COMOUT_WAVE_PREP}"
+if [[ ! -d "${COMOUT_WAVE_PREP"} ]]; then mkdir -p "${COMOUT_WAVE_PREP}" fi
 
 # Set mpi serial command
 export wavempexec=${wavempexec:-"mpirun -n"}

From a3fcbe1dd76a75d212023498a88e6738e075e0ca Mon Sep 17 00:00:00 2001
From: henrywinterbottom-wxdev <henry.winterbottom.wxdev@gmail.com>
Date: Tue, 4 Jun 2024 09:02:57 -0600
Subject: [PATCH 30/51] Fixed typo detected by linter.

---
 jobs/JGLOBAL_WAVE_INIT | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jobs/JGLOBAL_WAVE_INIT b/jobs/JGLOBAL_WAVE_INIT
index f2149cee71b..2cbb2574142 100755
--- a/jobs/JGLOBAL_WAVE_INIT
+++ b/jobs/JGLOBAL_WAVE_INIT
@@ -13,7 +13,7 @@ export MP_PULSE=0
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
    COMOUT_WAVE_PREP:COM_WAVE_PREP_TMPL
 
-if [[ ! -d "${COMOUT_WAVE_PREP"} ]]; then mkdir -p "${COMOUT_WAVE_PREP}" fi
+if [[ ! -d "${COMOUT_WAVE_PREP}" ]]; then mkdir -p "${COMOUT_WAVE_PREP}" fi
 
 # Set mpi serial command
 export wavempexec=${wavempexec:-"mpirun -n"}

From 4a5fef0fb6d31c5702dd5ff47af64988c83a9736 Mon Sep 17 00:00:00 2001
From: henrywinterbottom-wxdev <henry.winterbottom.wxdev@gmail.com>
Date: Tue, 4 Jun 2024 09:13:08 -0600
Subject: [PATCH 31/51] Added missing semicolon.

---
 jobs/JGLOBAL_WAVE_INIT | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jobs/JGLOBAL_WAVE_INIT b/jobs/JGLOBAL_WAVE_INIT
index 2cbb2574142..3a0a8b43a85 100755
--- a/jobs/JGLOBAL_WAVE_INIT
+++ b/jobs/JGLOBAL_WAVE_INIT
@@ -13,7 +13,7 @@ export MP_PULSE=0
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
    COMOUT_WAVE_PREP:COM_WAVE_PREP_TMPL
 
-if [[ ! -d "${COMOUT_WAVE_PREP}" ]]; then mkdir -p "${COMOUT_WAVE_PREP}" fi
+if [[ ! -d "${COMOUT_WAVE_PREP}" ]]; then mkdir -p "${COMOUT_WAVE_PREP}"; fi
 
 # Set mpi serial command
 export wavempexec=${wavempexec:-"mpirun -n"}

From fc6d0c2e34d45fd1e9a99ec6cc5554f78d8683a3 Mon Sep 17 00:00:00 2001
From: HenryWinterbottom-NOAA <henry.winterbottom@noaa.gov>
Date: Mon, 10 Jun 2024 17:51:52 +0000
Subject: [PATCH 32/51] Addressed reviewer comment.

---
 jobs/JGLOBAL_WAVE_POST_BNDPNTBLL | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL b/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL
index 56cf70ddb8a..4bb14d8d98d 100755
--- a/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL
+++ b/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL
@@ -15,9 +15,8 @@ export MP_PULSE=0
 # Set COM Paths and GETGES environment
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
    COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \
-   COMIN_WAVE_STATION:COM_WAVE_STATION_TMPL \
-   COMOUT_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
-   COMOUT_WAVE_STATION:COM_WAVE_STATION_TMPL
+   COMOUT_WAVE_STATION:COM_WAVE_STATION_TMPL \
+   COMOUT_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL
 
 for out_dir in "${COMOUT_WAVE_HISTORY}" "${COMOUT_WAVE_STATION}"; do
     if [[ ! -d ${out_dir} ]]; then mkdir -p "${out_dir}"; fi

From e1252375f4a56cb80a704713143173c9ac397a6e Mon Sep 17 00:00:00 2001
From: HenryWinterbottom-NOAA <henry.winterbottom@noaa.gov>
Date: Mon, 10 Jun 2024 18:08:36 +0000
Subject: [PATCH 33/51] Addressed reviewer comments.

---
 jobs/JGLOBAL_WAVE_POST_BNDPNT  | 4 ++--
 scripts/exgfs_wave_post_pnt.sh | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/jobs/JGLOBAL_WAVE_POST_BNDPNT b/jobs/JGLOBAL_WAVE_POST_BNDPNT
index 3ceee3b9369..edafffe06e6 100755
--- a/jobs/JGLOBAL_WAVE_POST_BNDPNT
+++ b/jobs/JGLOBAL_WAVE_POST_BNDPNT
@@ -11,10 +11,10 @@ export MP_PULSE=0
 # Set COM Paths and GETGES environment
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
    COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \
-   COMOUT_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
+   COMIN_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
    COMOUT_WAVE_STATION:COM_WAVE_STATION_TMPL
 
-for out_dir in "${COMOUT_WAVE_HISTORY}" "${COMOUT_WAVE_STATION}"; do
+for out_dir in "${COMIN_WAVE_HISTORY}" "${COMOUT_WAVE_STATION}"; do
     if [[ ! -d ${out_dir} ]]; then mkdir -p "${out_dir}"; fi
 done
 
diff --git a/scripts/exgfs_wave_post_pnt.sh b/scripts/exgfs_wave_post_pnt.sh
index f6f49e6d52f..90efbf3f875 100755
--- a/scripts/exgfs_wave_post_pnt.sh
+++ b/scripts/exgfs_wave_post_pnt.sh
@@ -249,8 +249,8 @@ source "${USHgfs}/preamble.sh"
 
     ${NLN} mod_def.$waveuoutpGRD mod_def.ww3
     HMS="${cyc}0000"
-    if [[ -f "${COMOUT_WAVE_HISTORY}/${WAV_MOD_TAG}.out_pnt.${waveuoutpGRD}.${PDY}.${HMS}" ]]; then
-      ${NLN} "${COMOUT_WAVE_HISTORY}/${WAV_MOD_TAG}.out_pnt.${waveuoutpGRD}.${PDY}.${HMS}" \
+    if [[ -f "${COMIN_WAVE_HISTORY}/${WAV_MOD_TAG}.out_pnt.${waveuoutpGRD}.${PDY}.${HMS}" ]]; then
+      ${NLN} "${COMIN_WAVE_HISTORY}/${WAV_MOD_TAG}.out_pnt.${waveuoutpGRD}.${PDY}.${HMS}" \
         "./out_pnt.${waveuoutpGRD}"
     else
       echo '*************************************************** '
@@ -368,7 +368,7 @@ source "${USHgfs}/preamble.sh"
     export BULLDATA=${DATA}/output_$YMDHMS
     cp $DATA/mod_def.${waveuoutpGRD} mod_def.${waveuoutpGRD}
 
-    pfile="${COMOUT_WAVE_HISTORY}/${WAV_MOD_TAG}.out_pnt.${waveuoutpGRD}.${YMD}.${HMS}"
+    pfile="${COMIN_WAVE_HISTORY}/${WAV_MOD_TAG}.out_pnt.${waveuoutpGRD}.${YMD}.${HMS}"
     if [ -f  ${pfile} ]
     then
       ${NLN} ${pfile} ./out_pnt.${waveuoutpGRD}

From 5b359067444b00075f590fe08c4668205fff061c Mon Sep 17 00:00:00 2001
From: HenryWinterbottom-NOAA <henry.winterbottom@noaa.gov>
Date: Wed, 12 Jun 2024 18:19:36 +0000
Subject: [PATCH 34/51] Addressed reviewer comments.

---
 jobs/JGLOBAL_WAVE_POST_BNDPNT          | 3 ++-
 jobs/JGLOBAL_WAVE_POST_SBS             | 3 +++
 jobs/JGLOBAL_WAVE_PRDGEN_BULLS         | 1 +
 jobs/JGLOBAL_WAVE_PREP                 | 1 +
 scripts/exgfs_wave_post_gridded_sbs.sh | 9 +++++++--
 scripts/exgfs_wave_post_pnt.sh         | 4 ++++
 scripts/exgfs_wave_prdgen_bulls.sh     | 4 ++++
 scripts/exgfs_wave_prdgen_gridded.sh   | 5 +++++
 scripts/exgfs_wave_prep.sh             | 7 +++++++
 9 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/jobs/JGLOBAL_WAVE_POST_BNDPNT b/jobs/JGLOBAL_WAVE_POST_BNDPNT
index edafffe06e6..a62228cc4fd 100755
--- a/jobs/JGLOBAL_WAVE_POST_BNDPNT
+++ b/jobs/JGLOBAL_WAVE_POST_BNDPNT
@@ -12,9 +12,10 @@ export MP_PULSE=0
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
    COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \
    COMIN_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
+   COMOUT_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
    COMOUT_WAVE_STATION:COM_WAVE_STATION_TMPL
 
-for out_dir in "${COMIN_WAVE_HISTORY}" "${COMOUT_WAVE_STATION}"; do
+for out_dir in "${COMOUT_WAVE_HISTORY}" "${COMOUT_WAVE_STATION}"; do
     if [[ ! -d ${out_dir} ]]; then mkdir -p "${out_dir}"; fi
 done
 
diff --git a/jobs/JGLOBAL_WAVE_POST_SBS b/jobs/JGLOBAL_WAVE_POST_SBS
index b977c71c353..b8462d99e71 100755
--- a/jobs/JGLOBAL_WAVE_POST_SBS
+++ b/jobs/JGLOBAL_WAVE_POST_SBS
@@ -11,6 +11,9 @@ export MP_PULSE=0
 # Set COM Paths and GETGES environment
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
     COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \
+    COMIN_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
+    COMIN_WAVE_GRID:COM_WAVE_GRID_TMPL \
+    COMOUT_WAVE_PREP:COM_WAVE_PREP_TMPL \
     COMOUT_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
     COMOUT_WAVE_GRID:COM_WAVE_GRID_TMPL
 
diff --git a/jobs/JGLOBAL_WAVE_PRDGEN_BULLS b/jobs/JGLOBAL_WAVE_PRDGEN_BULLS
index ebecf716afc..3f39fa3a4ae 100755
--- a/jobs/JGLOBAL_WAVE_PRDGEN_BULLS
+++ b/jobs/JGLOBAL_WAVE_PRDGEN_BULLS
@@ -15,6 +15,7 @@ export DBNROOT=${DBNROOT:-${UTILROOT}/fakedbn}
 
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
     COMIN_WAVE_STATION:COM_WAVE_STATION_TMPL \
+    COMIN_WAVE_WMO:COM_WAVE_WMO_TMPL \
     COMOUT_WAVE_WMO:COM_WAVE_WMO_TMPL
 
 if [[ ! -d ${COMOUT_WAVE_WMO} ]]; then mkdir -p "${COMOUT_WAVE_WMO}"; fi
diff --git a/jobs/JGLOBAL_WAVE_PREP b/jobs/JGLOBAL_WAVE_PREP
index 8596a02b8ed..7dd97d34544 100755
--- a/jobs/JGLOBAL_WAVE_PREP
+++ b/jobs/JGLOBAL_WAVE_PREP
@@ -19,6 +19,7 @@ export CDO=${CDO_ROOT}/bin/cdo
 # Set COM Paths and GETGES environment
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
 	COMIN_OBS:COM_OBS_TMPL \
+	COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \
 	COMOUT_WAVE_PREP:COM_WAVE_PREP_TMPL \
 	COMIN_RTOFS:COM_RTOFS_TMPL
 if [[ ! -d ${COMOUT_WAVE_PREP} ]]; then mkdir -m 775 -p "${COMOUT_WAVE_PREP}"; fi
diff --git a/scripts/exgfs_wave_post_gridded_sbs.sh b/scripts/exgfs_wave_post_gridded_sbs.sh
index d8bf8fb251d..cb940fcbfbc 100755
--- a/scripts/exgfs_wave_post_gridded_sbs.sh
+++ b/scripts/exgfs_wave_post_gridded_sbs.sh
@@ -20,6 +20,11 @@
 # 2020-06-10  J-Henrique Alves: Porting to R&D machine Hera
 # 2020-07-31  Jessica Meixner: Removing points, now gridded data only
 #
+# COM inputs:
+#  - ${COMIN_WAVE_PREP}/${RUN}wave.mod_def.${grdID}
+#  - ${COMIN_WAVE_HISTORY}/${WAV_MOD_TAG}.out_grd.${wavGRD}.${YMD}.${HMS}
+#  - ${COMIN_WAVE_GRID}/${gribchk}
+#
 # $Id$
 #
 # Attributes:
@@ -258,7 +263,7 @@ source "${USHgfs}/preamble.sh"
     then
       iwait=0
       for wavGRD in ${waveGRD} ; do
-        gfile=${COMOUT_WAVE_HISTORY}/${WAV_MOD_TAG}.out_grd.${wavGRD}.${YMD}.${HMS}
+        gfile=${COMIN_WAVE_HISTORY}/${WAV_MOD_TAG}.out_grd.${wavGRD}.${YMD}.${HMS}
         while [ ! -s ${gfile} ]; do sleep 10; let iwait=iwait+1; done
         if [ $iwait -eq $iwaitmax ]; then
           echo '*************************************************** '
@@ -409,7 +414,7 @@ source "${USHgfs}/preamble.sh"
       ENSTAG=""
       if [ ${waveMEMB} ]; then ENSTAG=".${membTAG}${waveMEMB}" ; fi
       gribchk="${RUN}wave.${cycle}${ENSTAG}.${GRDNAME}.${GRDRES}.f${FH3}.grib2"
-      if [ ! -s ${COMOUT_WAVE_GRID}/${gribchk} ]; then
+      if [ ! -s ${COMIN_WAVE_GRID}/${gribchk} ]; then
         set +x
         echo ' '
         echo '********************************************'
diff --git a/scripts/exgfs_wave_post_pnt.sh b/scripts/exgfs_wave_post_pnt.sh
index 90efbf3f875..24a25302d15 100755
--- a/scripts/exgfs_wave_post_pnt.sh
+++ b/scripts/exgfs_wave_post_pnt.sh
@@ -22,6 +22,10 @@
 # 2020-07-30  Jessica Meixner: Points only - no gridded data
 # 2020-09-29  Jessica Meixner: optimized by changing loop structures
 #
+# COM inputs:
+#  - ${COMIN_WAVE_PREP}/${RUN}wave.mod_def.${grdID}
+#  - ${COMIN_WAVE_HISTORY}/${WAV_MOD_TAG}.out_pnt.${waveuoutpGRD}.${PDY}.${HMS}
+#
 # $Id$
 #
 # Attributes:
diff --git a/scripts/exgfs_wave_prdgen_bulls.sh b/scripts/exgfs_wave_prdgen_bulls.sh
index 1fc2d26ce07..5f5b2c531e5 100755
--- a/scripts/exgfs_wave_prdgen_bulls.sh
+++ b/scripts/exgfs_wave_prdgen_bulls.sh
@@ -8,6 +8,10 @@
 # Remarks :                                                                   #
 # - Supplemental error output is witten to the gfswave_prdgbulls.log file.    #
 #                                                                             #
+# COM inputs:                                                                 #
+#  - ${COMIN_WAVE_STATION}/${RUNwave}.${cycle}.cbull_tar                      #
+# COM outputs:                                                                #
+#  - ${COMOUT_WAVE_WMO}/awipsbull.${cycle}.${RUNwave}                         #
 #                                                                             #
 # Origination  : 05/02/2007                                                   #
 # Last update  : 08/20/2020                                                   # 
diff --git a/scripts/exgfs_wave_prdgen_gridded.sh b/scripts/exgfs_wave_prdgen_gridded.sh
index 1579195b957..b31942779ec 100755
--- a/scripts/exgfs_wave_prdgen_gridded.sh
+++ b/scripts/exgfs_wave_prdgen_gridded.sh
@@ -8,6 +8,11 @@
 # Remarks :                                                                   #
 # - Supplemental error output is witten to the wave.log file.                 #
 #                                                                             #
+# COM inputs:                                                                 #
+#  - ${COMIN_WAVE_GRID}/${RUNwave}.${cycle}.${grdID}.f${fhr}.grib2            #
+#                                                                             #
+# COM outputs:                                                                #
+#  - ${COMOUT_WAVE_WMO}/grib2.${cycle}.f${fhr}.awipsww3_${grdOut}             #
 #                                                                             #
 # Origination  : 05/02/2007                                                   #
 # Last update  : 10/08/2020                                                   # 
diff --git a/scripts/exgfs_wave_prep.sh b/scripts/exgfs_wave_prep.sh
index 91decf89146..f83ead2c226 100755
--- a/scripts/exgfs_wave_prep.sh
+++ b/scripts/exgfs_wave_prep.sh
@@ -17,6 +17,13 @@
 # Remarks :                                                                   #
 # - For non-fatal errors output is witten to the wave.log file.               #
 #                                                                             #
+# COM inputs:                                                                 #
+#  - ${COMIN_WAVE_PREP}/${RUN}wave.mod_def.${grdID}                           #
+#  - ${COMIN_RTOFS}/${WAVECUR_DID}.${RPDY}/rtofs_glo_2ds_f#HHH_prog.nc        #
+#                                                                             #
+# COM outputs:                                                                #
+#  - ${COMOUT_WAVE_PREP}/${RUN}wave.${WAVECUR_FID}.$cycle.cur                 #
+#                                                                             #
 #  Update record :                                                            #
 #                                                                             #
 # - Origination:                                               01-Mar-2007    #

From 1186cadf83a0d2ebab546e6f7dab8d25fde7e64c Mon Sep 17 00:00:00 2001
From: HenryWinterbottom-NOAA <henry.winterbottom@noaa.gov>
Date: Wed, 12 Jun 2024 21:13:08 +0000
Subject: [PATCH 35/51] Bug fix.

---
 jobs/JGLOBAL_WAVE_POST_BNDPNTBLL | 1 +
 jobs/JGLOBAL_WAVE_POST_PNT       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL b/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL
index 4bb14d8d98d..477933a1f55 100755
--- a/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL
+++ b/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL
@@ -15,6 +15,7 @@ export MP_PULSE=0
 # Set COM Paths and GETGES environment
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
    COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \
+   COMIN_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
    COMOUT_WAVE_STATION:COM_WAVE_STATION_TMPL \
    COMOUT_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL
 
diff --git a/jobs/JGLOBAL_WAVE_POST_PNT b/jobs/JGLOBAL_WAVE_POST_PNT
index ded882335da..44a4d44d549 100755
--- a/jobs/JGLOBAL_WAVE_POST_PNT
+++ b/jobs/JGLOBAL_WAVE_POST_PNT
@@ -11,6 +11,7 @@ export MP_PULSE=0
 # Set COM Paths and GETGES environment
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
    COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \
+   COMIN_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
    COMOUT_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
    COMOUT_WAVE_STATION:COM_WAVE_STATION_TMPL
 

From cfc4f7819fac6e7d540a94fb8023f697e717776a Mon Sep 17 00:00:00 2001
From: henrywinterbottom-wxdev <henry.winterbottom.wxdev@gmail.com>
Date: Thu, 13 Jun 2024 09:27:29 -0600
Subject: [PATCH 36/51] Addressed reviewer comments.

---
 jobs/JGLOBAL_WAVE_POST_BNDPNTBLL       | 7 ++-----
 jobs/JGLOBAL_WAVE_POST_PNT             | 5 +----
 jobs/JGLOBAL_WAVE_POST_SBS             | 3 +--
 jobs/JGLOBAL_WAVE_PRDGEN_BULLS         | 1 -
 scripts/exgfs_wave_post_gridded_sbs.sh | 2 +-
 5 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL b/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL
index 477933a1f55..c85b1cb5f3c 100755
--- a/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL
+++ b/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL
@@ -16,12 +16,9 @@ export MP_PULSE=0
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
    COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \
    COMIN_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
-   COMOUT_WAVE_STATION:COM_WAVE_STATION_TMPL \
-   COMOUT_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL
+   COMOUT_WAVE_STATION:COM_WAVE_STATION_TMPL
 
-for out_dir in "${COMOUT_WAVE_HISTORY}" "${COMOUT_WAVE_STATION}"; do
-    if [[ ! -d ${out_dir} ]]; then mkdir -p "${out_dir}"; fi
-done
+if [[ ! -d "${COMOUT_WAVE_STATION}" ]]; then mkdir -p "${COMOUT_WAVE_STATION}"; fi
 
 # Set wave model ID tag to include member number
 # if ensemble; waveMEMB var empty in deterministic
diff --git a/jobs/JGLOBAL_WAVE_POST_PNT b/jobs/JGLOBAL_WAVE_POST_PNT
index 44a4d44d549..769159be617 100755
--- a/jobs/JGLOBAL_WAVE_POST_PNT
+++ b/jobs/JGLOBAL_WAVE_POST_PNT
@@ -12,12 +12,9 @@ export MP_PULSE=0
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
    COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \
    COMIN_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
-   COMOUT_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
    COMOUT_WAVE_STATION:COM_WAVE_STATION_TMPL
 
-for out_dir in "${COMOUT_WAVE_HISTORY}" "${COMOUT_WAVE_STATION}"; do
-    if [[ ! -d ${out_dir} ]]; then mkdir -p "${out_dir}"; fi
-done
+if [[ ! -d "${COMOUT_WAVE_STATION}" ]]; then mkdir -p "${COMOUT_WAVE_STATION}"; fi
 
 # Set wave model ID tag to include member number
 # if ensemble; waveMEMB var empty in deterministic
diff --git a/jobs/JGLOBAL_WAVE_POST_SBS b/jobs/JGLOBAL_WAVE_POST_SBS
index b8462d99e71..141a708b002 100755
--- a/jobs/JGLOBAL_WAVE_POST_SBS
+++ b/jobs/JGLOBAL_WAVE_POST_SBS
@@ -14,10 +14,9 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
     COMIN_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
     COMIN_WAVE_GRID:COM_WAVE_GRID_TMPL \
     COMOUT_WAVE_PREP:COM_WAVE_PREP_TMPL \
-    COMOUT_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
     COMOUT_WAVE_GRID:COM_WAVE_GRID_TMPL
 
-for out_dir in "${COMOUT_WAVE_PREP}" "${COMOUT_WAVE_HISTORY}" "${COMOUT_WAVE_GRID}"; do
+for out_dir in "${COMOUT_WAVE_PREP}" "${COMOUT_WAVE_GRID}"; do
     if [[ ! -d "${out_dir}" ]]; then mkdir -p "${out_dir}"; fi
 done
 
diff --git a/jobs/JGLOBAL_WAVE_PRDGEN_BULLS b/jobs/JGLOBAL_WAVE_PRDGEN_BULLS
index 3f39fa3a4ae..ebecf716afc 100755
--- a/jobs/JGLOBAL_WAVE_PRDGEN_BULLS
+++ b/jobs/JGLOBAL_WAVE_PRDGEN_BULLS
@@ -15,7 +15,6 @@ export DBNROOT=${DBNROOT:-${UTILROOT}/fakedbn}
 
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
     COMIN_WAVE_STATION:COM_WAVE_STATION_TMPL \
-    COMIN_WAVE_WMO:COM_WAVE_WMO_TMPL \
     COMOUT_WAVE_WMO:COM_WAVE_WMO_TMPL
 
 if [[ ! -d ${COMOUT_WAVE_WMO} ]]; then mkdir -p "${COMOUT_WAVE_WMO}"; fi
diff --git a/scripts/exgfs_wave_post_gridded_sbs.sh b/scripts/exgfs_wave_post_gridded_sbs.sh
index 11508957b27..0b434f85332 100755
--- a/scripts/exgfs_wave_post_gridded_sbs.sh
+++ b/scripts/exgfs_wave_post_gridded_sbs.sh
@@ -263,7 +263,7 @@ source "${USHgfs}/preamble.sh"
     if [ $fhr = $fhrg ]
     then
       for wavGRD in ${waveGRD}; do
-        gfile="${COM_WAVE_HISTORY}/${WAV_MOD_TAG}.out_grd.${wavGRD}.${YMD}.${HMS}"
+        gfile="${COMIN_WAVE_HISTORY}/${WAV_MOD_TAG}.out_grd.${wavGRD}.${YMD}.${HMS}"
         if ! wait_for_file "${gfile}" "${sleep_interval}" "${iwaitmax}"; then
           echo " FATAL ERROR : NO RAW FIELD OUTPUT FILE out_grd.${grdID}"
           echo "${WAV_MOD_TAG} post ${grdID} ${PDY} ${cycle} : field output missing."

From a5496004e3f5345827017dd020245aba28c73a1f Mon Sep 17 00:00:00 2001
From: henrywinterbottom-wxdev <henry.winterbottom.wxdev@gmail.com>
Date: Thu, 13 Jun 2024 09:32:42 -0600
Subject: [PATCH 37/51] Shellcheck linter.

---
 scripts/exgfs_wave_post_pnt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/exgfs_wave_post_pnt.sh b/scripts/exgfs_wave_post_pnt.sh
index 24a25302d15..7413df5fcf8 100755
--- a/scripts/exgfs_wave_post_pnt.sh
+++ b/scripts/exgfs_wave_post_pnt.sh
@@ -701,6 +701,6 @@ source "${USHgfs}/preamble.sh"
 # 4.  Ending output
 
 
-exit $exit_code
+exit "${exit_code}"
 
 # End of MWW3 point prostprocessor script ---------------------------------------- #

From acbf9c9f72fc219dc936ec8a5a65932037bb353c Mon Sep 17 00:00:00 2001
From: HenryWinterbottom-NOAA <henry.winterbottom@noaa.gov>
Date: Thu, 20 Jun 2024 16:38:45 +0000
Subject: [PATCH 38/51] Addressed reviewer comment.

---
 jobs/JGLOBAL_WAVE_POST_BNDPNT | 1 -
 1 file changed, 1 deletion(-)

diff --git a/jobs/JGLOBAL_WAVE_POST_BNDPNT b/jobs/JGLOBAL_WAVE_POST_BNDPNT
index a62228cc4fd..89bbe71344d 100755
--- a/jobs/JGLOBAL_WAVE_POST_BNDPNT
+++ b/jobs/JGLOBAL_WAVE_POST_BNDPNT
@@ -12,7 +12,6 @@ export MP_PULSE=0
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
    COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \
    COMIN_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
-   COMOUT_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
    COMOUT_WAVE_STATION:COM_WAVE_STATION_TMPL
 
 for out_dir in "${COMOUT_WAVE_HISTORY}" "${COMOUT_WAVE_STATION}"; do

From 0fed287530000415f5f23c205f8c03eab2681ee2 Mon Sep 17 00:00:00 2001
From: "Henry R. Winterbottom"
 <49202169+HenryWinterbottom-NOAA@users.noreply.github.com>
Date: Thu, 20 Jun 2024 10:40:06 -0600
Subject: [PATCH 39/51] Update jobs/JGLOBAL_WAVE_PREP

Co-authored-by: Walter Kolczynski - NOAA <Walter.Kolczynski@noaa.gov>
---
 jobs/JGLOBAL_WAVE_PREP | 1 -
 1 file changed, 1 deletion(-)

diff --git a/jobs/JGLOBAL_WAVE_PREP b/jobs/JGLOBAL_WAVE_PREP
index 7dd97d34544..e652c3c2703 100755
--- a/jobs/JGLOBAL_WAVE_PREP
+++ b/jobs/JGLOBAL_WAVE_PREP
@@ -18,7 +18,6 @@ export CDO=${CDO_ROOT}/bin/cdo
 
 # Set COM Paths and GETGES environment
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
-	COMIN_OBS:COM_OBS_TMPL \
 	COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \
 	COMOUT_WAVE_PREP:COM_WAVE_PREP_TMPL \
 	COMIN_RTOFS:COM_RTOFS_TMPL

From 0f91c5c1d6b5ba5ce486877b71a94025abc9a3ef Mon Sep 17 00:00:00 2001
From: HenryWinterbottom-NOAA <henry.winterbottom@noaa.gov>
Date: Thu, 20 Jun 2024 16:45:29 +0000
Subject: [PATCH 40/51] Removed unneccessary template creation.

---
 jobs/JGLOBAL_WAVE_PREP | 1 -
 1 file changed, 1 deletion(-)

diff --git a/jobs/JGLOBAL_WAVE_PREP b/jobs/JGLOBAL_WAVE_PREP
index 7dd97d34544..e652c3c2703 100755
--- a/jobs/JGLOBAL_WAVE_PREP
+++ b/jobs/JGLOBAL_WAVE_PREP
@@ -18,7 +18,6 @@ export CDO=${CDO_ROOT}/bin/cdo
 
 # Set COM Paths and GETGES environment
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
-	COMIN_OBS:COM_OBS_TMPL \
 	COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \
 	COMOUT_WAVE_PREP:COM_WAVE_PREP_TMPL \
 	COMIN_RTOFS:COM_RTOFS_TMPL

From eb5fe3449f3a68347e7cc211fd41781e3e3a7eff Mon Sep 17 00:00:00 2001
From: HenryWinterbottom-NOAA <henry.winterbottom@noaa.gov>
Date: Thu, 20 Jun 2024 16:47:51 +0000
Subject: [PATCH 41/51] Removed unnecessary template.

---
 jobs/JGLOBAL_WAVE_POST_SBS | 1 -
 1 file changed, 1 deletion(-)

diff --git a/jobs/JGLOBAL_WAVE_POST_SBS b/jobs/JGLOBAL_WAVE_POST_SBS
index 141a708b002..53ac4b20833 100755
--- a/jobs/JGLOBAL_WAVE_POST_SBS
+++ b/jobs/JGLOBAL_WAVE_POST_SBS
@@ -12,7 +12,6 @@ export MP_PULSE=0
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
     COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \
     COMIN_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
-    COMIN_WAVE_GRID:COM_WAVE_GRID_TMPL \
     COMOUT_WAVE_PREP:COM_WAVE_PREP_TMPL \
     COMOUT_WAVE_GRID:COM_WAVE_GRID_TMPL
 

From 9ecbfd559ffa1655d0c4b8749010f08974aa3bfc Mon Sep 17 00:00:00 2001
From: HenryWinterbottom-NOAA <henry.winterbottom@noaa.gov>
Date: Thu, 20 Jun 2024 20:13:22 +0000
Subject: [PATCH 42/51] Addressed reviewer comment.

---
 jobs/JGLOBAL_WAVE_POST_BNDPNT | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jobs/JGLOBAL_WAVE_POST_BNDPNT b/jobs/JGLOBAL_WAVE_POST_BNDPNT
index 89bbe71344d..064930be086 100755
--- a/jobs/JGLOBAL_WAVE_POST_BNDPNT
+++ b/jobs/JGLOBAL_WAVE_POST_BNDPNT
@@ -14,7 +14,7 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
    COMIN_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
    COMOUT_WAVE_STATION:COM_WAVE_STATION_TMPL
 
-for out_dir in "${COMOUT_WAVE_HISTORY}" "${COMOUT_WAVE_STATION}"; do
+for out_dir in "${COMOUT_WAVE_STATION}"; do
     if [[ ! -d ${out_dir} ]]; then mkdir -p "${out_dir}"; fi
 done
 

From 013411956ef64c844a757afabae81368c01e2296 Mon Sep 17 00:00:00 2001
From: HenryWinterbottom-NOAA <henry.winterbottom@noaa.gov>
Date: Thu, 20 Jun 2024 20:19:51 +0000
Subject: [PATCH 43/51] Fixed linter error; updated  call.

---
 jobs/JGLOBAL_WAVE_POST_BNDPNT | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/jobs/JGLOBAL_WAVE_POST_BNDPNT b/jobs/JGLOBAL_WAVE_POST_BNDPNT
index 064930be086..199cc2b7240 100755
--- a/jobs/JGLOBAL_WAVE_POST_BNDPNT
+++ b/jobs/JGLOBAL_WAVE_POST_BNDPNT
@@ -14,9 +14,7 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
    COMIN_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
    COMOUT_WAVE_STATION:COM_WAVE_STATION_TMPL
 
-for out_dir in "${COMOUT_WAVE_STATION}"; do
-    if [[ ! -d ${out_dir} ]]; then mkdir -p "${out_dir}"; fi
-done
+if [[ ! -d "${COMOUT_WAVE_STATION}" ]]; then then mkdir -m 775 -p "${COMOUT_WAVE_STATION}"; fi
 
 # Set wave model ID tag to include member number
 # if ensemble; waveMEMB var empty in deterministic

From abef5ef28dbec5580ec746e0e7995090d172573b Mon Sep 17 00:00:00 2001
From: HenryWinterbottom-NOAA <henry.winterbottom@noaa.gov>
Date: Thu, 20 Jun 2024 20:23:29 +0000
Subject: [PATCH 44/51] Fixed linter error.

---
 jobs/JGLOBAL_WAVE_POST_BNDPNT | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jobs/JGLOBAL_WAVE_POST_BNDPNT b/jobs/JGLOBAL_WAVE_POST_BNDPNT
index 199cc2b7240..b9b0bc66b09 100755
--- a/jobs/JGLOBAL_WAVE_POST_BNDPNT
+++ b/jobs/JGLOBAL_WAVE_POST_BNDPNT
@@ -14,7 +14,7 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
    COMIN_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
    COMOUT_WAVE_STATION:COM_WAVE_STATION_TMPL
 
-if [[ ! -d "${COMOUT_WAVE_STATION}" ]]; then then mkdir -m 775 -p "${COMOUT_WAVE_STATION}"; fi
+if [[ ! -d "${COMOUT_WAVE_STATION}" ]]; then mkdir -m 775 -p "${COMOUT_WAVE_STATION}"; fi
 
 # Set wave model ID tag to include member number
 # if ensemble; waveMEMB var empty in deterministic

From 401bbba9159f1372ce5899fe1504cb311327764a Mon Sep 17 00:00:00 2001
From: HenryWinterbottom-NOAA <henry.winterbottom@noaa.gov>
Date: Thu, 20 Jun 2024 20:29:25 +0000
Subject: [PATCH 45/51] Updated  flags.

---
 jobs/JGLOBAL_WAVE_INIT           | 2 +-
 jobs/JGLOBAL_WAVE_POST_BNDPNTBLL | 2 +-
 jobs/JGLOBAL_WAVE_POST_PNT       | 2 +-
 jobs/JGLOBAL_WAVE_POST_SBS       | 2 +-
 jobs/JGLOBAL_WAVE_PRDGEN_BULLS   | 2 +-
 jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/jobs/JGLOBAL_WAVE_INIT b/jobs/JGLOBAL_WAVE_INIT
index 3a0a8b43a85..306bce80f08 100755
--- a/jobs/JGLOBAL_WAVE_INIT
+++ b/jobs/JGLOBAL_WAVE_INIT
@@ -13,7 +13,7 @@ export MP_PULSE=0
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
    COMOUT_WAVE_PREP:COM_WAVE_PREP_TMPL
 
-if [[ ! -d "${COMOUT_WAVE_PREP}" ]]; then mkdir -p "${COMOUT_WAVE_PREP}"; fi
+if [[ ! -d "${COMOUT_WAVE_PREP}" ]]; then mkdir -m 775 -p "${COMOUT_WAVE_PREP}"; fi
 
 # Set mpi serial command
 export wavempexec=${wavempexec:-"mpirun -n"}
diff --git a/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL b/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL
index c85b1cb5f3c..64c93482695 100755
--- a/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL
+++ b/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL
@@ -18,7 +18,7 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
    COMIN_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
    COMOUT_WAVE_STATION:COM_WAVE_STATION_TMPL
 
-if [[ ! -d "${COMOUT_WAVE_STATION}" ]]; then mkdir -p "${COMOUT_WAVE_STATION}"; fi
+if [[ ! -d "${COMOUT_WAVE_STATION}" ]]; then mkdir -m 775 -p "${COMOUT_WAVE_STATION}"; fi
 
 # Set wave model ID tag to include member number
 # if ensemble; waveMEMB var empty in deterministic
diff --git a/jobs/JGLOBAL_WAVE_POST_PNT b/jobs/JGLOBAL_WAVE_POST_PNT
index 769159be617..6533608a9da 100755
--- a/jobs/JGLOBAL_WAVE_POST_PNT
+++ b/jobs/JGLOBAL_WAVE_POST_PNT
@@ -14,7 +14,7 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
    COMIN_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
    COMOUT_WAVE_STATION:COM_WAVE_STATION_TMPL
 
-if [[ ! -d "${COMOUT_WAVE_STATION}" ]]; then mkdir -p "${COMOUT_WAVE_STATION}"; fi
+if [[ ! -d "${COMOUT_WAVE_STATION}" ]]; then mkdir -m 775 -p "${COMOUT_WAVE_STATION}"; fi
 
 # Set wave model ID tag to include member number
 # if ensemble; waveMEMB var empty in deterministic
diff --git a/jobs/JGLOBAL_WAVE_POST_SBS b/jobs/JGLOBAL_WAVE_POST_SBS
index 53ac4b20833..f1861fc9794 100755
--- a/jobs/JGLOBAL_WAVE_POST_SBS
+++ b/jobs/JGLOBAL_WAVE_POST_SBS
@@ -16,7 +16,7 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
     COMOUT_WAVE_GRID:COM_WAVE_GRID_TMPL
 
 for out_dir in "${COMOUT_WAVE_PREP}" "${COMOUT_WAVE_GRID}"; do
-    if [[ ! -d "${out_dir}" ]]; then mkdir -p "${out_dir}"; fi
+    if [[ ! -d "${out_dir}" ]]; then mkdir -m 775 -p "${out_dir}"; fi
 done
 
 
diff --git a/jobs/JGLOBAL_WAVE_PRDGEN_BULLS b/jobs/JGLOBAL_WAVE_PRDGEN_BULLS
index ebecf716afc..7b9b48b31ad 100755
--- a/jobs/JGLOBAL_WAVE_PRDGEN_BULLS
+++ b/jobs/JGLOBAL_WAVE_PRDGEN_BULLS
@@ -17,7 +17,7 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
     COMIN_WAVE_STATION:COM_WAVE_STATION_TMPL \
     COMOUT_WAVE_WMO:COM_WAVE_WMO_TMPL
 
-if [[ ! -d ${COMOUT_WAVE_WMO} ]]; then mkdir -p "${COMOUT_WAVE_WMO}"; fi
+if [[ ! -d ${COMOUT_WAVE_WMO} ]]; then mkdir -m 775 -p "${COMOUT_WAVE_WMO}"; fi
 
 ###################################
 # Execute the Script
diff --git a/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED b/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED
index 6f5af4aca3f..09990a31c52 100755
--- a/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED
+++ b/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED
@@ -17,7 +17,7 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
     COMIN_WAVE_GRID:COM_WAVE_GRID_TMPL \
     COMOUT_WAVE_WMO:COM_WAVE_WMO
 
-if [[ ! -d ${COMOUT_WAVE_WMO} ]]; then mkdir -p "${COMOUT_WAVE_WMO}"; fi
+if [[ ! -d ${COMOUT_WAVE_WMO} ]]; then mkdir -m 775 -p "${COMOUT_WAVE_WMO}"; fi
 
 
 ###################################

From ccc071820383a9dcf73fc9927877a34e0db459bc Mon Sep 17 00:00:00 2001
From: HenryWinterbottom-NOAA <henry.winterbottom@noaa.gov>
Date: Thu, 20 Jun 2024 20:46:30 +0000
Subject: [PATCH 46/51] Reverted previous mkdir call flags.

---
 jobs/JGLOBAL_WAVE_INIT           | 2 +-
 jobs/JGLOBAL_WAVE_POST_BNDPNT    | 2 +-
 jobs/JGLOBAL_WAVE_POST_BNDPNTBLL | 2 +-
 jobs/JGLOBAL_WAVE_POST_PNT       | 2 +-
 jobs/JGLOBAL_WAVE_POST_SBS       | 2 +-
 jobs/JGLOBAL_WAVE_PRDGEN_BULLS   | 2 +-
 jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED | 2 +-
 jobs/JGLOBAL_WAVE_PREP           | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/jobs/JGLOBAL_WAVE_INIT b/jobs/JGLOBAL_WAVE_INIT
index 306bce80f08..3a0a8b43a85 100755
--- a/jobs/JGLOBAL_WAVE_INIT
+++ b/jobs/JGLOBAL_WAVE_INIT
@@ -13,7 +13,7 @@ export MP_PULSE=0
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
    COMOUT_WAVE_PREP:COM_WAVE_PREP_TMPL
 
-if [[ ! -d "${COMOUT_WAVE_PREP}" ]]; then mkdir -m 775 -p "${COMOUT_WAVE_PREP}"; fi
+if [[ ! -d "${COMOUT_WAVE_PREP}" ]]; then mkdir -p "${COMOUT_WAVE_PREP}"; fi
 
 # Set mpi serial command
 export wavempexec=${wavempexec:-"mpirun -n"}
diff --git a/jobs/JGLOBAL_WAVE_POST_BNDPNT b/jobs/JGLOBAL_WAVE_POST_BNDPNT
index b9b0bc66b09..808ba7d9f3f 100755
--- a/jobs/JGLOBAL_WAVE_POST_BNDPNT
+++ b/jobs/JGLOBAL_WAVE_POST_BNDPNT
@@ -14,7 +14,7 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
    COMIN_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
    COMOUT_WAVE_STATION:COM_WAVE_STATION_TMPL
 
-if [[ ! -d "${COMOUT_WAVE_STATION}" ]]; then mkdir -m 775 -p "${COMOUT_WAVE_STATION}"; fi
+if [[ ! -d "${COMOUT_WAVE_STATION}" ]]; then mkdir -p "${COMOUT_WAVE_STATION}"; fi
 
 # Set wave model ID tag to include member number
 # if ensemble; waveMEMB var empty in deterministic
diff --git a/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL b/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL
index 64c93482695..c85b1cb5f3c 100755
--- a/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL
+++ b/jobs/JGLOBAL_WAVE_POST_BNDPNTBLL
@@ -18,7 +18,7 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
    COMIN_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
    COMOUT_WAVE_STATION:COM_WAVE_STATION_TMPL
 
-if [[ ! -d "${COMOUT_WAVE_STATION}" ]]; then mkdir -m 775 -p "${COMOUT_WAVE_STATION}"; fi
+if [[ ! -d "${COMOUT_WAVE_STATION}" ]]; then mkdir -p "${COMOUT_WAVE_STATION}"; fi
 
 # Set wave model ID tag to include member number
 # if ensemble; waveMEMB var empty in deterministic
diff --git a/jobs/JGLOBAL_WAVE_POST_PNT b/jobs/JGLOBAL_WAVE_POST_PNT
index 6533608a9da..769159be617 100755
--- a/jobs/JGLOBAL_WAVE_POST_PNT
+++ b/jobs/JGLOBAL_WAVE_POST_PNT
@@ -14,7 +14,7 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
    COMIN_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
    COMOUT_WAVE_STATION:COM_WAVE_STATION_TMPL
 
-if [[ ! -d "${COMOUT_WAVE_STATION}" ]]; then mkdir -m 775 -p "${COMOUT_WAVE_STATION}"; fi
+if [[ ! -d "${COMOUT_WAVE_STATION}" ]]; then mkdir -p "${COMOUT_WAVE_STATION}"; fi
 
 # Set wave model ID tag to include member number
 # if ensemble; waveMEMB var empty in deterministic
diff --git a/jobs/JGLOBAL_WAVE_POST_SBS b/jobs/JGLOBAL_WAVE_POST_SBS
index f1861fc9794..53ac4b20833 100755
--- a/jobs/JGLOBAL_WAVE_POST_SBS
+++ b/jobs/JGLOBAL_WAVE_POST_SBS
@@ -16,7 +16,7 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
     COMOUT_WAVE_GRID:COM_WAVE_GRID_TMPL
 
 for out_dir in "${COMOUT_WAVE_PREP}" "${COMOUT_WAVE_GRID}"; do
-    if [[ ! -d "${out_dir}" ]]; then mkdir -m 775 -p "${out_dir}"; fi
+    if [[ ! -d "${out_dir}" ]]; then mkdir -p "${out_dir}"; fi
 done
 
 
diff --git a/jobs/JGLOBAL_WAVE_PRDGEN_BULLS b/jobs/JGLOBAL_WAVE_PRDGEN_BULLS
index 7b9b48b31ad..ebecf716afc 100755
--- a/jobs/JGLOBAL_WAVE_PRDGEN_BULLS
+++ b/jobs/JGLOBAL_WAVE_PRDGEN_BULLS
@@ -17,7 +17,7 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
     COMIN_WAVE_STATION:COM_WAVE_STATION_TMPL \
     COMOUT_WAVE_WMO:COM_WAVE_WMO_TMPL
 
-if [[ ! -d ${COMOUT_WAVE_WMO} ]]; then mkdir -m 775 -p "${COMOUT_WAVE_WMO}"; fi
+if [[ ! -d ${COMOUT_WAVE_WMO} ]]; then mkdir -p "${COMOUT_WAVE_WMO}"; fi
 
 ###################################
 # Execute the Script
diff --git a/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED b/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED
index 09990a31c52..6f5af4aca3f 100755
--- a/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED
+++ b/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED
@@ -17,7 +17,7 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
     COMIN_WAVE_GRID:COM_WAVE_GRID_TMPL \
     COMOUT_WAVE_WMO:COM_WAVE_WMO
 
-if [[ ! -d ${COMOUT_WAVE_WMO} ]]; then mkdir -m 775 -p "${COMOUT_WAVE_WMO}"; fi
+if [[ ! -d ${COMOUT_WAVE_WMO} ]]; then mkdir -p "${COMOUT_WAVE_WMO}"; fi
 
 
 ###################################
diff --git a/jobs/JGLOBAL_WAVE_PREP b/jobs/JGLOBAL_WAVE_PREP
index e652c3c2703..3de9417ba19 100755
--- a/jobs/JGLOBAL_WAVE_PREP
+++ b/jobs/JGLOBAL_WAVE_PREP
@@ -21,7 +21,7 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
 	COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \
 	COMOUT_WAVE_PREP:COM_WAVE_PREP_TMPL \
 	COMIN_RTOFS:COM_RTOFS_TMPL
-if [[ ! -d ${COMOUT_WAVE_PREP} ]]; then mkdir -m 775 -p "${COMOUT_WAVE_PREP}"; fi
+if [[ ! -d ${COMOUT_WAVE_PREP} ]]; then mkdir -p "${COMOUT_WAVE_PREP}"; fi
 
 # Execute the Script
 ${SCRgfs}/exgfs_wave_prep.sh

From 0474c12dc1157c04d0f9c0e9da715e9220ca9996 Mon Sep 17 00:00:00 2001
From: "Henry R. Winterbottom"
 <49202169+HenryWinterbottom-NOAA@users.noreply.github.com>
Date: Fri, 21 Jun 2024 08:29:15 -0600
Subject: [PATCH 47/51] Update jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED

Co-authored-by: Rahul Mahajan <aerorahul@users.noreply.github.com>
---
 jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED b/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED
index 6f5af4aca3f..208b36c5352 100755
--- a/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED
+++ b/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED
@@ -15,7 +15,7 @@ export DBNROOT=${DBNROOT:-${UTILROOT}/fakedbn}
 
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
     COMIN_WAVE_GRID:COM_WAVE_GRID_TMPL \
-    COMOUT_WAVE_WMO:COM_WAVE_WMO
+    COMOUT_WAVE_WMO:COM_WAVE_WMO_TMPL
 
 if [[ ! -d ${COMOUT_WAVE_WMO} ]]; then mkdir -p "${COMOUT_WAVE_WMO}"; fi
 

From aff48143b775c3a1a85260882eafce75d6b456dc Mon Sep 17 00:00:00 2001
From: HenryWinterbottom-NOAA <henry.winterbottom@noaa.gov>
Date: Fri, 21 Jun 2024 14:34:00 +0000
Subject: [PATCH 48/51] Addressed reviewer comment.

---
 jobs/JGLOBAL_WAVE_PREP | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jobs/JGLOBAL_WAVE_PREP b/jobs/JGLOBAL_WAVE_PREP
index 3de9417ba19..65928b870de 100755
--- a/jobs/JGLOBAL_WAVE_PREP
+++ b/jobs/JGLOBAL_WAVE_PREP
@@ -18,6 +18,7 @@ export CDO=${CDO_ROOT}/bin/cdo
 
 # Set COM Paths and GETGES environment
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
+	COMIN_OBS:COM_OBS_TMPL \
 	COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \
 	COMOUT_WAVE_PREP:COM_WAVE_PREP_TMPL \
 	COMIN_RTOFS:COM_RTOFS_TMPL

From 26ba301c947314cd4d49530a94075ba502448fd1 Mon Sep 17 00:00:00 2001
From: HenryWinterbottom-NOAA <henry.winterbottom@noaa.gov>
Date: Fri, 21 Jun 2024 19:11:13 +0000
Subject: [PATCH 49/51] Corrected CI/CD detected bug.

---
 jobs/JGLOBAL_WAVE_POST_SBS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jobs/JGLOBAL_WAVE_POST_SBS b/jobs/JGLOBAL_WAVE_POST_SBS
index 53ac4b20833..141a708b002 100755
--- a/jobs/JGLOBAL_WAVE_POST_SBS
+++ b/jobs/JGLOBAL_WAVE_POST_SBS
@@ -12,6 +12,7 @@ export MP_PULSE=0
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
     COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \
     COMIN_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
+    COMIN_WAVE_GRID:COM_WAVE_GRID_TMPL \
     COMOUT_WAVE_PREP:COM_WAVE_PREP_TMPL \
     COMOUT_WAVE_GRID:COM_WAVE_GRID_TMPL
 

From 63904c2a9a6468f115ece2c9325ca908c78de91f Mon Sep 17 00:00:00 2001
From: "Henry R. Winterbottom"
 <49202169+HenryWinterbottom-NOAA@users.noreply.github.com>
Date: Mon, 24 Jun 2024 18:24:30 -0600
Subject: [PATCH 50/51] Update jobs/JGLOBAL_WAVE_POST_SBS

Co-authored-by: Walter Kolczynski - NOAA <Walter.Kolczynski@noaa.gov>
---
 jobs/JGLOBAL_WAVE_POST_SBS | 1 -
 1 file changed, 1 deletion(-)

diff --git a/jobs/JGLOBAL_WAVE_POST_SBS b/jobs/JGLOBAL_WAVE_POST_SBS
index 141a708b002..53ac4b20833 100755
--- a/jobs/JGLOBAL_WAVE_POST_SBS
+++ b/jobs/JGLOBAL_WAVE_POST_SBS
@@ -12,7 +12,6 @@ export MP_PULSE=0
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
     COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \
     COMIN_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL \
-    COMIN_WAVE_GRID:COM_WAVE_GRID_TMPL \
     COMOUT_WAVE_PREP:COM_WAVE_PREP_TMPL \
     COMOUT_WAVE_GRID:COM_WAVE_GRID_TMPL
 

From e17eec7792de75eb5d443eec8088fc565850290d Mon Sep 17 00:00:00 2001
From: HenryWinterbottom-NOAA <henry.winterbottom@noaa.gov>
Date: Tue, 25 Jun 2024 14:14:10 +0000
Subject: [PATCH 51/51] Made correction to path causing issue for RDHPCS
 Hercules.

---
 scripts/exgfs_wave_post_gridded_sbs.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/scripts/exgfs_wave_post_gridded_sbs.sh b/scripts/exgfs_wave_post_gridded_sbs.sh
index 0b434f85332..b0cca34bd10 100755
--- a/scripts/exgfs_wave_post_gridded_sbs.sh
+++ b/scripts/exgfs_wave_post_gridded_sbs.sh
@@ -21,9 +21,6 @@
 # 2020-07-31  Jessica Meixner: Removing points, now gridded data only
 #
 # COM inputs:
-#  - ${COMIN_WAVE_PREP}/${RUN}wave.mod_def.${grdID}
-#  - ${COMIN_WAVE_HISTORY}/${WAV_MOD_TAG}.out_grd.${wavGRD}.${YMD}.${HMS}
-#  - ${COMIN_WAVE_GRID}/${gribchk}
 #
 # $Id$
 #
@@ -409,7 +406,7 @@ source "${USHgfs}/preamble.sh"
       ENSTAG=""
       if [ ${waveMEMB} ]; then ENSTAG=".${membTAG}${waveMEMB}" ; fi
       gribchk="${RUN}wave.${cycle}${ENSTAG}.${GRDNAME}.${GRDRES}.f${FH3}.grib2"
-      if [ ! -s ${COMIN_WAVE_GRID}/${gribchk} ]; then
+      if [ ! -s ${COMOUT_WAVE_GRID}/${gribchk} ]; then
         set +x
         echo ' '
         echo '********************************************'