Merge pull request #247 from JessicaMeixner-NOAA/errorcheckwave3

Issue #1 and issue #238 - Move errchk from script level to job level for three wave jobs
NOAA-EMC · Jan 25, 2021 · 80ffcfc · 80ffcfc
2 parents 676e22f + 52485c4
commit 80ffcfc
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/jobs/JGLOBAL_WAVE_GEMPAK b/jobs/JGLOBAL_WAVE_GEMPAK
@@ -30,6 +30,9 @@ export COMPONENT=${COMPONENT:-wave}
 export machine=${machine:-WCOSS_DELL_P3}
 export HOMEgfs=${HOMEgfs:-$(dirname $(dirname $0))} 
 
+# Add default errchk = err_chk
+export errchk=${errchk:-err_chk}
+
 ###################################
 # Set COM Paths
 export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/$COMPONENT}

diff --git a/jobs/JGLOBAL_WAVE_PRDGEN_BULLS b/jobs/JGLOBAL_WAVE_PRDGEN_BULLS
@@ -23,6 +23,9 @@ export RUN=${RUN:-gfs}
 export COMPONENT=${COMPONENT:-wave}
 export HOMEgfs=${HOMEgfs:-$(dirname $(dirname $0))} # parent directory of current job card
 
+# Add default errchk = err_chk
+export errchk=${errchk:-err_chk}
+
 ###################################
 # Set COM Paths
 export COMIN=${COMIN:-$(compath.py ${NET}/${envir}/${RUN}.${PDY})/${cyc}/$COMPONENT}

diff --git a/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED b/jobs/JGLOBAL_WAVE_PRDGEN_GRIDDED
@@ -24,6 +24,9 @@ export RUN=${RUN:-gfs}
 export COMPONENT=${COMPONENT:-wave}
 export HOMEgfs=${HOMEgfs:-$(dirname $(dirname $0))} # parent directory of current job card
 
+# Add default errchk = err_chk
+export errchk=${errchk:-err_chk}
+
 ###################################
 # Set COM Paths
 ###################################

diff --git a/scripts/exgfs_wave_nawips.sh b/scripts/exgfs_wave_nawips.sh
@@ -25,9 +25,6 @@ export cycle=${cycle:-t${cyc}z}
 export GEMwave=${GEMwave:-$HOMEgfs/gempak}
 export FIXwave=${FIXwave:-HOMEgfs/fix}
 export DATA=${DATA:-${DATAROOT:?}/${jobid}}
-
-export errchk=${errchk:-err_chk}
-
 if [ ! -d $DATA ];then
   mkdir -p $DATA
 fi

diff --git a/scripts/exgfs_wave_prdgen_bulls.sh b/scripts/exgfs_wave_prdgen_bulls.sh
@@ -36,8 +36,6 @@
  export USHwave=${USHwave:-$HOMEgfs/ush}
  #export EXECcode=${EXECcode:-CODEwave/exec}
 
- export errchk=${errchk:-err_chk}
-
  mkdir -p $DATA
  cd $DATA
  export wavelog=${DATA}/${RUNwave}_prdgbulls.log

diff --git a/scripts/exgfs_wave_prdgen_gridded.sh b/scripts/exgfs_wave_prdgen_gridded.sh
@@ -41,8 +41,6 @@
  mkdir -p $DATA
  cd $DATA
  export wavelog=${DATA}/${COMPONENTwave}_prdggridded.log
-
- export errchk=${errchk:-err_chk}
 
  postmsg "$jlogfile" "HAS BEGUN on `hostname`"
  msg="Starting MWW3 GRIDDED PRODUCTS SCRIPT"