Rename wave output and refactor some wave scripts to use MPMD, and fix some bugzillas along the way

ci/cases/pr/C96C48_ufs_hybatmDA.yaml

@@ -20,6 +20,7 @@ arguments:
 
 skip_ci_on_hosts:
   - gaeac5
+  - gaeac6
   - orion
   - hercules
   - awsepicglobalworkflow

env/AWSPW.env

@@ -54,7 +54,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}
@@ -69,13 +69,6 @@ elif [[ "${step}" = "fcst" ]] || [[ "${step}" = "efcs" ]]; then
     export APRUN_UFS="${launcher} -n ${ufs_ntasks}"
     unset nnodes ufs_ntasks
 
-elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}" = "wavepostsbs" ]] || [[ "${step}" = "wavepostbndpnt" ]] || [[ "${step}" = "wavepostbndpntbll" ]] || [[ "${step}" = "wavepostpnt" ]]; then
-
-    export CFP_MP="YES"
-    if [[ "${step}" = "waveprep" ]]; then export MP_PULSE=0 ; fi
-    export wavempexec=${launcher}
-    export wave_mpmd=${mpmd_opt}
-
 elif [[ "${step}" = "post" ]]; then
 
     export NTHREADS_UPP=${NTHREADS1}

env/AZUREPW.env

@@ -50,7 +50,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

@@ -52,8 +52,8 @@ case ${step} in
  ;;
  "waveinit" | "waveprep" | "wavepostsbs" | "wavepostbndpnt" | "wavepostpnt" | "wavepostbndpntbll")
 
-    export CFP_MP="YES"
-    if [[ "${step}" = "waveprep" ]]; then
+    export USE_CFP="YES"
+    if [[ "${step}" == "waveprep" ]]; then
         export MP_PULSE=0
     fi
     export wavempexec=${launcher}
@@ -330,4 +330,3 @@ case ${step} in
     echo "WARNING: The job step ${step} does not specify GAEAC5-specific resources"
  ;;
 esac
-

env/GAEAC6.env

@@ -52,7 +52,7 @@ case ${step} in
  ;;
  "waveinit" | "waveprep" | "wavepostsbs" | "wavepostbndpnt" | "wavepostpnt" | "wavepostbndpntbll")
 
-    export CFP_MP="YES"
+    export USE_CFP="YES"
     if [[ "${step}" == "waveprep" ]]; then
         export MP_PULSE=0
     fi

env/GOOGLEPW.env

@@ -53,7 +53,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

@@ -62,7 +62,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}
@@ -205,8 +205,8 @@ elif [[ "${step}" = "sfcanl" ]]; then
     # REGRID requires multiple of 6 tasks
     ntdiv6=$((ntasks/6))
     ntasks_regrid=$((ntdiv6*6))
-    if [[ ${ntasks_regrid} -gt 36 ]]; then 
-        ntasks_regrid=36 
+    if [[ ${ntasks_regrid} -gt 36 ]]; then
+        ntasks_regrid=36
     fi
     export APRUN_REGRID="${launcher} -n ${ntasks_regrid} "
 
@@ -283,8 +283,8 @@ elif [[ "${step}" = "esfc" ]]; then
 
     ntdiv6=$((ntasks/6))
     ntasks_regrid=$((ntdiv6*6))
-    if [[ ${ntasks_regrid} -gt 36 ]]; then 
-        ntasks_regrid=36 
+    if [[ ${ntasks_regrid} -gt 36 ]]; then
+        ntasks_regrid=36
     fi
     export APRUN_REGRID="${launcher} -n ${ntasks_regrid} "
 

env/HERCULES.env

@@ -60,10 +60,8 @@ case ${step} in
  ;;
  "waveinit" | "waveprep" | "wavepostsbs" | "wavepostbndpnt" | "wavepostpnt" | "wavepostbndpntbll")
 
-    export CFP_MP="YES"
-    if [[ "${step}" == "waveprep" ]]; then
-        export MP_PULSE=0
-    fi
+    export USE_CFP="YES"
+    if [[ "${step}" == "waveprep" ]]; then export MP_PULSE=0; fi
     export wavempexec=${launcher}
     export wave_mpmd=${mpmd_opt}
 

env/JET.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/ORION.env

@@ -58,7 +58,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

@@ -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/WCOSS2.env

@@ -45,6 +45,10 @@ elif [[ "${step}" = "prep_emissions" ]]; then
 elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}" = "wavepostsbs" ]] || [[ "${step}" = "wavepostbndpnt" ]] || [[ "${step}" = "wavepostbndpntbll"  ]] || [[ "${step}" = "wavepostpnt" ]]; then
 
     export USE_CFP="YES"
+    if [[ "${step}" = "wavepostpnt" ]] || [[ "${step}" = "wavepostbndpnt" ]] || \
+       [[ "${step}" = "wavepostbndpntbll" ]]; then
+      export USE_CFP="NO"
+    fi
     export wavempexec="${launcher} -np"
     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,24 +15,23 @@ 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
+ COMOUT_WAVE_GEMPAK:COM_WAVE_GEMPAK_TMPL
 
 if [[ -n "${GEMPAK_GRIDS}" ]]; then
-    for grdID in ${GEMPAK_GRIDS}; do 
-        process_grdID "${grdID}"
-        YMD=${PDY} HH=${cyc} GRDRESNAME=${grdNAME} declare_from_tmpl -rx \
-            "COMIN_WAVE_GRID_${GRDREGION}_${GRDRES}:COM_WAVE_GRID_RES_TMPL"
-    done
+  for grdID in ${GEMPAK_GRIDS}; do
+    process_grdID "${grdID}"
+    YMD=${PDY} HH=${cyc} GRDRESNAME=${grdNAME} declare_from_tmpl -rx \
+      "COMIN_WAVE_GRID_${GRDREGION}_${GRDRES}:COM_WAVE_GRID_RES_TMPL"
+  done
 else
-    echo "waveinterpGRD is empty. No grids to process."
+    echo "'GEMPAK_GRIDS' is empty. No grids to process."
 fi
 
 if [[ ! -d ${COMOUT_WAVE_GEMPAK} ]]; then mkdir -p "${COMOUT_WAVE_GEMPAK}"; fi
 
 ########################################################
 # Execute the script.
-${SCRgfs}/exgfs_wave_nawips.sh
+"${SCRgfs}/exgfs_wave_nawips.sh"
 err=$?
 if [[ ${err} -ne 0 ]]; then
     exit "${err}"
@@ -40,7 +40,7 @@ fi
 
 # Remove temp directories
 cd "${DATAROOT}" || true
-if [ "${KEEPDATA}" != "YES" ]; then
+if [[ "${KEEPDATA}" != "YES" ]]; then
   rm -rf "${DATA}"
 fi
 

jobs/JGLOBAL_WAVE_INIT

@@ -3,15 +3,14 @@
 source "${HOMEgfs}/ush/preamble.sh"
 source "${HOMEgfs}/ush/jjob_header.sh" -e "waveinit" -c "base wave waveinit"
 
-
 # Add default errchk = err_chk
 export errchk=${errchk:-err_chk}
 
 export MP_PULSE=0
 
 # Set COM Paths
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
-   COMOUT_WAVE_PREP:COM_WAVE_PREP_TMPL
+    COMOUT_WAVE_PREP:COM_WAVE_PREP_TMPL
 
 if [[ ! -d "${COMOUT_WAVE_PREP}" ]]; then mkdir -p "${COMOUT_WAVE_PREP}"; fi
 
@@ -20,15 +19,16 @@ export wavempexec=${wavempexec:-"mpirun -n"}
 export wave_mpmd=${wave_mpmd:-"cfp"}
 
 # Execute the Script
-${SCRgfs}/exgfs_wave_init.sh
+"${SCRgfs}/exgfs_wave_init.sh"
+err=$?
+if [[ "${err}" -ne 0 ]]; then exit "${err}"; fi
 
 ##########################################
 # Remove the Temporary working directory
 ##########################################
 cd "${DATAROOT}" || true
-if [[ "${KEEPDATA}" == "NO" ]]; then
-    rm -rf "${DATA}"
+if [[ "${KEEPDATA}" != "YES" ]]; then
+  rm -rf "${DATA}"
 fi
 
-
 exit 0

jobs/JGLOBAL_WAVE_POST_BNDPNT

@@ -10,25 +10,18 @@ export MP_PULSE=0
 
 # Set COM Paths
 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 CFP_VERBOSE=1
 
 export FHMAX_WAV_PNT=${FHMAX_WAV_IBP}
-export DOSPC_WAV='YES' # Spectral post
-export DOBLL_WAV='NO' # Bulletin post
-export DOBNDPNT_WAV='YES'  # Do boundary points
+export DOSPC_WAV='YES'  # Spectral post
+export DOBLL_WAV='NO'  # Bulletin post
+export DOBNDPNT_WAV='YES'  # Boundary points
 
 # Execute the Script
 ${SCRgfs}/exgfs_wave_post_pnt.sh

jobs/JGLOBAL_WAVE_POST_BNDPNTBLL

@@ -14,25 +14,18 @@ export MP_PULSE=0
 
 # Set COM Paths
 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 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

jobs/JGLOBAL_WAVE_POST_PNT

@@ -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 - OFFSET_START_HOUR ))

jobs/JGLOBAL_WAVE_POST_SBS

@@ -2,12 +2,7 @@
 
 source "${HOMEgfs}/ush/preamble.sh"
 source "${HOMEgfs}/ush/jjob_header.sh" -e "wavepostsbs" -c "base wave wavepostsbs"
-source "${USHgfs}/wave_domain_grid.sh" 
-
-# Add default errchk = err_chk
-export errchk=${errchk:-err_chk}
-
-export MP_PULSE=0
+source "${USHgfs}/wave_domain_grid.sh"
 
 # Set COM Paths
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
@@ -18,43 +13,32 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
 if [[ ! -d "${COMOUT_WAVE_GRID}" ]]; then mkdir -p "${COMOUT_WAVE_GRID}"; fi
 
 if [[ -n "${wavepostGRD}" || -n "${waveinterpGRD}" ]]; then
-    for grdID in ${wavepostGRD} ${waveinterpGRD}; do
-        process_grdID "${grdID}"
-        YMD=${PDY} HH=${cyc} GRDRESNAME=${grdNAME} declare_from_tmpl -rx \
-            "COMOUT_WAVE_GRID_${GRDREGION}_${GRDRES}:COM_WAVE_GRID_RES_TMPL"
-        out_dir_varname="COMOUT_WAVE_GRID_${GRDREGION}_${GRDRES}"
-        out_dir=${!out_dir_varname}
-        if [[ ! -d "${out_dir}" ]]; then mkdir -p "${out_dir}"; fi
-    done
+  for grdID in ${wavepostGRD} ${waveinterpGRD}; do
+    process_grdID "${grdID}"
+    YMD=${PDY} HH=${cyc} GRDRESNAME=${grdNAME} declare_from_tmpl -rx \
+        "COMOUT_WAVE_GRID_${GRDREGION}_${GRDRES}:COM_WAVE_GRID_RES_TMPL"
+    out_dir_varname="COMOUT_WAVE_GRID_${GRDREGION}_${GRDRES}"
+    out_dir=${!out_dir_varname}
+    if [[ ! -d "${out_dir}" ]]; then mkdir -p "${out_dir}"; fi
+  done
 else
-    echo "Both wavepostGRD and waveinterpGRD are empty. No grids to process."
+  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!"
+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}" || true
-if [[ "${KEEPDATA}" == "NO" ]]; then
-    rm -rf "${DATA}"
+if [[ "${KEEPDATA}" != "YES" ]]; then
+  rm -rf "${DATA}"
 fi
 
-
 exit 0