Updates for wave jobs to develop (NOAA-EMC#5176)

This brings in changes from two dev/gfsv17 PRs:
NOAA-EMC#4878
NOAA-EMC#4911

Author: JessicaMeixner-NOAA

dev/job_cards/rocoto/wavepostsbs.sh dev/job_cards/rocoto/wavepostgridded.shdev/job_cards/rocoto/wavepostsbs.sh renamed to dev/job_cards/rocoto/wavepostgridded.sh

@@ -11,7 +11,7 @@ if [[ "${err}" -ne 0 ]]; then
     exit "${err}"
 fi
 
-export job="wavepostsbs"
+export job="wavepostgridded"
 
 ###############################################################
 # shellcheck disable=SC2153
@@ -22,7 +22,7 @@ for FORECAST_HOUR in "${fhr_list[@]}"; do
     fhr3=$(printf '%03d' "${FORECAST_HOUR}")
     jobid="${job}_f${fhr3}.$$"
     # Execute the JJOB
-    "${HOMEglobal}/dev/jobs/JGLOBAL_WAVE_POST_SBS"
+    "${HOMEglobal}/dev/jobs/JGLOBAL_WAVE_POST_GRIDDED"
     err=$?
     if [[ "${err}" -ne 0 ]]; then
         exit "${err}"

dev/job_cards/rocoto/waveprep.sh

@@ -53,7 +53,7 @@ declare -rx COMIN_MED_RESTART="${COMIN}/model/med/restart"
 declare -rx COMIN_SNOW_ANALYSIS="${COMIN}/analysis/snow"
 declare -rx COMIN_SNOW_ANLMON="${COMIN}/products/snow/anlmon"
 declare -rx COMIN_ICE_ANALYSIS="${COMIN}/analysis/ice"
-declare -rx COMIN_ICE_BMATRIX="${COMIN}/bmatrix/ice"
+declare -rx COMIN_ICE_BMATRIX="${COMIN}/analysis/ice/bmatrix"
 declare -rx COMIN_ICE_HISTORY="${COMIN}/model/ice/history"
 declare -rx COMIN_ICE_RESTART="${COMIN}/model/ice/restart"
 declare -rx COMIN_ICE_GRIB="${COMIN}/products/ice/grib2"
@@ -65,7 +65,7 @@ declare -rx COMIN_OCEAN_RESTART="${COMIN}/model/ocean/restart"
 declare -rx COMIN_OCEAN_GRIB="${COMIN}/products/ocean/grib2"
 declare -rx COMIN_OCEAN_NETCDF="${COMIN}/products/ocean/netcdf"
 declare -rx COMIN_OCEAN_ANALYSIS="${COMIN}/analysis/ocean"
-declare -rx COMIN_OCEAN_BMATRIX="${COMIN}/bmatrix/ocean"
+declare -rx COMIN_OCEAN_BMATRIX="${COMIN}/analysis/ocean/bmatrix"
 declare -rx COMIN_WAVE_GRID="${COMIN}/products/wave/gridded"
 declare -rx COMIN_WAVE_HISTORY="${COMIN}/model/wave/history"
 declare -rx COMIN_WAVE_STATION="${COMIN}/products/wave/station"

dev/jobs/JGLOBAL_ARCHIVE_TARS

@@ -42,8 +42,6 @@ declare -rx COMIN_ATMOS_ENKF_ANALYSIS_STAT="${ROTDIR}/enkfgdas.${PDY}/${cyc}/ens
 #  COMIN_SOIL_ANALYSIS_MEM (alias of COMIN_ATMOS_ENKF_ANALYSIS_STAT)
 #  COMOUT_ATMOS_ANALYSIS_MEM (alias of COMOUT_ATMOS_ANALYSIS)
 
-mkdir -p "${COMOUT_ATMOS_RESTART}"
-
 # Use CFP to stage and save files in parallel
 export USE_CFP=YES
 

dev/jobs/JGLOBAL_ATMOS_SFCANL_REGRID

@@ -87,7 +87,7 @@ else
 fi
 
 if [[ "${DO_WAVE}" == "YES" ]]; then
-    declare -rx COMIN_WAVE_PREP="${COMIN}/model/wave/prep"
+    declare -rx COMIN_WAVE_INIT="${COMIN}/model/wave/init"
     declare -rx COMOUT_WAVE_RESTART="${COMOUT}/model/wave/restart"
     declare -rx COMOUT_WAVE_HISTORY="${COMOUT}/model/wave/history"
     declare -rx COMIN_WAVE_RESTART_PREV="${COMIN_RESTART_PREV}/model/wave/restart"

dev/jobs/JGLOBAL_FORECAST

@@ -42,8 +42,8 @@ declare -rx COMIN_OCEAN_HISTORY_PREV="${ROTDIR}/${GDUMP}.${gPDY}/${gcyc}/model/o
 declare -rx COMIN_ICE_HISTORY_PREV="${ROTDIR}/${GDUMP}.${gPDY}/${gcyc}/model/ice/history"
 declare -rx COMIN_ICE_RESTART_PREV="${ROTDIR}/${GDUMP}.${gPDY}/${gcyc}/model/ice/restart"
 
-declare -rx COMIN_OCEAN_BMATRIX="${ROTDIR}/${RUN}.${PDY}/${cyc}/bmatrix/ocean"
-declare -rx COMIN_ICE_BMATRIX="${ROTDIR}/${RUN}.${PDY}/${cyc}/bmatrix/ice"
+declare -rx COMIN_OCEAN_BMATRIX="${ROTDIR}/${RUN}.${PDY}/${cyc}/analysis/ocean/bmatrix"
+declare -rx COMIN_ICE_BMATRIX="${ROTDIR}/${RUN}.${PDY}/${cyc}/analysis/ice/bmatrix"
 
 ###############################################################
 # Run relevant script

dev/jobs/JGLOBAL_MARINE_ANALYSIS_INITIALIZE

@@ -58,8 +58,8 @@ declare -rx COMIN_ICE_HISTORY_PREV="${ROTDIR}/${GDUMP}.${gPDY}/${gcyc}/model/ice
 declare -rx COMIN_OCEAN_HISTORY_ENS_PREV="${ROTDIR}/${GDUMP_ENS}.${gPDY}/${gcyc}/model/ocean/history"
 declare -rx COMIN_ICE_HISTORY_ENS_PREV="${ROTDIR}/${GDUMP_ENS}.${gPDY}/${gcyc}/model/ice/history"
 
-declare -rx COMOUT_OCEAN_BMATRIX="${ROTDIR}/${RUN}.${PDY}/${cyc}/bmatrix/ocean"
-declare -rx COMOUT_ICE_BMATRIX="${ROTDIR}/${RUN}.${PDY}/${cyc}/bmatrix/ice"
+declare -rx COMOUT_OCEAN_BMATRIX="${ROTDIR}/${RUN}.${PDY}/${cyc}/analysis/ocean/bmatrix"
+declare -rx COMOUT_ICE_BMATRIX="${ROTDIR}/${RUN}.${PDY}/${cyc}/analysis/ice/bmatrix"
 declare -rx COMOUT_CONF="${ROTDIR}/${RUN}.${PDY}/${cyc}/conf"
 
 mkdir -m 775 -p "${COMOUT_OCEAN_BMATRIX}"

dev/jobs/JGLOBAL_MARINE_BMAT

@@ -59,8 +59,8 @@ declare -rx COMIN_ICE_HISTORY_PREV="${ROTDIR}/${GDUMP}.${gPDY}/${gcyc}/model/ice
 declare -rx COMIN_OCEAN_HISTORY_ENS_PREV="${ROTDIR}/${GDUMP_ENS}.${gPDY}/${gcyc}/model/ocean/history"
 declare -rx COMIN_ICE_HISTORY_ENS_PREV="${ROTDIR}/${GDUMP_ENS}.${gPDY}/${gcyc}/model/ice/history"
 
-declare -rx COMOUT_OCEAN_BMATRIX="${ROTDIR}/${RUN}.${PDY}/${cyc}/bmatrix/ocean"
-declare -rx COMOUT_ICE_BMATRIX="${ROTDIR}/${RUN}.${PDY}/${cyc}/bmatrix/ice"
+declare -rx COMOUT_OCEAN_BMATRIX="${ROTDIR}/${RUN}.${PDY}/${cyc}/analysis/ocean/bmatrix"
+declare -rx COMOUT_ICE_BMATRIX="${ROTDIR}/${RUN}.${PDY}/${cyc}/analysis/ice/bmatrix"
 
 mkdir -p "${COMOUT_OCEAN_BMATRIX}"
 mkdir -p "${COMOUT_ICE_BMATRIX}"

dev/jobs/JGLOBAL_MARINE_BMAT_INITIALIZE

@@ -25,9 +25,9 @@ if [[ 10#${ENSMEM:--1} -ge 0 ]]; then
 else
     declare -rx COMOUT="${ROTDIR}/${RUN}.${PDY}/${cyc}"
 fi
-declare -rx COMOUT_WAVE_PREP="${COMOUT}/model/wave/prep"
+declare -rx COMOUT_WAVE_INIT="${COMOUT}/model/wave/init"
 
-mkdir -p "${COMOUT_WAVE_PREP}"
+mkdir -p "${COMOUT_WAVE_INIT}"
 
 # Additional variables are set in scripts/exglobal_wave_init.sh in order to loop over
 # ensemble members (gefs only):
@@ -38,7 +38,7 @@ export wavempexec=${wavempexec:-"mpirun -n"}
 export wave_mpmd=${wave_mpmd:-"cfp"}
 
 # Execute the Script
-"${SCRglobal}/exgfs_wave_init.sh" && true
+"${SCRglobal}/exglobal_wave_init.sh" && true
 export err=$?
 if [[ ${err} -ne 0 ]]; then
     err_exit "Failed to generate wave grids for model initialization."

dev/jobs/JGLOBAL_WAVE_INIT

@@ -1,7 +1,7 @@
 #! /usr/bin/env bash
 set -x
 
-source "${HOMEglobal}/ush/jjob_header.sh" -e "wavepostbndpnt" -c "base wave wavepostsbs wavepostbndpnt"
+source "${HOMEglobal}/ush/jjob_header.sh" -e "wavepostbndpnt" -c "base wave wavepostgridded wavepostbndpnt"
 
 #{% if false %}
 source "${HOMEglobal}/ush/jjob_standard_vars.sh"
@@ -17,7 +17,7 @@ source "${USHglobal}/set_strict.sh"
 export MP_PULSE=0
 
 # Set COM Paths
-declare -rx COMIN_WAVE_PREP="${ROTDIR}/${RUN}.${PDY}/${cyc}/model/wave/prep"
+declare -rx COMIN_WAVE_INIT="${ROTDIR}/${RUN}.${PDY}/${cyc}/model/wave/init"
 declare -rx COMIN_WAVE_HISTORY="${ROTDIR}/${RUN}.${PDY}/${cyc}/model/wave/history"
 declare -rx COMOUT_WAVE_STATION="${ROTDIR}/${RUN}.${PDY}/${cyc}/products/wave/station"
 
@@ -31,7 +31,7 @@ export DOBLL_WAV='NO'     # Bulletin post
 export DOBNDPNT_WAV='YES' # Boundary points
 
 # Execute the Script
-"${SCRglobal}/exgfs_wave_post_pnt.sh" && true
+"${SCRglobal}/exglobal_wave_post_pnt.sh" && true
 export err=$?
 if [[ ${err} -ne 0 ]]; then
     err_exit "ex-script of JGLOBAL_WAVE_POST_BNDPNT failed!"