Issue NOAA-EMC#94 removing the load of modulefiles and sending set.pd…

…y to j-jobs
RobertoPadilla-NOAA · Aug 24, 2020 · 8a68d3c · 8a68d3c
1 parent 96655fb
commit 8a68d3c
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 49 deletions.
diff --git a/jobs/JGLOBAL_WAVE_GEMPAK b/jobs/JGLOBAL_WAVE_GEMPAK
@@ -9,7 +9,7 @@ export NET=${NET:-gfs}
 export RUN=${RUN:-gfs}
 export COMPONENT=${COMPONENT:-wave}
 export machine=${machine:-WCOSS_DELL_P3}
-export HOMEwave=${HOMEwave:-$(dirname $(dirname $0))} 
+export HOMEgfs=${HOMEgfs:-$(dirname $(dirname $0))} 
 ###################################
 # Set COM Paths
 export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/$COMPONENT}
@@ -20,10 +20,16 @@ export pgmout="OUTPUT.$$"
 export DBN_ALERT_TYPE=NFC_WAVEENS_GEMPAK
 export SENDCOM=${SENDCOM:-YES}
 export SENDDBN=${SENDDBN:-YES}
+# Set PDY
+sh setpdy.sh
+. PDY
+env
+msg="Begin job for $job"
+postmsg "$jlogfile" "$msg"
 
 ########################################################
 # Execute the script.
-/${HOMEwave}/scripts/exgfs_wave_nawips.sh.ecf
+/${HOMEgfs}/scripts/exgfs_wave_nawips.sh.ecf
 
 ###################################
 # Remove temp directories

diff --git a/jobs/JGLOBAL_WAVE_PRDGEN_BULLS b/jobs/JGLOBAL_WAVE_PRDGEN_BULLS
@@ -7,7 +7,7 @@ set -xa
 export NET=${NET:-gfs}
 export RUN=${RUN:-gfs}
 export COMPONENT=${COMPONENT:-wave}
-export HOMEwave=${HOMEwave:-$(dirname $(dirname $0))} # parent directory of current job card
+export HOMEgfs=${HOMEgfs:-$(dirname $(dirname $0))} # parent directory of current job card
 
 ###################################
 # Set COM Paths
@@ -20,11 +20,15 @@ export SENDDBN_NTC=${SENDDBN_NTC:-YES}
 if [ $SENDCOM = YES ]; then
   mkdir -p $COMOUT $PCOM
 fi
+# Set PDY
+ setpdy.sh
+ . PDY
+env
 
 ###################################
 # Execute the Script  
 
-$HOMEwave/scripts/exgfs_wave_prdgen_bulls.sh.ecf
+$HOMEgfs/scripts/exgfs_wave_prdgen_bulls.sh.ecf
 
 ###################################
 # Remove temp directories

diff --git a/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED b/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED
@@ -8,7 +8,7 @@ set -xa
 export NET=${NET:-gfs}
 export RUN=${RUN:-gfs}
 export COMPONENT=${COMPONENT:-wave}
-export HOMEwave=${HOMEwave:-$(dirname $(dirname $0))} # parent directory of current job card
+export HOMEgfs=${HOMEgfs:-$(dirname $(dirname $0))} # parent directory of current job card
 
 ###################################
 # Set COM Paths
@@ -22,10 +22,15 @@ if [ $SENDCOM = YES ]; then
   mkdir -p $COMOUT $PCOM
 fi
 
+# Set PDY
+ setpdy.sh
+ . PDY
+ env
+
 ###################################
 # Execute the Script  
 ###################################
-$HOMEwave/scripts/exgfswave_prdgen_gridded.native.sh.ecf
+$HOMEgfs/scripts/exgfswave_prdgen_gridded.native.sh.ecf
 
 ###################################
 # Remove temp directories

diff --git a/scripts/exgfs_wave_nawips.sh.ecf b/scripts/exgfs_wave_nawips.sh.ecf
@@ -11,7 +11,7 @@ echo " March 2020- Modified for GEFSv12.0"
 #####################################################################
 
 set -xa
-#--------------------------
+
 #export grids=${grids:-'glo_30m at_10m ep_10m wc_10m ao_9km'}
 export grids=${grids:-'glo_10m gso_15m ao_9km'}
 export RUNwave=${RUNwave:-${RUN}${COMPONENT}}
@@ -22,20 +22,14 @@ export FHOUT_WAV=${FHOUT_WAV:-6}
 export FHOUT_HF_WAV=${FHOUT_HF_WAV:-3}
 export maxtries=${maxtries:-720}
 export cycle=${cycle:-t${cyc}z}
-export GEMwave=${GEMwave:-$HOMEwave/gempak}
-export FIXwave=${FIXwave:-HOMEwave/fix}
+export GEMwave=${GEMwave:-$HOMEgfs/gempak}
+export FIXwave=${FIXwave:-HOMEgfs/fix}
 export DATA=${DATA:-${DATAROOT:?}/${jobid}}
 if [ ! -d $DATA ];then
   mkdir -p $DATA
 fi
-#--------------------------
+
 cd $DATA
-# Set PDY
-sh setpdy.sh
-. PDY
-env
-msg="Begin job for $job"
-postmsg "$jlogfile" "$msg"
 
 cpyfil=gds
 garea=dset

diff --git a/scripts/exgfs_wave_prdgen_bulls.sh.ecf b/scripts/exgfs_wave_prdgen_bulls.sh.ecf
@@ -11,7 +11,7 @@
 # Origination  : 05/02/2007                                                   #
 # Last update  : 08/20/2020                                                   # 
 #                                                                             #
-# Aug/2020 RPadilla JHAlves - Merging wave scripts to GFSv16 global workflow  #
+# Aug/2020 RPadilla & JHAlves - Merging wave scripts to GFSv16 global workflow#
 #                                                                             #
 ###############################################################################
 # --------------------------------------------------------------------------- #
@@ -30,18 +30,15 @@
  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 EXECwave=${EXECwave:-HOMEgfs/exec}
+ export FIXwave=${FIXwave:-HOMEgfs/fix}
+ export PARMwave=${PARMwave:-HOMEgfs/parm}
+ export USHwave=${USHwave:-HOMEgfs/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`"
 
@@ -208,24 +205,9 @@
      err=5;export err;err_chk
      exit $err
    fi
-# ======================================================================
-# TEMPORAL FIXING  -didn't work really- 
-
-   #if [ -f tempo ]; then
-   #  rm tempo*
-   #fi
-   #tr -d '\n' < $oname > tempo
-   #rm $oname
-#
-   #sed 's/<<@/\n/g' tempo > tempo2
-   #sed '/<<%/,+1d' < tempo2 > tempo3
-   #sed  "s/'100000 PERL FORMBUL VERSION 20001206.50//g" < tempo3 >$oname 
-#========================================================================
 
    cat $oname >> awipsbull.$cycle.${RUNwave}
-   #mv $oname $PCOM
-   #XXXrm -f formbul.out $oname
-   #mv tempo tempo2 tempo3 $PCOM
+
  done
 
 # 3. Send output files to the proper destination

diff --git a/scripts/exgfswave_prdgen_gridded.sh.ecf b/scripts/exgfswave_prdgen_gridded.sh.ecf
@@ -31,22 +31,17 @@
  export FHOUT_WAV=${FHOUT_WAV:-6}         #from 72 to 180 inc=6
  export FHOUT_HF_WAV=${FHOUT_HF_WAV:-3}
  export maxtries=720
- export FIXwave=${FIXwave:-HOMEwave/fix}
- export PARMwave=${PARMwave:-HOMEwave/parm}
- export USHwave=${USHwave:-HOMEwave/ush}
+ export FIXwave=${FIXwave:-HOMEgfs/fix}
+ export PARMwave=${PARMwave:-HOMEgfs/parm}
+ export USHwave=${USHwave:-HOMEgfs/ush}
  export cyc=${cyc:-00}
  export cycle=${cycle:-t${cyc}z}
  export pgmout=OUTPUT.$$
  export DATA=${DATA:-${DATAROOT:?}/${job}.$$}
  mkdir -p $DATA
  cd $DATA
  export wavelog=${DATA}/${COMPONENTwave}_prdggridded.log
- env
 
-# Set PDY
- setpdy.sh
- . PDY
-
  postmsg "$jlogfile" "HAS BEGUN on `hostname`"
  msg="Starting MWW3 GRIDDED PRODUCTS SCRIPT"
  postmsg "$jlogfile" "$msg"