Rename wave output and refactor some wave scripts

env/AWSPW.env

@@ -50,7 +50,7 @@ elif [[ "${step}" = "prep_emissions" ]]; then
 
 elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}" = "wavepostsbs" ]] || [[ "${step}" = "wavepostbndpnt" ]] || [[ "${step}" = "wavepostbndpntbll" ]] || [[ "${step}" = "wavepostpnt" ]]; then
 
-    export CFP_MP="YES"
+    export USE_CFP="YES"
     if [[ "${step}" = "waveprep" ]]; then export MP_PULSE=0 ; fi
     export wavempexec=${launcher}
     export wave_mpmd=${mpmd_opt}

env/AZUREPW.env

@@ -46,7 +46,7 @@ if [[ "${step}" = "fcst" ]] || [[ "${step}" = "efcs" ]]; then
 
 elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}" = "wavepostsbs" ]] || [[ "${step}" = "wavepostbndpnt" ]] || [[ "${step}" = "wavepostbndpntbll" ]] || [[ "${step}" = "wavepostpnt" ]]; then
 
-    export CFP_MP="YES"
+    export USE_CFP="YES"
     if [[ "${step}" = "waveprep" ]]; then export MP_PULSE=0 ; fi
     export wavempexec=${launcher}
     export wave_mpmd=${mpmd_opt}

env/GAEAC5.env

@@ -48,7 +48,7 @@ case ${step} in
  ;;
  "waveinit" | "waveprep" | "wavepostsbs" | "wavepostbndpnt" | "wavepostpnt" | "wavepostbndpntbll")
 
-    export CFP_MP="YES"
+    export USE_CFP="YES"
     [[ "${step}" = "waveprep" ]] && export MP_PULSE=0
     export wavempexec=${launcher}
     export wave_mpmd=${mpmd_opt}

env/GAEAC6.env

@@ -48,7 +48,7 @@ case ${step} in
  ;;
  "waveinit" | "waveprep" | "wavepostsbs" | "wavepostbndpnt" | "wavepostpnt" | "wavepostbndpntbll")
 
-    export CFP_MP="YES"
+    export USE_CFP="YES"
     [[ "${step}" = "waveprep" ]] && export MP_PULSE=0
     export wavempexec=${launcher}
     export wave_mpmd=${mpmd_opt}

env/GOOGLEPW.env

@@ -49,7 +49,7 @@ elif [[ "${step}" = "prep_emissions" ]]; then
 
 elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}" = "wavepostsbs" ]] || [[ "${step}" = "wavepostbndpnt" ]] || [[ "${step}" = "wavepostbndpntbll" ]] || [[ "${step}" = "wavepostpnt" ]]; then
 
-    export CFP_MP="YES"
+    export USE_CFP="YES"
     if [[ "${step}" = "waveprep" ]]; then export MP_PULSE=0 ; fi
     export wavempexec=${launcher}
     export wave_mpmd=${mpmd_opt}

env/HERA.env

@@ -58,7 +58,7 @@ elif [[ "${step}" = "prep_emissions" ]]; then
 
 elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}" = "wavepostsbs" ]] || [[ "${step}" = "wavepostbndpnt" ]] || [[ "${step}" = "wavepostbndpntbll" ]] || [[ "${step}" = "wavepostpnt" ]]; then
 
-    export CFP_MP="YES"
+    export USE_CFP="YES"
     if [[ "${step}" = "waveprep" ]]; then export MP_PULSE=0 ; fi
     export wavempexec=${launcher}
     export wave_mpmd=${mpmd_opt}

env/HERCULES.env

@@ -56,7 +56,7 @@ case ${step} in
  ;;
  "waveinit" | "waveprep" | "wavepostsbs" | "wavepostbndpnt" | "wavepostpnt" | "wavepostbndpntbll")
 
-    export CFP_MP="YES"
+    export USE_CFP="YES"
     [[ "${step}" = "waveprep" ]] && export MP_PULSE=0
     export wavempexec=${launcher}
     export wave_mpmd=${mpmd_opt}

env/JET.env

@@ -46,7 +46,7 @@ elif [[ "${step}" = "prep_emissions" ]]; then
 
 elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}" = "wavepostsbs" ]] || [[ "${step}" = "wavepostbndpnt" ]] || [[ "${step}" = "wavepostbndpntbll" ]] || [[ "${step}" = "wavepostpnt" ]]; then
 
-    export CFP_MP="YES"
+    export USE_CFP="YES"
     if [[ "${step}" = "waveprep" ]]; then export MP_PULSE=0 ; fi
     export wavempexec=${launcher}
     export wave_mpmd=${mpmd_opt}

env/ORION.env

@@ -54,7 +54,7 @@ elif [[ "${step}" = "prep_emissions" ]]; then
 elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}" = "wavepostsbs" ]] || \
     [[ "${step}" = "wavepostbndpnt" ]] || [[ "${step}" = "wavepostpnt" ]] || [[ "${step}" == "wavepostbndpntbll" ]]; then
 
-    export CFP_MP="YES"
+    export USE_CFP="YES"
     if [[ "${step}" = "waveprep" ]]; then export MP_PULSE=0 ; fi
     export wavempexec=${launcher}
     export wave_mpmd=${mpmd_opt}

env/S4.env

@@ -46,7 +46,7 @@ elif [[ "${step}" = "prep_emissions" ]]; then
 
 elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}" = "wavepostsbs" ]] || [[ "${step}" = "wavepostbndpnt" ]] || [[ "${step}" = "wavepostbndpntbll" ]] || [[ "${step}" = "wavepostpnt" ]]; then
 
-    export CFP_MP="YES"
+    export USE_CFP="YES"
     if [[ "${step}" = "waveprep" ]]; then export MP_PULSE=0 ; fi
     export wavempexec=${launcher}
     export wave_mpmd=${mpmd_opt}

jobs/JGLOBAL_WAVE_GEMPAK

@@ -2,6 +2,7 @@
 
 source "${HOMEgfs}/ush/preamble.sh"
 source "${HOMEgfs}/ush/jjob_header.sh" -e "wavegempak" -c "base wave wavegempak"
+source "${USHgfs}/wave_domain_grid.sh"
 
 # Add default errchk = err_chk
 export errchk=${errchk:-err_chk}
@@ -14,7 +15,6 @@ export SENDDBN=${SENDDBN:-YES}
 export DBNROOT=${DBNROOT:-${UTILROOT}/fakedbn}
 
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
-   COMIN_WAVE_GRID:COM_WAVE_GRID_TMPL \
    COMOUT_WAVE_GEMPAK:COM_WAVE_GEMPAK_TMPL
 
 if [[ -n "${GEMPAK_GRIDS}" ]]; then
@@ -31,15 +31,13 @@ if [[ ! -d ${COMOUT_WAVE_GEMPAK} ]]; then mkdir -p "${COMOUT_WAVE_GEMPAK}"; fi
 
 ########################################################
 # Execute the script.
-${SCRgfs}/exgfs_wave_nawips.sh
-status=$?
-[[ ${status} -ne 0 ]] && exit ${status}
+"${SCRgfs}/exgfs_wave_nawips.sh"
+err=$?
+if [[ "${err}" -ne 0 ]]; then exit "${err}"; fi
 ###################################
 
 # Remove temp directories
-cd ${DATAROOT}
-if [ "${KEEPDATA}" != "YES" ]; then
-  rm -rf ${DATA}
+cd "${DATAROOT}" || true
+if [[ "${KEEPDATA}" != "YES" ]]; then
+  rm -rf "${DATA}"
 fi
-
-exit 0

jobs/JGLOBAL_WAVE_INIT

@@ -20,13 +20,12 @@ export wavempexec=${wavempexec:-"mpirun -n"}
 export wave_mpmd=${wave_mpmd:-"cfp"}
 
 # Execute the Script
-${SCRgfs}/exgfs_wave_init.sh
+"${SCRgfs}/exgfs_wave_init.sh"
 
 ##########################################
 # Remove the Temporary working directory
 ##########################################
-cd ${DATAROOT}
-[[ ${KEEPDATA} = "NO" ]] && rm -rf ${DATA}
-
+cd "${DATAROOT}" || true
+if [[ ${KEEPDATA} = "NO" ]]; then rm -rf "${DATA}"; fi
 
 exit 0

jobs/JGLOBAL_WAVE_POST_BNDPNT

@@ -16,13 +16,6 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
 
 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
-membTAG='p'
-if [ "${waveMEMB}" == "00" ]; then membTAG='c'; fi
-export membTAG
-export WAV_MOD_TAG=${RUN}wave${waveMEMB}
-
 export CFP_VERBOSE=1
 
 export FHMAX_WAV_PNT=${FHMAX_WAV_IBP}

jobs/JGLOBAL_WAVE_POST_BNDPNTBLL

@@ -14,32 +14,27 @@ 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
+	COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \
+	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
 
-# Set wave model ID tag to include member number
-# if ensemble; waveMEMB var empty in deterministic
-membTAG='p'
-if [ "${waveMEMB}" == "00" ]; then membTAG='c'; fi
-export membTAG
-export WAV_MOD_TAG=${RUN}wave${waveMEMB}
+export WAV_MOD_TAG=${RUN}.wave
 
 export CFP_VERBOSE=1
 
 export FHMAX_WAV_PNT=${FHMAX_WAV_IBP}
-export DOSPC_WAV='NO' # Spectral post
-export DOBLL_WAV='YES' # Bulletin post
-export DOBNDPNT_WAV='YES'  #boundary points
+export DOSPC_WAV='NO'     # Spectral post
+export DOBLL_WAV='YES'    # Bulletin post
+export DOBNDPNT_WAV='YES' #boundary points
 
 # Execute the Script
 ${SCRgfs}/exgfs_wave_post_pnt.sh
 err=$?
 if [ ${err} -ne 0 ]; then
-  echo "FATAL ERROR: ex-script of GFS_WAVE_POST_PNT failed!"
-  exit ${err}
+	echo "FATAL ERROR: ex-script of GFS_WAVE_POST_PNT failed!"
+	exit ${err}
 fi
 
 ##########################################
@@ -48,5 +43,4 @@ fi
 cd ${DATAROOT}
 [[ ${KEEPDATA} = "NO" ]] && rm -rf ${DATA}
 
-
 exit 0

jobs/JGLOBAL_WAVE_POST_SBS

@@ -32,30 +32,21 @@ if [[ -n "${wavepostGRD}" || -n "${waveinterpGRD}" ]]; then
 else
     echo "Both wavepostGRD and waveinterpGRD are empty. No grids to process."
 fi
-# Set wave model ID tag to include member number
-# if ensemble; waveMEMB var empty in deterministic
-# Set wave model ID tag to include member number
-# if ensemble; waveMEMB var empty in deterministic
-membTAG='p'
-if [ "${waveMEMB}" == "00" ]; then membTAG='c'; fi
-export membTAG
-export WAV_MOD_TAG=${RUN}wave${waveMEMB}
 
 export CFP_VERBOSE=1
 
 # Execute the Script
-${SCRgfs}/exgfs_wave_post_gridded_sbs.sh
+"${SCRgfs}/exgfs_wave_post_gridded_sbs.sh"
 err=$?
-if [ ${err} -ne 0 ]; then
-  echo "FATAL ERROR: ex-script of GWES_POST failed!"
-  exit ${err}
+if [[ ${err} -ne 0 ]]; then
+  echo "FATAL ERROR: ex-script of gridded wave post failed!"
+  exit "${err}"
 fi
 
 ##########################################
 # Remove the Temporary working directory
 ##########################################
-cd ${DATAROOT}
-[[ ${KEEPDATA} = "NO" ]] && rm -rf ${DATA}
-
+cd "${DATAROOT}" || true
+if [[ ${KEEPDATA} = "NO" ]]; then rm -rf "${DATA}"; fi
 
 exit 0

jobs/rocoto/wavegempak.sh

@@ -1,18 +1,27 @@
 #! /usr/bin/env bash
 
-source "$HOMEgfs/ush/preamble.sh"
+source "${HOMEgfs}/ush/preamble.sh"
 
 ###############################################################
-source $HOMEgfs/ush/load_fv3gfs_modules.sh
-status=$?
-[[ $status -ne 0 ]] && exit $status
+source "${HOMEgfs}/ush/load_fv3gfs_modules.sh"
+err=$?
+if [[ "${err}" -ne 0 ]]; then exit "${err}"; fi
 
-export job="post"
+export job="wavegempak"
 export jobid="${job}.$$"
 
 ###############################################################
-# Execute the JJOB
-$HOMEgfs/jobs/JGLOBAL_WAVE_GEMPAK
-status=$?
+# shellcheck disable=SC2153
+IFS=', ' read -r -a fhr_list <<< "${FHR_LIST}"
 
-exit $status
+export FORECAST_HOUR jobid
+for FORECAST_HOUR in "${fhr_list[@]}"; do
+	fhr3=$(printf '%03d' "${FORECAST_HOUR}")
+	jobid="${job}_f${fhr3}.$$"
+	# Execute the JJOB
+	"${HOMEgfs}/jobs/JGLOBAL_WAVE_GEMPAK"
+	err=$?
+	if [[ "${err}" -ne 0 ]]; then exit "${err}"; fi
+done
+
+exit "${err}"

jobs/rocoto/wavepostsbs.sh

@@ -15,10 +15,10 @@ export job="wavepostsbs"
 # shellcheck disable=SC2153
 IFS=', ' read -r -a fhr_list <<< "${FHR_LIST}"
 
-export FHR3 jobid
+export FORECAST_HOUR jobid
 for FORECAST_HOUR in "${fhr_list[@]}"; do
-	FHR3=$(printf '%03d' "${FORECAST_HOUR}")
-	jobid="${job}_f${FHR3}.$$"
+	fhr3=$(printf '%03d' "${FORECAST_HOUR}")
+	jobid="${job}_f${fhr3}.$$"
 	# Execute the JJOB
 	"${HOMEgfs}/jobs/JGLOBAL_WAVE_POST_SBS"
 	status=$?

parm/config/gfs/config.resources

@@ -249,7 +249,7 @@ case ${step} in
     ;;
 
   "wavegempak")
-    walltime="02:00:00"
+    walltime="00:10:00"
     ntasks=1
     threads_per_task=1
     tasks_per_node=$(( max_tasks_per_node / threads_per_task ))

parm/wave/ak_10m_interp.inp.tmpl

@@ -1,7 +1,7 @@
 $ Input file for interpolation of GLO30m_ext Grid
 $------------------------------------------------
 $ Start Time DT NSteps
- TIME DT NSTEPS
+ @[time] @[dt] @[nsteps]
 $ Total number of grids 
  2
 $ Grid extensions 

parm/wave/at_10m_interp.inp.tmpl

@@ -1,7 +1,7 @@
 $ Input file for interpolation of GLO30m_ext Grid
 $------------------------------------------------
 $ Start Time DT NSteps
- TIME DT NSTEPS
+ @[time] @[dt] @[nsteps]
 $ Total number of grids 
  2
 $ Grid extensions 

parm/wave/ep_10m_interp.inp.tmpl

@@ -1,7 +1,7 @@
 $ Input file for interpolation of GLO30m_ext Grid
 $------------------------------------------------
 $ Start Time DT NSteps
- TIME DT NSTEPS
+ @[time] @[dt] @[nsteps]
 $ Total number of grids 
  2
 $ Grid extensions 

parm/wave/glo_15mxt_interp.inp.tmpl

@@ -1,7 +1,7 @@
 $ Input file for interpolation of GLO30m_ext Grid
 $------------------------------------------------
 $ Start Time DT NSteps
- TIME DT NSTEPS
+ @[time] @[dt] @[nsteps]
 $ Total number of grids 
  2
 $ Grid extensions 

parm/wave/glo_200_interp.inp.tmpl

@@ -1,7 +1,7 @@
 $ Input file for interpolation of GLO30m_ext Grid
 $------------------------------------------------
 $ Start Time DT NSteps
- TIME DT NSTEPS
+ @[time] @[dt] @[nsteps]
 $ Total number of grids 
  2
 $ Grid extensions 

parm/wave/glo_30m_interp.inp.tmpl

@@ -1,7 +1,7 @@
 $ Input file for interpolation of GLO30m_ext Grid
 $------------------------------------------------
 $ Start Time DT NSteps
- TIME DT NSTEPS
+ @[time] @[dt] @[nsteps]
 $ Total number of grids 
  2
 $ Grid extensions 

parm/wave/reg025_interp.inp.tmpl

@@ -1,7 +1,7 @@
 $ Input file for interpolation of GLO30m_ext Grid
 $------------------------------------------------
 $ Start Time DT NSteps
- TIME DT NSTEPS
+ @[time] @[dt] @[nsteps]
 $ Total number of grids 
  2
 $ Grid extensions 

parm/wave/wc_10m_interp.inp.tmpl

@@ -1,7 +1,7 @@
 $ Input file for interpolation of GLO30m_ext Grid
 $------------------------------------------------
 $ Start Time DT NSteps
- TIME DT NSTEPS
+ @[time] @[dt] @[nsteps]
 $ Total number of grids 
  2
 $ Grid extensions 

parm/wave/ww3_grib2.ak_10m.inp.tmpl

@@ -1,9 +1,9 @@
 $ WAVEWATCH-III gridded output input file 
 $ ----------------------------------------
-TIME DT NT
+@[time] @[dt] @[nt]
 N
-FLAGS
+@[grib_flags]
 $
-TIME  7 MODNR GRIDNR 0 0
+@[time]  7 @[modnr] @[gridnr] 0 0
 $
 $ end of input file