diff --git a/util/Radiance_Monitor/get_hostname.pl b/util/Radiance_Monitor/get_hostname.pl index ac3d971fc..fed558afc 100755 --- a/util/Radiance_Monitor/get_hostname.pl +++ b/util/Radiance_Monitor/get_hostname.pl @@ -17,13 +17,12 @@ my $my_os = "export MY_OS=$arch"; # - # Determine if installation is on WCOSS, Theia, or Zeus. + # Determine if installation is on cray, wcoss_d, or hera # if( $arch ne "linux" && $arch ne "aix" ) { die( "only linux and aix are supported, $arch is not\n" ); } -# print "\n"; -# print "arch = $arch\n"; + my $machine = ""; @@ -32,7 +31,6 @@ # while ccs and (perhaps) wcoss return [hostname].ncep.noaa.gov. Keep only the # actual hostname and see if it matches the node names for zeus, tide, or gyre. # - my $host_zeus = 0; my $host = ""; $host = ` hostname `; chomp( $host ); diff --git a/util/Radiance_Monitor/nwprod/gdas_radmon.v3.0.0/driver/test_jgdas_verfrad.sh b/util/Radiance_Monitor/nwprod/gdas_radmon.v3.0.0/driver/test_jgdas_verfrad.sh deleted file mode 100755 index 10ceb0465..000000000 --- a/util/Radiance_Monitor/nwprod/gdas_radmon.v3.0.0/driver/test_jgdas_verfrad.sh +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/ksh - -#BSUB -o gdas_verfrad.o%J -#BSUB -e gdas_verfrad.o%J -#BSUB -J gdas_verfrad -#BSUB -q dev_shared -#BSUB -n 1 -#BSUB -R affinity[core] -#BSUB -M 4000 -#BSUB -W 00:20 -#BSUB -a poe -#BSUB -P GFS-T2O - -set -x - -#export PDATE=2019061700 # binary radstat -export PDATE=2018110206 # netcdf radstat - -############################################################# -# Specify whether the run is production or development -############################################################# -export PDY=`echo $PDATE | cut -c1-8` -export cyc=`echo $PDATE | cut -c9-10` -export job=gdas_verfrad.${cyc} -export pid=${pid:-$$} -export jobid=${job}.${pid} -export envir=para -export DATAROOT=/gpfs/td2/emc/da/noscrub/${LOGNAME}/test_data -export COMROOT=/ptmpd1/$LOGNAME/com - -if [[ ! -d ${COMROOT}/logs/jlogfiles ]]; then - mkdir -p ${COMROOT}/logs/jlogfiles -fi - - -############################################################# -# Specify versions -############################################################# -export gdas_ver=v15.0.0 -export global_shared_ver=v15.0.0 -export gdas_radmon_ver=v3.0.0 -export radmon_shared_ver=v3.0.0 - - -############################################################# -# Load modules -############################################################# -. /usrx/local/Modules/3.2.9/init/ksh -module use /nwprod2/modulefiles -#module load grib_util -module load prod_util -#module load util_shared - -module list - - -############################################################# -# WCOSS environment settings -############################################################# -export POE=YES - - -############################################################# -# Set user specific variables -############################################################# -export RADMON_SUFFIX=testrad -export NWTEST=/gpfs/td2/emc/da/noscrub/Edward.Safford/ProdGSI/util/Radiance_Monitor/nwprod - -export HOMEgdas=${NWTEST}/gdas_radmon.${gdas_radmon_ver} -export HOMEgfs=${HOMEgdas} -export FIXgdas=${FIXgdas:-$HOMEgfs/fix} - -export JOBGLOBAL=${HOMEgdas}/jobs -export HOMEradmon=${NWTEST}/radmon_shared.${radmon_shared_ver} -export COM_IN=${DATAROOT} -export TANKverf=${COMROOT}/${RADMON_SUFFIX} - -export parm_file=${HOMEgdas}/parm/gdas_radmon.parm - -############################################################# -# Execute job -############################################################# -$JOBGLOBAL/JGDAS_VERFRAD - -exit - diff --git a/util/Radiance_Monitor/nwprod/gdas_radmon.v3.0.0/driver/test_jgdas_verfrad_theia.sh b/util/Radiance_Monitor/nwprod/gdas_radmon.v3.0.0/driver/test_jgdas_verfrad_hera.sh similarity index 53% rename from util/Radiance_Monitor/nwprod/gdas_radmon.v3.0.0/driver/test_jgdas_verfrad_theia.sh rename to util/Radiance_Monitor/nwprod/gdas_radmon.v3.0.0/driver/test_jgdas_verfrad_hera.sh index fcd354e00..14afa518a 100755 --- a/util/Radiance_Monitor/nwprod/gdas_radmon.v3.0.0/driver/test_jgdas_verfrad_theia.sh +++ b/util/Radiance_Monitor/nwprod/gdas_radmon.v3.0.0/driver/test_jgdas_verfrad_hera.sh @@ -10,8 +10,11 @@ set -x +export MY_MACHINE=hera + #export PDATE=${PDATE:-2018091712} #binary export PDATE=${PDATE:-2018110206} #NetCDF + ############################################################# # Specify whether the run is production or development ############################################################# @@ -21,8 +24,8 @@ export job=gdas_verfrad.${cyc} export pid=${pid:-$$} export jobid=${job}.${pid} export envir=para -export DATAROOT=${DATAROOT:-/scratch4/NCEPDEV/da/noscrub/Edward.Safford/test_data} -export COMROOT=${COMROOT:-/scratch4/NCEPDEV/stmp3/$LOGNAME/com} +export DATAROOT=${DATAROOT:-/scratch1/NCEPDEV/da/Edward.Safford/noscrub/test_data} +export COMROOT=${COMROOT:-/scratch2/NCEPDEV/stmp3/${LOGNAME}/com} ############################################################# @@ -34,21 +37,12 @@ export gdas_radmon_ver=v3.0.0 export radmon_shared_ver=v3.0.0 -############################################################# -# Add nwpara tools to path -############################################################# -NWPROD=${NWPROD:-/scratch4/NCEPDEV/global/save/glopara/nwpara/util} -NWPRODush=${NWPRODush:=${NWPROD}/ush} -NWPRODexec=${NWPRODexec:=${NWPROD}/exec} -export PATH=${PATH}:${NWPRODush}:${NWPRODexec} - ############################################################# # Set user specific variables ############################################################# export RADMON_SUFFIX=${RADMON_SUFFIX:-testrad} -#export NWTEST=${NWTEST:-/scratch4/NCEPDEV/da/noscrub/${LOGNAME}/gfs_q3fy17} -export NWTEST=${NWTEST:-/scratch4/NCEPDEV/da/noscrub/Edward.Safford/ProdGSI/util/Radiance_Monitor/nwprod} +export NWTEST=${NWTEST:-/scratch1/NCEPDEV/da/Edward.Safford/noscrub/GSI/util/Radiance_Monitor/nwprod} export HOMEgdas=${HOMEgdas:-${NWTEST}/gdas_radmon.${gdas_radmon_ver}} export HOMEgfs=$HOMEgdas @@ -59,28 +53,19 @@ export HOMEradmon=${HOMEradmon:-${NWTEST}/radmon_shared.${radmon_shared_ver}} export COM_IN=${COM_IN:-${DATAROOT}} export TANKverf=${TANKverf:-${COMROOT}/${RADMON_SUFFIX}} -export SUB=${SUB:-/apps/torque/default/bin/qsub} -export NDATE=${NDATE:-ndate} +export SUB=${SUB:-/apps/slurm/default/bin/sbatch} +export NDATE=${NDATE:-/home/Edward.Safford/bin/ndate} export parm_file=${HOMEgdas}/parm/gdas_radmon.parm -####################################################################### -# theia specific hacks for no prod_utils module & no setpdy.sh script -####################################################################### -export MY_MACHINE=theia + prevday=`$NDATE -24 $PDATE` export PDYm1=`echo $prevday | cut -c1-8` -ln -s ${NWPRODush}/startmsg.sh ${COMROOT}/startmsg -ln -s ${NWPRODush}/postmsg.sh ${COMROOT}/postmsg -ln -s ${NWPRODush}/prep_step.sh ${COMROOT}/prep_step -ln -s ${NWPRODush}/err_chk.sh ${COMROOT}/err_chk -export PATH=$PATH:${COMROOT} -export utilscript=${utilscript:-${NWPRODush}} # err_chk calls postmsg.sh - # directly so need to override - # utilscript location for theia + + ############################################################# # Execute job -############################################################# +# $JOBGLOBAL/JGDAS_VERFRAD exit diff --git a/util/Radiance_Monitor/nwprod/gdas_radmon.v3.0.0/driver/test_jgdas_verfrad_wcoss_d.sh b/util/Radiance_Monitor/nwprod/gdas_radmon.v3.0.0/driver/test_jgdas_verfrad_wcoss_d.sh index 97d841806..51ddcb881 100755 --- a/util/Radiance_Monitor/nwprod/gdas_radmon.v3.0.0/driver/test_jgdas_verfrad_wcoss_d.sh +++ b/util/Radiance_Monitor/nwprod/gdas_radmon.v3.0.0/driver/test_jgdas_verfrad_wcoss_d.sh @@ -25,9 +25,7 @@ export job=gdas_verfrad.${cyc} export pid=${pid:-$$} export jobid=${job}.${pid} export envir=prod -#export DATAROOT=/gpfs/dell2/emc/modeling/noscrub/${LOGNAME}/test_data -#export DATAROOT=/gpfs/dell3/ptmp/emc.glopara/ROTDIRS/v16rt0 -export DATAROOT=/gpfs/dell1/nco/ops/com/gfs/prod +export DATAROOT=/gpfs/dell2/emc/modeling/noscrub/${LOGNAME}/test_data export COMROOT=/gpfs/dell2/ptmp/${LOGNAME} if [[ ! -d ${COMROOT}/logs/jlogfiles ]]; then @@ -75,7 +73,7 @@ if [[ -d ${DATA} ]]; then fi export jlogfile=${COMROOT}/logs/jlogfiles/${RADMON_SUFFIX}_jlog -export NWTEST=/gpfs/dell2/emc/modeling/noscrub/Edward.Safford/ProdGSI/util/Radiance_Monitor/nwprod +export NWTEST=/gpfs/dell2/emc/modeling/noscrub/Edward.Safford/GSI/util/Radiance_Monitor/nwprod export HOMEgdas=${NWTEST}/gdas_radmon.${gdas_radmon_ver} export HOMEgfs=${HOMEgdas} diff --git a/util/Radiance_Monitor/nwprod/gdas_radmon.v3.0.0/fix/gdas_radmon_base.tar b/util/Radiance_Monitor/nwprod/gdas_radmon.v3.0.0/fix/gdas_radmon_base.tar new file mode 100644 index 000000000..4e3ac88fe Binary files /dev/null and b/util/Radiance_Monitor/nwprod/gdas_radmon.v3.0.0/fix/gdas_radmon_base.tar differ diff --git a/util/Radiance_Monitor/nwprod/gdas_radmon.v3.0.0/jobs/JGDAS_VERFRAD b/util/Radiance_Monitor/nwprod/gdas_radmon.v3.0.0/jobs/JGDAS_VERFRAD index 11f69731c..c7f4cd45c 100755 --- a/util/Radiance_Monitor/nwprod/gdas_radmon.v3.0.0/jobs/JGDAS_VERFRAD +++ b/util/Radiance_Monitor/nwprod/gdas_radmon.v3.0.0/jobs/JGDAS_VERFRAD @@ -94,17 +94,23 @@ export RAD_AREA=${RAD_AREA:-glb} export biascr=${biascr:-$COMIN/gdas.t${cyc}z.abias} export radstat=${radstat:-$COMIN/gdas.t${cyc}z.radstat} -msg="JOB HAS STARTED" -postmsg "$jlogfile" "$msg" +echo " " +echo "JOB HAS STARTED" +echo " " + ######################################################## # Execute the script. ${RADMONSH:-${SCRgfs}/exgdas_vrfyrad.sh.ecf} ${PDY} ${cyc} err=$? -[[ $err -ne 0 ]] && exit $err -msg="JOB COMPLETED NORMALLY" -postmsg "$jlogfile" "$msg" +if [[ $err -ne 0 ]] ; then + exit $err +else + echo " " + echo "JOB HAS COMPLETED NORMALLY" + echo " " +fi ################################ # Remove the Working Directory diff --git a/util/Radiance_Monitor/nwprod/gdas_radmon.v3.0.0/scripts/exgdas_vrfyrad.sh.ecf b/util/Radiance_Monitor/nwprod/gdas_radmon.v3.0.0/scripts/exgdas_vrfyrad.sh.ecf index 9edf15d9d..771a5a549 100755 --- a/util/Radiance_Monitor/nwprod/gdas_radmon.v3.0.0/scripts/exgdas_vrfyrad.sh.ecf +++ b/util/Radiance_Monitor/nwprod/gdas_radmon.v3.0.0/scripts/exgdas_vrfyrad.sh.ecf @@ -235,8 +235,8 @@ if [[ "$VERBOSE" = "YES" ]]; then echo "end exgdas_vrfyrad.sh.ecf, exit value = ${err}" fi -msg="${scr} HAS ENDED" -postmsg "$jlogfile" "$msg" +echo "${scr} HAS ENDED" + set +x exit ${err} diff --git a/util/Radiance_Monitor/nwprod/radmon_shared.v3.0.0/ush/radmon_verf_angle.sh b/util/Radiance_Monitor/nwprod/radmon_shared.v3.0.0/ush/radmon_verf_angle.sh index 288630cc9..647c8c1b0 100755 --- a/util/Radiance_Monitor/nwprod/radmon_shared.v3.0.0/ush/radmon_verf_angle.sh +++ b/util/Radiance_Monitor/nwprod/radmon_shared.v3.0.0/ush/radmon_verf_angle.sh @@ -76,9 +76,6 @@ rgnTM=${rgnTM:-} export PDATE=${1:-${PDATE:?}} -scr=radmon_verf_angle.sh -msg="${scr} HAS STARTED" -postmsg "$jlogfile" "$msg" echo " REGIONAL_RR, rgnHH, rgnTM = $REGIONAL_RR, $rgnHH, $rgnTM" netcdf_boolean=".false." if [[ $RADMON_NETCDF -eq 1 ]]; then @@ -263,8 +260,6 @@ if [[ "$VERBOSE" = "YES" ]]; then echo $(date) EXITING $0 error code ${err} >&2 fi -msg="${scr} HAS ENDED" -postmsg "$jlogfile" "$msg" echo "<-- radmon_verf_angle.sh" exit ${err} diff --git a/util/Radiance_Monitor/nwprod/radmon_shared.v3.0.0/ush/radmon_verf_bcoef.sh b/util/Radiance_Monitor/nwprod/radmon_shared.v3.0.0/ush/radmon_verf_bcoef.sh index 93c56226b..ee81c98c1 100755 --- a/util/Radiance_Monitor/nwprod/radmon_shared.v3.0.0/ush/radmon_verf_bcoef.sh +++ b/util/Radiance_Monitor/nwprod/radmon_shared.v3.0.0/ush/radmon_verf_bcoef.sh @@ -72,10 +72,6 @@ # Command line arguments. export PDATE=${1:-${PDATE:?}} -scr=radmon_verf_bcoef.sh -msg="${scr} HAS STARTED" -postmsg "$jlogfile" "$msg" - netcdf_boolean=".false." if [[ $RADMON_NETCDF -eq 1 ]]; then netcdf_boolean=".true." @@ -246,7 +242,5 @@ if [[ "$VERBOSE" = "YES" ]]; then echo $(date) EXITING $0 with error code ${err} >&2 fi -msg="${scr} HAS ENDED" -postmsg "$jlogfile" "$msg" exit ${err} diff --git a/util/Radiance_Monitor/nwprod/radmon_shared.v3.0.0/ush/radmon_verf_bcor.sh b/util/Radiance_Monitor/nwprod/radmon_shared.v3.0.0/ush/radmon_verf_bcor.sh index cfba7367d..2d1faefff 100755 --- a/util/Radiance_Monitor/nwprod/radmon_shared.v3.0.0/ush/radmon_verf_bcor.sh +++ b/util/Radiance_Monitor/nwprod/radmon_shared.v3.0.0/ush/radmon_verf_bcor.sh @@ -71,10 +71,6 @@ # Command line arguments. export PDATE=${1:-${PDATE:?}} -scr=radmon_verf_bcor.sh -msg="${scr} HAS STARTED" -postmsg "$jlogfile" "$msg" - if [[ "$VERBOSE" = "YES" ]]; then set -ax @@ -239,8 +235,5 @@ if [[ "$VERBOSE" = "YES" ]]; then echo $(date) EXITING $0 error code ${err} >&2 fi -msg="${scr} HAS ENDED" -postmsg "$jlogfile" "$msg" - exit ${err} diff --git a/util/Radiance_Monitor/parm/RadMon_config b/util/Radiance_Monitor/parm/RadMon_config index 908c2553a..ae86fc2fe 100644 --- a/util/Radiance_Monitor/parm/RadMon_config +++ b/util/Radiance_Monitor/parm/RadMon_config @@ -20,7 +20,7 @@ export MONITOR=radmon # you checked out only the Radiance_Monitor portion of the branch then # MY_RADMON should point to that. # -export MY_RADMON=${MY_RADMON:-/gpfs/dell2/emc/modeling/noscrub/Edward.Safford/ProdGSI/util/Radiance_Monitor} +export MY_RADMON=${MY_RADMON:-/scratch1/NCEPDEV/da/Edward.Safford/noscrub/ProdGSI/util/Radiance_Monitor} # # The MY_TANKDIR will be the location for the extracted data files and @@ -28,7 +28,7 @@ export MY_RADMON=${MY_RADMON:-/gpfs/dell2/emc/modeling/noscrub/Edward.Safford/Pr # and the succedding scripts will construct and use subdirectories under # this location. # -export MY_TANKDIR=${MY_TANKDIR:-/gpfs/dell2/emc/modeling/noscrub/Edward.Safford/nbns} +export MY_TANKDIR=${MY_TANKDIR:-/scratch1/NCEPDEV/da/Edward.Safford/nbns} export RUN=${RUN:-gdas} @@ -67,16 +67,16 @@ export WEBDIR=${WEBDIR:-/home/people/emc/www/htdocs/gmb/gdas/radiance/esafford} ############################################################################### ############################################################################### -export MY_MACHINE=wcoss_d +export MY_MACHINE=hera export LITTLE_ENDIAN=${LITTLE_ENDIAN:-0} # # Log and work space definitions # -export MY_PTMP=${MY_PTMP:-/gpfs/dell2/ptmp} +export MY_PTMP=${MY_PTMP:-/scratch2/NCEPDEV/stmp3} export PTMP_USER=${PTMP_USER:-${MY_PTMP}/${LOGNAME}} -export MY_STMP=${MY_STMP:-/gpfs/dell2/stmp} +export MY_STMP=${MY_STMP:-/scratch2/NCEPDEV/stmp1} export STMP_USER=${STMP_USER:-${MY_STMP}/${LOGNAME}} export LOGSverf_rad=${LOGSverf_rad:-${PTMP_USER}/logs} @@ -184,39 +184,19 @@ elif [[ $MY_MACHINE = "cray" ]]; then export COMPRESS="gzip -f" export UNCOMPRESS="gunzip -f" -elif [[ $MY_MACHINE = "theia" ]]; then +elif [[ $MY_MACHINE = "hera" ]]; then + + export GRADS=/apps/grads/2.0.2/bin/grads + export STNMAP=/apps/grads/2.0.2/bin/stnmap export SUB=/apps/slurm/default/bin/sbatch - NWPROD=${NWPROD:-/scratch4/NCEPDEV/global/save/glopara/nwpara/util} - NWPRODush=${NWPRODush:=${NWPROD}/ush} - NWPRODexec=${NWPRODexec:=${NWPROD}/exec} - export NDATE=${NDATE:-${NWPRODexec}/ndate} - export COMPRESS=gzip - export UNCOMPRESS="gunzip -f" - export LOADLQ="squeue -u $LOGNAME" - - #------------------------------------------------------------------------ - # The links below are a hack around the modules that are available - # on the wcoss ibm & cray machines but not here on theia. The alternative - # was a bunch of contitional executions within the scripts to avoid the - # nco mandated log and error requirements. - #------------------------------------------------------------------------ + export NDATE=/home/Edward.Safford/bin/ndate + export COMPRESS=${COMPRESS:-gzip} + export UNCOMPRESS=${UNCOMPRESS:-"gunzip -f"} + prevday=`$NDATE -24 $PDATE` export PDYm1=`echo $prevday | cut -c1-8` - ln -s ${NWPRODush}/startmsg.sh ${STMP_USER}/startmsg - ln -s ${NWPRODush}/postmsg.sh ${STMP_USER}/postmsg - ln -s ${NWPRODush}/prep_step.sh ${STMP_USER}/prep_step - ln -s ${NWPRODush}/err_chk.sh ${STMP_USER}/err_chk - export PATH=$PATH:${STMP_USER} - - #------------------------------------------------------------------------ - # err_chk "helpfully" calls postmsg.sh directly so we need to override - # the utilscript location on theia to defeat err_chk's helpfulness and - # avoid a fatal error. - #------------------------------------------------------------------------ - export utilscript=${utilscript:-${NWPRODush}} - - + fi