Skip to content

Commit

Permalink
changed GRDNAME to GRDREGION
Browse files Browse the repository at this point in the history
  • Loading branch information
@AntonMFernando-NOAA
AntonMFernando-NOAA committed Jan 15, 2025
1 parent 3cfa069 commit 3d9bfdc
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 31 deletions.
4 changes: 2 additions & 2 deletions jobs/JGLOBAL_ARCHIVE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ if [[ "${DO_WAVE}" == "YES" ]]; then
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"
grids_arr+=("${GRDNAME}.${GRDRES}")
"COMIN_WAVE_GRID_${GRDREGION}_${GRDRES}:COM_WAVE_GRID_RES_TMPL"
grids_arr+=("${GRDREGION}.${GRDRES}")
done
export WAVE_OUT_GRIDS="${grids_arr[*]}"
else
Expand Down
4 changes: 2 additions & 2 deletions jobs/JGLOBAL_WAVE_POST_SBS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ if [[ -n "${wavepostGRD}" || -n "${waveinterpGRD}" ]]; then
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}"
"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
Expand Down
2 changes: 1 addition & 1 deletion jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ if [[ -n "${GEMPAK_GRIDS}" ]]; then
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"
"COMIN_WAVE_GRID_${GRDREGION}_${GRDRES}:COM_WAVE_GRID_RES_TMPL"
done
else
echo "GEMPAK_GRIDS are empty. No grids to process."
Expand Down
8 changes: 4 additions & 4 deletions scripts/exgfs_wave_post_gridded_sbs.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ source "${USHgfs}/preamble.sh"
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" >> ${fcmdigrd}.${nigrd}
echo "${USHgfs}/wave_grib2_sbs.sh $grdID $GRIDNR $MODNR $ymdh $fhr $GRDREGION $GRDRES $gribFL > grib_$grdID.out 2>&1" >> ${fcmdigrd}.${nigrd}
fi
echo "${GRIBDATA}/${fcmdigrd}.${nigrd}" >> ${fcmdnow}
chmod 744 ${fcmdigrd}.${nigrd}
Expand All @@ -272,7 +272,7 @@ source "${USHgfs}/preamble.sh"
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}
echo "${USHgfs}/wave_grib2_sbs.sh $grdID $GRIDNR $MODNR $ymdh $fhr $GRDREGION $GRDRES $gribFL > grib_$grdID.out 2>&1" >> ${fcmdnow}
done
fi

Expand Down Expand Up @@ -347,10 +347,10 @@ source "${USHgfs}/preamble.sh"

# Check if grib2 file created
ENSTAG=""
com_varname="COMOUT_WAVE_GRID_${GRDNAME}_${GRDRES}"
com_varname="COMOUT_WAVE_GRID_${GRDREGION}_${GRDRES}"
com_dir=${!com_varname}
if [ ${waveMEMB} ]; then ENSTAG=".${membTAG}${waveMEMB}" ; fi
gribchk="${RUN}wave.${cycle}${ENSTAG}.${GRDNAME}.${GRDRES}.f${FH3}.grib2"
gribchk="${RUN}wave.${cycle}${ENSTAG}.${GRDREGION}.${GRDRES}.f${FH3}.grib2"
if [ ! -s ${com_dir}/${gribchk} ]; then
set +x
echo ' '
Expand Down
2 changes: 1 addition & 1 deletion scripts/exgfs_wave_prdgen_gridded.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ grids=${GEMPAK_GRIDS:-ak_10m at_10m ep_10m wc_10m glo_30m}
source "${USHgfs}/wave_domain_grid.sh"
process_grdID "${grdout}"
grdIDin=${grdNAME}
com_varname="${COMIN_WAVE_GRID}_${GRDNAME}_${GRDRES}"
com_varname="${COMIN_WAVE_GRID}_${GRDREGION}_${GRDRES}"
com_dir="${!com_varname}"

GRIBIN="${com_dir}/${RUNwave}.${cycle}.${grdIDin}.f${fhr}.grib2"
Expand Down
42 changes: 21 additions & 21 deletions ush/wave_domain_grid.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,31 +12,31 @@
process_grdID() {
grdID=$1
case ${grdID} in
glo_10m) GRDNAME='global' ; GRDRES=0p16 ; GRIDNR=255 ; MODNR=11 ;;
glo_15mxt) GRDNAME='global' ; GRDRES=0p25 ; GRIDNR=255 ; MODNR=11 ;;
glo_30mxt) GRDNAME='global' ; GRDRES=0p50 ; GRIDNR=255 ; MODNR=11 ;;
glo_30m) GRDNAME='global' ; GRDRES=0p50 ; 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 ;;
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 ;;
aoc_9km) GRDNAME='arctic' ; GRDRES=9km ; GRIDNR=255 ; MODNR=11 ;;
ant_9km) GRDNAME='antarc' ; GRDRES=9km ; GRIDNR=255 ; MODNR=11 ;;
gnh_10m) GRDNAME='global' ; GRDRES=0p16 ; GRIDNR=255 ; MODNR=11 ;;
gsh_15m) GRDNAME='gsouth' ; 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 ;;
reg025) GRDNAME='global' ; GRDRES=0p25 ; GRIDNR=255 ; MODNR=11 ;;
gwes_30m) GRDNAME='global' ; GRDRES=0p50 ; GRIDNR=255 ; MODNR=10 ;;
glo_10m) GRDREGION='global' ; GRDRES=0p16 ; GRIDNR=255 ; MODNR=11 ;;
glo_15mxt) GRDREGION='global' ; GRDRES=0p25 ; GRIDNR=255 ; MODNR=11 ;;
glo_30mxt) GRDREGION='global' ; GRDRES=0p50 ; GRIDNR=255 ; MODNR=11 ;;
glo_30m) GRDREGION='global' ; GRDRES=0p50 ; GRIDNR=255 ; MODNR=11 ;;
glo_025) GRDREGION='global' ; GRDRES=0p25 ; GRIDNR=255 ; MODNR=11 ;;
glo_100) GRDREGION='global' ; GRDRES=1p00 ; GRIDNR=255 ; MODNR=11 ;;
glo_200) GRDREGION='global' ; GRDRES=2p00 ; GRIDNR=255 ; MODNR=11 ;;
glo_500) GRDREGION='global' ; GRDRES=5p00 ; GRIDNR=255 ; MODNR=11 ;;
at_10m) GRDREGION='atlocn' ; GRDRES=0p16 ; GRIDNR=255 ; MODNR=11 ;;
ep_10m) GRDREGION='epacif' ; GRDRES=0p16 ; GRIDNR=255 ; MODNR=11 ;;
wc_10m) GRDREGION='wcoast' ; GRDRES=0p16 ; GRIDNR=255 ; MODNR=11 ;;
ak_10m) GRDREGION='alaska' ; GRDRES=0p16 ; GRIDNR=255 ; MODNR=11 ;;
aoc_9km) GRDREGION='arctic' ; GRDRES=9km ; GRIDNR=255 ; MODNR=11 ;;
ant_9km) GRDREGION='antarc' ; GRDRES=9km ; GRIDNR=255 ; MODNR=11 ;;
gnh_10m) GRDREGION='global' ; GRDRES=0p16 ; GRIDNR=255 ; MODNR=11 ;;
gsh_15m) GRDREGION='gsouth' ; GRDRES=0p25 ; GRIDNR=255 ; MODNR=11 ;;
ao_20m) GRDREGION='arctic' ; GRDRES=0p33 ; GRIDNR=255 ; MODNR=11 ;;
so_20m) GRDREGION='antarc' ; GRDRES=0p33 ; GRIDNR=255 ; MODNR=11 ;;
reg025) GRDREGION='global' ; GRDRES=0p25 ; GRIDNR=255 ; MODNR=11 ;;
gwes_30m) GRDREGION='global' ; GRDRES=0p50 ; GRIDNR=255 ; MODNR=10 ;;
*)
echo "FATAL ERROR: No grid specific wave config values exist for ${grdID}. Aborting."
exit 1 ;;
esac
grdNAME="${GRDNAME}.${GRDRES}"
grdNAME="${GRDREGION}.${GRDRES}"
echo "grdNAME=${grdNAME}"
echo "GRIDNR=${GRIDNR}"
echo "MODNR=${MODNR}"
Expand Down

0 comments on commit 3d9bfdc

Please sign in to comment.