Add domain level to wave gridded COM path

jobs/JGLOBAL_ARCHIVE

@@ -1,7 +1,7 @@
 #! /usr/bin/env bash
 
 source "${HOMEgfs}/ush/preamble.sh"
-source "${HOMEgfs}/ush/jjob_header.sh" -e "arch" -c "base arch"
+source "${HOMEgfs}/ush/jjob_header.sh" -e "arch" -c "base arch wave"
 
 
 ##############################################
@@ -50,6 +50,20 @@ for grid in "0p25" "0p50" "1p00"; do
        "COMIN_ATMOS_GRIB_${grid}:COM_ATMOS_GRIB_GRID_TMPL"
 done
 
+###############################################################
+# Create an array of output wave grids to process
+if [[ -n "${wavepostGRD}" || -n "${waveinterpGRD}" ]]; then
+    for grdID in ${wavepostGRD} ${waveinterpGRD}; do
+        source "${USHgfs}/wave_domain_grid.sh" 
+        process_grdID "${grdID}"
+        YMD=${PDY} HH=${cyc} GRDRESNAME=${grdNAME} declare_from_tmpl -rx \
+            "COMIN_WAVE_GRID_${GRDNAME}_${GRDRES}:COM_WAVE_GRID_RES_TMPL"
+		gCOM+="${GRDNAME}.${GRDRES}"
+    done
+else
+    echo "Both wavepostGRD and waveinterpGRD are empty. No grids to process."
+fi
+export gCOM="${gCOM[*]}"
 ###############################################################
 # Run archive script
 ###############################################################

jobs/JGLOBAL_WAVE_POST_SBS

@@ -19,7 +19,19 @@ for out_dir in "${COMOUT_WAVE_PREP}" "${COMOUT_WAVE_GRID}"; do
     if [[ ! -d "${out_dir}" ]]; then mkdir -p "${out_dir}"; fi
 done
 
-
+if [[ -n "${wavepostGRD}" || -n "${waveinterpGRD}" ]]; then
+    for grdID in ${wavepostGRD} ${waveinterpGRD}; do
+        source "${USHgfs}/wave_domain_grid.sh" 
+        process_grdID "${grdID}"
+        YMD=${PDY} HH=${cyc} GRDRESNAME=${grdNAME} declare_from_tmpl -rx \
+            "COMOUT_WAVE_GRID_${GRDNAME}_${GRDRES}:COM_WAVE_GRID_RES_TMPL"
+        out_dir_varname="COMOUT_WAVE_GRID_${GRDNAME}_${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."
+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

jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED

@@ -19,6 +19,16 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
 
 if [[ ! -d ${COMOUT_WAVE_WMO} ]]; then mkdir -p "${COMOUT_WAVE_WMO}"; fi
 
+if [[ -n "${GEMPACK_GRIDS}" ]]; then
+    for grdID in ${GEMPACK_GRIDS}; do
+        source "${USHgfs}/wave_domain_grid.sh" 
+        process_grdID "${grdID}"
+        YMD=${PDY} HH=${cyc} GRDRESNAME=${grdNAME} declare_from_tmpl -rx \
+            "COMIN_WAVE_GRID_${GRDNAME}_${GRDRES}:COM_WAVE_GRID_RES_TMPL"
+    done
+else
+    echo "GEMPACK_GRIDS are empty. No grids to process."
+fi
 
 ###################################
 # Execute the Script

parm/archive/gefs_extracted_wave.yaml.j2

@@ -13,8 +13,6 @@ gefs_wave:
     {% set ofst_hr = FHMIN_GFS %}
 {% endif %}
 
-{% set res = (waveGRD[-3:])[0] ~ "p" ~ (waveGRD[-3:])[-2:] %}
-
 #select mem%03d and ensstat files required
 {% set members = [] %}
 {% for mem_nm in range(0, NMEM_ENS + 1) %}
@@ -27,17 +25,6 @@ gefs_wave:
                           '${YMD}':cycle_YMD,
                           '${HH}':cycle_HH,
                           '${MEMDIR}':mem }) %}
-
-    {% set COMIN_WAVE_GRID = COM_WAVE_GRID_TMPL | replace_tmpl(tmpl_dict) %}
-    # Select grib2 files to copy to the atardir
-    {% if path_exists(COMIN_WAVE_GRID) %}
-        {% for fhr in range(ofst_hr, FHMAX_GFS + FHOUT_WAV, FHOUT_WAV) %}
-            {% set file_name = head ~ "global." ~ res ~ ".f" ~ '%03d'|format(fhr) ~ ".grib2" %}
-            {% set file_path = COMIN_WAVE_GRID ~ "/" ~ file_name %}
-        - "{{ file_path | relpath(ROTDIR)}}"
-        {% endfor %}
-    {% endif %}
-
     {% set COMIN_WAVE_STATION = COM_WAVE_STATION_TMPL | replace_tmpl(tmpl_dict) %}
     # Select station files to copy to the atardir
     {% if path_exists(COMIN_WAVE_STATION) %}
@@ -48,4 +35,18 @@ gefs_wave:
         {% set file_path = COMIN_WAVE_STATION ~ "/" ~ RUN ~ "wave.t" ~ cycle_HH ~ "z.bull_tar" %}
         - "{{ file_path | relpath(ROTDIR)}}"
     {% endif %}
+
+        # Select grib2 files to copy to the atardir
+    {% set gCOM_list = gCOM.split(' ') %}
+    {% for grd in gCOM_list %}
+    {% set tmpl_dict = tmpl_dict.update({'${GRDRESNAME}': grd}) %}
+    {% set file_path = COM_WAVE_GRID_RES_TMPL | replace_tmpl(tmpl_dict) %}  
+    {% if path_exists(file_path) %}
+        {% for fhr in range(ofst_hr, FHMAX_GFS + FHOUT_WAV, FHOUT_WAV) %}
+            {% set file_name = head ~ grd ~ ".f" ~ '%03d'|format(fhr) ~ ".grib2" %}
+            {% set file_path = file_path ~ "/" ~ file_name %}
+        - "{{ file_path | relpath(ROTDIR)}}"
+        {% endfor %}
+    {% endif %}
+    {% endfor %}
 {% endfor %}

parm/archive/gfswave.yaml.j2

@@ -1,20 +1,31 @@
 gfswave:
     {% set head = "gfswave.t" + cycle_HH + "z." %}
+
     name: "GFSWAVE"
     target: "{{ ATARDIR }}/{{ cycle_YMDH }}/gfswave.tar"
     required:
         # Wave GRIB2 regional forecast products
+        {% set gCOM_list = gCOM.split(' ') %}
+        {% for grd in gCOM_list %}
+        {% set tmpl_dict = ({ '${ROTDIR}':ROTDIR,
+                              '${RUN}':RUN,
+                              '${YMD}':cycle_YMD,
+                              '${HH}':cycle_HH,
+                              '${MEMDIR}':'',
+                              '${GRDRESNAME}':grd}) %}
+        {% set file_path = COM_WAVE_GRID_RES_TMPL | replace_tmpl(tmpl_dict) %}        
+
         {% for fh in range(0, FHMAX_HF_WAV + FHOUT_HF_WAV, FHOUT_HF_WAV) %}
         # NOTE This is as explicit as possible without major logic to parse wavepostGRD.
         #      Matches files of the form "gfswave.tCCz.<region>.<res>.fHHH.grib2".
-        - "{{ COMIN_WAVE_GRID | relpath(ROTDIR) }}/{{ head }}*.*.f{{ '%03d' % fh }}.grib2"
-        - "{{ COMIN_WAVE_GRID | relpath(ROTDIR) }}/{{ head }}*.*.f{{ '%03d' % fh }}.grib2.idx"
+        - "{{ file_path | relpath(ROTDIR) }}/{{ head }}*.*.f{{ '%03d' % fh }}.grib2"
+        - "{{ file_path | relpath(ROTDIR) }}/{{ head }}*.*.f{{ '%03d' % fh }}.grib2.idx"
         {% endfor %}
 
         # Global wave GRIB2 forecast products
         {% for fh in range(FHMAX_HF_WAV + FHOUT_WAV, FHMAX_WAV_GFS + FHOUT_WAV, FHOUT_WAV) %}
-        - "{{ COMIN_WAVE_GRID | relpath(ROTDIR) }}/{{ head }}*.*.f{{ '%03d' % fh }}.grib2"
-        - "{{ COMIN_WAVE_GRID | relpath(ROTDIR) }}/{{ head }}*.*.f{{ '%03d' % fh }}.grib2.idx"
+        - "{{ file_path | relpath(ROTDIR) }}/{{ head }}*.*.f{{ '%03d' % fh }}.grib2"
+        - "{{ file_path | relpath(ROTDIR) }}/{{ head }}*.*.f{{ '%03d' % fh }}.grib2.idx"
         {% endfor %}
 
         # Wave bulletins
@@ -28,3 +39,4 @@ gfswave:
         - "{{ COMIN_WAVE_STATION | relpath(ROTDIR) }}/{{ head }}ibpcbull_tar"
         - "{{ COMIN_WAVE_STATION | relpath(ROTDIR) }}/{{ head }}ibp_tar"
         {% endif %}
+        {% endfor %}

parm/config/gfs/config.com

@@ -74,6 +74,7 @@ declare -rx COM_WAVE_RESTART_TMPL=${COM_BASE}'/model/wave/restart'
 declare -rx COM_WAVE_PREP_TMPL=${COM_BASE}'/model/wave/prep'
 declare -rx COM_WAVE_HISTORY_TMPL=${COM_BASE}'/model/wave/history'
 declare -rx COM_WAVE_GRID_TMPL=${COM_BASE}'/products/wave/gridded'
+declare -rx COM_WAVE_GRID_RES_TMPL=${COM_BASE}'/products/wave/gridded/${GRDRESNAME}'
 declare -rx COM_WAVE_STATION_TMPL=${COM_BASE}'/products/wave/station'
 declare -rx COM_WAVE_GEMPAK_TMPL=${COM_BASE}'/products/wave/gempak'
 declare -rx COM_WAVE_WMO_TMPL=${COM_BASE}'/products/wave/wmo'

parm/config/gfs/config.waveawipsgridded

@@ -9,5 +9,6 @@ echo "BEGIN: config.waveawipsgridded"
 . $EXPDIR/config.resources waveawipsgridded
 
 export DBNROOT=/dev/null
-
+export GEMPAK_GRIDS=${GEMPAK_GRIDS:-ak_10m at_10m ep_10m wc_10m glo_30m}
+# export GEMPAK_GRIDS=${GEMPAK_GRIDS:-ao_9km at_10m ep_10m wc_10m glo_30m}
 echo "END: config.waveawipsgridded"

scripts/exgfs_wave_post_gridded_sbs.sh

@@ -218,7 +218,6 @@ source "${USHgfs}/preamble.sh"
   echo '   Making command file for sbs grib2 and GRID Interpolation '
   set_trace
   fhr=$(( 10#${FHR3} ))
-  fhrg=$fhr
   ymdh=$($NDATE $fhr ${PDY}${cyc})
   YMD=$(echo $ymdh | cut -c1-8)
   HMS="$(echo $ymdh | cut -c9-10)0000"
@@ -238,75 +237,43 @@ source "${USHgfs}/preamble.sh"
   export GRDIDATA=${DATA}/output_$YMDHMS
 
 # Gridded data (main part, need to be run side-by-side with forecast
-
-  if [ $fhr = $fhrg ]
-  then
-    gfile="${COMIN_WAVE_HISTORY}/${WAV_MOD_TAG}.out_grd.${waveGRD}.${YMD}.${HMS}"
-      if [[ ! -s "${gfile}" ]]; then
-        echo " FATAL ERROR : NO RAW FIELD OUTPUT FILE ${gfile}"
-        err=3; export err; "${errchk}"
-        exit "${err}"
-      fi
-    ${NLN} "${gfile}" "./out_grd.${waveGRD}"
-
-    if [ "$DOGRI_WAV" = 'YES' ]
-    then
-      nigrd=1
-      for grdID in $waveinterpGRD
-      do
-        ymdh_int=$($NDATE -${WAVHINDH} $ymdh); dt_int=3600.; n_int=9999 ;
-        echo "${USHgfs}/wave_grid_interp_sbs.sh $grdID $ymdh_int $dt_int $n_int > grint_$grdID.out 2>&1" >> ${fcmdigrd}.${nigrd}
-        if [ "$DOGRB_WAV" = 'YES' ]
-        then
-          gribFL=\'$(echo ${OUTPARS_WAV})\'
-          case $grdID in
-            glo_15mxt) GRDNAME='global' ; GRDRES=0p25 ; GRIDNR=255  ; MODNR=11 ;;
-            reg025) GRDNAME='global' ; GRDRES=0p25 ; GRIDNR=255  ; MODNR=11 ;;
-            glo_025) GRDNAME='global' ; GRDRES=0p25 ; GRIDNR=255  ; MODNR=11 ;;
-            glo_100) GRDNAME='global' ; GRDRES=1p00 ; GRIDNR=255  ; MODNR=11 ;;
-            glo_200) GRDNAME='global' ; GRDRES=2p00 ; GRIDNR=255  ; MODNR=11 ;;
-            glo_500) GRDNAME='global' ; GRDRES=5p00 ; GRIDNR=255  ; MODNR=11 ;;
-            glo_30mxt) GRDNAME='global' ; GRDRES=0p50 ; GRIDNR=255  ; MODNR=11 ;;
-            glo_30m) GRDNAME='global' ; GRDRES=0p50 ; GRIDNR=255  ; MODNR=11 ;;
-            at_10m) GRDNAME='atlocn' ; GRDRES=0p16 ; GRIDNR=255  ; MODNR=11   ;;
-            ep_10m) GRDNAME='epacif' ; GRDRES=0p16 ; GRIDNR=255  ; MODNR=11   ;;
-            wc_10m) GRDNAME='wcoast' ; GRDRES=0p16 ; GRIDNR=255  ; MODNR=11   ;;
-            ak_10m) GRDNAME='alaska' ; GRDRES=0p16 ; GRIDNR=255  ; MODNR=11   ;;
-          esac
-          echo "${USHgfs}/wave_grib2_sbs.sh $grdID $GRIDNR $MODNR $ymdh $fhr $GRDNAME $GRDRES $gribFL > grib_$grdID.out 2>&1" >> ${fcmdigrd}.${nigrd}
-        fi
-        echo "${GRIBDATA}/${fcmdigrd}.${nigrd}" >> ${fcmdnow}
-        chmod 744 ${fcmdigrd}.${nigrd}
-        nigrd=$((nigrd+1))
-      done
+  gfile="${COMIN_WAVE_HISTORY}/${WAV_MOD_TAG}.out_grd.${waveGRD}.${YMD}.${HMS}"
+    if [[ ! -s "${gfile}" ]]; then
+      echo " FATAL ERROR : NO RAW FIELD OUTPUT FILE ${gfile}"
+      err=3; export err; "${errchk}"
+      exit "${err}"
     fi
+  ${NLN} "${gfile}" "./out_grd.${waveGRD}"
 
-    if [ "$DOGRB_WAV" = 'YES' ]
-    then
-      for grdID in ${wavepostGRD} # First concatenate grib files for sbs grids
-      do
+  if [ "$DOGRI_WAV" = 'YES' ]
+  then
+    nigrd=1
+    for grdID in $waveinterpGRD
+    do
+      ymdh_int=$($NDATE -${WAVHINDH} $ymdh); dt_int=3600.; n_int=9999 ;
+      echo "${USHgfs}/wave_grid_interp_sbs.sh $grdID $ymdh_int $dt_int $n_int > grint_$grdID.out 2>&1" >> ${fcmdigrd}.${nigrd}
+      if [ "$DOGRB_WAV" = 'YES' ]
+      then
         gribFL=\'$(echo ${OUTPARS_WAV})\'
-        case $grdID in
-            aoc_9km) GRDNAME='arctic' ; GRDRES=9km ; GRIDNR=255  ; MODNR=11   ;;
-            ant_9km) GRDNAME='antarc' ; GRDRES=9km ; GRIDNR=255  ; MODNR=11   ;;
-            glo_10m) GRDNAME='global' ; GRDRES=0p16 ; GRIDNR=255  ; MODNR=11   ;;
-            gnh_10m) GRDNAME='global' ; GRDRES=0p16 ; GRIDNR=255  ; MODNR=11   ;;
-            gsh_15m) GRDNAME='gsouth' ; GRDRES=0p25 ; GRIDNR=255  ; MODNR=11   ;;
-            glo_15m) GRDNAME='global' ; GRDRES=0p25 ; GRIDNR=255  ; MODNR=11   ;;
-            ao_20m) GRDNAME='arctic' ; GRDRES=0p33 ; GRIDNR=255  ; MODNR=11   ;;
-            so_20m) GRDNAME='antarc' ; GRDRES=0p33 ; GRIDNR=255  ; MODNR=11   ;;
-            glo_15mxt) GRDNAME='global' ; GRDRES=0p25 ; GRIDNR=255  ; MODNR=11   ;;
-            reg025) GRDNAME='global' ; GRDRES=0p25 ; GRIDNR=255  ; MODNR=11   ;;
-            glo_025) GRDNAME='global' ; GRDRES=0p25 ; GRIDNR=255  ; MODNR=11 ;;
-            glo_100) GRDNAME='global' ; GRDRES=1p00 ; GRIDNR=255  ; MODNR=11 ;;
-            glo_200) GRDNAME='global' ; GRDRES=2p00 ; GRIDNR=255  ; MODNR=11 ;;
-            glo_500) GRDNAME='global' ; GRDRES=5p00 ; GRIDNR=255  ; MODNR=11 ;;
-            gwes_30m) GRDNAME='global' ; GRDRES=0p50 ; GRIDNR=255  ; MODNR=10 ;;
-        esac
-        echo "${USHgfs}/wave_grib2_sbs.sh $grdID $GRIDNR $MODNR $ymdh $fhr $GRDNAME $GRDRES $gribFL > grib_$grdID.out 2>&1" >> ${fcmdnow}
-      done
-    fi
+        source "${USHgfs}/wave_domain_grid.sh"
+        process_grdID "${grdID}"
+        echo "${USHgfs}/wave_grib2_sbs.sh $grdID $GRIDNR $MODNR $ymdh $fhr $GRDNAME $GRDRES $gribFL > grib_$grdID.out 2>&1" >> ${fcmdigrd}.${nigrd}
+      fi
+      echo "${GRIBDATA}/${fcmdigrd}.${nigrd}" >> ${fcmdnow}
+      chmod 744 ${fcmdigrd}.${nigrd}
+      nigrd=$((nigrd+1))
+    done
+  fi
 
+  if [ "$DOGRB_WAV" = 'YES' ]
+  then
+    for grdID in ${wavepostGRD} # First concatenate grib files for sbs grids
+    do
+      gribFL=\'$(echo ${OUTPARS_WAV})\'
+      source "${USHgfs}/wave_domain_grid.sh"
+      process_grdID "${grdID}"
+      echo "${USHgfs}/wave_grib2_sbs.sh $grdID $GRIDNR $MODNR $ymdh $fhr $GRDNAME $GRDRES $gribFL > grib_$grdID.out 2>&1" >> ${fcmdnow}
+    done
   fi
 
   if [ ${CFP_MP:-"NO"} = "YES" ]; then
@@ -377,15 +344,14 @@ source "${USHgfs}/preamble.sh"
   rm -f out_grd.* # Remove large binary grid output files
 
   cd $DATA
-
-
-  if [ "$fhr" = "$fhrg" ]
-  then
+
 # Check if grib2 file created
     ENSTAG=""
+    com_varname="COMOUT_WAVE_GRID_${GRDNAME}_${GRDRES}"
+    com_dir=${!com_varname}
     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 ${com_dir}/${gribchk} ]; then
       set +x
       echo ' '
       echo '********************************************'
@@ -397,7 +363,6 @@ source "${USHgfs}/preamble.sh"
       err=5; export err;${errchk}
       exit "$err"
     fi
-  fi
 
 # --------------------------------------------------------------------------- #
 # 7.  Ending output