Issue #2: merge branch 'master' at 93cd14b into release/gfsda.v16.0.0

NOAA-EMC · Jun 12, 2020 · 63d9f19 · 63d9f19
2 parents e9e717a + 93cd14b
commit 63d9f19
Show file tree

Hide file tree

Showing 12 changed files with 45 additions and 182 deletions.
diff --git a/src/enkf/mpi_readobs.f90 b/src/enkf/mpi_readobs.f90
@@ -317,8 +317,8 @@ subroutine mpi_getobs(obspath, datestring, nobs_conv, nobs_oz, nobs_sat, nobs_to
                                      maxval(sprd_ob(nobs_conv+nobs_oz+1:nobs_tot))
        do nob =nobs_conv+nobs_oz+1 , nobs_tot
           if (sprd_ob(nob) > 1000.) then 
-             print *, nob, ' sat spread: ', sprd_ob(nob), ', ensmean_ob: ', ensmean_obbc(nob), &
-                           ', anal_ob: ', anal_ob(:,nob), ', mem_ob: ', mem_ob(nob)
+             print *, nob, trim(obtype(nob)),ob(nob),' sat spread: ', sprd_ob(nob), ', ensmean_ob: ', ensmean_obbc(nob), &
+                           ', anal_ob: ', anal_ob(:,nob)
           endif
        enddo
     endif

diff --git 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
diff --git a/...v3.0.0/driver/test_jgdas_verfrad_theia.sh → ....v3.0.0/driver/test_jgdas_verfrad_hera.sh b/...v3.0.0/driver/test_jgdas_verfrad_theia.sh → ....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
@@ -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
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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}