Merge pull request #57 from EdwardSafford-NOAA/feature/misc_fix_56

Misc minor fixes
NOAA-EMC · Dec 12, 2022 · cb35353 · cb35353
2 parents 6723399 + d14e0f6
commit cb35353
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/src/Minimization_Monitor/data_xtrct/ush/MinMon_CP.sh b/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

diff --git a/src/Radiance_Monitor/data_extract/ush/RadMon_CP_glb.sh b/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"

diff --git a/src/Radiance_Monitor/data_extract/ush/radmon_copy.sh b/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