From a1d0998c5f8caee6cc85f32592841c6a096e664a Mon Sep 17 00:00:00 2001 From: "Edward.Safford" Date: Mon, 3 Mar 2025 21:55:01 +0000 Subject: [PATCH] Ref #106 Save work in progress. --- .../data_extract/ush/ConMon_DE_rgn.sh | 17 ++++++--- .../conmon_shared/ush/diag2grad_ps_case.sh | 1 - .../nwprod/conmon_shared/ush/horz_hist.sh | 21 ++++++----- .../nwprod/conmon_shared/ush/time_vert.sh | 8 +++-- .../nwprod/nam_conmon/jobs/JNAM_CONMON | 31 +++++++++------- .../nwprod/nam_conmon/scripts/exnam_conmon.sh | 35 +++++++++---------- 6 files changed, 63 insertions(+), 50 deletions(-) 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 479cf2c..42a590b 100755 --- a/src/Conventional_Monitor/data_extract/ush/ConMon_DE_rgn.sh +++ b/src/Conventional_Monitor/data_extract/ush/ConMon_DE_rgn.sh @@ -220,9 +220,9 @@ fi export cnvstat=${cnvstat_location}/${CONMON_SUFFIX}.${day}/${CONMON_SUFFIX}.${rgnHH}.cnvstat.${rgnTM} if [[ -e ${cnvstat} ]]; then - echo "cnvstat exists" + echo "cnvstat exists: $cnvstat" else - echo "cnvstat is a no-go" + echo "cnvstat is a no-go: $cnvstat" fi #------------------------------------------------------------ @@ -270,8 +270,17 @@ 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 -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}, \ + PDY=${PDY}, CYC=${CYC}, HOMEnam_conmon=${HOMEnam_conmon}, \ + WGRIB2=${WGRIB2}, USHconmon=${USHconmon}, CLEAN_TANKDIR=${CLEAN_TANKDIR}, \ + EXECconmon=${EXECconmon}" \ + -q $JOB_QUEUE -A $ACCOUNT -o ${logfile} -e ${logfile} -l walltime=30:00 -N ${jobname} \ + -l select=1:mem=4G ${HOMEnam_conmon}/jobs/JNAM_CONMON + fi else 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 5d9e7c0..3a37243 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 @@ -19,7 +19,6 @@ set -xa echo "mtype = $mtype (type = $type)" echo "subtype = $subtype" echo "hint = $hint" - echo "workdir = $workdir" echo "INPUT_FILE = ${INPUT_FILE}" diff --git a/src/Conventional_Monitor/nwprod/conmon_shared/ush/horz_hist.sh b/src/Conventional_Monitor/nwprod/conmon_shared/ush/horz_hist.sh index 02d03ec..8706605 100755 --- a/src/Conventional_Monitor/nwprod/conmon_shared/ush/horz_hist.sh +++ b/src/Conventional_Monitor/nwprod/conmon_shared/ush/horz_hist.sh @@ -6,13 +6,10 @@ # #------------------------------------------------------------------ - set -ax - echo "--> horz_hist.sh" date rc=0 - echo "CONMON_SUFFIX = $CONMON_SUFFIX" export hint=10 ##(mb) the plot pressure interval press+-hint #---------------------------------------------------------- @@ -42,9 +39,10 @@ for type in ps q t uv; do - eval stype=\${${type}_TYPE} - eval nreal=\${nreal_${type}} - exec=read_${type} + eval export stype=\${${type}_TYPE} + eval export nreal=\${nreal_${type}} + export type=${type} + export exec=read_${type} #--------------------------------- # decoding the dignostic file @@ -52,10 +50,11 @@ for dtype in ${stype}; do - mtype=`echo ${dtype} | cut -f1 -d_ | xargs` - subtype=`echo ${dtype} | cut -f2 -d_ | xargs` + export mtype=`echo ${dtype} | cut -f1 -d_ | xargs` + export subtype=`echo ${dtype} | cut -f2 -d_ | xargs` for run in ges anl; do + export run=${run} #------------------------------------------------------------- # Because few things in life are convenient or consistent, @@ -115,7 +114,7 @@ $UNCOMPRESS ${low_cnt_file}.gz fi - gdate=`${NDATE} -6 ${PDATE}` + gdate=`${NDATE} -6 ${PDATE}` prev_low_cnt_file=${TANKDIR_prev_conmon}/horz_hist/${run}/low_cnt.${run}.${gdate} if [[ -e ${prev_low_cnt_file}.gz ]]; then $UNCOMPRESS ${prev_low_cnt_file}.gz @@ -125,8 +124,8 @@ --lcf ${low_cnt_file} --plcf ${prev_low_cnt_file} \ --cyc0 ${PDATE} --cyc1 ${gdate} \ --errf ${TANKDIR_conmon}/horz_hist/${run}/err_rpt.${run}.${PDATE} - fi - done + fi + done echo "<-- horz_hist.sh" diff --git a/src/Conventional_Monitor/nwprod/conmon_shared/ush/time_vert.sh b/src/Conventional_Monitor/nwprod/conmon_shared/ush/time_vert.sh index e9fe54a..d3df4bf 100755 --- a/src/Conventional_Monitor/nwprod/conmon_shared/ush/time_vert.sh +++ b/src/Conventional_Monitor/nwprod/conmon_shared/ush/time_vert.sh @@ -46,9 +46,11 @@ echo "--> time_vert.sh" if [ $CONMON_NETCDF -eq 0 ]; then for run in ges anl; do - - ${UNCOMPRESS} ./diag_conv_${run}.${PDATE}.${Z} - + + if [[ -e ./diag_conv_${run}.${PDATE}.gz ]]; then + ${UNCOMPRESS} ./diag_conv_${run}.${PDATE}.gz + fi + cat << EOF > input &input input_file=diag_conv_${run}.${PDATE}, diff --git a/src/Conventional_Monitor/nwprod/nam_conmon/jobs/JNAM_CONMON b/src/Conventional_Monitor/nwprod/nam_conmon/jobs/JNAM_CONMON index 9e5124e..c33be3c 100755 --- a/src/Conventional_Monitor/nwprod/nam_conmon/jobs/JNAM_CONMON +++ b/src/Conventional_Monitor/nwprod/nam_conmon/jobs/JNAM_CONMON @@ -5,15 +5,28 @@ ######################################################### echo "--> JNAM_CONMON" -set -xa +#set -xa echo `date` $0 `date -u` begin -export PS4='$SECONDS + ' +#export PS4='$SECONDS + ' ########################################################### # set up temp working directory space ########################################################### export CONMON_WORK_DIR=${CONMON_WORK_DIR:-/tmpnwprd} +export KEEPDATA=${KEEPDATA:-YES} +export C_DATAROOT=${C_DATAROOT:-${CONMON_WORK_DIR}} + +job=${job:-nam_conmon} +pid=${pid:-$$} +export C_DATA=${C_DATA:-${C_DATAROOT}/${job}.${pid}} +echo C_DATA = $C_DATA + +if [[ -e ${C_DATA} ]]; then + rm -rf ${C_DATA} +fi +mkdir -p ${C_DATA} +cd ${C_DATA} ##################### @@ -26,6 +39,8 @@ export CONMON_AREA=rgn export VERBOSE=${VERBOSE:-YES} export CLEAN_TANKDIR=${CLEAN_TANKDIR:-YES} +export COMPRESS=${COMPRESS:-gzip} +export UNCOMPRESS=${UNCOMPRESS:-gunzip} ################################################################### @@ -39,7 +54,7 @@ export TANKDIR_conmon=${C_TANKDIR}/conmon.${PDY} export COM_IN=${COM_IN:-${COMROOT}/${NET}/${version}} export C_COMIN=${C_COMIN:-$COM_IN/${CONMON_SUFFIX}.${PDY}} -case $CYC in +case ${CYC} in 00) export rgnHH=t00z export rgnTM=tm00;; 01) export rgnHH=t06z @@ -92,20 +107,10 @@ esac export cnvstat=${cnvstat:-${C_COMIN}/${CONMON_SUFFIX}.${rgnHH}.cnvstat.${rgnTM}} - ######################################################## # Execute the script. # ${CONMONSH:-$HOMEnam_conmon/scripts/exnam_conmon.sh} ######################################################## -################################ -# Remove the Working Directory -################################ -KEEPDATA=${KEEPDATA:-YES} -cd ${CONMON_WORK_DIR} -if [ ${KEEPDATA} = NO ] ; then - rm -rf ${CONMON_WORK_DIR} -fi - echo "<-- JNAM_CONMON" diff --git a/src/Conventional_Monitor/nwprod/nam_conmon/scripts/exnam_conmon.sh b/src/Conventional_Monitor/nwprod/nam_conmon/scripts/exnam_conmon.sh index 6b533d4..c807179 100755 --- a/src/Conventional_Monitor/nwprod/nam_conmon/scripts/exnam_conmon.sh +++ b/src/Conventional_Monitor/nwprod/nam_conmon/scripts/exnam_conmon.sh @@ -10,6 +10,8 @@ echo start exnam_conmon.sh err=0 + export NCP=${NCP:-/bin/cp -f} + export Z=gz #------------------------- # confirm $cnvstat exists @@ -31,35 +33,28 @@ if [[ ${err} -eq 0 ]]; then export PDATE=${PDY}${CYC} - + echo PDATE = $PDATE + if [[ ! -d ${TANKDIR_conmon} ]]; then mkdir -p ${TANKDIR_conmon} fi - ############################################### - # Expand C_DATA (stmp work space) and cd to it - # - export CONMON_WORK_DIR=$CONMON_WORK_DIR/DE.${PDATE} #------------------------------------------------------------- # Ensure necessary work and TANKDIR directories are in place #------------------------------------------------------------- - if [[ ! -d ${CONMON_WORK_DIR} ]]; then - mkdir -p $CONMON_WORK_DIR - mkdir -p ${TANKDIR_conmon}/horz_hist/anl - mkdir -p ${TANKDIR_conmon}/horz_hist/ges - mkdir -p ${TANKDIR_conmon}/time_vert - fi - cd $CONMON_WORK_DIR + mkdir -p ${TANKDIR_conmon}/horz_hist/anl + mkdir -p ${TANKDIR_conmon}/horz_hist/ges + mkdir -p ${TANKDIR_conmon}/time_vert #------------------------------------------------------------------ # Copy data files file to local data directory. # Untar cnvstat file. #------------------------------------------------------------------ - $NCP $cnvstat ./cnvstat.$PDATE + ${NCP} ${cnvstat} ./cnvstat.${PDATE} - tar -xvf ./cnvstat.$PDATE - rm cnvstat.$PDATE + tar -xvf ./cnvstat.${PDATE} + rm cnvstat.${PDATE} netcdf=0 count=`ls diag* | grep ".nc4" | wc -l` @@ -71,10 +66,9 @@ done fi - echo "netcdf: $netcdf" + echo "netcdf: ${netcdf}" export CONMON_NETCDF=${netcdf} - $UNCOMPRESS ./*.${Z} - + ${UNCOMPRESS} *.gz #--------------------------------------- # run the time-vert extraction script @@ -108,6 +102,11 @@ err=$rc_time_vert fi + if [[ ${KEEPDATA} = "NO" ]]; then + cd ${C_DATA}/.. + rm -rf ${C_DATA} + fi + echo "end exgdas_conmon.sh, exit value = ${err}" exit ${err}