Ref NOAA-EMC#106

Complete ConMon changes.
EdwardSafford-NOAA · Mar 4, 2025 · 8b8958b · 8b8958b
1 parent a1d0998
commit 8b8958b
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 26 deletions.
diff --git a/src/Conventional_Monitor/data_extract/ush/ConMon_DE.sh b/src/Conventional_Monitor/data_extract/ush/ConMon_DE.sh
@@ -234,7 +234,7 @@ if [ -s $cnvstat  -a -s $pgrbf00 -a -s $pgrbf06 ]; then
                   C_DATDIR=${C_DATDIR}, C_GDATDIR=${C_GDATDIR}, C_COMIN=${C_COMIN}, C_COMINm6h=${C_COMINm6h}, \
                   CONMON_WORK_DIR=${CONMON_WORK_DIR}, PDATE=${PDATE}, PDY=${PDY}, CYC=${CYC}, HOMEgdas_conmon=${HOMEgdas_conmon}, \
 		  WGRIB2=${WGRIB2}, USHconmon=${USHconmon}, CLEAN_TANKDIR=${CLEAN_TANKDIR}, convinfo=${convinfo}, gfs_ver=${gfs_ver}, \
-		  HOMEgfs_conmon=${HOMEgfs_conmon}, EXECconmon=${EXECconmon}" \
+		  HOMEgfs_conmon=${HOMEgfs_conmon}, EXECconmon=${EXECconmon}, KEEPDATA=${KEEPDATA}" \
               -q $JOB_QUEUE -A $ACCOUNT -o ${logfile} -e ${logfile} -l walltime=30:00 -N ${jobname} \
               -l select=1:mem=12G ${HOMEgdas_conmon}/jobs/JGDAS_ATMOS_CONMON
       fi

diff --git a/src/Conventional_Monitor/data_extract/ush/ConMon_DE_rgn.sh b/src/Conventional_Monitor/data_extract/ush/ConMon_DE_rgn.sh
@@ -270,11 +270,9 @@ if [[ -e ${cnvstat} ]]; then
 		${HOMEnam_conmon}/jobs/JNAM_CONMON
 
    elif [[ ${MY_MACHINE} = "wcoss2" ]]; then
-#      ${SUB} -V -q ${JOB_QUEUE} -A ${ACCOUNT} -o ${logfile} -e ${logfile} -l walltime=30:00 \
-#  	      -N ${jobname} -l select=1:mem=5000M ${HOMEnam_conmon}/jobs/JNAM_CONMON
       $SUB -v "C_TANKDIR=${C_TANKDIR}, C_LOGDIR=${C_LOGDIR}, cnvstat=${cnvstat}, \
                CNVSTAT_LOCATION=${cnvstat_location}, CONMON_WORK_DIR=${CONMON_WORK_DIR}, \
-               C_DATDIR=${C_DATDIR}, C_COMIN=${C_COMIN}, \
+               C_DATDIR=${C_DATDIR}, C_COMIN=${C_COMIN}, KEEPDATA=${KEEPDATA}, \
                PDY=${PDY}, CYC=${CYC}, HOMEnam_conmon=${HOMEnam_conmon}, \
                WGRIB2=${WGRIB2}, USHconmon=${USHconmon}, CLEAN_TANKDIR=${CLEAN_TANKDIR}, \
                EXECconmon=${EXECconmon}" \

diff --git a/src/Conventional_Monitor/nwprod/conmon_shared/ush/diag2grad_ps_case.sh b/src/Conventional_Monitor/nwprod/conmon_shared/ush/diag2grad_ps_case.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-set -xa
 
 #-------------------------------------------------------
 #
@@ -14,7 +13,6 @@ set -xa
    echo "type            = $type"
    echo "PDATE           = $PDATE"
    echo "EXECconmon      = $EXECconmon"
-   echo "cycle           = $cycle"
    echo "nreal           = $nreal"
    echo "mtype           = $mtype (type = $type)"
    echo "subtype         = $subtype"

diff --git a/src/Conventional_Monitor/nwprod/conmon_shared/ush/diag2grad_q_case.sh b/src/Conventional_Monitor/nwprod/conmon_shared/ush/diag2grad_q_case.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-set -xa
 
 #------------------------------------------------------------
 #
@@ -14,7 +13,6 @@ echo "--> diag2grad_q_case.sh"
    echo "type          = $type"
    echo "PDATE         = $PDATE"
    echo "EXECconmon      = $EXECconmon"
-   echo "cycle         = $cycle"
    echo "run           = $run  "
    echo "nreal         = $nreal"
    echo "mtype         = $mtype (type = $type)"

diff --git a/src/Conventional_Monitor/nwprod/conmon_shared/ush/diag2grad_t_case.sh b/src/Conventional_Monitor/nwprod/conmon_shared/ush/diag2grad_t_case.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-set -xa
 
 #-----------------------------------------------------
 #  
@@ -14,7 +13,6 @@ echo "--> diag2grad_t_case.sh"
    echo "type          = $type"
    echo "PDATE         = $PDATE"
    echo "EXECconmon      = $EXECconmon"
-   echo "cycle         = $cycle"
    echo "nreal         = $nreal"
    echo "mtype         = $mtype (type = $type)"
    echo "subtype       = $subtype"

diff --git a/src/Conventional_Monitor/nwprod/conmon_shared/ush/diag2grad_uv_case.sh b/src/Conventional_Monitor/nwprod/conmon_shared/ush/diag2grad_uv_case.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-set -xa
 
 #----------------------------------------------------------
 #
@@ -13,20 +12,15 @@ echo "--> diag2grad_uv_case.sh"
 
    nreal_uv=$nreal   
    nreal2_uv=`expr $nreal - 2`
-   echo "nreal2_uv = ", ${nreal2_uv}
-   echo "mtype     = ", ${mtype}
 
    run_exe=1
    ctype=`echo ${mtype} | cut -c3-5`
 
-   echo "CONMON_NETCDF = ${CONMON_NETCDF}"
-   netcdf=".false."
-   run_exe=1
-
    if [ $CONMON_NETCDF -eq 1 ]; then
       netcdf=".true."
+   else
+      netcdf=".false."
    fi
-   echo "netcdf = $netcdf"
 
 
    if [ "$mtype" = 'uv221' -o "$mtype" = 'uv224' -o "$mtype" = 'uv229' -o "$mtype" = 'uv230' -o "$mtype" = 'uv231' -o "$mtype" = 'uv232' -o "$mtype" = 'uv233' -o "$mtype" = 'uv234' -o "$mtype" = 'uv235' -o "$mtype" = 'uv240' -o "$mtype" = 'uv241' -o "$mtype" = 'uv242' -o "$mtype" = 'uv243'  -o "$mtype" = 'uv244' -o "$mtype" = 'uv245' -o "$mtype" = 'uv246' -o "$mtype" = 'uv247' -o "$mtype" = 'uv248' -o "$mtype" = 'uv249' -o "$mtype" = 'uv250' -o "$mtype" = 'uv251' -o "$mtype" = 'uv252' -o "$mtype" = 'uv253' -o "$mtype" = 'uv254' -o "$mtype" = 'uv255' -o "$mtype" = 'uv256' -o "$mtype" = 'uv257' -o "$mtype" = 'uv258' -o "$mtype" = 'uv259' -o "$mtype" = 'uv260' ]; then

diff --git a/src/Conventional_Monitor/nwprod/gdas_conmon/jobs/JGDAS_ATMOS_CONMON b/src/Conventional_Monitor/nwprod/gdas_conmon/jobs/JGDAS_ATMOS_CONMON
@@ -72,8 +72,7 @@ export PDY_m6h=`echo $m6h_date|cut -c1-8`
 export C_COMIN_m6h=${C_COMIN_m6h:-$C_COM_IN/${RUN}.${PDY_m6h}}
 
 export CONMON_AREA=${CONMON_AREA:-glb}
-export SAVE_WORK=${SAVE_WORK:-NO}
-
+export KEEPDATA=${KEEPDATA:-YES}
 
 ########################################################
 # Execute the script.

diff --git a/src/Conventional_Monitor/nwprod/gdas_conmon/scripts/exgdas_atmos_conmon.sh b/src/Conventional_Monitor/nwprod/gdas_conmon/scripts/exgdas_atmos_conmon.sh
@@ -245,7 +245,7 @@
 
    echo; echo "end exgdas_conmon.sh.sms, exit value = ${err}"; echo
 
-   if [[ ${SAVE_WORK} = "NO" ]]; then
+   if [[ ${KEEPDATA} = "NO" ]]; then
       cd ${workdir}/..
       rm -rf ${workdir}
    fi

diff --git a/src/Conventional_Monitor/nwprod/nam_conmon/jobs/JNAM_CONMON b/src/Conventional_Monitor/nwprod/nam_conmon/jobs/JNAM_CONMON
@@ -5,11 +5,6 @@
 #########################################################
 echo "--> JNAM_CONMON"
 
-#set -xa
-
-echo `date` $0 `date -u` begin
-#export PS4='$SECONDS + '
-
 ########################################################### 
 # set up temp working directory space
 ###########################################################

diff --git a/src/Conventional_Monitor/parm/ConMon_config b/src/Conventional_Monitor/parm/ConMon_config
@@ -17,6 +17,7 @@ source $MON_CONFIG
 export MONITOR=conmon
 export AREA=${AREA:-glb}
 export RUN=${RUN:-gdas}
+export KEEPDATA=NO
 
 export WEBDIR=${WEBDIR:-/home/people/emc/www/htdocs/gmb/gdas/es_conv}