Ref NOAA-EMC#28

More cleanup.
EdwardSafford-NOAA · Dec 19, 2022 · 2f3d435 · 2f3d435
1 parent ad569dd
commit 2f3d435
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 253 deletions.
diff --git a/src/Conventional_Monitor/data_extract/ush/ConMon_DE.sh b/src/Conventional_Monitor/data_extract/ush/ConMon_DE.sh
@@ -145,16 +145,9 @@ echo "CNVSTAT_LOCATION = $CNVSTAT_LOCATION"
 
 export COMPONENT=${COMPONENT:-atmos}
 
-#
-#  Is there any difference in location from ops to wkfl?
-#
-
 export C_DATDIR=${C_DATDIR:-${CNVSTAT_LOCATION}/${RUN}.${PDY}/${CYC}/${COMPONENT}}
 export C_GDATDIR=${C_GDATDIR:-${CNVSTAT_LOCATION}/${RUN}.${PDYm6h}/${GCYC}/${COMPONENT}}
 
-echo "C_DATDIR  = $C_DATDIR"
-echo "C_GDATDIR = $C_GDATDIR"
-
 export C_COMIN=${C_DATDIR}
 export C_COMINm6h=${C_GDATDIR}
 

diff --git a/src/Conventional_Monitor/image_gen/ush/ConMon_IG.sh b/src/Conventional_Monitor/image_gen/ush/ConMon_IG.sh
@@ -20,7 +20,7 @@ function usage {
   echo "            Suffix is the indentifier for this data source."
   echo " "
   echo "            -p | --pdate yyyymmddcc to specify the cycle to be plotted."
-  echo "                 If not specified pdate will be set using the "
+  echo "                 If not specified, pdate will be set using the "
   echo "                 C_IMGNDIR/last_plot_time file, and if that doesn't"
   echo "                 exist, then the last available date will be plotted."
   echo " "             
@@ -137,9 +137,8 @@ fi
 echo "C_IG_SCRIPTS = ${C_IG_SCRIPTS}"
 echo "C_TANKDIR = ${C_TANKDIR}"
 
-last_cycle=`${C_IG_SCRIPTS}/find_cycle.pl \
-		--cyc 1 --dir ${C_TANKDIR} --run ${RUN}`
-
+last_cycle=`${MON_USH}/find_last_cycle.sh --net ${CONMON_SUFFIX} \
+              --run ${RUN} --tank ${TANKDIR} --mon conmon`
 
 if [[ ${PDATE} = "" ]]; then
 
@@ -191,9 +190,7 @@ if [[ $PDATE -le ${last_cycle} ]]; then
    #--------------------------------------------------------------------
    #  Update the last_plot_time file if found
    #--------------------------------------------------------------------
-   echo C_IMGNDIR = $C_IMGNDIR
    if [[ -e ${C_IMGNDIR}/last_plot_time ]]; then
-      echo "update last_plot_time file"  
       echo ${PDATE} > ${C_IMGNDIR}/last_plot_time
    fi
 

diff --git a/src/Conventional_Monitor/image_gen/ush/Transfer.sh b/src/Conventional_Monitor/image_gen/ush/Transfer.sh
@@ -80,14 +80,14 @@ export jobname=transfer_${CONMON_SUFFIX}_conmon
 #  and leave it to the user to manually transfer files to
 #  the server.
 #
-if [[ $MY_MACHINE = "wcoss2" ]]; then
+if [[ ${MY_MACHINE} = "wcoss2" ]]; then
 
-   $SUB -q $JOB_QUEUE -A $ACCOUNT -o ${logfile} -e ${errfile} \
+   ${SUB} -q ${JOB_QUEUE} -A ${ACCOUNT} -o ${logfile} -e ${errfile} \
         -V -l select=1:mem=500M -l walltime=45:00 -N ${jobname} \
         ${C_IG_SCRIPTS}/transfer_imgs.sh
 
 else
-   echo "Unable to transfer files from $MY_MACHINE to $WEBSVR."
+   echo "Unable to transfer files from ${MY_MACHINE} to ${WEBSVR}."
    echo "Manual intervention is required."
 
 fi

diff --git a/src/Conventional_Monitor/image_gen/ush/find_cycle.pl b/src/Conventional_Monitor/image_gen/ush/find_cycle.pl
diff --git a/src/Conventional_Monitor/image_gen/ush/mk_time_vert.sh b/src/Conventional_Monitor/image_gen/ush/mk_time_vert.sh
@@ -33,7 +33,6 @@ echo "--> mk_time_vert.sh"
                 -p ${SERVICE_PARTITION} -J ${jobname} -o ${logfile} ${pltfile}
 
    elif [[ ${MY_MACHINE} = "wcoss2" ]]; then
-      echo "submitting $jobname"
       $SUB -V -q $JOB_QUEUE -A $ACCOUNT -o ${logfile} -e ${logfile} -l walltime=50:00 -N ${jobname} \
                 -l select=1:mem=200M ${pltfile}
    fi
@@ -57,7 +56,7 @@ echo "--> mk_time_vert.sh"
       fi
 
       if [[ ${MY_MACHINE} == "hera" || ${MY_MACHINE} == "s4" || \
-            ${MY_MACHINE} == "jet" || ${MY_MACHINE} = "orion" ]]; then
+            ${MY_MACHINE} == "jet" || ${MY_MACHINE} == "orion" ]]; then
          if [[ ${type} == "uv" || ${type} == "u" || ${type} == "v" ]]; then
             walltime="02:30:00"
          else
@@ -69,11 +68,10 @@ echo "--> mk_time_vert.sh"
 
       elif [[ ${MY_MACHINE} = "wcoss2" ]]; then
          if [[ ${type} == "uv" || ${type} == "u" || ${type} == "v" ]]; then
-            walltime="01:30:00"
+            walltime="02:00:00"
          else
             walltime="50:00"
          fi
-        echo "submitting $jobname"
 
         $SUB -V -q ${JOB_QUEUE} -A ${ACCOUNT} -o ${logfile} -e ${logfile} -l walltime=${walltime}\
 	       	-N ${jobname} -l select=1:mem=200M ${pltfile}
@@ -113,7 +111,6 @@ echo "--> mk_time_vert.sh"
                 -p ${SERVICE_PARTITION} -J ${jobname} -o ${logfile} ${pltfile}
 
       elif [[ ${MY_MACHINE} == "wcoss2" ]]; then
-	echo "submitting $jobname"
         ${SUB} -V -q ${JOB_QUEUE} -A ${ACCOUNT} -o ${logfile} -e ${logfile} -l walltime=50:00 \
 	       	-N ${jobname} -l select=1:mem=500M ${pltfile}
 

diff --git a/src/Conventional_Monitor/parm/ConMon_config b/src/Conventional_Monitor/parm/ConMon_config
@@ -23,9 +23,6 @@ export WEBDIR=${WEBDIR:-/home/people/emc/www/htdocs/gmb/gdas/es_conv}
 #  TANKDIR is the location for the extracted data files and
 #  the control files used for image plotting.
 #
-#export CONMON_TANKDIR=/u/Edward.Safford/nbns
-#export C_TANKverf=${C_TANKverf:-${CONMON_TANKDIR}}
-
 export C_TANKDIR=${TANKDIR}/stats/${CONMON_SUFFIX}
 export C_IMGNDIR=${TANKDIR}/imgn/${CONMON_SUFFIX}/${RUN}/conmon
 
@@ -88,28 +85,16 @@ export C_STMP_USER=${C_STMP_USER:-${MON_STMP}/${LOGNAME}}
 export C_PTMP_USER=${C_PTMP_USER:-${MON_PTMP}/${LOGNAME}}
 
 export C_LOGDIR=${MON_LOGDIR}/${CONMON_SUFFIX}/${RUN}/conmon
-#export WORK_conmon=${WORK_conmon:-${C_STMP_USER}/${CONMON_SUFFIX}/${RUN}/ConMon}
+export CONMON_IMAGE_GEN=${CONMON_IMAGE_GEN:-${MY_CONMON}/image_gen}
 
-#   export CONMON_DATA_EXTRACT=${CONMON_DATA_EXTRACT:-${MY_CONMON}/data_extract}
-#   export C_DE_EXEC=${C_DE_EXEC:-${CONMON_DATA_EXTRACT}/exec}
-#   export C_DE_PARM=${C_DE_PARM:-${CONMON_DATA_EXTRACT}/parm}
-#   export C_DE_SCRIPTS=${C_DE_SCRIPTS:-${CONMON_DATA_EXTRACT}/ush}
-#
-   export CONMON_IMAGE_GEN=${CONMON_IMAGE_GEN:-${MY_CONMON}/image_gen}
-#   export C_IG_EXEC=${C_IG_EXEC:-${CONMON_IMAGE_GEN}/exec}
-   export C_IG_GSCRIPTS=${C_IG_GSCRIPTS:-${CONMON_IMAGE_GEN}/gscripts}
-#   export C_IG_PARM=${C_IG_PARM:-${CONMON_IMAGE_GEN}/parm}
-   export C_IG_SCRIPTS=${C_IG_SCRIPTS:-${CONMON_IMAGE_GEN}/ush}
-   export C_IG_FIX=${C_IG_FIX:-${CONMON_IMAGE_GEN}/fix}
-#   export C_IG_HTML=${C_IG_HTML:-${CONMON_IMAGE_GEN}/html}
-#   export C_IG_SAVE_WORK=${C_IG_SAVE_WORK:-1}		# switch to save plot work directories
-#
-#   export CONMON_PARM=${CONMON_PARM:-${MY_CONMON}/parm}
+export C_IG_GSCRIPTS=${C_IG_GSCRIPTS:-${CONMON_IMAGE_GEN}/gscripts}
+export C_IG_SCRIPTS=${C_IG_SCRIPTS:-${CONMON_IMAGE_GEN}/ush}
+export C_IG_FIX=${C_IG_FIX:-${CONMON_IMAGE_GEN}/fix}
 
-   export HOMEconmon_shared=${HOMEconmon_shared:-${MY_CONMON}/nwprod/conmon_shared}
-   export HOMEgdas_conmon=${HOMEgdas_conmon:-${MY_CONMON}/nwprod/gdas_conmon}
-   export HOMEgfs_conmon=$HOMEgdas_conmon
+export HOMEconmon_shared=${HOMEconmon_shared:-${MY_CONMON}/nwprod/conmon_shared}
+export HOMEgdas_conmon=${HOMEgdas_conmon:-${MY_CONMON}/nwprod/gdas_conmon}
+export HOMEgfs_conmon=$HOMEgdas_conmon
 
-   export USHconmon=${USHconmon:-${HOMEconmon_shared}/ush}
-   export EXECconmon=${EXECconmon:-${GSI_MON_BIN}}
+export USHconmon=${USHconmon:-${HOMEconmon_shared}/ush}
+export EXECconmon=${EXECconmon:-${GSI_MON_BIN}}