diff --git a/util/Conventional_Monitor/ToDo b/util/Conventional_Monitor/ToDo index ad6fbff34e..ac8921f14d 100644 --- a/util/Conventional_Monitor/ToDo +++ b/util/Conventional_Monitor/ToDo @@ -1,8 +1,9 @@ - Package install - Package build - Data extraction - Data copy - image generation - file transfer +N/a Package install +Done Package build +N/a Data extraction +N/a Data copy +N/a image generation +Done file transfer html generation base file creation + image gen for horiz plots not working (still?) diff --git a/util/Conventional_Monitor/image_gen/ush/Transfer.sh b/util/Conventional_Monitor/image_gen/ush/Transfer.sh index 53079bd7ae..829da5cd60 100755 --- a/util/Conventional_Monitor/image_gen/ush/Transfer.sh +++ b/util/Conventional_Monitor/image_gen/ush/Transfer.sh @@ -65,6 +65,7 @@ fi logfile=${C_LOGDIR}/transfer_${CMON_SUFFIX}.log +errfile=${C_LOGDIR}/transfer_${CMON_SUFFIX}.err export JOB_QUEUE=dev_transfer WEBDIR=${WEBDIR}/${CMON_SUFFIX}/${RUN} @@ -82,6 +83,12 @@ if [[ $MY_MACHINE == "wcoss_d" || $MY_MACHINE == "wcoss_c" ]]; then $SUB -P $PROJECT -q $JOB_QUEUE -o ${logfile} -M 80 -W 1:30 \ -R affinity[core] -J ${jobname} -cwd ${PWD} \ ${C_IG_SCRIPTS}/transfer_imgs.sh + +elif [[ $MY_MACHINE = "wcoss2" ]]; then + $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 "Manual intervention is required." diff --git a/util/Conventional_Monitor/image_gen/ush/transfer_imgs.sh b/util/Conventional_Monitor/image_gen/ush/transfer_imgs.sh index 2107e79575..8d9f1e3adb 100755 --- a/util/Conventional_Monitor/image_gen/ush/transfer_imgs.sh +++ b/util/Conventional_Monitor/image_gen/ush/transfer_imgs.sh @@ -9,7 +9,7 @@ if [[ ${C_IMGNDIR} != "/" ]]; then echo "WEBSVR = $WEBSVR" echo "WEBDIR = $WEBDIR" - if [[ $MY_MACHINE = "wcoss_d" || $MY_MACHINE = "cray" ]]; then + if [[ $MY_MACHINE = "wcoss_d" || $MY_MACHINE = "cray" || $MY_MACHINE = "wcoss2" ]]; then /usr/bin/rsync -ave ssh --exclude *.ctl.${Z} --delete-during ${C_IMGNDIR}/ \ ${WEBUSER}@${WEBSVR}.ncep.noaa.gov:${WEBDIR}/ fi diff --git a/util/Conventional_Monitor/parm/ConMon_config b/util/Conventional_Monitor/parm/ConMon_config index 120d0a261c..fb2bc66c9b 100644 --- a/util/Conventional_Monitor/parm/ConMon_config +++ b/util/Conventional_Monitor/parm/ConMon_config @@ -9,7 +9,7 @@ if [[ $CONMON_CONFIG -ne 1 ]]; then export CONMON_CONFIG=1 - export MY_MACHINE=wcoss_d + export MY_MACHINE=wcoss2 #----------------------------------------------------- @@ -40,7 +40,7 @@ if [[ $CONMON_CONFIG -ne 1 ]]; then # MY_CONMON should point to your working directory which contains the # top level directory to the ConMon package. # - export MY_CONMON=/gpfs/dell2/emc/modeling/noscrub/Edward.Safford/GSI/util/Conventional_Monitor + export MY_CONMON=/lfs/h2/emc/da/noscrub/Edward.Safford/git/gsi/GSI/util/Conventional_Monitor #--------------------------------------------------------------------- @@ -58,7 +58,7 @@ if [[ $CONMON_CONFIG -ne 1 ]]; then # and the succedding scripts will construct and use subdirectories under # this location. # - export CONMON_TANKDIR=/u/Edward.Safford/nbns + export CONMON_TANKDIR=/lfs/h2/emc/da/noscrub/Edward.Safford/nbns export C_TANKverf=${C_TANKverf:-${CONMON_TANKDIR}} export C_TANKDIR=${CONMON_TANKDIR}/stats/${CONMON_SUFFIX} @@ -159,20 +159,36 @@ if [[ $CONMON_CONFIG -ne 1 ]]; then export SERVICE_PARTITION="service" elif [[ $MY_MACHINE = "wcoss2" ]]; then + module load prod_util/2.0.13 + module load util_shared/1.4.0 + module load grib_util/1.2.4 + module load wgrib2/2.0.8_wmo + + #------------------------ + # temporary workaround + # + module use /apps/test/modules + module load GrADS/2.2.1-cce-11.0.4 + export GRADS=`which grads` + export STNMAP=`which stnmap` + #------------------------ + + export WGRIB2=`which wgrib2` + export SUB="qsub" export COMPRESS=/usr/bin/gzip export UNCOMPRESS="/usr/bin/gunzip -f" fi export Z="gz" - export ACCOUNT=${ACCOUNT:-} - export PROJECT= - export JOB_QUEUE= + export ACCOUNT=${ACCOUNT:-GFS-DEV} + export PROJECT=${PROJECT:-GDAS-DEV} + export JOB_QUEUE=${JOB_QUEUE:-dev} - export C_STMP=${C_STMP:-/gpfs/dell2/stmp} - export C_STMP_USER=${C_STMP_USER:-${C_STMP}/${LOGNAME}} - export C_PTMP=${C_PTMP:-/gpfs/dell2/ptmp} - export C_PTMP_USER=${C_PTMP_USER:-${C_PTMP}/${LOGNAME}} + export MY_STMP=${MY_STMP:-/lfs/h2/emc/stmp} + export C_STMP_USER=${C_STMP_USER:-${MY_STMP}/${LOGNAME}} + export MY_PTMP=${MY_PTMP:-/lfs/h2/emc/ptmp} + export C_PTMP_USER=${C_PTMP_USER:-${MY_PTMP}/${LOGNAME}} export C_LOGDIR=${C_PTMP_USER}/logs/${CONMON_SUFFIX}/${RUN}/conmon export WORK_conmon=${WORK_conmon:-${C_STMP_USER}/${CONMON_SUFFIX}/${RUN}/ConMon}