Ref NOAA-EMC#28

Merge branch 'develop' into feature/updt_ConMon_28

.github/workflows/gcc.yml

@@ -30,7 +30,7 @@ env:
 
 jobs:
   setup:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     steps:
       # Cache spack, compiler and dependencies

.github/workflows/intel.yml

@@ -9,7 +9,7 @@ defaults:
 
 # Set I_MPI_CC/F90 so Intel MPI wrapper uses icc/ifort instead of gcc/gfortran
 env:
-  cache_key: intel3  # The number (#) following the cache_key "intel" is to flush Action cache.
+  cache_key: intel4  # The number (#) following the cache_key "intel" is to flush Action cache.
   CC: icc
   FC: ifort
   CXX: icpc
@@ -33,7 +33,7 @@ env:
 
 jobs:
   setup:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     steps:
       # Cache spack, compiler and dependencies
@@ -79,7 +79,7 @@ jobs:
 
   build:
     needs: setup
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     steps:
       - name: checkout-gsi-monitor

src/Minimization_Monitor/data_xtrct/ush/MinMon_CP.sh

@@ -39,6 +39,8 @@ fi
 #  Process command line arguments
 #
 pdate=""
+run=""
+
 while [[ $# -ge 1 ]]
 do
    key="$1"
@@ -123,7 +125,7 @@ cyc=`echo $pdate|cut -c9-10`
 #  Verify the data files are available for this cycle
 #
 data_dir=""
-data_dir=`$MON_USH/get_stats_path.sh --run $RUN --pdate ${pdate} --net ${MINMON_SUFFIX} --tank ${data} --mon minmon`
+data_dir=`$MON_USH/get_stats_path.sh --run $run --pdate ${pdate} --net ${MINMON_SUFFIX} --tank ${data} --mon minmon`
 echo data_dir = $data_dir
 
 if [[ ! -d ${data_dir} ]]; then

src/Radiance_Monitor/data_extract/ush/RadMon_CP_glb.sh

@@ -53,6 +53,8 @@ export RAD_AREA=glb
 #  Set default values and process command line arguments.
 #
 run=gdas
+pdate=""
+data_file_loc=""
 
 while [[ $# -ge 1 ]]
 do
@@ -145,7 +147,8 @@ fi
 # $TANKverf and increment 6 hours.
 #---------------------------------------------------------------
 if [[ $pdate = "" ]]; then
-   ldate=`${DE_SCRIPTS}/nu_find_cycle.pl --run $RUN --cyc 1 --dir ${TANKverf}`
+   ldate=`${MON_USH}/find_last_cycle.sh --net ${RADMON_SUFFIX} \
+	                               --run ${RUN} --mon radmon --tank ${TANKDIR}`
    pdate=`${NDATE} +06 ${ldate}`
 fi
 echo "pdate = $pdate"

src/Radiance_Monitor/data_extract/ush/radmon_copy.sh

@@ -61,9 +61,15 @@ fi
 #  'drop out' plots.
 # 
 nfile_src=`ls -l ${DATA_LOCATION}/*${PDATE}*ieee_d* | egrep -c '^-'`
+if [[ ${nfile_src} -le 0 ]]; then
+   nfile_src=`ls -l ${DATA_LOCATION}/radmon_*tar* | egrep -c '^-'`
+fi
 echo "nfile_src = ${nfile_src}"
 
 nfile_thirty=`find ${DATA_LOCATION}/*${PDATE}*ieee_d* -maxdepth 0 -mmin -30`
+if [[ ${nfile_thirty} -le 0 ]]; then
+   nfile_thirty=`find ${DATA_LOCATION}/*radmon_*tar* -maxdepth 0 -mmin -30`
+fi
 echo "nfile_thirty = ${nfile_thirty}"
 
 if [[ ${nfile_src} -le 0 ]]; then
@@ -82,7 +88,7 @@ if [[ ${exit_value} -eq 0 ]]; then
 
    for type in ${type_list}; do 
 
-      file_list=`ls ${DATA_LOCATION}/${type}.*${PDATE}*ieee_d* ${DATA_LOCATION}/${type}*tar* `
+      file_list=`ls ${DATA_LOCATION}/${type}.*${PDATE}*ieee_d* ${DATA_LOCATION}/radmon_${type}*tar* `
 
       for file in ${file_list}; do
          bfile=`basename ${file}`
@@ -188,7 +194,7 @@ if [[ $exit_value == 0 ]]; then
 
 	 ${DE_SCRIPTS}/radmon_diag_ck.sh --rad ${radstat} --sat ${satype_file} --out ${diag_out}
          if [[ -e ${diag_out} ]]; then
-            $NCP ./${diag_out} ${TANKverf}/${RUN}.${day}/${cyc}/radmon/.
+            $NCP ./${diag_out} ${TANKverf}/${RUN}.${PDY}/${CYC}/radmon/.
          fi
       fi
 

src/Radiance_Monitor/image_gen/html/Install_html.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 #--------------------------------------------------------------------
 #--------------------------------------------------------------------
@@ -10,25 +10,51 @@
 #--------------------------------------------------------------------
 #--------------------------------------------------------------------
 
+#--------------------------------------------------------------------
+#  usage
+#--------------------------------------------------------------------
 function usage {
-  echo "Usage:  Install_html.sh suffix area"
+  echo "Usage:  Install_html.sh suffix [-t|--tank]"
   echo "            Suffix is data source identifier that matches data in "
   echo "              the $TANKDIR/stats directory."
-  echo "            area is either 'glb' or 'rgn' (global or regional)"
+  echo "            -t | --tank parent directory to the adnmon data file location.  This"
+  echo "              will be extended by \$RADMON_SUFFIX, \$RUN, and \$PDATE to locate the"
+  echo "              extracted radmon data."
+  echo ""
 }
 
 echo "BEGIN Install_html.sh"
 echo ""
 
 nargs=$#
-if [[ $nargs -ne 2 ]]; then
+
+if [[ $nargs -lt 1 || $nargs -gt 3 ]]; then
    usage
    exit 2
 fi
 
-export RADMON_SUFFIX=$1
-echo RADMON_SUFFIX = $RADMON_SUFFIX
-export RAD_AREA=$2
+#-----------------------------------------------------------
+#  Set default values and process command line arguments.
+#
+#run=gdas
+tank=""
+area=""
+
+while [[ $# -ge 1 ]]; do
+   key="$1"
+
+   case $key in
+      -t|--tank)
+         tank="$2"
+	 shift # past argument
+         ;;
+      *)
+         #any unspecified key is RADMON_SUFFIX
+	 export RADMON_SUFFIX=$key
+	 ;;
+   esac
+   shift
+done
 
 this_file=`basename $0`
 this_dir=`dirname $0`
@@ -60,14 +86,15 @@ if [[ $? -ne 0 ]]; then
    exit $?
 fi
 
-#--------------------------------------------------------------
-#  call the appropriate child script for glb or rgn
-#
-if [[ $RAD_AREA == "glb" ]]; then 
-   ${RADMON_IMAGE_GEN}/html/install_glb.sh 
-else 
-   ${RADMON_IMAGE_GEN}/html/install_rgn.sh
+
+if [[ ${#tank} -le 0 ]]; then
+   tank=${TANKDIR}
 fi
+export R_TANKDIR=${tank}
+echo R_TANKDIR = $R_TANKDIR
+
+
+${RADMON_IMAGE_GEN}/html/install_glb.sh 
 
 
 echo "END Install_html.sh"