Merge pull request #122 from KateFriedman-NOAA/feature/gfsv16b_wavedown

Add downstream wave jobs to GFSv16

jobs/JGLOBAL_WAVE_GEMPAK

@@ -10,6 +10,7 @@ export RUN=${RUN:-gfs}
 export COMPONENT=${COMPONENT:-wave}
 export machine=${machine:-WCOSS_DELL_P3}
 export HOMEgfs=${HOMEgfs:-$(dirname $(dirname $0))} 
+
 ###################################
 # Set COM Paths
 export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/$COMPONENT}
@@ -20,16 +21,29 @@ export pgmout="OUTPUT.$$"
 export DBN_ALERT_TYPE=NFC_WAVEENS_GEMPAK
 export SENDCOM=${SENDCOM:-YES}
 export SENDDBN=${SENDDBN:-YES}
-# Set PDY
-sh setpdy.sh
+
+export DATA=${DATA:-${DATAROOT}/${jobid:?}}
+mkdir -p $DATA
+cd $DATA
+
+if [ $SENDCOM = YES ] ; then
+  mkdir -m 775 -p $COMOUT
+fi
+
+######################################
+# Set up the cycle variable
+######################################
+export cycle=${cycle:-t${cyc}z}
+
+setpdy.sh
 . PDY
 env
 msg="Begin job for $job"
 postmsg "$jlogfile" "$msg"
 
 ########################################################
 # Execute the script.
-/${HOMEgfs}/scripts/exgfs_wave_nawips.sh
+${HOMEgfs}/scripts/exgfs_wave_nawips.sh
 
 ###################################
 # Remove temp directories

jobs/JGLOBAL_WAVE_PRDGEN_BULLS

@@ -12,14 +12,24 @@ export HOMEgfs=${HOMEgfs:-$(dirname $(dirname $0))} # parent directory of curren
 ###################################
 # Set COM Paths
 export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/$COMPONENT}
-export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/$COMPONENT/gempak}
+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}
 
 if [ $SENDCOM = YES ]; then
   mkdir -p $COMOUT $PCOM
 fi
+
+export DATA=${DATA:-${DATAROOT}/${jobid:?}}
+mkdir -p $DATA
+cd $DATA
+
+######################################
+# Set up the cycle variable
+######################################
+export cycle=${cycle:-t${cyc}z}
+
 # Set PDY
  setpdy.sh
  . PDY

jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED

@@ -14,14 +14,23 @@ export HOMEgfs=${HOMEgfs:-$(dirname $(dirname $0))} # parent directory of curren
 # Set COM Paths
 ###################################
 export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/$COMPONENT}
-export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/$COMPONENT/gempak}
+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}
 if [ $SENDCOM = YES ]; then
   mkdir -p $COMOUT $PCOM
 fi
 
+export DATA=${DATA:-${DATAROOT}/${jobid:?}}
+mkdir -p $DATA
+cd $DATA
+
+######################################
+# Set up the cycle variable
+######################################
+export cycle=${cycle:-t${cyc}z}
+
 # Set PDY
  setpdy.sh
  . PDY
@@ -30,7 +39,7 @@ fi
 ###################################
 # Execute the Script  
 ###################################
-$HOMEgfs/scripts/exgfswave_prdgen_gridded.native.sh
+$HOMEgfs/scripts/exgfs_wave_prdgen_gridded.sh
 
 ###################################
 # Remove temp directories

jobs/rocoto/waveawipsbulls.sh

@@ -0,0 +1,42 @@
+#!/bin/ksh -x
+
+###############################################################
+echo
+echo "=============== START TO SOURCE FV3GFS WORKFLOW MODULES ==============="
+. $HOMEgfs/ush/load_fv3gfs_modules.sh
+status=$?
+[[ $status -ne 0 ]] && exit $status
+
+# Load job specific modulefile
+module use -a $HOMEgfs/modulefiles
+module load modulefile_gfswave_prdgen.wcoss_dell_p3
+status=$?
+[[ $status -ne 0 ]] && exit $status
+
+###############################################################
+echo
+echo "=============== BEGIN TO SOURCE RELEVANT CONFIGS ==============="
+configs="base waveawipsbulls"
+for config in $configs; do
+    . $EXPDIR/config.${config}
+    status=$?
+    [[ $status -ne 0 ]] && exit $status
+done
+
+###############################################################
+echo
+echo "=============== BEGIN TO SOURCE MACHINE RUNTIME ENVIRONMENT ==============="
+. $BASE_ENV/${machine}.env waveawipsbulls
+status=$?
+[[ $status -ne 0 ]] && exit $status
+
+export DBNROOT=/dev/null
+
+###############################################################
+echo
+echo "=============== START TO RUN WAVE PRDGEN BULLS ==============="
+# Execute the JJOB
+$HOMEgfs/jobs/JGLOBAL_WAVE_PRDGEN_BULLS
+status=$?
+exit $status
+

jobs/rocoto/waveawipsgridded.sh

@@ -0,0 +1,41 @@
+#!/bin/ksh -x
+
+###############################################################
+echo
+echo "=============== START TO SOURCE FV3GFS WORKFLOW MODULES ==============="
+. $HOMEgfs/ush/load_fv3gfs_modules.sh
+status=$?
+[[ $status -ne 0 ]] && exit $status
+
+# Load job specific modulefile
+module use -a $HOMEgfs/modulefiles
+module load modulefile_gfswave_prdgen.wcoss_dell_p3
+status=$?
+[[ $status -ne 0 ]] && exit $status
+
+###############################################################
+echo
+echo "=============== BEGIN TO SOURCE RELEVANT CONFIGS ==============="
+configs="base waveawipsgridded"
+for config in $configs; do
+    . $EXPDIR/config.${config}
+    status=$?
+    [[ $status -ne 0 ]] && exit $status
+done
+
+###############################################################
+echo
+echo "=============== BEGIN TO SOURCE MACHINE RUNTIME ENVIRONMENT ==============="
+. $BASE_ENV/${machine}.env waveawipsgridded
+status=$?
+[[ $status -ne 0 ]] && exit $status
+
+export DBNROOT=/dev/null
+
+###############################################################
+echo
+echo "=============== START TO RUN WAVE PRDGEN GRIDDED ==============="
+# Execute the JJOB
+$HOMEgfs/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED
+status=$?
+exit $status

jobs/rocoto/wavegempak.sh

@@ -0,0 +1,39 @@
+#!/bin/ksh -x
+
+###############################################################
+echo
+echo "=============== START TO SOURCE FV3GFS WORKFLOW MODULES ==============="
+. $HOMEgfs/ush/load_fv3gfs_modules.sh
+status=$?
+[[ $status -ne 0 ]] && exit $status
+
+# Load job specific modulefile
+module use -a $HOMEgfs/modulefiles
+module load modulefile_gfswave_gempak.wcoss_dell_p3
+status=$?
+[[ $status -ne 0 ]] && exit $status
+
+###############################################################
+echo
+echo "=============== BEGIN TO SOURCE RELEVANT CONFIGS ==============="
+configs="base wavegempak"
+for config in $configs; do
+    . $EXPDIR/config.${config}
+    status=$?
+    [[ $status -ne 0 ]] && exit $status
+done
+
+###############################################################
+echo
+echo "=============== BEGIN TO SOURCE MACHINE RUNTIME ENVIRONMENT ==============="
+. $BASE_ENV/${machine}.env wavegempak
+status=$?
+[[ $status -ne 0 ]] && exit $status
+
+###############################################################
+echo
+echo "=============== START TO RUN WAVE GEMPAK ==============="
+# Execute the JJOB
+$HOMEgfs/jobs/JGLOBAL_WAVE_GEMPAK
+status=$?
+exit $status

parm/config/config.resources

@@ -10,8 +10,8 @@ if [ $# -ne 1 ]; then
     echo "argument can be any one of the following:"
     echo "anal analcalc analdiag gldas fcst post vrfy metp arch echgres"
     echo "eobs ediag eomg eupd ecen esfc efcs epos earc"
-    echo "waveinit waveprep wavepostsbs wavegempaksbs waveawipssbs"
-    echo "wavepost waveawips wavestat"
+    echo "waveinit waveprep wavepostsbs"
+    echo "wavegempak waveawipsbulls waveawipsgridded"
     echo "postsnd awips gempak"
     echo "wafs wafsgrib2 wafsblending wafsgrib20p25 wafsblending0p25 wafsgcip"
     exit 1
@@ -66,45 +66,29 @@ elif [ $step = "wavepostsbs" ]; then
     export npe_node_wavepostsbs=$(echo "$npe_node_max / $nth_wavepostsbs" | bc)
     export NTASKS=${npe_wavepostsbs}
 
-elif [ $step = "wavegempaksbs" ]; then
+elif [ $step = "wavegempak" ]; then
 
-    export wtime_wavegempaksbs="06:00:00"
-    export npe_wavegempaksbs=$npe_node_max
-    export nth_wavegempaksbs=1
-    export npe_node_wavegempaksbs=$(echo "$npe_node_max / $nth_wavegempaksbs" | bc)
-    export NTASKS=${npe_wavegempaksbs}
+    export wtime_wavegempak="01:00:00"
+    export npe_wavegempak=$npe_node_max
+    export nth_wavegempak=1
+    export npe_node_wavegempak=$(echo "$npe_node_max / $nth_wavegempak" | bc)
+    export NTASKS=${npe_wavegempak}
 
-elif [ $step = "waveawipssbs" ]; then
+elif [ $step = "waveawipsbulls" ]; then
 
-    export wtime_waveawipssbs="08:00:00"
-    export npe_waveawipssbs=$npe_node_max
-    export nth_waveawipssbs=1
-    export npe_node_waveawipssbs=$(echo "$npe_node_max / $nth_waveawipssbs" | bc)
-    export NTASKS=${npe_waveawipssbs}
+    export wtime_waveawipsbulls="00:30:00"
+    export npe_waveawipsbulls=$npe_node_max
+    export nth_waveawipsbulls=1
+    export npe_node_waveawipsbulls=$(echo "$npe_node_max / $nth_waveawipsbulls" | bc)
+    export NTASKS=${npe_waveawipsbulls}
 
-elif [ $step = "wavepost" ]; then
+elif [ $step = "waveawipsgridded" ]; then
 
-    export wtime_wavepost="01:00:00"
-    export npe_wavepost=560
-    export nth_wavepost=1
-    export npe_node_wavepost=$(echo "$npe_node_max / $nth_wavepost" | bc)
-    export NTASKS=${npe_wavepost}
-
-elif [ $step = "waveawips" ]; then
-
-    export wtime_waveawips="06:00:00"
-    export npe_waveawips=$npe_node_max
-    export nth_waveawips=1
-    export npe_node_waveawips=$(echo "$npe_node_max / $nth_waveawips" | bc)
-    export NTASKS=${npe_waveawips}
-
-elif [ $step = "wavestat" ]; then
-
-    export wtime_wavestat="01:00:00"
-    export npe_wavestat=$npe_node_max
-    export nth_wavestat=1
-    export npe_node_wavestat=$(echo "$npe_node_max / $nth_wavestat" | bc)
-    export NTASKS=${npe_wavestats}
+    export wtime_waveawipsgridded="00:30:00"
+    export npe_waveawipsgridded=$npe_node_max
+    export nth_waveawipsgridded=1
+    export npe_node_waveawipsgridded=$(echo "$npe_node_max / $nth_waveawipsgridded" | bc)
+    export NTASKS=${npe_waveawipsgridded}
 
 elif [ $step = "anal" ]; then
 
@@ -128,7 +112,6 @@ elif [ $step = "analcalc" ]; then
     export nth_analcalc=1
     export npe_node_analcalc=$npe_node_max
     if [[ "$machine" = "WCOSS_DELL_P3" ]]; then export npe_analcalc=127 ; fi
-    if [[ "$machine" == "WCOSS_C" ]]; then export memory_analcalc="3072M"; fi
 
 elif [ $step = "analdiag" ]; then
 

parm/config/config.waveawipsbulls

@@ -0,0 +1,17 @@
+#!/bin/ksh -x
+
+########## config.waveawipsbulls ##########
+# Wave steps specific
+
+echo "BEGIN: config.waveawipsbulls"
+
+# Get task specific resources
+. $EXPDIR/config.resources waveawipsbulls
+
+export DBNROOT=/dev/null
+export SENDCOM="YES"
+export COMPONENT=${COMPONENT:-wave}
+export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
+export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
+
+echo "END: config.waveawipsbulls"

parm/config/config.waveawipsgridded

@@ -0,0 +1,17 @@
+#!/bin/ksh -x
+
+########## config.waveawipsgridded ##########
+# Wave steps specific
+
+echo "BEGIN: config.waveawipsgridded"
+
+# Get task specific resources
+. $EXPDIR/config.resources waveawipsgridded
+
+export DBNROOT=/dev/null
+export SENDCOM="YES"
+export COMPONENT=${COMPONENT:-wave}
+export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
+export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
+
+echo "END: config.waveawipsgridded"

parm/config/config.wavegempak

@@ -0,0 +1,16 @@
+#!/bin/ksh -x
+
+########## config.wavegempak ##########
+# Wave steps specific
+
+echo "BEGIN: config.wavegempak"
+
+# Get task specific resources
+. $EXPDIR/config.resources wavegempak
+
+export SENDCOM="YES"
+export COMPONENT=${COMPONENT:-wave}
+export COMIN="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT"
+export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc/$COMPONENT/gempak"
+
+echo "END: config.wavegempak"