Merge pull request NOAA-EMC#189 from gsketefian/feature/preproc

Feature/preproc
EricJames-NOAA · Apr 8, 2020 · 711e558 · 711e558
2 parents 3bfbd92 + 487706e
commit 711e558
Show file tree

Hide file tree

Showing 27 changed files with 1,464 additions and 1,761 deletions.
diff --git a/jobs/JREGIONAL_MAKE_GRID b/jobs/JREGIONAL_MAKE_GRID
@@ -145,22 +145,12 @@ This is the J-job script for the task that generates grid files.
 #
 #-----------------------------------------------------------------------
 #
-# Export select variables.
-#
-#-----------------------------------------------------------------------
-#
-export gtype="$GTYPE"
-export stretch_fac=${STRETCH_FAC}
-#
-#-----------------------------------------------------------------------
-#
 # Call the ex-script for this J-job and pass to it the necessary varia-
 # bles.
 #
 #-----------------------------------------------------------------------
 #
-${SCRIPTSDIR}/exregional_make_grid.sh \
-  WORKDIR_LOCAL="ABCD" || \
+${SCRIPTSDIR}/exregional_make_grid.sh || \
 print_err_msg_exit "\
 Call to ex-script corresponding to J-job \"${scrfunc_fn}\" failed."
 #

diff --git a/jobs/JREGIONAL_MAKE_OROG b/jobs/JREGIONAL_MAKE_OROG
@@ -52,8 +52,7 @@ This is the J-job script for the task that generates orography files.
 #
 #-----------------------------------------------------------------------
 #
-${SCRIPTSDIR}/exregional_make_orog.sh \
-  WORKDIR_LOCAL="ABCD" || \
+${SCRIPTSDIR}/exregional_make_orog.sh || \
 print_err_msg_exit "\
 Call to ex-script corresponding to J-job \"${scrfunc_fn}\" failed."
 #

diff --git a/jobs/JREGIONAL_RUN_POST b/jobs/JREGIONAL_RUN_POST
@@ -88,8 +88,22 @@ cd_vrfy "${fhr_dir}"
 #
 #-----------------------------------------------------------------------
 #
+# Make sure that fhr is a non-empty string consisting of only digits.  
+#
+#-----------------------------------------------------------------------
+#
+fhr=$( printf "%s" "${fhr}" | sed -n -r -e "s/^([0-9]+)$/\1/p" )
+if [ -z "$fhr" ]; then
+  print_err_msg_exit "\
+The forecast hour (fhr) must be a non-empty string consisting of only 
+digits:
+  fhr = \"${fhr}\""
+fi
+#
+#-----------------------------------------------------------------------
+#
 # Call the ex-script for this J-job and pass to it the necessary varia-
-# bles. 
+# bles.
 #
 #-----------------------------------------------------------------------
 #

diff --git a/modulefiles/tasks/hera/make_orog.hardcoded b/modulefiles/tasks/hera/make_orog.hardcoded
@@ -6,5 +6,5 @@ module purge
 
 module load intel/18.0.5.274
 module load netcdf/4.7.0
-module load hdf5/1.10.4
+module load hdf5/1.10.5