From fa4568afff311646e1a74e96b7a8e41a711a4203 Mon Sep 17 00:00:00 2001
From: "Edward.Safford" <edward.safford@noaa.gov>
Date: Tue, 20 Dec 2022 17:06:16 +0000
Subject: [PATCH] Ref #28

Rm debug statements.
---
 .../data_extract/ush/ConMon_DE.sh             |  7 -------
 .../image_gen/ush/plot_horz.sh                | 19 ++++++++++++++-----
 .../image_gen/ush/plot_horz_uv.sh             | 19 ++++++++++++++-----
 .../image_gen/ush/plot_time_ps.sh             |  6 ++----
 4 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/src/Conventional_Monitor/data_extract/ush/ConMon_DE.sh b/src/Conventional_Monitor/data_extract/ush/ConMon_DE.sh
index 461add5b..af5210cd 100755
--- a/src/Conventional_Monitor/data_extract/ush/ConMon_DE.sh
+++ b/src/Conventional_Monitor/data_extract/ush/ConMon_DE.sh
@@ -106,7 +106,6 @@ jobname=ConMon_DE_${CONMON_SUFFIX}
 echo "C_TANKDIR = ${C_TANKDIR}"
 echo "C_LOGDIR  = ${C_LOGDIR}"
 echo "C_IMGNDIR = ${C_IMGNDIR}"
-echo "MON_USH   = $MON_USH"
 
 if [[ ! -d ${C_TANKDIR} ]]; then
    mkdir -p ${C_TANKDIR}
@@ -141,8 +140,6 @@ if [[ ${#cnvstat_location} -le 0 ]]; then
    export cnvstat_location=${COMROOT}/gfs/${gfs_ver}
 fi
 export CNVSTAT_LOCATION=${cnvstat_location} 
-echo "CNVSTAT_LOCATION = $CNVSTAT_LOCATION"
-
 export COMPONENT=${COMPONENT:-atmos}
 
 export C_DATDIR=${C_DATDIR:-${CNVSTAT_LOCATION}/${RUN}.${PDY}/${CYC}/${COMPONENT}}
@@ -181,10 +178,6 @@ if [[ ! -s ${pgrbf06} ]]; then
    export pgrbf06="${C_GDATDIR}/gdas.t${GCYC}z.pgrb2.1p00.f006"
 fi
 
-echo "cnvstat = $cnvstat"
-echo "pgrbf00 = $pgrbf00"
-echo "pgrbf06 = $pgrbf06"
-
 
 #---------------------------------------------
 # override the default convinfo definition
diff --git a/src/Conventional_Monitor/image_gen/ush/plot_horz.sh b/src/Conventional_Monitor/image_gen/ush/plot_horz.sh
index 9245dbb9..2c0af4b6 100755
--- a/src/Conventional_Monitor/image_gen/ush/plot_horz.sh
+++ b/src/Conventional_Monitor/image_gen/ush/plot_horz.sh
@@ -7,7 +7,9 @@
 #----------------------------------------------------------------------------------------
    echo "--> plot_horz.sh"
 
-   hh_tankdir=${C_TANKDIR}/${RUN}.${PDY}/${CYC}/conmon/horz_hist
+   hh_tankdir=`$MON_USH/get_stats_path.sh --run $RUN --pdate ${PDATE} \
+	        --net ${CONMON_SUFFIX} --tank ${TANKDIR} --mon conmon`
+   hh_tankdir=${hh_tankdir}/horz_hist
 
    export xsize=x800
    export ysize=y600
@@ -23,11 +25,18 @@
    #----------------------------------------------------------------------
    #  link in the analysis and guess data files
    #----------------------------------------------------------------------
-   ${UNCOMPRESS} ${hh_tankdir}/anl/anal.${PDATE}.${Z}
-   ${UNCOMPRESS} ${hh_tankdir}/ges/guess.${PDATE}.${Z}
+   anl_file=${hh_tankdir}/anl/anal.${PDATE}
+   ges_file=${hh_tankdir}/ges/guess.${PDATE}
 
-   ln -s ${hh_tankdir}/anl/anal.${PDATE}  anal.${PDATE}
-   ln -s ${hh_tankdir}/ges/guess.${PDATE} guess.${PDATE}
+   if [[ -e ${anl_file}.gz ]]; then 
+      ${UNCOMPRESS} ${anl_file}.gz
+   fi
+   if [[ -e ${ges_file}.gz ]]; then 
+      ${UNCOMPRESS} ${ges_file}.gz
+   fi
+
+   ln -s ${anl_file} anal.${PDATE}
+   ln -s ${ges_file} guess.${PDATE}
 
 
    #----------------------------------------------------------------------
diff --git a/src/Conventional_Monitor/image_gen/ush/plot_horz_uv.sh b/src/Conventional_Monitor/image_gen/ush/plot_horz_uv.sh
index ad5686e5..2a12f9d2 100755
--- a/src/Conventional_Monitor/image_gen/ush/plot_horz_uv.sh
+++ b/src/Conventional_Monitor/image_gen/ush/plot_horz_uv.sh
@@ -7,7 +7,9 @@
    #---------------------------------------------------------------------
    echo "--> plot_horz_uv.sh"
 
-   hh_tankdir=${C_TANKDIR}/${RUN}.${PDY}/${CYC}/conmon/horz_hist
+   hh_tankdir=`$MON_USH/get_stats_path.sh --run $RUN --pdate ${PDATE} \
+                --net ${CONMON_SUFFIX} --tank ${TANKDIR} --mon conmon`
+   hh_tankdir=${hh_tankdir}/horz_hist
 
    workdir=${C_PLOT_WORKDIR}/plothorz_uv
    if [[ -d ${workdir} ]]; then
@@ -22,11 +24,18 @@
    #----------------------------------------------------------------------
    #  Link in the analysis and guess data files
    #----------------------------------------------------------------------
-   ${UNCOMPRESS} ${hh_tankdir}/anl/anal.${PDATE}.gz
-   ${UNCOMPRESS} ${hh_tankdir}/ges/guess.${PDATE}.gz
+   anl_file=${hh_tankdir}/anl/anal.${PDATE}
+   ges_file=${hh_tankdir}/ges/guess.${PDATE}
 
-   ln -s ${hh_tankdir}/anl/anal.${PDATE}  anal.${PDATE}
-   ln -s ${hh_tankdir}/ges/guess.${PDATE} guess.${PDATE}
+   if [[ -e ${anl_file}.gz ]]; then
+      ${UNCOMPRESS} ${anl_file}.gz
+   fi
+   if [[ -e ${ges_file}.gz ]]; then
+      ${UNCOMPRESS} ${ges_file}.gz
+   fi
+
+   ln -s ${anl_file} anal.${PDATE}
+   ln -s ${ges_file} guess.${PDATE}
 
 
    #----------------------------------------------------------------------
diff --git a/src/Conventional_Monitor/image_gen/ush/plot_time_ps.sh b/src/Conventional_Monitor/image_gen/ush/plot_time_ps.sh
index beb6e543..7f22a953 100755
--- a/src/Conventional_Monitor/image_gen/ush/plot_time_ps.sh
+++ b/src/Conventional_Monitor/image_gen/ush/plot_time_ps.sh
@@ -25,7 +25,7 @@
    #---------------------------------------------------
 
    ${NCP} ${C_IG_GSCRIPTS}/plotstas_time_count_ps.gs . 
-   ${NCP} ${C_IG_GSCRIPTS}/plotstas_time_bias_ps.gs  . 
+   ${NCP} ${C_IG_GSCRIPTS}/plotstas_time_bias2_ps.gs  . 
 
    #---------------------------------------------------
    #  Link in the data files.
@@ -93,9 +93,7 @@
 
    grads -bpc "run ./plotstas_time_count_ps.gs"
  
-   grads -bpc "run ./plotstas_time_bias_ps.gs"
-
-#   grads -bpc "run ./plotstas_time_bias2_ps.gs"
+   grads -bpc "run ./plotstas_time_bias2_ps.gs"
 
    img_files=`ls *.png`
    for imgf in ${img_files}; do