From 8b8958b2db61633e93cb68fbd2eb803c7927e794 Mon Sep 17 00:00:00 2001 From: "Edward.Safford" Date: Tue, 4 Mar 2025 20:15:12 +0000 Subject: [PATCH] Ref #106 Complete ConMon changes. --- src/Conventional_Monitor/data_extract/ush/ConMon_DE.sh | 2 +- .../data_extract/ush/ConMon_DE_rgn.sh | 4 +--- .../nwprod/conmon_shared/ush/diag2grad_ps_case.sh | 2 -- .../nwprod/conmon_shared/ush/diag2grad_q_case.sh | 2 -- .../nwprod/conmon_shared/ush/diag2grad_t_case.sh | 2 -- .../nwprod/conmon_shared/ush/diag2grad_uv_case.sh | 10 ++-------- .../nwprod/gdas_conmon/jobs/JGDAS_ATMOS_CONMON | 3 +-- .../nwprod/gdas_conmon/scripts/exgdas_atmos_conmon.sh | 2 +- .../nwprod/nam_conmon/jobs/JNAM_CONMON | 5 ----- src/Conventional_Monitor/parm/ConMon_config | 1 + 10 files changed, 7 insertions(+), 26 deletions(-) diff --git a/src/Conventional_Monitor/data_extract/ush/ConMon_DE.sh b/src/Conventional_Monitor/data_extract/ush/ConMon_DE.sh index e8e960c..324b8a0 100755 --- 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 index 42a590b..d3ef607 100755 --- 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 index 3a37243..acf21c8 100755 --- 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 index 072b064..a2d9bef 100755 --- 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 index 2c1c1f1..9d31e64 100755 --- 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 index 749211c..a4feffb 100755 --- 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 index 6cb9b0c..23e4252 100755 --- 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 index 1fbaa18..0cdb7a3 100755 --- 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 index c33be3c..d9be27c 100755 --- 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 index 1ef5b68..520dc08 100644 --- 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}