Remove Direct Linking to COM from DATA for wavepostsbs Job

ush/wave_grib2_sbs.sh

@@ -82,7 +82,7 @@ if [[ ! -d "${com_dir}" ]]; then
 else
     echo "Directory ${com_dir} already exists."
 fi
-# Only create file if not present in COM
+# Only create file if not present in working directory
 if [[ ! -s "${com_dir}/${outfile}.idx" ]]; then
 
   set +x
@@ -169,11 +169,11 @@ if [[ ! -s "${com_dir}/${outfile}.idx" ]]; then
   fi
 
   if (( fhr > 0 )); then
-    ${WGRIB2} gribfile -set_date "${PDY}${cyc}" -set_ftime "${fhr} hour fcst" -grib "${com_dir}/${outfile}"
+    ${WGRIB2} gribfile -set_date "${PDY}${cyc}" -set_ftime "${fhr} hour fcst" -grib "${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_dir}/${outfile}"
+      -set table_1.4 1 -set table_1.2 1 -grib "${outfile}"
     err=$?
   fi
 
@@ -189,23 +189,44 @@ if [[ ! -s "${com_dir}/${outfile}.idx" ]]; then
   fi
 
   # Create index
-  ${WGRIB2} -s "${com_dir}/${outfile}" > "${com_dir}/${outfile}.idx"
+  ${WGRIB2} -s "${outfile}" > "${outfile}.idx"
 
-  # Create grib2 subgrid is this is the source grid
+  # Create grib2 subgrid if this is the source grid
   if [[ "${grdID}" = "${WAV_SUBGRBSRC}" ]]; then
     for subgrb in ${WAV_SUBGRB}; do
       subgrbref=$(echo ${!subgrb} | cut -d " " -f 1-20)
       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_dir}/${outfile}" "${com_dir}/${subfnam}"
-      ${WGRIB2} -s "${com_dir}/${subfnam}" > "${com_dir}/${subfnam}.idx"
+      ${COPYGB2} -g "${subgrbref}" -i0 -x "${outfile}" "${subfnam}"
+      ${WGRIB2} -s "${subfnam}" > "${subfnam}.idx"
    done
   fi
 
   # 1.e Save in /com
+  # Move grib files to COM directory
+  if [[ -s "${outfile}" ]] && [[ -s "${outfile}.idx" ]]; then
+    cp -f "${outfile}" "${com_dir}/${outfile}"
+    cp -f "${outfile}.idx" "${com_dir}/${outfile}.idx"
+    echo "Copied ${outfile} and ${outfile}.idx from ${GRIBDATA} to COM"
+  else
+    echo "${outfile} and ${outfile}.idx not found in ${GRIBDATA} to copy to COM"
+  fi
 
-  if [[ ! -s "${com_dir}/${outfile}" ]]; then
+  if [[ "${grdID}" = "${WAV_SUBGRBSRC}" ]]; then
+    for subgrb in ${WAV_SUBGRB}; do
+      subfnam="${WAV_MOD_TAG}.${cycle}${ENSTAG}.${subgrbnam}.${subgrbres}.f${FH3}.grib2"
+      if [[ -s "${subfnam}" ]] && [[ -s "${subfnam}.idx" ]]; then
+        cp -f "${subfnam}" "${com_dir}/${subfnam}"
+        cp -f "${subfnam}.idx" "${com_dir}/${subfnam}.idx"
+        echo "Copied ${subfnam} and ${subfnam}.idx from ${GRIBDATA} to COM"
+      else
+        echo "${subfnam} and ${subfnam}.idx not found in ${GRIBDATA} to copy to COM"
+      fi
+    done
+  fi
+
+  if [[ ! -s "${outfile}" ]]; then
     set +x
     echo ' '
     echo '********************************************* '
@@ -217,7 +238,7 @@ if [[ ! -s "${com_dir}/${outfile}.idx" ]]; then
     set_trace
     exit 4
   fi
-  if [[ ! -s "${com_dir}/${outfile}.idx" ]]; then
+  if [[ ! -s "${outfile}.idx" ]]; then
     set +x
     echo ' '
     echo '*************************************************** '
@@ -232,16 +253,14 @@ if [[ ! -s "${com_dir}/${outfile}.idx" ]]; then
 
   if [[ "${SENDDBN}" = 'YES' ]] && [[ ${outfile} != *global.0p50* ]]; then
     set +x
-    echo "   Alerting GRIB file as ${com_dir}/${outfile}"
-    echo "   Alerting GRIB index file as ${com_dir}/${outfile}.idx"
+    echo "   Alerting GRIB file as ${outfile}"
+    echo "   Alerting GRIB index file as ${outfile}.idx"
     set_trace
     "${DBNROOT}/bin/dbn_alert" MODEL "${alertName}_WAVE_GB2" "${job}" "${com_dir}/${outfile}"
     "${DBNROOT}/bin/dbn_alert" MODEL "${alertName}_WAVE_GB2_WIDX" "${job}" "${com_dir}/${outfile}.idx"
   else
     echo "${outfile} is global.0p50 or SENDDBN is NO, no alert sent"
   fi
-
-
   # --------------------------------------------------------------------------- #
   # 3.  Clean up the directory
 

ush/wave_grid_interp_sbs.sh

@@ -94,7 +94,7 @@ source "${USHgfs}/preamble.sh"
   for ID in ${waveGRD} ${grdID}; do
     ${NLN} "${DATA}/mod_def.${ID}" "mod_def.${ID}"
   done
-  
+
 
 # --------------------------------------------------------------------------- #
 # 1.  Generate GRID file with all data