Issue NOAA-EMC#94 Solving reviewers comments

RobertoPadilla-NOAA · Aug 24, 2020 · 7f9344f · 7f9344f
1 parent a1c456f
commit 7f9344f
Show file tree

Hide file tree

Showing 5 changed files with 99 additions and 209 deletions.
diff --git a/jobs/JGLOBAL_WAVE_GEMPAK b/jobs/JGLOBAL_WAVE_GEMPAK
@@ -1,102 +1,36 @@
 #!/bin/bash
-#
-# March-2020 RPadilla & JHAlves                                       +
-#           - For GEFSv12.0                                           +
-#                                                                     +
-######################################################################
+
+
+date
 set -xa
-# #### 08/25/1999 ###################
-# SET SHELL PROCESSING VARIABLES
-# ###################################
 export PS4='$SECONDS + ' 
-date
 # 
-#####################################
-# SET SOME VARIABLES
-export grids=${grids:-'glo_30m at_10m ep_10m wc_10m ao_9km'}
 export NET=${NET:-gfs}
 export RUN=${RUN:-gfs}
 export COMPONENT=${COMPONENT:-wave}
-export RUNwave=${RUNwave:-${RUN}${COMPONENT}}
-#export modID=${modID:-${RUN}${NET}}
-export fstart=${fstart:-0}
-export FHMAX_WAV=${FHMAX_WAV:-180}  #180 Total of hours to process
-export FHMAX_HF_WAV=${FHMAX_HF_WAV:-72}
-export FHOUT_WAV=${FHOUT_WAV:-6}
-export FHOUT_HF_WAV=${FHOUT_HF_WAV:-3}
-export maxtries=${maxtries:-720}
 export machine=${machine:-WCOSS_DELL_P3}
-export cycle=${cycle:-t${cyc}z} 
-export DBN_ALERT_TYPE=NFC_WAVEENS_GEMPAK
-export SENDCOM=${SENDCOM:-YES}
-export SENDDBN=${SENDDBN:-YES}
-export SENDECF=${SENDECF:-YES}
-
-#export COMINwave=${COMINwave:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}}
-#export COMOUTwave=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/gempak}
+export HOMEwave=${HOMEwave:-$(dirname $(dirname $0))} 
+###################################
+# 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}
-
-if [ ! -f $COMOUT ] ; then
-  mkdir -p -m 775 $COMOUT
-fi
-#
-export pid=$$
-export DATA=${DATA:-${DATAROOT:?}/${jobid}}
-if [ ! -d $DATA ];then
-  mkdir -p $DATA
-fi
-cd $DATA
-
-####################################
-# Determine Job Output Name on System
-####################################
+#export pid=$$
 export pgmout="OUTPUT.$$"
+##export MP_PULSE=0
+####export sigMODE=post # Only post-processing done here, but may need to be revised by NCO
 
-####################################
-# Determine Job Output Name on System
-####################################
-export pgmout="OUTPUT.$$"
-export MP_PULSE=0
-export sigMODE=post # Only post-processing done here, but may need to be revised by NCO
-
-####################################
-# Path to HOME Directory
-####################################
-
-export HOMEwave=${HOMEwave:-$(dirname $(dirname $0))} # parent directory of current job card
-export GEMwave=${GEMwave:-$HOMEwave/gempak}
-export FIXwave=${FIXwave:-HOMEwave/fix}
-
-####################################
-# load modules
-####################################
- module use ${HOMEwave}/modulefiles
- module load runtime_gfswave_gempak.wcoss_dell_p3
-
-# Run setpdy and initialize PDY variables
-sh setpdy.sh
-. PDY
-
-#
-
-#######################
-# Copy job specific GEMPAK table for FNMOC grib2 files
-#######################
-#cp ${GEMwave}/fix/g2varswmo5.tbl .
-#cp ${GEMwave}/fix/g2vcrdwmo5.tbl .
-#cp ${GEMwave}/fix/g2varswmo2.tbl .
-#cp ${GEMwave}/fix/g2vcrdwmo2.tbl .
-
-env
+module use ${HOMEwave}/modulefiles
+module load runtime_gfswave_gempak.wcoss_dell_p3
+export DBN_ALERT_TYPE=NFC_WAVEENS_GEMPAK
+export SENDCOM=${SENDCOM:-YES}
+export SENDDBN=${SENDDBN:-YES}
 
 ########################################################
 # Execute the script.
-/${HOMEwave}/scripts/exwave_nawips.sh.ecf
-########################################################
-
-cat $pgmout
+/${HOMEwave}/scripts/exgfs_wave_nawips.sh.ecf
 
+###################################
+# Remove temp directories
 if [ "$KEEPDATA" != "YES" ]; then
   cd $DATAROOT
   rm -rf $DATA

diff --git a/jobs/JGLOBAL_WAVE_PRDGEN_BULLS b/jobs/JGLOBAL_WAVE_PRDGEN_BULLS
@@ -4,47 +4,16 @@ date
 export PS4=' $SECONDS + '
 set -xa
 
-# PATH for working directory
 export NET=${NET:-gfs}
 export RUN=${RUN:-gfs}
 export COMPONENT=${COMPONENT:-wave}
-export RUNwave=${RUNwave:-${RUN}${COMPONENT}}
-export envir=${envir:-ops}
 export HOMEwave=${HOMEwave:-$(dirname $(dirname $0))} # parent directory of current job card
-export DATA=${DATA:-${DATAROOT:?}/${job}.$$}
-mkdir -p $DATA
-cd $DATA
-
-cyc=${cyc:-00}
-export cycle=${cycle:-t${cyc}z}
-export pgmout=OUTPUT.$$
-#export modID=${RUN}${NET}
-
-####################################
-# Path to HOME Directory
-####################################
-export CODEwave=${CODEwave:-${NWROOT}/${NET}_code.${wave_code_ver}/${code_pkg}}
-export EXECwave=${EXECwave:-HOMEwave/exec}
-export FIXwave=${FIXwave:-HOMEwave/fix}
-export PARMwave=${PARMwave:-HOMEwave/parm}
-export USHwave=${USHwave:-HOMEwave/ush}
-export EXECcode=${EXECcode:-CODEwave/exec}
-
-# Set PDY
-setpdy.sh
-. PDY
-
-####################################
-# load modules
-####################################
+#
 module use ${HOMEwave}/modulefiles
 module load modulefile_gfswave_prdgen.wcoss_dell_p3
 
 ###################################
-# Set COM Paths and GETGES environment
-###################################
-#export COMINwave=${COMINwave:-${COMROOT:?}/${COMPONENT}/${envir}}
-#export COMOUTwave=${COMOUTwave:-${COMROOT:?}/${COMPONENT}/${envir}}
+# 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 PCOM=${PCOM:-${COMOUT}/wmo}
@@ -55,19 +24,13 @@ if [ $SENDCOM = YES ]; then
   mkdir -p $COMOUT $PCOM
 fi
 
-export wavelog=${COMOUTwave}/${COMPONENTwave}_prdgbulls.log
-
-env
-
 ###################################
 # Execute the Script  
-###################################
 
-$HOMEwave/scripts/exwave_prdgen_bulls.sh.ecf
+$HOMEwave/scripts/exgfs_wave_prdgen_bulls.sh.ecf
 
 ###################################
 # Remove temp directories
-###################################
 
 if [ "$KEEPDATA" != "YES" ]; then
   cd $DATAROOT

diff --git a/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED b/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED
@@ -8,75 +8,31 @@ set -xa
 export NET=${NET:-gfs}
 export RUN=${RUN:-gfs}
 export COMPONENT=${COMPONENT:-wave}
-export RUNwave=${RUNwave:-${RUN}${COMPONENT}}
-export envir=${envir:-ops}
-export fstart=${fstart:-0}
-export FHMAX_WAV=${FHMAX_WAV:-180}       #180 Total of hours to process
-export FHMAX_HF_WAV=${FHMAX_HF_WAV:-72}  #from 00 to  72 inc=3
-export FHOUT_WAV=${FHOUT_WAV:-6}         #from 72 to 180 inc=6
-export FHOUT_HF_WAV=${FHOUT_HF_WAV:-3}
-export maxtries=720
-
-
 export HOMEwave=${HOMEwave:-$(dirname $(dirname $0))} # parent directory of current job card
-export DATA=${DATA:-${DATAROOT:?}/${job}.$$}
-mkdir -p $DATA
-cd $DATA
-
-cyc=${cyc:-00}
-export cycle=${cycle:-t${cyc}z}
-export pgmout=OUTPUT.$$
-#export modID=${RUN}${NET}
-export modID=${modID:-${NET}${COMPONENT}}
-
-####################################
-# Path to HOME Directory
-####################################
-
-export CODEwave=${CODEwave:-${NWROOT}/${COMPONENT}_code.${wave_code_ver}/${code_pkg}}
-
-export EXECwave=${EXECwave:-HOMEwave/exec}
-export FIXwave=${FIXwave:-HOMEwave/fix}
-export PARMwave=${PARMwave:-HOMEwave/parm}
-export USHwave=${USHwave:-HOMEwave/ush}
-export EXECcode=${EXECcode:-CODEwave/exec}
 
-# Set PDY
-setpdy.sh
-. PDY
-####################################
-# load modules
-####################################
 module use ${HOMEwave}/modulefiles
 module load modulefile_gfswave_prdgen.wcoss_dell_p3
 
 ###################################
-# Set COM Paths and GETGES environment
+# Set COM Paths
 ###################################
-#export COMINwave=${COMINwave:-${COMROOT:?}/${COMPONENT}/${envir}}
-#export COMOUTwave=${COMOUTwave:-${COMROOT:?}/${COMPONENT}/${envir}}
 export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/$COMPONENT}
 export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/${cyc}/$COMPONENT/gempak}
 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 wavelog=${COMOUTwave}/wave.log
-
-env
-
 ###################################
 # Execute the Script  
 ###################################
-
-$HOMEwave/scripts/exwave_prdgen_gridded.sh.ecf
+$HOMEwave/scripts/exgfswave_prdgen_gridded.native.sh.ecf
 
 ###################################
 # Remove temp directories
 ###################################
-
 if [ "$KEEPDATA" != "YES" ]; then
   cd $DATAROOT
   rm -rf $DATA

diff --git a/scripts/exgfs_wave_prdgen_bulls.sh.ecf b/scripts/exgfs_wave_prdgen_bulls.sh.ecf
@@ -1,50 +1,67 @@
 #!/bin/bash
 ###############################################################################
 #                                                                             #
-# This script is the product generator ("graphics job")  for the multi-grid   #
-# MWW3 wave model.                                                            #
+# This script is the product generator ("graphics job")  for the              #
+#  WW3 wave model.                                                            #
 #                                                                             #
 # Remarks :                                                                   #
 # - Supplemental error output is witten to the gfswave_prdgbulls.log file.    #
 #                                                                             #
 #                                                                             #
 # Origination  : 05/02/2007                                                   #
-# Last update  : 05/04/2007                                                   # 
+# Last update  : 08/20/2020                                                   # 
 #                                                                             #
-# May 2020 RPadilla JHAlves - Merging wave scripts to GFSv16 global workflow  #
+# Aug/2020 RPadilla JHAlves - Merging wave scripts to GFSv16 global workflow  #
 #                                                                             #
 ###############################################################################
 # --------------------------------------------------------------------------- #
 # 0.  Preparations
 # 0.a Basic modes of operation
-  set -xa
-  # Use LOUD variable to turn on/off trace.  Defaults to YES (on).
-  export LOUD=${LOUD:-YES}; [[ $LOUD = yes ]] && export LOUD=YES
-  [[ "$LOUD" != YES ]] && set +x
+ set -xa
+ # Use LOUD variable to turn on/off trace.  Defaults to YES (on).
+ export LOUD=${LOUD:-YES}; [[ $LOUD = yes ]] && export LOUD=YES
+ [[ "$LOUD" != YES ]] && set +x
 
-  cd $DATA
-
-  postmsg "$jlogfile" "HAS BEGUN on `hostname`"
+# PATH for working and home directories
+ export RUNwave=${RUNwave:-${RUN}${COMPONENT}}
+ export envir=${envir:-ops}
+ export cyc=${cyc:-00}
+ export cycle=${cycle:-t${cyc}z}
+ export pgmout=OUTPUT.$$
+ export DATA=${DATA:-${DATAROOT:?}/${job}.$$}
+ #export CODEwave=${CODEwave:-${NWROOT}/${NET}_code.${wave_code_ver}/${code_pkg}}
+ export EXECwave=${EXECwave:-HOMEwave/exec}
+ export FIXwave=${FIXwave:-HOMEwave/fix}
+ export PARMwave=${PARMwave:-HOMEwave/parm}
+ export USHwave=${USHwave:-HOMEwave/ush}
+ #export EXECcode=${EXECcode:-CODEwave/exec}
+# Set PDY
+ setpdy.sh
+ . PDY
+ mkdir -p $DATA
+ cd $DATA
+ export wavelog=${DATA}/${RUNwave}_prdgbulls.log
+ env
+
+ postmsg "$jlogfile" "HAS BEGUN on `hostname`"
 
-  msg="Starting MWW3 BULLETINS PRODUCTS SCRIPT"
-  postmsg "$jlogfile" "$msg"
-  touch $wavelog
+ msg="Starting MWW3 BULLETINS PRODUCTS SCRIPT"
+ postmsg "$jlogfile" "$msg"
+ touch $wavelog
 # 0.b Date and time stuff
-
-  export date=$PDY
-  export YMDH=${PDY}${cyc}
-
-  set +x
-  echo ' '
-  echo '                  **************************************'
-  echo '                  *** MWW3 BULLETINS PRODUCTS SCRIPT ***'
-  echo '                  **************************************'
-  echo "                                         $date $cycle"
-  echo ' '
-  echo "Starting at : `date`"
-  echo ' '
-  echo ' '
-  [[ "$LOUD" = YES ]] && set -x
+ export date=$PDY
+ export YMDH=${PDY}${cyc}
+ set +x
+ echo ' '
+ echo '                  **************************************'
+ echo '                  *** MWW3 BULLETINS PRODUCTS SCRIPT ***'
+ echo '                  **************************************'
+ echo "                                         $date $cycle"
+ echo ' '
+ echo "Starting at : `date`"
+ echo ' '
+ echo ' '
+ [[ "$LOUD" = YES ]] && set -x
 
 # 1.  Get necessary files
  set +x