Skip to content

Commit

Permalink
Merge pull request #141 from RobertoPadilla-NOAA/feature/gfsv16_wave_…
Browse files Browse the repository at this point in the history
…prdgen

Updates to downstream wave jobs
  • Loading branch information
KateFriedman-NOAA committed Oct 2, 2020
2 parents 897286f + d5457ec commit 340f849
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 6 deletions.
5 changes: 4 additions & 1 deletion jobs/JGLOBAL_WAVE_GEMPAK
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export SENDCOM=${SENDCOM:-YES}
export SENDDBN=${SENDDBN:-YES}
export DBNROOT=${DBNROOT:-${UTILROOT}/fakedbn}


export DATA=${DATA:-${DATAROOT}/${jobid:?}}
mkdir -p $DATA
cd $DATA
Expand All @@ -45,7 +46,8 @@ postmsg "$jlogfile" "$msg"
########################################################
# Execute the script.
${HOMEgfs}/scripts/exgfs_wave_nawips.sh

status=$?
[[ $status -ne 0 ]] && exit $status
###################################
# Remove temp directories
if [ "$KEEPDATA" != "YES" ]; then
Expand All @@ -54,3 +56,4 @@ if [ "$KEEPDATA" != "YES" ]; then
fi

date
exit 0
6 changes: 5 additions & 1 deletion jobs/JGLOBAL_WAVE_PRDGEN_BULLS
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,13 @@ export HOMEgfs=${HOMEgfs:-$(dirname $(dirname $0))} # parent directory of curren
export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/$COMPONENT}
export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/$COMPONENT}
export PCOM=${PCOM:-${COMOUT}/wmo}

export SENDCOM=${SENDCOM:-YES}
export SENDDBN_NTC=${SENDDBN_NTC:-YES}
export SENDDBN=${SENDDBN:-NO}
export DBNROOT=${DBNROOT:-${UTILROOT}/fakedbn}


if [ $SENDCOM = YES ]; then
mkdir -p $COMOUT $PCOM
fi
Expand All @@ -41,7 +43,8 @@ env
# Execute the Script

$HOMEgfs/scripts/exgfs_wave_prdgen_bulls.sh

status=$?
[[ $status -ne 0 ]] && exit $status
###################################
# Remove temp directories

Expand All @@ -50,4 +53,5 @@ if [ "$KEEPDATA" != "YES" ]; then
rm -rf $DATA
fi
date
exit 0

7 changes: 6 additions & 1 deletion jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,14 @@ export HOMEgfs=${HOMEgfs:-$(dirname $(dirname $0))} # parent directory of curren
export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/$COMPONENT}
export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/$COMPONENT}
export PCOM=${PCOM:-${COMOUT}/wmo}


export SENDCOM=${SENDCOM:-YES}
export SENDDBN_NTC=${SENDDBN_NTC:-YES}
export SENDDBN=${SENDDBN:-NO}
export DBNROOT=${DBNROOT:-${UTILROOT}/fakedbn}


if [ $SENDCOM = YES ]; then
mkdir -p $COMOUT $PCOM
fi
Expand All @@ -43,7 +46,8 @@ export cycle=${cycle:-t${cyc}z}
# Execute the Script
###################################
$HOMEgfs/scripts/exgfs_wave_prdgen_gridded.sh

status=$?
[[ $status -ne 0 ]] && exit $status
###################################
# Remove temp directories
###################################
Expand All @@ -52,4 +56,5 @@ if [ "$KEEPDATA" != "YES" ]; then
rm -rf $DATA
fi
date
exit 0

8 changes: 6 additions & 2 deletions scripts/exgfs_wave_nawips.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ echo " March 2020- Modified for GEFSv12.0"

set -xa

export grids=${grids:-'glo_30m at_10m ep_10m wc_10m ao_9km'} #Interpolated grids
#export grids=${grids:-'glo_10m gso_15m ao_9km'} #Native grids
#export grids=${grids:-'glo_30m at_10m ep_10m wc_10m ao_9km'} #Interpolated grids
export grids=${grids:-'glo_10m gso_15m ao_9km'} #Native grids
export RUNwave=${RUNwave:-${RUN}${COMPONENT}}
export fstart=${fstart:-0}
export FHMAX_WAV=${FHMAX_WAV:-180} #180 Total of hours to process
Expand Down Expand Up @@ -60,6 +60,10 @@ while [ $fhcnt -le $FHMAX_WAV ]; do
grdIDout='gfswavewc10m' ;;
glo_30m) grdIDin='global.0p25'
grdIDout='gfswavegl30m' ;;
glo_10m) grdIDin='global.0p16'
grdIDout='gfswaveg16k' ;;
gso_15m) grdIDin='gsouth.0p25'
grdIDout='gfswaves25k' ;;
*) gridIDin=
grdIDout= ;;
esac
Expand Down
2 changes: 1 addition & 1 deletion scripts/exgfs_wave_prdgen_gridded.sh
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@
#set +x
fi

if [ "$SENDDBN_NTC" = 'YES' ]
if [ "$SENDDBN" = 'YES' ]
then
echo " Sending $AWIPSGRB.$grdID.f${fhr} to DBRUN."
$DBNROOT/bin/dbn_alert GRIB_LOW $RUN $job $PCOM/grib2.$cycle.f${fhr}.awipsww3_${grdOut}
Expand Down

0 comments on commit 340f849

Please sign in to comment.