diff --git a/README.md b/README.md index cb6a01f..a3c6aef 100644 --- a/README.md +++ b/README.md @@ -25,13 +25,11 @@ EMC_verif-global depends on the following prerequisities to be available on the * NetCDF Operators (NCO) EMC_verif-global is supported on the following machines: -* WCOSS-Dell (Mars and Venus) -* WCOSS-Cray (Luna and Surge) +* WCOSS2 (Cactus and Dogwood) * Hera * Orion * S4 * Jet -* WCOSS2 (Cactus and Dogwood) For questions or issues, please e-mail Mallory Row at mallory.row@noaa.gov. diff --git a/ecf/scripts/verif_global/jverif_global_grid2grid_step1.ecf b/ecf/scripts/verif_global/jverif_global_grid2grid_step1.ecf deleted file mode 100644 index d4f621a..0000000 --- a/ecf/scripts/verif_global/jverif_global_grid2grid_step1.ecf +++ /dev/null @@ -1,59 +0,0 @@ -#PBS -N verif_global_grid2grid_step1_%CYC% -#PBS -j oe -#PBS -S /bin/sh -#PBS -q %QUEUE% -#PBS -A %PROJ%-%PROJENVIR% -#PBS -l walltime=06:00:00 -#PBS -l place=vscatter,select=1:ncpus=3 -#PBS -l debug=true - -%include -%include - -export model=verif_global -%include - -############################################################ -# Load modules -############################################################ -module load envvar/${envvar_ver} -module load PrgEnv-intel/${PrgEnvintel_ver} -module load craype/${craype_ver} -module load intel/${intel_ver} -module load cray-mpich/${craympich_ver} -module load cray-pals/${craypals_ver} -module load cfp/${cfp_ver} -module load libjpeg/${libjpeg_ver} -module load libpng/${libpng_ver} -module load zlib/${zlib_ver} -module load jasper/${jasper_ver} -module load proj/${proj_ver} -module load geos/${geos_ver} -module load hdf5/${hdf5_ver} -module load netcdf/${netcdf_ver} -module load nco/${nco_ver} -module load prod_util/${prod_util_ver} -module load grib_util/${grib_util_ver} -module load imagemagick/${imagemagick_ver} -module load python/${python_ver} - -set -x -export cyc=%CYC% -export NET=verif_global -export RUN=grid2grid_step1 - -${HOMEverif_global}/jobs/JVERIF_GLOBAL_GRID2GRID_STEP1 - -%include -%manual -################################################################################# -#TASKSCRIPT DOCUMENTATION BLOCK -# -#PURPOSE: To execute the job that creates the ncepdate on IBMSP -####################################################################### -####################################################################### -## Job specific troubleshooting instructions: -# see generic troubleshoot manual page -# -###################################################################### -%end diff --git a/ecf/scripts/verif_global/jverif_global_grid2grid_step2.ecf b/ecf/scripts/verif_global/jverif_global_grid2grid_step2.ecf deleted file mode 100644 index a1fbd5a..0000000 --- a/ecf/scripts/verif_global/jverif_global_grid2grid_step2.ecf +++ /dev/null @@ -1,59 +0,0 @@ -#PBS -N verif_global_grid2grid_step2_%CYC% -#PBS -j oe -#PBS -S /bin/sh -#PBS -q %QUEUE% -#PBS -A %PROJ%-%PROJENVIR% -#PBS -l walltime=06:00:00 -#PBS -l place=vscatter,select=1:ncpus=3 -#PBS -l debug=true - -%include -%include - -export model=verif_global -%include - -############################################################ -# Load modules -############################################################ -module load envvar/${envvar_ver} -module load PrgEnv-intel/${PrgEnvintel_ver} -module load craype/${craype_ver} -module load intel/${intel_ver} -module load cray-mpich/${craympich_ver} -module load cray-pals/${craypals_ver} -module load cfp/${cfp_ver} -module load libjpeg/${libjpeg_ver} -module load libpng/${libpng_ver} -module load zlib/${zlib_ver} -module load jasper/${jasper_ver} -module load proj/${proj_ver} -module load geos/${geos_ver} -module load hdf5/${hdf5_ver} -module load netcdf/${netcdf_ver} -module load nco/${nco_ver} -module load prod_util/${prod_util_ver} -module load grib_util/${grib_util_ver} -module load imagemagick/${imagemagick_ver} -module load python/${python_ver} - -set -x -export cyc=%CYC% -export NET=verif_global -export RUN=grid2grid_step2 - -${HOMEverif_global}/jobs/JVERIF_GLOBAL_GRID2GRID_STEP2 - -%include -%manual -################################################################################# -#TASKSCRIPT DOCUMENTATION BLOCK -# -#PURPOSE: To execute the job that creates the ncepdate on IBMSP -####################################################################### -####################################################################### -## Job specific troubleshooting instructions: -# see generic troubleshoot manual page -# -###################################################################### -%end diff --git a/ecf/scripts/verif_global/jverif_global_grid2obs_step1.ecf b/ecf/scripts/verif_global/jverif_global_grid2obs_step1.ecf deleted file mode 100644 index 265d81d..0000000 --- a/ecf/scripts/verif_global/jverif_global_grid2obs_step1.ecf +++ /dev/null @@ -1,59 +0,0 @@ -#PBS -N verif_global_grid2obs_step1_%CYC% -#PBS -j oe -#PBS -S /bin/sh -#PBS -q %QUEUE% -#PBS -A %PROJ%-%PROJENVIR% -#PBS -l walltime=06:00:00 -#PBS -l place=vscatter,select=1:ncpus=3 -#PBS -l debug=true - -%include -%include - -export model=verif_global -%include - -############################################################ -# Load modules -############################################################ -module load envvar/${envvar_ver} -module load PrgEnv-intel/${PrgEnvintel_ver} -module load craype/${craype_ver} -module load intel/${intel_ver} -module load cray-mpich/${craympich_ver} -module load cray-pals/${craypals_ver} -module load cfp/${cfp_ver} -module load libjpeg/${libjpeg_ver} -module load libpng/${libpng_ver} -module load zlib/${zlib_ver} -module load jasper/${jasper_ver} -module load proj/${proj_ver} -module load geos/${geos_ver} -module load hdf5/${hdf5_ver} -module load netcdf/${netcdf_ver} -module load nco/${nco_ver} -module load prod_util/${prod_util_ver} -module load grib_util/${grib_util_ver} -module load imagemagick/${imagemagick_ver} -module load python/${python_ver} - -set -x -export cyc=%CYC% -export NET=verif_global -export RUN=grid2obs_step1 - -${HOMEverif_global}/jobs/JVERIF_GLOBAL_GRID2OBS_STEP1 - -%include -%manual -################################################################################# -#TASKSCRIPT DOCUMENTATION BLOCK -# -#PURPOSE: To execute the job that creates the ncepdate on IBMSP -####################################################################### -####################################################################### -## Job specific troubleshooting instructions: -# see generic troubleshoot manual page -# -###################################################################### -%end diff --git a/ecf/scripts/verif_global/jverif_global_grid2obs_step2.ecf b/ecf/scripts/verif_global/jverif_global_grid2obs_step2.ecf deleted file mode 100644 index 9549185..0000000 --- a/ecf/scripts/verif_global/jverif_global_grid2obs_step2.ecf +++ /dev/null @@ -1,59 +0,0 @@ -#PBS -N verif_global_grid2obs_step2_%CYC% -#PBS -j oe -#PBS -S /bin/sh -#PBS -q %QUEUE% -#PBS -A %PROJ%-%PROJENVIR% -#PBS -l walltime=06:00:00 -#PBS -l place=vscatter,select=1:ncpus=3 -#PBS -l debug=true - -%include -%include - -export model=verif_global -%include - -############################################################ -# Load modules -############################################################ -module load envvar/${envvar_ver} -module load PrgEnv-intel/${PrgEnvintel_ver} -module load craype/${craype_ver} -module load intel/${intel_ver} -module load cray-mpich/${craympich_ver} -module load cray-pals/${craypals_ver} -module load cfp/${cfp_ver} -module load libjpeg/${libjpeg_ver} -module load libpng/${libpng_ver} -module load zlib/${zlib_ver} -module load jasper/${jasper_ver} -module load proj/${proj_ver} -module load geos/${geos_ver} -module load hdf5/${hdf5_ver} -module load netcdf/${netcdf_ver} -module load nco/${nco_ver} -module load prod_util/${prod_util_ver} -module load grib_util/${grib_util_ver} -module load imagemagick/${imagemagick_ver} -module load python/${python_ver} - -set -x -export cyc=%CYC% -export NET=verif_global -export RUN=grid2obs_step2 - -${HOMEverif_global}/jobs/JVERIF_GLOBAL_GRID2OBS_STEP2 - -%include -%manual -################################################################################# -#TASKSCRIPT DOCUMENTATION BLOCK -# -#PURPOSE: To execute the job that creates the ncepdate on IBMSP -####################################################################### -####################################################################### -## Job specific troubleshooting instructions: -# see generic troubleshoot manual page -# -###################################################################### -%end diff --git a/ecf/scripts/verif_global/jverif_global_precip_step1.ecf b/ecf/scripts/verif_global/jverif_global_precip_step1.ecf deleted file mode 100644 index 1966a81..0000000 --- a/ecf/scripts/verif_global/jverif_global_precip_step1.ecf +++ /dev/null @@ -1,59 +0,0 @@ -#PBS -N verif_global_precip_step1_%CYC% -#PBS -j oe -#PBS -S /bin/sh -#PBS -q %QUEUE% -#PBS -A %PROJ%-%PROJENVIR% -#PBS -l walltime=06:00:00 -#PBS -l place=vscatter,select=1:ncpus=3 -#PBS -l debug=true - -%include -%include - -export model=verif_global -%include - -############################################################ -# Load modules -############################################################ -module load envvar/${envvar_ver} -module load PrgEnv-intel/${PrgEnvintel_ver} -module load craype/${craype_ver} -module load intel/${intel_ver} -module load cray-mpich/${craympich_ver} -module load cray-pals/${craypals_ver} -module load cfp/${cfp_ver} -module load libjpeg/${libjpeg_ver} -module load libpng/${libpng_ver} -module load zlib/${zlib_ver} -module load jasper/${jasper_ver} -module load proj/${proj_ver} -module load geos/${geos_ver} -module load hdf5/${hdf5_ver} -module load netcdf/${netcdf_ver} -module load nco/${nco_ver} -module load prod_util/${prod_util_ver} -module load grib_util/${grib_util_ver} -module load imagemagick/${imagemagick_ver} -module load python/${python_ver} - -set -x -export cyc=%CYC% -export NET=verif_global -export RUN=precip_step1 - -${HOMEverif_global}/jobs/JVERIF_GLOBAL_PRECIP_STEP1 - -%include -%manual -################################################################################# -#TASKSCRIPT DOCUMENTATION BLOCK -# -#PURPOSE: To execute the job that creates the ncepdate on IBMSP -####################################################################### -####################################################################### -## Job specific troubleshooting instructions: -# see generic troubleshoot manual page -# -###################################################################### -%end diff --git a/ecf/scripts/verif_global/jverif_global_precip_step2.ecf b/ecf/scripts/verif_global/jverif_global_precip_step2.ecf deleted file mode 100644 index d7ba2aa..0000000 --- a/ecf/scripts/verif_global/jverif_global_precip_step2.ecf +++ /dev/null @@ -1,59 +0,0 @@ -#PBS -N verif_global_precip_step2_%CYC% -#PBS -j oe -#PBS -S /bin/sh -#PBS -q %QUEUE% -#PBS -A %PROJ%-%PROJENVIR% -#PBS -l walltime=06:00:00 -#PBS -l place=vscatter,select=1:ncpus=3 -#PBS -l debug=true - -%include -%include - -export model=verif_global -%include - -############################################################ -# Load modules -############################################################ -module load envvar/${envvar_ver} -module load PrgEnv-intel/${PrgEnvintel_ver} -module load craype/${craype_ver} -module load intel/${intel_ver} -module load cray-mpich/${craympich_ver} -module load cray-pals/${craypals_ver} -module load cfp/${cfp_ver} -module load libjpeg/${libjpeg_ver} -module load libpng/${libpng_ver} -module load zlib/${zlib_ver} -module load jasper/${jasper_ver} -module load proj/${proj_ver} -module load geos/${geos_ver} -module load hdf5/${hdf5_ver} -module load netcdf/${netcdf_ver} -module load nco/${nco_ver} -module load prod_util/${prod_util_ver} -module load grib_util/${grib_util_ver} -module load imagemagick/${imagemagick_ver} -module load python/${python_ver} - -set -x -export cyc=%CYC% -export NET=verif_global -export RUN=precip_step2 - -${HOMEverif_global}/jobs/JVERIF_GLOBAL_PRECIP_STEP2 - -%include -%manual -################################################################################# -#TASKSCRIPT DOCUMENTATION BLOCK -# -#PURPOSE: To execute the job that creates the ncepdate on IBMSP -####################################################################### -####################################################################### -## Job specific troubleshooting instructions: -# see generic troubleshoot manual page -# -###################################################################### -%end diff --git a/jobs/JVERIF_GLOBAL_GRID2GRID_STEP1 b/jobs/JVERIF_GLOBAL_GRID2GRID_STEP1 deleted file mode 100755 index f541919..0000000 --- a/jobs/JVERIF_GLOBAL_GRID2GRID_STEP1 +++ /dev/null @@ -1,128 +0,0 @@ -#!/bin/sh - -export PS4='$SECONDS + ' -date -set -xa - -####################################################### -# This job processes the GRID2GRID cloud verification -####################################################### -export RUN_ENVIR=${RUN_ENVIR:-nco} -export SENDECF=${SENDECF:-YES} - -############################### -# Specify RUN name -############################### -export NET=verf_global -export RUN=grid2grid_step1 - -############################################################### -# This block can be modified for different Production test -# environment. This is used for operational testings -############################################################### -if [ "$RUN_ENVIR" = nco -o "$RUN_ENVIR" = para ] ; then - if [ $envir != "prod" ] ; then - export SENDDBN=${SENDDBN:-NO} - export DBNLOG=${DBNLOG:-YES} - export DATA_IN=${DATA_IN:-$DATAROOT} - fi -fi - -##################################################################################### -# This block is for Developer's test run: -# Run config file to get input parameters -##################################################################################### -if [ "$RUN_ENVIR" = dev ] ### For Developers -then - . $HOME/parm/config/config.vrfy -fi - -if [ $SENDECF = YES ] -then - ecflow_client .init=${ECF_RID} -fi - -# ################################### -# SET SHELL PROCESSING VARIABLES -# ################################### -export PS4='$SECONDS + ' -date - -########################################################## -# obtain unique process id (pid) and make temp directory -########################################################## -export pid=$$ -export DATA=${DATA:-${DATAROOT}/${jobid:?}} -rm -rf $DATA -mkdir -p $DATA -cd $DATA - -########################################### -# Run setpdy and initialize PDY variables -########################################### -export cycle=${cycle:-t${cyc}z} -setpdy.sh -. PDY - -#################################### -# File To Log Msgs -#################################### -export jlogfile=${jlogfile:-${DATA}/jlogfile} - -#################################### -# Determine Job Output Name on System -#################################### -export outid="LL$job" -export jobid="${outid}.o${pid}" -export pgmout="OUTPUT.${pid}" - -export cycle=t${cyc}z - -############################################## -# Begin JOB SPECIFIC work -############################################## -export USHverif_global=$HOMEverif_global/ush -export EXECverif_global=$HOMEverif_global/exec -export PARMverif_global=$HOMEverif_global/parm -export FIXverif_global=$HOMEverif_global/fix - -export DCOM=${DCOM:-$DCOMROOT/$NET} -export PCOM=${PCOM:-$PCOMROOT/$NET} -export COMIN=${COMIN:-$COMROOT/$NET/$envir/$RUN.$PDY} -export COMOUT=${COMOUT:-$COMROOT/$NET/$envir/$RUN.$PDY} -mkdir -p $COMOUT $DCOM $PCOM $GESOUT - -env - -# Execute the script. -msg="HAS BEGUN on $(hostname)" -postmsg "$jlogfile" "$msg" -sh $HOMEverif_global/scripts/exgrid2grid_step1.sh -status=$? -if [[ $status -ne 0 ]]; then - exit $status -fi -############################################## -# End JOB SPECIFIC work -############################################# - - -############################################## -# Final processing -############################################## -msg="ENDED NORMALLY." -postmsg "$jlogfile" "$msg" - -if [ -e "$pgmout" ]; then - cat $pgmout -fi - -########################################## -# Remove the Temporary working directory -########################################## -cd $DATAROOT -if [[ $KEEPDATA = "NO" ]]; then - rm -rf $DATA -fi - -date diff --git a/jobs/JVERIF_GLOBAL_GRID2GRID_STEP2 b/jobs/JVERIF_GLOBAL_GRID2GRID_STEP2 deleted file mode 100755 index f523abe..0000000 --- a/jobs/JVERIF_GLOBAL_GRID2GRID_STEP2 +++ /dev/null @@ -1,128 +0,0 @@ -#!/bin/sh - -export PS4='$SECONDS + ' -date -set -xa - -####################################################### -# This job processes the GRID2GRID cloud verification -####################################################### -export RUN_ENVIR=${RUN_ENVIR:-nco} -export SENDECF=${SENDECF:-YES} - -############################### -# Specify RUN name -############################### -export NET=verf_global -export RUN=grid2grid_step2 - -############################################################### -# This block can be modified for different Production test -# environment. This is used for operational testings -############################################################### -if [ "$RUN_ENVIR" = nco -o "$RUN_ENVIR" = para ] ; then - if [ $envir != "prod" ] ; then - export SENDDBN=${SENDDBN:-NO} - export DBNLOG=${DBNLOG:-YES} - export DATA_IN=${DATA_IN:-$DATAROOT} - fi -fi - -##################################################################################### -# This block is for Developer's test run: -# Run config file to get input parameters -##################################################################################### -if [ "$RUN_ENVIR" = dev ] ### For Developers -then - . $HOME/parm/config/config.vrfy -fi - -if [ $SENDECF = YES ] -then - ecflow_client .init=${ECF_RID} -fi - -# ################################### -# SET SHELL PROCESSING VARIABLES -# ################################### -export PS4='$SECONDS + ' -date - -########################################################## -# obtain unique process id (pid) and make temp directory -########################################################## -export pid=$$ -export DATA=${DATA:-${DATAROOT}/${jobid:?}} -rm -rf $DATA -mkdir -p $DATA -cd $DATA - -########################################### -# Run setpdy and initialize PDY variables -########################################### -export cycle=${cycle:-t${cyc}z} -setpdy.sh -. PDY - -#################################### -# File To Log Msgs -#################################### -export jlogfile=${jlogfile:-${DATA}/jlogfile} - -#################################### -# Determine Job Output Name on System -#################################### -export outid="LL$job" -export jobid="${outid}.o${pid}" -export pgmout="OUTPUT.${pid}" - -export cycle=t${cyc}z - -############################################## -# Begin JOB SPECIFIC work -############################################## -export USHverif_global=$HOMEverif_global/ush -export EXECverif_global=$HOMEverif_global/exec -export PARMverif_global=$HOMEverif_global/parm -export FIXverif_global=$HOMEverif_global/fix - -export DCOM=${DCOM:-$DCOMROOT/$NET} -export PCOM=${PCOM:-$PCOMROOT/$NET} -export COMIN=${COMIN:-$COMROOT/$NET/$envir/$RUN.$PDY} -export COMOUT=${COMOUT:-$COMROOT/$NET/$envir/$RUN.$PDY} -mkdir -p $COMOUT $DCOM $PCOM $GESOUT - -env - -# Execute the script. -msg="HAS BEGUN on $(hostname)" -postmsg "$jlogfile" "$msg" -sh $HOMEverif_global/scripts/exgrid2grid_step2.sh -status=$? -if [[ $status -ne 0 ]]; then - exit $status -fi -############################################## -# End JOB SPECIFIC work -############################################# - - -############################################## -# Final processing -############################################## -msg="ENDED NORMALLY." -postmsg "$jlogfile" "$msg" - -if [ -e "$pgmout" ]; then - cat $pgmout -fi - -########################################## -# Remove the Temporary working directory -########################################## -cd $DATAROOT -if [[ $KEEPDATA = "NO" ]]; then - rm -rf $DATA -fi - -date diff --git a/jobs/JVERIF_GLOBAL_GRID2OBS_STEP1 b/jobs/JVERIF_GLOBAL_GRID2OBS_STEP1 deleted file mode 100755 index 6b14966..0000000 --- a/jobs/JVERIF_GLOBAL_GRID2OBS_STEP1 +++ /dev/null @@ -1,128 +0,0 @@ -#!/bin/sh - -export PS4='$SECONDS + ' -date -set -xa - -####################################################### -# This job processes the GRID2GRID cloud verification -####################################################### -export RUN_ENVIR=${RUN_ENVIR:-nco} -export SENDECF=${SENDECF:-YES} - -############################### -# Specify RUN name -############################### -export NET=verf_global -export RUN=grid2obs_step1 - -############################################################### -# This block can be modified for different Production test -# environment. This is used for operational testings -############################################################### -if [ "$RUN_ENVIR" = nco -o "$RUN_ENVIR" = para ] ; then - if [ $envir != "prod" ] ; then - export SENDDBN=${SENDDBN:-NO} - export DBNLOG=${DBNLOG:-YES} - export DATA_IN=${DATA_IN:-$DATAROOT} - fi -fi - -##################################################################################### -# This block is for Developer's test run: -# Run config file to get input parameters -##################################################################################### -if [ "$RUN_ENVIR" = dev ] ### For Developers -then - . $HOME/parm/config/config.vrfy -fi - -if [ $SENDECF = YES ] -then - ecflow_client .init=${ECF_RID} -fi - -# ################################### -# SET SHELL PROCESSING VARIABLES -# ################################### -export PS4='$SECONDS + ' -date - -########################################################## -# obtain unique process id (pid) and make temp directory -########################################################## -export pid=$$ -export DATA=${DATA:-${DATAROOT}/${jobid:?}} -rm -rf $DATA -mkdir -p $DATA -cd $DATA - -########################################### -# Run setpdy and initialize PDY variables -########################################### -export cycle=${cycle:-t${cyc}z} -setpdy.sh -. PDY - -#################################### -# File To Log Msgs -#################################### -export jlogfile=${jlogfile:-${DATA}/jlogfile} - -#################################### -# Determine Job Output Name on System -#################################### -export outid="LL$job" -export jobid="${outid}.o${pid}" -export pgmout="OUTPUT.${pid}" - -export cycle=t${cyc}z - -############################################## -# Begin JOB SPECIFIC work -############################################## -export USHverif_global=$HOMEverif_global/ush -export EXECverif_global=$HOMEverif_global/exec -export PARMverif_global=$HOMEverif_global/parm -export FIXverif_global=$HOMEverif_global/fix - -export DCOM=${DCOM:-$DCOMROOT/$NET} -export PCOM=${PCOM:-$PCOMROOT/$NET} -export COMIN=${COMIN:-$COMROOT/$NET/$envir/$RUN.$PDY} -export COMOUT=${COMOUT:-$COMROOT/$NET/$envir/$RUN.$PDY} -mkdir -p $COMOUT $DCOM $PCOM $GESOUT - -env - -# Execute the script. -msg="HAS BEGUN on $(hostname)" -postmsg "$jlogfile" "$msg" -sh $HOMEverif_global/scripts/exgrid2obs_step1.sh -status=$? -if [[ $status -ne 0 ]]; then - exit $status -fi -############################################## -# End JOB SPECIFIC work -############################################# - - -############################################## -# Final processing -############################################## -msg="ENDED NORMALLY." -postmsg "$jlogfile" "$msg" - -if [ -e "$pgmout" ]; then - cat $pgmout -fi - -########################################## -# Remove the Temporary working directory -########################################## -cd $DATAROOT -if [[ $KEEPDATA = "NO" ]]; then - rm -rf $DATA -fi - -date diff --git a/jobs/JVERIF_GLOBAL_GRID2OBS_STEP2 b/jobs/JVERIF_GLOBAL_GRID2OBS_STEP2 deleted file mode 100755 index f523abe..0000000 --- a/jobs/JVERIF_GLOBAL_GRID2OBS_STEP2 +++ /dev/null @@ -1,128 +0,0 @@ -#!/bin/sh - -export PS4='$SECONDS + ' -date -set -xa - -####################################################### -# This job processes the GRID2GRID cloud verification -####################################################### -export RUN_ENVIR=${RUN_ENVIR:-nco} -export SENDECF=${SENDECF:-YES} - -############################### -# Specify RUN name -############################### -export NET=verf_global -export RUN=grid2grid_step2 - -############################################################### -# This block can be modified for different Production test -# environment. This is used for operational testings -############################################################### -if [ "$RUN_ENVIR" = nco -o "$RUN_ENVIR" = para ] ; then - if [ $envir != "prod" ] ; then - export SENDDBN=${SENDDBN:-NO} - export DBNLOG=${DBNLOG:-YES} - export DATA_IN=${DATA_IN:-$DATAROOT} - fi -fi - -##################################################################################### -# This block is for Developer's test run: -# Run config file to get input parameters -##################################################################################### -if [ "$RUN_ENVIR" = dev ] ### For Developers -then - . $HOME/parm/config/config.vrfy -fi - -if [ $SENDECF = YES ] -then - ecflow_client .init=${ECF_RID} -fi - -# ################################### -# SET SHELL PROCESSING VARIABLES -# ################################### -export PS4='$SECONDS + ' -date - -########################################################## -# obtain unique process id (pid) and make temp directory -########################################################## -export pid=$$ -export DATA=${DATA:-${DATAROOT}/${jobid:?}} -rm -rf $DATA -mkdir -p $DATA -cd $DATA - -########################################### -# Run setpdy and initialize PDY variables -########################################### -export cycle=${cycle:-t${cyc}z} -setpdy.sh -. PDY - -#################################### -# File To Log Msgs -#################################### -export jlogfile=${jlogfile:-${DATA}/jlogfile} - -#################################### -# Determine Job Output Name on System -#################################### -export outid="LL$job" -export jobid="${outid}.o${pid}" -export pgmout="OUTPUT.${pid}" - -export cycle=t${cyc}z - -############################################## -# Begin JOB SPECIFIC work -############################################## -export USHverif_global=$HOMEverif_global/ush -export EXECverif_global=$HOMEverif_global/exec -export PARMverif_global=$HOMEverif_global/parm -export FIXverif_global=$HOMEverif_global/fix - -export DCOM=${DCOM:-$DCOMROOT/$NET} -export PCOM=${PCOM:-$PCOMROOT/$NET} -export COMIN=${COMIN:-$COMROOT/$NET/$envir/$RUN.$PDY} -export COMOUT=${COMOUT:-$COMROOT/$NET/$envir/$RUN.$PDY} -mkdir -p $COMOUT $DCOM $PCOM $GESOUT - -env - -# Execute the script. -msg="HAS BEGUN on $(hostname)" -postmsg "$jlogfile" "$msg" -sh $HOMEverif_global/scripts/exgrid2grid_step2.sh -status=$? -if [[ $status -ne 0 ]]; then - exit $status -fi -############################################## -# End JOB SPECIFIC work -############################################# - - -############################################## -# Final processing -############################################## -msg="ENDED NORMALLY." -postmsg "$jlogfile" "$msg" - -if [ -e "$pgmout" ]; then - cat $pgmout -fi - -########################################## -# Remove the Temporary working directory -########################################## -cd $DATAROOT -if [[ $KEEPDATA = "NO" ]]; then - rm -rf $DATA -fi - -date diff --git a/jobs/JVERIF_GLOBAL_PRECIP_STEP1 b/jobs/JVERIF_GLOBAL_PRECIP_STEP1 deleted file mode 100755 index b944595..0000000 --- a/jobs/JVERIF_GLOBAL_PRECIP_STEP1 +++ /dev/null @@ -1,128 +0,0 @@ -#!/bin/sh - -export PS4='$SECONDS + ' -date -set -xa - -####################################################### -# This job processes the GRID2GRID cloud verification -####################################################### -export RUN_ENVIR=${RUN_ENVIR:-nco} -export SENDECF=${SENDECF:-YES} - -############################### -# Specify RUN name -############################### -export NET=verf_global -export RUN=grid2grid_step1 - -############################################################### -# This block can be modified for different Production test -# environment. This is used for operational testings -############################################################### -if [ "$RUN_ENVIR" = nco -o "$RUN_ENVIR" = para ] ; then - if [ $envir != "prod" ] ; then - export SENDDBN=${SENDDBN:-NO} - export DBNLOG=${DBNLOG:-YES} - export DATA_IN=${DATA_IN:-$DATAROOT} - fi -fi - -##################################################################################### -# This block is for Developer's test run: -# Run config file to get input parameters -##################################################################################### -if [ "$RUN_ENVIR" = dev ] ### For Developers -then - . $HOME/parm/config/config.vrfy -fi - -if [ $SENDECF = YES ] -then - ecflow_client .init=${ECF_RID} -fi - -# ################################### -# SET SHELL PROCESSING VARIABLES -# ################################### -export PS4='$SECONDS + ' -date - -########################################################## -# obtain unique process id (pid) and make temp directory -########################################################## -export pid=$$ -export DATA=${DATA:-${DATAROOT}/${jobid:?}} -rm -rf $DATA -mkdir -p $DATA -cd $DATA - -########################################### -# Run setpdy and initialize PDY variables -########################################### -export cycle=${cycle:-t${cyc}z} -setpdy.sh -. PDY - -#################################### -# File To Log Msgs -#################################### -export jlogfile=${jlogfile:-${DATA}/jlogfile} - -#################################### -# Determine Job Output Name on System -#################################### -export outid="LL$job" -export jobid="${outid}.o${pid}" -export pgmout="OUTPUT.${pid}" - -export cycle=t${cyc}z - -############################################## -# Begin JOB SPECIFIC work -############################################## -export USHverif_global=$HOMEverif_global/ush -export EXECverif_global=$HOMEverif_global/exec -export PARMverif_global=$HOMEverif_global/parm -export FIXverif_global=$HOMEverif_global/fix - -export DCOM=${DCOM:-$DCOMROOT/$NET} -export PCOM=${PCOM:-$PCOMROOT/$NET} -export COMIN=${COMIN:-$COMROOT/$NET/$envir/$RUN.$PDY} -export COMOUT=${COMOUT:-$COMROOT/$NET/$envir/$RUN.$PDY} -mkdir -p $COMOUT $DCOM $PCOM $GESOUT - -env - -# Execute the script. -msg="HAS BEGUN on $(hostname)" -postmsg "$jlogfile" "$msg" -sh $HOMEverif_global/scripts/exprecip_step1.sh -status=$? -if [[ $status -ne 0 ]]; then - exit $status -fi -############################################## -# End JOB SPECIFIC work -############################################# - - -############################################## -# Final processing -############################################## -msg="ENDED NORMALLY." -postmsg "$jlogfile" "$msg" - -if [ -e "$pgmout" ]; then - cat $pgmout -fi - -########################################## -# Remove the Temporary working directory -########################################## -cd $DATAROOT -if [[ $KEEPDATA = "NO" ]]; then - rm -rf $DATA -fi - -date diff --git a/jobs/JVERIF_GLOBAL_PRECIP_STEP2 b/jobs/JVERIF_GLOBAL_PRECIP_STEP2 deleted file mode 100755 index 1d06195..0000000 --- a/jobs/JVERIF_GLOBAL_PRECIP_STEP2 +++ /dev/null @@ -1,128 +0,0 @@ -#!/bin/sh - -export PS4='$SECONDS + ' -date -set -xa - -####################################################### -# This job processes the GRID2GRID cloud verification -####################################################### -export RUN_ENVIR=${RUN_ENVIR:-nco} -export SENDECF=${SENDECF:-YES} - -############################### -# Specify RUN name -############################### -export NET=verf_global -export RUN=precip_step2 - -############################################################### -# This block can be modified for different Production test -# environment. This is used for operational testings -############################################################### -if [ "$RUN_ENVIR" = nco -o "$RUN_ENVIR" = para ] ; then - if [ $envir != "prod" ] ; then - export SENDDBN=${SENDDBN:-NO} - export DBNLOG=${DBNLOG:-YES} - export DATA_IN=${DATA_IN:-$DATAROOT} - fi -fi - -##################################################################################### -# This block is for Developer's test run: -# Run config file to get input parameters -##################################################################################### -if [ "$RUN_ENVIR" = dev ] ### For Developers -then - . $HOME/parm/config/config.vrfy -fi - -if [ $SENDECF = YES ] -then - ecflow_client .init=${ECF_RID} -fi - -# ################################### -# SET SHELL PROCESSING VARIABLES -# ################################### -export PS4='$SECONDS + ' -date - -########################################################## -# obtain unique process id (pid) and make temp directory -########################################################## -export pid=$$ -export DATA=${DATA:-${DATAROOT}/${jobid:?}} -rm -rf $DATA -mkdir -p $DATA -cd $DATA - -########################################### -# Run setpdy and initialize PDY variables -########################################### -export cycle=${cycle:-t${cyc}z} -setpdy.sh -. PDY - -#################################### -# File To Log Msgs -#################################### -export jlogfile=${jlogfile:-${DATA}/jlogfile} - -#################################### -# Determine Job Output Name on System -#################################### -export outid="LL$job" -export jobid="${outid}.o${pid}" -export pgmout="OUTPUT.${pid}" - -export cycle=t${cyc}z - -############################################## -# Begin JOB SPECIFIC work -############################################## -export USHverif_global=$HOMEverif_global/ush -export EXECverif_global=$HOMEverif_global/exec -export PARMverif_global=$HOMEverif_global/parm -export FIXverif_global=$HOMEverif_global/fix - -export DCOM=${DCOM:-$DCOMROOT/$NET} -export PCOM=${PCOM:-$PCOMROOT/$NET} -export COMIN=${COMIN:-$COMROOT/$NET/$envir/$RUN.$PDY} -export COMOUT=${COMOUT:-$COMROOT/$NET/$envir/$RUN.$PDY} -mkdir -p $COMOUT $DCOM $PCOM $GESOUT - -env - -# Execute the script. -msg="HAS BEGUN on $(hostname)" -postmsg "$jlogfile" "$msg" -sh $HOMEverif_global/scripts/exprecip_step2.sh -status=$? -if [[ $status -ne 0 ]]; then - exit $status -fi -############################################## -# End JOB SPECIFIC work -############################################# - - -############################################## -# Final processing -############################################## -msg="ENDED NORMALLY." -postmsg "$jlogfile" "$msg" - -if [ -e "$pgmout" ]; then - cat $pgmout -fi - -########################################## -# Remove the Temporary working directory -########################################## -cd $DATAROOT -if [[ $KEEPDATA = "NO" ]]; then - rm -rf $DATA -fi - -date diff --git a/parm/config/config.vrfy b/parm/config/config.vrfy index 0031ee7..582bd45 100644 --- a/parm/config/config.vrfy +++ b/parm/config/config.vrfy @@ -511,7 +511,7 @@ if [ $RUN_MAPSDA = YES ]; then export mapsda_ens_regrid_to_grid="G002" export mapsda_ens_guess_hour="06" export mapsda_ens_model_dir_list="/lfs/h1/ops/prod/com" - export mapsda_ens_model_file_format_list="v16.2/enkfgdas.{init?fmt=%Y%m%d}/{init?fmt=%H}/atmos/gdas.t{init?fmt=%H}z.atmf{lead?fmt=%3H}.ens[mean,spread].nc" + export mapsda_ens_model_file_format_list="v16.3/enkfgdas.{init?fmt=%Y%m%d}/{init?fmt=%H}/atmos/gdas.t{init?fmt=%H}z.atmf{lead?fmt=%3H}.ens[mean,spread].nc" export mapsda_ens_model_data_run_hpss="YES" fi diff --git a/scripts/exgrid2grid_step1.sh b/scripts/exgrid2grid_step1.sh index 8372720..24df552 100755 --- a/scripts/exgrid2grid_step1.sh +++ b/scripts/exgrid2grid_step1.sh @@ -86,15 +86,11 @@ if [ $MPMD = YES ]; then chmod 775 $poe_script export MP_PGMMODEL=mpmd export MP_CMDFILE=${poe_script} - if [ $machine = WCOSS_C ]; then - launcher="aprun -j 1 -n 1 -N 1 -d 1 cfp" - elif [ $machine = WCOSS_DELL_P3 ]; then - launcher="mpirun -n ${nproc} cfp" - elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET ]; then - launcher="srun --export=ALL --multi-prog" - elif [ $machine = WCOSS2 ]; then + if [ $machine = WCOSS2 ]; then export LD_LIBRARY_PATH=/apps/dev/pmi-fix:$LD_LIBRARY_PATH launcher="mpiexec -np ${nproc} -ppn ${nproc} --cpu-bind verbose,core cfp" + elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET ]; then + launcher="srun --export=ALL --multi-prog" fi $launcher $MP_CMDFILE done diff --git a/scripts/exgrid2grid_step2.sh b/scripts/exgrid2grid_step2.sh index 8c0f064..d6663ff 100755 --- a/scripts/exgrid2grid_step2.sh +++ b/scripts/exgrid2grid_step2.sh @@ -86,15 +86,11 @@ if [ $MPMD = YES ]; then chmod 775 $poe_script export MP_PGMMODEL=mpmd export MP_CMDFILE=${poe_script} - if [ $machine = WCOSS_C ]; then - launcher="aprun -j 1 -n 1 -N 1 -d 1 cfp" - elif [ $machine = WCOSS_DELL_P3 ]; then - launcher="mpirun -n $((${nproc}*3)) cfp" - elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET ]; then - launcher="srun --export=ALL --multi-prog" - elif [ $machine = WCOSS2 ]; then + if [ $machine = WCOSS2 ]; then export LD_LIBRARY_PATH=/apps/dev/pmi-fix:$LD_LIBRARY_PATH launcher="mpiexec -np ${nproc} -ppn ${nproc} --cpu-bind verbose,core cfp" + elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET ]; then + launcher="srun --export=ALL --multi-prog" fi $launcher $MP_CMDFILE done diff --git a/scripts/exgrid2obs_step1.sh b/scripts/exgrid2obs_step1.sh index 9946e63..a97d8ce 100755 --- a/scripts/exgrid2obs_step1.sh +++ b/scripts/exgrid2obs_step1.sh @@ -86,15 +86,11 @@ if [ $MPMD = YES ]; then chmod 775 $poe_script export MP_PGMMODEL=mpmd export MP_CMDFILE=${poe_script} - if [ $machine = WCOSS_C ]; then - launcher="aprun -j 1 -n 1 -N 1 -d 1 cfp" - elif [ $machine = WCOSS_DELL_P3 ]; then - launcher="mpirun -n ${nproc} cfp" - elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET ]; then - launcher="srun --export=ALL --multi-prog" - elif [ $machine = WCOSS2 ]; then + if [ $machine = WCOSS2 ]; then export LD_LIBRARY_PATH=/apps/dev/pmi-fix:$LD_LIBRARY_PATH launcher="mpiexec -np ${nproc} -ppn ${nproc} --cpu-bind verbose,core cfp" + elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET ]; then + launcher="srun --export=ALL --multi-prog" fi $launcher $MP_CMDFILE done diff --git a/scripts/exgrid2obs_step2.sh b/scripts/exgrid2obs_step2.sh index d98a4dc..ebe2121 100755 --- a/scripts/exgrid2obs_step2.sh +++ b/scripts/exgrid2obs_step2.sh @@ -86,15 +86,11 @@ if [ $MPMD = YES ]; then chmod 775 $poe_script export MP_PGMMODEL=mpmd export MP_CMDFILE=${poe_script} - if [ $machine = WCOSS_C ]; then - launcher="aprun -j 1 -n 1 -N 1 -d 1 cfp" - elif [ $machine = WCOSS_DELL_P3 ]; then - launcher="mpirun -n $((${nproc}*4)) cfp" - elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET ]; then - launcher="srun --export=ALL --multi-prog" - elif [ $machine = WCOSS2 ]; then + if [ $machine = WCOSS2 ]; then export LD_LIBRARY_PATH=/apps/dev/pmi-fix:$LD_LIBRARY_PATH launcher="mpiexec -np ${nproc} -ppn ${nproc} --cpu-bind verbose,core cfp" + elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET ]; then + launcher="srun --export=ALL --multi-prog" fi $launcher $MP_CMDFILE done diff --git a/scripts/exmaps2d.sh b/scripts/exmaps2d.sh index ec6b9ec..5599068 100755 --- a/scripts/exmaps2d.sh +++ b/scripts/exmaps2d.sh @@ -86,15 +86,11 @@ if [ $MPMD = YES ]; then chmod 775 $poe_script export MP_PGMMODEL=mpmd export MP_CMDFILE=${poe_script} - if [ $machine = WCOSS_C ]; then - launcher="aprun -j 1 -n 1 -N 1 -d 1 cfp" - elif [ $machine = WCOSS_DELL_P3 ]; then - launcher="mpirun -n $((${nproc}*4)) cfp" - elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET ]; then - launcher="srun --export=ALL --multi-prog" - elif [ $machine = WCOSS2 ]; then + if [ $machine = WCOSS2 ]; then export LD_LIBRARY_PATH=/apps/dev/pmi-fix:$LD_LIBRARY_PATH launcher="mpiexec -np ${nproc} -ppn ${nproc} --cpu-bind verbose,core cfp" + elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET ]; then + launcher="srun --export=ALL --multi-prog" fi $launcher $MP_CMDFILE done diff --git a/scripts/exmapsda.sh b/scripts/exmapsda.sh index daff154..02b8760 100755 --- a/scripts/exmapsda.sh +++ b/scripts/exmapsda.sh @@ -87,15 +87,11 @@ if [ $MPMD = YES ]; then chmod 775 $poe_script export MP_PGMMODEL=mpmd export MP_CMDFILE=${poe_script} - if [ $machine = WCOSS_C ]; then - launcher="aprun -j 1 -n 1 -N 1 -d 1 cfp" - elif [ $machine = WCOSS_DELL_P3 ]; then - launcher="mpirun -n ${nproc} cfp" - elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET ]; then - launcher="srun --export=ALL --multi-prog" - elif [ $machine = WCOSS2 ]; then + if [ $machine = WCOSS2 ]; then export LD_LIBRARY_PATH=/apps/dev/pmi-fix:$LD_LIBRARY_PATH launcher="mpiexec -np ${nproc} -ppn ${nproc} --cpu-bind verbose,core cfp" + elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET ]; then + launcher="srun --export=ALL --multi-prog" fi $launcher $MP_CMDFILE done diff --git a/scripts/exprecip_step1.sh b/scripts/exprecip_step1.sh index f2adfa3..03ba3e3 100755 --- a/scripts/exprecip_step1.sh +++ b/scripts/exprecip_step1.sh @@ -86,15 +86,11 @@ if [ $MPMD = YES ]; then chmod 775 $poe_script export MP_PGMMODEL=mpmd export MP_CMDFILE=${poe_script} - if [ $machine = WCOSS_C ]; then - launcher="aprun -j 1 -n 1 -N 1 -d 1 cfp" - elif [ $machine = WCOSS_DELL_P3 ]; then - launcher="mpirun -n ${nproc} cfp" - elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET ]; then - launcher="srun --export=ALL --multi-prog" - elif [ $machine = WCOSS2 ]; then + if [ $machine = WCOSS2 ]; then export LD_LIBRARY_PATH=/apps/dev/pmi-fix:$LD_LIBRARY_PATH launcher="mpiexec -np ${nproc} -ppn ${nproc} --cpu-bind verbose,core cfp" + elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET ]; then + launcher="srun --export=ALL --multi-prog" fi $launcher $MP_CMDFILE done diff --git a/scripts/exprecip_step2.sh b/scripts/exprecip_step2.sh index cfbec33..05f8c36 100755 --- a/scripts/exprecip_step2.sh +++ b/scripts/exprecip_step2.sh @@ -86,15 +86,11 @@ if [ $MPMD = YES ]; then chmod 775 $poe_script export MP_PGMMODEL=mpmd export MP_CMDFILE=${poe_script} - if [ $machine = WCOSS_C ]; then - launcher="aprun -j 1 -n 1 -N 1 -d 1 cfp" - elif [ $machine = WCOSS_DELL_P3 ]; then - launcher="mpirun -n ${nproc} cfp" - elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET ]; then - launcher="srun --export=ALL --multi-prog" - elif [ $machine = WCOSS2 ]; then + if [ $machine = WCOSS2 ]; then export LD_LIBRARY_PATH=/apps/dev/pmi-fix:$LD_LIBRARY_PATH launcher="mpiexec -np ${nproc} -ppn ${nproc} --cpu-bind verbose,core cfp" + elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET ]; then + launcher="srun --export=ALL --multi-prog" fi $launcher $MP_CMDFILE done diff --git a/scripts/exsatellite_step1.sh b/scripts/exsatellite_step1.sh index 11e2a8d..e74d93b 100755 --- a/scripts/exsatellite_step1.sh +++ b/scripts/exsatellite_step1.sh @@ -86,15 +86,11 @@ if [ $MPMD = YES ]; then chmod 775 $poe_script export MP_PGMMODEL=mpmd export MP_CMDFILE=${poe_script} - if [ $machine = WCOSS_C ]; then - launcher="aprun -j 1 -n 1 -N 1 -d 1 cfp" - elif [ $machine = WCOSS_DELL_P3 ]; then - launcher="mpirun -n ${nproc} cfp" - elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET ]; then - launcher="srun --export=ALL --multi-prog" - elif [ $machine = WCOSS2 ]; then + if [ $machine = WCOSS2 ]; then export LD_LIBRARY_PATH=/apps/dev/pmi-fix:$LD_LIBRARY_PATH launcher="mpiexec -np ${nproc} -ppn ${nproc} --cpu-bind verbose,core cfp" + elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET ]; then + launcher="srun --export=ALL --multi-prog" fi $launcher $MP_CMDFILE done diff --git a/scripts/exsatellite_step2.sh b/scripts/exsatellite_step2.sh index 0fe2c08..20ff880 100755 --- a/scripts/exsatellite_step2.sh +++ b/scripts/exsatellite_step2.sh @@ -86,15 +86,11 @@ if [ $MPMD = YES ]; then chmod 775 $poe_script export MP_PGMMODEL=mpmd export MP_CMDFILE=${poe_script} - if [ $machine = WCOSS_C ]; then - launcher="aprun -j 1 -n 1 -N 1 -d 1 cfp" - elif [ $machine = WCOSS_DELL_P3 ]; then - launcher="mpirun -n ${nproc} cfp" - elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET ]; then - launcher="srun --export=ALL --multi-prog" - elif [ $machine = WCOSS2 ]; then + if [ $machine = WCOSS2 ]; then export LD_LIBRARY_PATH=/apps/dev/pmi-fix:$LD_LIBRARY_PATH launcher="mpiexec -np ${nproc} -ppn ${nproc} --cpu-bind verbose,core cfp" + elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET ]; then + launcher="srun --export=ALL --multi-prog" fi $launcher $MP_CMDFILE done diff --git a/scripts/extropcyc.sh b/scripts/extropcyc.sh index d36b76b..103eeb5 100755 --- a/scripts/extropcyc.sh +++ b/scripts/extropcyc.sh @@ -88,15 +88,11 @@ if [ $MPMD = YES ]; then chmod 775 $poe_script export MP_PGMMODEL=mpmd export MP_CMDFILE=${poe_script} - if [ $machine = WCOSS_C ]; then - launcher="aprun -j 1 -n 1 -N 1 -d 1 cfp" - elif [ $machine = WCOSS_DELL_P3 ]; then - launcher="mpirun -n ${nproc} cfp" - elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET ]; then - launcher="srun --export=ALL --multi-prog" - elif [ $machine = WCOSS2 ]; then + if [ $machine = WCOSS2 ]; then export LD_LIBRARY_PATH=/apps/dev/pmi-fix:$LD_LIBRARY_PATH launcher="mpiexec -np ${nproc} -ppn ${nproc} --cpu-bind verbose,core cfp" + elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET ]; then + launcher="srun --export=ALL --multi-prog" fi $launcher $MP_CMDFILE done @@ -132,14 +128,11 @@ if [ $MPMD = YES ]; then chmod 775 $poe_script export MP_PGMMODEL=mpmd export MP_CMDFILE=${poe_script} - if [ $machine = WCOSS_C ]; then - launcher="aprun -j 1 -n 1 -N 1 -d 1 cfp" - elif [ $machine = WCOSS_DELL_P3 ]; then - launcher="mpirun -n ${nproc} cfp" + if [ $machine = WCOSS2 ]; then + export LD_LIBRARY_PATH=/apps/dev/pmi-fix:$LD_LIBRARY_PATH + launcher="mpiexec -np ${nproc} -ppn ${nproc} --cpu-bind verbose,core cfp" elif [ $machine = HERA -o $machine = ORION -o $machine = S4 -o $machine = JET ]; then launcher="srun --export=ALL --multi-prog" - elif [ $machine = WCOSS2 ]; then - launcher="mpiexec -np ${nproc} -ppn ${nproc} --cpu-bind verbose,core cfp" fi $launcher $MP_CMDFILE done diff --git a/ush/build_webpage.py b/ush/build_webpage.py index 76d698a..afa325b 100644 --- a/ush/build_webpage.py +++ b/ush/build_webpage.py @@ -934,14 +934,11 @@ def tropcyc_write_template_body2(template_filename): web_job_name = web_job_filename.rpartition('/')[2].replace('.sh', '') print("Submitting "+web_job_filename+" to "+QUEUESERV) print("Output sent to "+web_job_output) -if machine == 'WCOSS_C': - os.system('bsub -W '+walltime.strftime('%H:%M')+' -q '+QUEUESERV+' ' - +'-P '+ACCOUNT+' -o '+web_job_output+' -e '+web_job_output+' ' - +'-J '+web_job_name+' -R rusage[mem=2048] '+web_job_filename) -elif machine == 'WCOSS_DELL_P3': - os.system('bsub -W '+walltime.strftime('%H:%M')+' -q '+QUEUESERV+' ' - +'-P '+ACCOUNT+' -o '+web_job_output+' -e '+web_job_output+' ' - +'-J '+web_job_name+' -M 2048 -R "affinity[core(1)]" '+web_job_filename) +if machine == 'WCOSS2': + os.system('qsub -V -l walltime='+walltime.strftime('%H:%M:%S')+' ' + +'-q '+QUEUESERV+' -A '+ACCOUNT+' -o '+web_job_output+' ' + +'-e '+web_job_output+' -N '+web_job_name+' ' + +'-l select=1:ncpus=1 '+web_job_filename) elif machine == 'HERA': os.system('sbatch --ntasks=1 --time='+walltime.strftime('%H:%M:%S')+' ' +'--partition='+QUEUESERV+' --account='+ACCOUNT+' ' @@ -972,10 +969,5 @@ def tropcyc_write_template_body2(template_filename): +'--partition='+QUEUESERV+' --account='+ACCOUNT+' ' +'--output='+web_job_output+' ' +'--job-name='+web_job_name+' '+web_job_filename) -elif machine == 'WCOSS2': - os.system('qsub -V -l walltime='+walltime.strftime('%H:%M:%S')+' ' - +'-q '+QUEUESERV+' -A '+ACCOUNT+' -o '+web_job_output+' ' - +'-e '+web_job_output+' -N '+web_job_name+' ' - +'-l select=1:ncpus=1 '+web_job_filename) print("END: "+os.path.basename(__file__)) diff --git a/ush/get_data_files.py b/ush/get_data_files.py index 98ac541..0ab8d88 100644 --- a/ush/get_data_files.py +++ b/ush/get_data_files.py @@ -171,24 +171,13 @@ def wget_data(wget_job_filename, wget_job_name, wget_job_output): os.chmod(wget_job_filename, 0o755) print("Submitting "+wget_job_filename+" to "+QUEUESERV) print("Output sent to "+wget_job_output) - if machine == 'WCOSS_C': - os.system('bsub -W '+walltime.strftime('%H:%M')+' -q '+QUEUESERV+' ' - +'-P '+ACCOUNT+' -o '+wget_job_output+' -e ' - +wget_job_output+' ' - +'-J '+wget_job_name+' -R rusage[mem=2048] ' - +wget_job_filename) - job_check_cmd = ('bjobs -a -u '+os.environ['USER']+' ' - +'-noheader -J '+wget_job_name - +'| grep "RUN\|PEND" | wc -l') - elif machine == 'WCOSS_DELL_P3': - os.system('bsub -W '+walltime.strftime('%H:%M')+' -q '+QUEUESERV+' ' - +'-P '+ACCOUNT+' -o '+wget_job_output+' -e ' - +wget_job_output+' ' - +'-J '+wget_job_name+' -M 2048 -R "affinity[core(1)]" ' - +wget_job_filename) - job_check_cmd = ('bjobs -a -u '+os.environ['USER']+' ' - +'-noheader -J '+wget_job_name - +'| grep "RUN\|PEND" | wc -l') + if machine == 'WCOSS2': + os.system('qsub -V -l walltime='+walltime.strftime('%H:%M:%S')+' ' + +'-q '+QUEUESERV+' -A '+ACCOUNT+' -o '+wget_job_output+' ' + +'-e '+wget_job_output+' -N '+wget_job_name+' ' + +'-l select=1:ncpus=1 '+wget_job_filename) + job_check_cmd = ('qselect -s QR -u '+os.environ['USER']+' ' + +'-N '+wget_job_name+' | wc -l') elif machine in ['HERA', 'ORION', 'S4', 'JET']: os.system('sbatch --ntasks=1 --time=' +walltime.strftime('%H:%M:%S')+' --partition='+QUEUESERV+' ' @@ -196,13 +185,6 @@ def wget_data(wget_job_filename, wget_job_name, wget_job_output): +'--job-name='+wget_job_name+' '+wget_job_filename) job_check_cmd = ('squeue -u '+os.environ['USER']+' -n ' +wget_job_name+' -t R,PD -h | wc -l') - elif machine == 'WCOSS2': - os.system('qsub -V -l walltime='+walltime.strftime('%H:%M:%S')+' ' - +'-q '+QUEUESERV+' -A '+ACCOUNT+' -o '+wget_job_output+' ' - +'-e '+wget_job_output+' -N '+wget_job_name+' ' - +'-l select=1:ncpus=1 '+wget_job_filename) - job_check_cmd = ('qselect -s QR -u '+os.environ['USER']+' ' - +'-N '+wget_job_name+' | wc -l') sleep_counter, sleep_checker = 1, 10 while (sleep_counter*sleep_checker) <= walltime_seconds: sleep(sleep_checker) @@ -258,7 +240,24 @@ def set_up_gfs_hpss_info(dt_init_time, hpss_dir, model_dump, if 'NCEPPROD' in hpss_dir: # Operational GFS HPSS archive set up if dt_init_time \ - >= datetime.datetime.strptime('20210628', '%Y%m%d'): + >= datetime.datetime.strptime('20221129', '%Y%m%d'): + if hpss_file_suffix == 'prepbufr': + hpss_tar_filename_prefix = ('com_obsproc_v1.1_'+model_dump+'.' + +YYYYmmdd+'_'+HH+'.obsproc_' + +model_dump) + hpss_file_prefix = os.path.join(model_dump+'.'+YYYYmmdd, HH, + 'atmos', model_dump+'.t' + +HH+'z.') + else: + hpss_tar_filename_prefix = ('com_gfs_v16.3_'+model_dump+'.' + +YYYYmmdd+'_'+HH+'.'+model_dump) + hpss_file_prefix = os.path.join(model_dump+'.'+YYYYmmdd, HH, + 'atmos', model_dump+'.t' + +HH+'z.') + elif dt_init_time \ + >= datetime.datetime.strptime('20220628', '%Y%m%d') \ + and dt_init_time \ + < datetime.datetime.strptime('20221129', '%Y%m%d'): if hpss_file_suffix == 'prepbufr': hpss_tar_filename_prefix = ('com_obsproc_v1.0_'+model_dump+'.' +YYYYmmdd+'_'+HH+'.obsproc_' @@ -275,7 +274,7 @@ def set_up_gfs_hpss_info(dt_init_time, hpss_dir, model_dump, elif dt_init_time \ >= datetime.datetime.strptime('20210321', '%Y%m%d') \ and dt_init_time \ - < datetime.datetime.strptime('20210628', '%Y%m%d'): + < datetime.datetime.strptime('20220628', '%Y%m%d'): hpss_tar_filename_prefix = ('com_gfs_prod_'+model_dump+'.' +YYYYmmdd+'_'+HH+'.'+model_dump) hpss_file_prefix = os.path.join(model_dump+'.'+YYYYmmdd, HH, @@ -448,24 +447,13 @@ def get_hpss_data(hpss_job_filename, save_data_dir, save_data_file, hpss_job_name = hpss_job_filename.rpartition('/')[2].replace('.sh', '') print("Submitting "+hpss_job_filename+" to "+QUEUESERV) print("Output sent to "+hpss_job_output) - if machine == 'WCOSS_C': - os.system('bsub -W '+walltime.strftime('%H:%M')+' -q '+QUEUESERV+' ' - +'-P '+ACCOUNT+' -o '+hpss_job_output+' -e ' - +hpss_job_output+' ' - +'-J '+hpss_job_name+' -R rusage[mem=2048] ' - +hpss_job_filename) - job_check_cmd = ('bjobs -a -u '+os.environ['USER']+' ' - +'-noheader -J '+hpss_job_name - +'| grep "RUN\|PEND" | wc -l') - elif machine == 'WCOSS_DELL_P3': - os.system('bsub -W '+walltime.strftime('%H:%M')+' -q '+QUEUESERV+' ' - +'-P '+ACCOUNT+' -o '+hpss_job_output+' -e ' - +hpss_job_output+' ' - +'-J '+hpss_job_name+' -M 2048 -R "affinity[core(1)]" ' - +hpss_job_filename) - job_check_cmd = ('bjobs -a -u '+os.environ['USER']+' ' - +'-noheader -J '+hpss_job_name - +'| grep "RUN\|PEND" | wc -l') + if machine == 'WCOSS2': + os.system('qsub -V -l walltime='+walltime.strftime('%H:%M:%S')+' ' + +'-q '+QUEUESERV+' -A '+ACCOUNT+' -o '+hpss_job_output+' ' + +'-e '+hpss_job_output+' -N '+hpss_job_name+' ' + +'-l select=1:ncpus=1 '+hpss_job_filename) + job_check_cmd = ('qselect -s QR -u '+os.environ['USER']+' ' + +'-N '+hpss_job_name+' | wc -l') elif machine in ['HERA', 'JET']: os.system('sbatch --ntasks=1 --time=' +walltime.strftime('%H:%M:%S')+' --partition='+QUEUESERV+' ' @@ -475,13 +463,6 @@ def get_hpss_data(hpss_job_filename, save_data_dir, save_data_file, +hpss_job_name+' -t R,PD -h | wc -l') elif machine in ['ORION', 'S4']: print("ERROR: No HPSS access from "+machine) - elif machine == 'WCOSS2': - os.system('qsub -V -l walltime='+walltime.strftime('%H:%M:%S')+' ' - +'-q '+QUEUESERV+' -A '+ACCOUNT+' -o '+hpss_job_output+' ' - +'-e '+hpss_job_output+' -N '+hpss_job_name+' ' - +'-l select=1:ncpus=1 '+hpss_job_filename) - job_check_cmd = ('qselect -s QR -u '+os.environ['USER']+' ' - +'-N '+hpss_job_name+' | wc -l') if machine not in ['ORION', 'S4']: sleep_counter, sleep_checker = 1, 10 while (sleep_counter*sleep_checker) <= walltime_seconds: @@ -1582,14 +1563,21 @@ def get_model_stat_file(valid_time_dt, init_time_dt, lead_str, +offset_YYYYmmdd, offset_filename ) if offset_time \ - >= datetime.datetime.strptime('20200227', + >= datetime.datetime.strptime('20221129', '%Y%m%d'): + prepbufr_hpss_tar_prefix = 'com_obsproc_v1.1_nam.' + elif offset_time \ + >= datetime.datetime.strptime('20220628', + '%Y%m%d') \ + and offset_time \ + < datetime.datetime.strptime('20221129', + '%Y%m%d'): prepbufr_hpss_tar_prefix = 'com_obsproc_v1.0_nam.' elif offset_time \ >= datetime.datetime.strptime('20200227', '%Y%m%d') \ and offset_time \ - < datetime.datetime.strptime('20200628', + < datetime.datetime.strptime('20220628', '%Y%m%d'): prepbufr_hpss_tar_prefix = 'com_nam_prod_nam.' elif offset_time \ diff --git a/ush/get_machine.py b/ush/get_machine.py index 6907767..7db2b32 100644 --- a/ush/get_machine.py +++ b/ush/get_machine.py @@ -16,8 +16,7 @@ print("BEGIN: "+os.path.basename(__file__)) EMC_verif_global_machine_list = [ - 'HERA', 'ORION', 'WCOSS_C', 'WCOSS_DELL_P3', 'S4', 'JET', - 'WCOSS2' + 'HERA', 'ORION', 'S4', 'JET', 'WCOSS2' ] # Read in environment variables @@ -41,18 +40,6 @@ orion_match = re.match( re.compile(r"^Orion-login-[0-9]{1}.HPC.MsState.Edu$"), hostname ) - surge_match = re.match(re.compile(r"^slogin[0-9]{1}$"), hostname) - luna_match = re.match(re.compile(r"^llogin[0-9]{1}$"), hostname) - mars_match = re.match(re.compile(r"^m[0-9]{2,3}[a-z]{1}[0-9]{1}$"), - hostname) - mars_match2 = re.match( - re.compile(r"^m[0-9]{2,3}[a-z]{1}[0-9]{1,3}[a-z]{1}$"), hostname - ) - venus_match = re.match(re.compile(r"^v[0-9]{2,3}[a-z]{1}[0-9]{1}$"), - hostname) - venus_match2 = re.match( - re.compile(r"^v[0-9]{2,3}[a-z]{1}[0-9]{1,3}[a-z]{1}$"), hostname - ) cactus_match = re.match( re.compile(r"^clogin[0-9]{2}$"), hostname ) @@ -67,20 +54,16 @@ ) s4_match = re.match(re.compile(r"s4-submit.ssec.wisc.edu"), hostname) jet_match = re.match(re.compile(r"^fe[0-9]{1}"), hostname) + if cactus_match or dogwood_match or cactus_match2 or dogwood_match2: + machine = 'WCOSS2' if hera_match: machine = 'HERA' elif orion_match: machine = 'ORION' - elif surge_match or luna_match: - machine = 'WCOSS_C' - elif mars_match or venus_match or mars_match2 or venus_match2: - machine = 'WCOSS_DELL_P3' elif s4_match: machine = 'S4' elif jet_match: machine = 'JET' - elif cactus_match or dogwood_match or cactus_match2 or dogwood_match2: - machine = 'WCOSS2' else: print("Cannot find match for "+hostname) sys.exit(1) diff --git a/ush/load_modules.sh b/ush/load_modules.sh index f70542f..ca185a2 100755 --- a/ush/load_modules.sh +++ b/ush/load_modules.sh @@ -25,72 +25,26 @@ else fi ## Load -if [ $machine = WCOSS_C ]; then - source /opt/modules/default/init/sh - module purge - module load craype-haswell - if [ $MET_version = 9.1 ]; then - module use /gpfs/hps/nco/ops/nwprod/modulefiles - module load met/9.1.3 - export HOMEMET="/gpfs/hps/nco/ops/nwprod/met.v${MET_version}.3" - export HOMEMET_bin_exec="exec" - else - "ERROR: $MET_version is not supported on $machine" - exit 1 - fi - if [ $METplus_version = 3.1 ]; then - module use /gpfs/hps/nco/ops/nwprod/modulefiles - module load metplus/3.1.1 - export HOMEMETplus="${METPLUS_PATH}" - else - "ERROR: $METplus_version is not supported on $machine" - exit 1 - fi - module load alps - module load xt-lsfhpc/9.1.3 - module load cfp-intel-sandybridge/1.1.0 - module load hpss/4.1.0.3 - module load prod_util/1.1.2 - module load grib_util/1.1.1 - module load nco-gnu-sandybridge/4.4.4 - module unload python/3.6.3 - module unuse /usrx/local/prod/modulefiles - module use /usrx/local/dev/modulefiles - module load NetCDF-intel-sandybridge/4.5.0 - module load python/3.6.3 - module load GrADS/2.0.2 -elif [ $machine = WCOSS_DELL_P3 ]; then - source /usrx/local/prod/lmod/lmod/init/sh - module purge +if [ $machine = WCOSS2 ]; then + source /usr/share/lmod/lmod/init/sh + module reset + source ${HOMEverif_global}/versions/run.ver + export HPC_OPT=/apps/ops/para/libs + module use ${HOMEverif_global}/modulefiles + module load emc_verif_global_wcoss2 if [ $MET_version = 9.1 ]; then - module use /gpfs/dell1/nco/ops/nwprod/modulefiles/compiler_prod/ips/18.0.1 - module load met/9.1.3 - export HOMEMET="/gpfs/dell1/nco/ops/nwprod/met.v${MET_version}.3" - export HOMEMET_bin_exec="exec" + export HOMEMET="$MET_ROOT" + export HOMEMET_bin_exec="bin" else "ERROR: $MET_version is not supported on $machine" exit 1 fi if [ $METplus_version = 3.1 ]; then - module use /gpfs/dell1/nco/ops/nwprod/modulefiles/compiler_prod/ips/18.0.1 - module load metplus/3.1.1 export HOMEMETplus="${METPLUS_PATH}" else "ERROR: $METplus_version is not supported on $machine" exit 1 fi - module load EnvVars/1.0.3 - module load lsf/10.1 - module load ips/18.0.1.163 - module load impi/18.0.1 - module load CFP/2.0.1 - module load HPSS/5.0.2.5 - module load prod_util/1.1.5 - module load grib_util/1.1.1 - module load NetCDF/4.5.0 - module load GrADS/2.2.0 - module use /usrx/local/dev/modulefiles - module load compiler_third/ips/18.0.1/NCO/4.7.0 elif [ $machine = HERA ]; then source /apps/lmod/lmod/init/sh module purge @@ -205,26 +159,6 @@ elif [ $machine = JET ]; then "ERROR: $METplus_version is not supported on $machine" exit 1 fi -elif [ $machine = WCOSS2 ]; then - source /usr/share/lmod/lmod/init/sh - module reset - source ${HOMEverif_global}/versions/run.ver - export HPC_OPT=/apps/ops/para/libs - module use ${HOMEverif_global}/modulefiles - module load emc_verif_global_wcoss2 - if [ $MET_version = 9.1 ]; then - export HOMEMET="$MET_ROOT" - export HOMEMET_bin_exec="bin" - else - "ERROR: $MET_version is not supported on $machine" - exit 1 - fi - if [ $METplus_version = 3.1 ]; then - export HOMEMETplus="${METPLUS_PATH}" - else - "ERROR: $METplus_version is not supported on $machine" - exit 1 - fi else echo "ERROR: $machine is not supported" exit 1 diff --git a/ush/load_to_METviewer_AWS.py b/ush/load_to_METviewer_AWS.py index 86449dd..ec7dd1a 100644 --- a/ush/load_to_METviewer_AWS.py +++ b/ush/load_to_METviewer_AWS.py @@ -172,22 +172,14 @@ AWS_job_name = AWS_job_filename.rpartition('/')[2].replace('.sh', '') print("Submitting "+AWS_job_filename+" to "+QUEUESERV) print("Output sent to "+AWS_job_output) -if machine == 'WCOSS_C': - os.system('bsub -W '+walltime.strftime('%H:%M')+' -q '+QUEUESERV+' ' - +'-P '+ACCOUNT+' -o '+AWS_job_output+' -e '+AWS_job_output+' ' - +'-J '+AWS_job_name+' -R rusage[mem=2048] '+AWS_job_filename) -elif machine == 'WCOSS_DELL_P3': - os.system('bsub -W '+walltime.strftime('%H:%M')+' -q '+QUEUESERV+' ' - +'-P '+ACCOUNT+' -o '+AWS_job_output+' -e '+AWS_job_output+' ' - +'-J '+AWS_job_name+' -M 2048 -R "affinity[core(1)]" '+AWS_job_filename) +if machine == 'WCOSS2': + os.system('qsub -V -l walltime='+walltime.strftime('%H:%M:%S')+' ' + +'-q '+QUEUESERV+' -A '+ACCOUNT+' -o '+AWS_job_output+' ' + +'-e '+AWS_job_output+' -N '+AWS_job_name+' ' + +'-l select=1:ncpus=1 '+AWS_job_filename) elif machine in ['HERA', 'ORION', 'S4', 'JET']: os.system('sbatch --ntasks=1 --time='+walltime.strftime('%H:%M:%S')+' ' +'--partition='+QUEUESERV+' --account='+ACCOUNT+' ' +'--output='+AWS_job_output+' ' +'--job-name='+AWS_job_name+' '+AWS_job_filename) -elif machine == 'WCOSS2': - os.system('qsub -V -l walltime='+walltime.strftime('%H:%M:%S')+' ' - +'-q '+QUEUESERV+' -A '+ACCOUNT+' -o '+AWS_job_output+' ' - +'-e '+AWS_job_output+' -N '+AWS_job_name+' ' - +'-l select=1:ncpus=1 '+AWS_job_filename) print("END: "+os.path.basename(__file__)) diff --git a/ush/plotting_scripts/plot_maps2d_lat_lon_errors.py b/ush/plotting_scripts/plot_maps2d_lat_lon_errors.py index 22becd2..d6fcd49 100644 --- a/ush/plotting_scripts/plot_maps2d_lat_lon_errors.py +++ b/ush/plotting_scripts/plot_maps2d_lat_lon_errors.py @@ -284,18 +284,14 @@ def plot_subplot_data(ax_tmp, map_ax_tmp, plot_data, plot_data_lat, plt.rcParams['savefig.dpi'] = 75 # Set up location of Natural Earth files -if machine == 'HERA': +if machine == 'WCOSS2': + config['data_dir']='/u/emc.vpppg/.local/share/cartopy' +elif machine == 'HERA': config['data_dir']='/home/Mallory.Row/.local/share/cartopy' -elif machine == 'WCOSS_C': - config['data_dir']='/u/emc.verif/.local/share/cartopy' -elif machine == 'WCOSS_DELL_P3': - config['data_dir']='/u/emc.verif/.local/share/cartopy' elif machine == 'S4': config['data_dir']='/home/dhuber/.local/share/cartopy' elif machine == 'JET': config['data_dir']='/home/Mallory.Row/.local/share/cartopy' -elif machine == 'WCOSS2': - config['data_dir']='/u/emc.vpppg/.local/share/cartopy' # Set up information env_var_model_list = [] diff --git a/ush/plotting_scripts/plot_maps2d_model2obs_calc_vars_lat_lon_errors.py b/ush/plotting_scripts/plot_maps2d_model2obs_calc_vars_lat_lon_errors.py index ce2c5a0..77b8a36 100644 --- a/ush/plotting_scripts/plot_maps2d_model2obs_calc_vars_lat_lon_errors.py +++ b/ush/plotting_scripts/plot_maps2d_model2obs_calc_vars_lat_lon_errors.py @@ -278,18 +278,14 @@ def plot_subplot_data(ax_tmp, map_ax_tmp, plot_data, plot_data_lat, plt.rcParams['savefig.dpi'] = 75 # Set up location of Natural Earth files -if machine == 'HERA': +if machine == 'WCOSS2': + config['data_dir']='/u/emc.vpppg/.local/share/cartopy' +elif machine == 'HERA': config['data_dir']='/home/Mallory.Row/.local/share/cartopy' -elif machine == 'WCOSS_C': - config['data_dir']='/u/emc.verif/.local/share/cartopy' -elif machine == 'WCOSS_DELL_P3': - config['data_dir']='/u/emc.verif/.local/share/cartopy' elif machine == 'S4': config['data_dir']='/home/dhuber/.local/share/cartopy' elif machine == 'JET': config['data_dir']='/home/Mallory.Row/.local/share/cartopy' -elif machine == 'WCOSS2': - config['data_dir']='/u/emc.vpppg/.local/share/cartopy' # Set up information RUN_type = 'model2obs' diff --git a/ush/plotting_scripts/plot_mapsda_lat_lon_errors.py b/ush/plotting_scripts/plot_mapsda_lat_lon_errors.py index 8b2e2c8..ac418e7 100644 --- a/ush/plotting_scripts/plot_mapsda_lat_lon_errors.py +++ b/ush/plotting_scripts/plot_mapsda_lat_lon_errors.py @@ -330,18 +330,14 @@ def plot_subplot_data(ax_tmp, map_ax_tmp, plot_data, plot_data_lat, plt.rcParams['savefig.dpi'] = 75 # Set up location of Natural Earth files -if machine == 'HERA': +if machine == 'WCOSS2': + config['data_dir']='/u/emc.vpppg/.local/share/cartopy' +elif machine == 'HERA': config['data_dir']='/home/Mallory.Row/.local/share/cartopy' -elif machine == 'WCOSS_C': - config['data_dir']='/u/emc.verif/.local/share/cartopy' -elif machine == 'WCOSS_DELL_P3': - config['data_dir']='/u/emc.verif/.local/share/cartopy' elif machine == 'S4': config['data_dir']='/home/dhuber/.local/share/cartopy' elif machine == 'JET': config['data_dir']='/home/Mallory.Row/.local/share/cartopy' -elif machine == 'WCOSS2': - config['data_dir']='/u/emc.vpppg/.local/share/cartopy' # Set up information env_var_model_list = [] diff --git a/ush/plotting_scripts/plot_scorecard.py b/ush/plotting_scripts/plot_scorecard.py index 02511fd..0fde1ce 100644 --- a/ush/plotting_scripts/plot_scorecard.py +++ b/ush/plotting_scripts/plot_scorecard.py @@ -532,24 +532,14 @@ def get_day_value(filename, filename_cols, day): web_job_name = web_job_filename.rpartition('/')[2].replace('.sh', '') print("Submitting "+web_job_filename+" to "+QUEUESERV) print("Output sent to "+web_job_output) - if machine == 'WCOSS_C': - os.system('bsub -W '+walltime.strftime('%H:%M')+' -q '+QUEUESERV+' ' - +'-P '+ACCOUNT+' -o '+web_job_output+' -e ' - +web_job_output+' ' - +'-J '+web_job_name+' -R rusage[mem=2048] '+web_job_filename) - elif machine == 'WCOSS_DELL_P3': - os.system('bsub -W '+walltime.strftime('%H:%M')+' -q '+QUEUESERV+' ' - +'-P '+ACCOUNT+' -o '+web_job_output+' -e '+web_job_output+' ' - +'-J '+web_job_name+' -M 2048 -R "affinity[core(1)]" ' - +web_job_filename) + if machine == 'WCOSS2': + os.system('qsub -V -l walltime='+walltime.strftime('%H:%M:%S')+' ' + +'-q '+QUEUESERV+' -A '+ACCOUNT+' -o '+web_job_output+' ' + +'-e '+web_job_output+' -N '+web_job_name+' ' + +'-l select=1:ncpus=1 '+web_job_filename) elif machine in ['HERA', 'ORION', 'S4']: os.system('sbatch --ntasks=1 --time='+walltime.strftime('%H:%M:%S')+' ' +'--partition='+QUEUESERV+' --account='+ACCOUNT+' ' +'--output='+web_job_output+' ' +'--job-name='+web_job_name+' '+web_job_filename) - elif machine == 'WCOSS2': - os.system('qsub -V -l walltime='+walltime.strftime('%H:%M:%S')+' ' - +'-q '+QUEUESERV+' -A '+ACCOUNT+' -o '+web_job_output+' ' - +'-e '+web_job_output+' -N '+web_job_name+' ' - +'-l select=1:ncpus=1 '+web_job_filename) diff --git a/ush/run_batch.py b/ush/run_batch.py index 47e4494..8aa13ed 100644 --- a/ush/run_batch.py +++ b/ush/run_batch.py @@ -37,30 +37,20 @@ # Create job card print("Writing job card to "+job_card_filename) with open(job_card_filename, 'a') as job_card: - if machine in ['WCOSS_C', 'WCOSS_DELL_P3']: + if machine == 'WCOSS2': job_card.write('#!/bin/sh\n') - job_card.write('#BSUB -q '+QUEUE+'\n') - job_card.write('#BSUB -P '+ACCOUNT+'\n') - job_card.write('#BSUB -J '+job_name+'\n') - job_card.write('#BSUB -o '+job_output_filename+'\n') - job_card.write('#BSUB -e '+job_output_filename+'\n') - job_card.write('#BSUB -W 6:00\n') - job_card.write('#BSUB -M 3000\n') - if machine == 'WCOSS_C': - job_card.write("#BSUB -extsched 'CRAYLINUX[]' -R '1*" - "{select[craylinux && !vnode]} + " - +nproc+"*{select[craylinux && vnode]" - "span[ptile=24] cu[type=cabinet]}'\n") - job_card.write('export PMI_NO_FORK=1\n') - elif machine == 'WCOSS_DELL_P3': - if RUN in ['grid2grid_step2']: - job_card.write('#BSUB -n '+str(int(nproc)*3)+'\n') - elif RUN in ['grid2obs_step2', 'maps2d']: - job_card.write('#BSUB -n '+str(int(nproc)*4)+'\n') - else: - job_card.write('#BSUB -n '+nproc+'\n') - job_card.write('#BSUB -R "span[ptile='+nproc+']"\n') - job_card.write('#BSUB -R affinity[core(1):distribute=balance]\n') + job_card.write('#PBS -q '+QUEUE+'\n') + job_card.write('#PBS -A '+ACCOUNT+'\n') + job_card.write('#PBS -V \n') + job_card.write('#PBS -N '+job_name+'\n') + job_card.write('#PBS -o '+job_output_filename+'\n') + job_card.write('#PBS -e '+job_output_filename+'\n') + job_card.write('#PBS -l walltime=6:00:00\n') + job_card.write('#PBS -l debug=true\n') + job_card.write('#PBS -l place=vscatter:exclhost,select=1:ncpus=128' + +':ompthreads=1\n') + job_card.write('\n') + job_card.write('cd $PBS_O_WORKDIR\n') elif machine == 'HERA': job_card.write('#!/bin/sh\n') job_card.write('#SBATCH --qos='+QUEUE+'\n') @@ -80,31 +70,15 @@ job_card.write('#SBATCH --nodes=1\n') job_card.write('#SBATCH --ntasks-per-node='+nproc+'\n') job_card.write('#SBATCH --time=6:00:00\n') - elif machine == 'WCOSS2': - job_card.write('#!/bin/sh\n') - job_card.write('#PBS -q '+QUEUE+'\n') - job_card.write('#PBS -A '+ACCOUNT+'\n') - job_card.write('#PBS -V \n') - job_card.write('#PBS -N '+job_name+'\n') - job_card.write('#PBS -o '+job_output_filename+'\n') - job_card.write('#PBS -e '+job_output_filename+'\n') - job_card.write('#PBS -l walltime=6:00:00\n') - job_card.write('#PBS -l debug=true\n') - job_card.write('#PBS -l place=vscatter:exclhost,select=1:ncpus=128' - +':ompthreads=1\n') - job_card.write('\n') - job_card.write('cd $PBS_O_WORKDIR\n') job_card.write('\n') job_card.write('/bin/sh '+script) # Submit job card print("Submitting "+job_card_filename+" to "+QUEUE) print("Output sent to "+job_output_filename) -if machine in ['WCOSS_C', 'WCOSS_DELL_P3']: - os.system('bsub < '+job_card_filename) +if machine == 'WCOSS2': + os.system('qsub '+job_card_filename) elif machine in ['HERA', 'ORION', 'S4', 'JET']: os.system('sbatch '+job_card_filename) -elif machine == 'WCOSS2': - os.system('qsub '+job_card_filename) print("END: "+os.path.basename(__file__)) diff --git a/ush/run_verif_global_in_global_workflow.sh b/ush/run_verif_global_in_global_workflow.sh index 265b085..36b667c 100755 --- a/ush/run_verif_global_in_global_workflow.sh +++ b/ush/run_verif_global_in_global_workflow.sh @@ -201,7 +201,7 @@ if [ -s config.machine ]; then [[ $status -eq 0 ]] && echo "Succesfully sourced config.machine" fi -if [[ "$machine" =~ ^(HERA|ORION|WCOSS_C|WCOSS_DELL_P3|S4|JET|WCOSS2)$ ]]; then +if [[ "$machine" =~ ^(HERA|ORION|S4|JET|WCOSS2)$ ]]; then echo else echo "ERROR: $machine is not a supported machine" @@ -241,7 +241,11 @@ export PATH="${USHMETplus}:${PATH}" export PYTHONPATH="${USHMETplus}:${PYTHONPATH}" ## Set machine and user specific directories -if [ $machine = "HERA" ]; then +if [ $machine = "WCOSS2" ]; then + export global_archive="/lfs/h2/emc/vpppg/noscrub/emc.vpppg/verification/global/archive/model_data" + export prepbufr_arch_dir="/lfs/h2/emc/vpppg/noscrub/emc.vpppg/verification/global/archive/obs_data/prepbufr" + export ccpa_24hr_arch_dir="/lfs/h2/emc/vpppg/noscrub/emc.vpppg/verification/global/archive/obs_data/ccpa_accum24hr" +elif [ $machine = "HERA" ]; then export global_archive="/scratch1/NCEPDEV/global/Mallory.Row/archive" export prepbufr_arch_dir="/scratch1/NCEPDEV/global/Mallory.Row/prepbufr" export ccpa_24hr_arch_dir="/scratch1/NCEPDEV/global/Mallory.Row/obdata/ccpa_accum24hr" @@ -249,14 +253,6 @@ elif [ $machine = "ORION" ]; then export global_archive="/work/noaa/ovp/mrow/archive" export prepbufr_arch_dir="/work/noaa/ovp/mrow/prepbufr" export ccpa_24hr_arch_dir="/work/noaa/ovp/mrow/obdata/ccpa_accum24hr" -elif [ $machine = "WCOSS_C" ]; then - export global_archive="/gpfs/dell2/emc/verification/noscrub/emc.verif/global/archive" - export prepbufr_arch_dir="/gpfs/dell2/emc/verification/noscrub/emc.verif/global/archive/prepbufr" - export ccpa_24hr_arch_dir="/gpfs/dell2/emc/verification/noscrub/emc.verif/global/archive/ccpa_accum24hr" -elif [ $machine = "WCOSS_DELL_P3" ]; then - export global_archive="/gpfs/dell2/emc/verification/noscrub/emc.verif/global/archive" - export prepbufr_arch_dir="/gpfs/dell2/emc/verification/noscrub/emc.verif/global/archive/prepbufr" - export ccpa_24hr_arch_dir="/gpfs/dell2/emc/verification/noscrub/emc.verif/global/archive/ccpa_accum24hr" elif [ $machine = "S4" ]; then export global_archive="/data/prod/glopara/MET_data/archive" export prepbufr_arch_dir="/data/prod/glopara/MET_data/prepbufr" @@ -265,22 +261,13 @@ elif [ $machine = "JET" ]; then export global_archive="/lfs4/HFIP/hfv3gfs/Mallory.Row/archive" export prepbufr_arch_dir="/lfs4/HFIP/hfv3gfs/Mallory.Row/prepbufr" export ccpa_24hr_arch_dir="/lfs4/HFIP/hfv3gfs/Mallory.Row/obdata/ccpa_accum24hr" -elif [ $machine = "WCOSS2" ]; then - export global_archive="/lfs/h2/emc/vpppg/noscrub/emc.vpppg/verification/global/archive/model_data" - export prepbufr_arch_dir="/lfs/h2/emc/vpppg/noscrub/emc.vpppg/verification/global/archive/obs_data/prepbufr" - export ccpa_24hr_arch_dir="/lfs/h2/emc/vpppg/noscrub/emc.vpppg/verification/global/archive/obs_data/ccpa_accum24hr" fi ## Set operational directories -export prepbufr_prod_upper_air_dir="/gpfs/dell1/nco/ops/com/gfs/prod" -export prepbufr_prod_conus_sfc_dir="/gpfs/dell1/nco/ops/com/nam/prod" -export ccpa_24hr_prod_dir="/gpfs/dell1/nco/ops/com/verf/prod" -if [ $machine = "WCOSS2" ]; then - source ${HOMEverif_global}/versions/run.ver - export prepbufr_prod_upper_air_dir="/lfs/h1/ops/prod/com/obsproc/${obsproc_ver}" - export prepbufr_prod_conus_sfc_dir="/lfs/h1/ops/prod/com/obsproc/${obsproc_ver}" - export ccpa_24hr_prod_dir="/lfs/h1/ops/prod/com/verf_precip/${verf_precip_ver}" -fi +source ${HOMEverif_global}/versions/run.ver +export prepbufr_prod_upper_air_dir="/lfs/h1/ops/prod/com/obsproc/${obsproc_ver}" +export prepbufr_prod_conus_sfc_dir="/lfs/h1/ops/prod/com/obsproc/${obsproc_ver}" +export ccpa_24hr_prod_dir="/lfs/h1/ops/prod/com/verf_precip/${verf_precip_ver}" ## Some online sites export iabp_ftp="http://iabp.apl.washington.edu/Data_Products/Daily_Full_Res_Data" diff --git a/ush/set_up_verif_global.sh b/ush/set_up_verif_global.sh index d296b0a..806bb16 100755 --- a/ush/set_up_verif_global.sh +++ b/ush/set_up_verif_global.sh @@ -69,7 +69,7 @@ if [ -s config.machine ]; then [[ $status -eq 0 ]] && echo "Succesfully sourced config.machine" fi -if [[ "$machine" =~ ^(HERA|ORION|WCOSS_C|WCOSS_DELL_P3|S4|JET|WCOSS2)$ ]]; then +if [[ "$machine" =~ ^(HERA|ORION|S4|JET|WCOSS2)$ ]]; then echo else echo "ERROR: $machine is not a supported machine" @@ -97,24 +97,28 @@ export PATH="${USHMETplus}:${PATH}" export PYTHONPATH="${USHMETplus}:${PYTHONPATH}" ## Set machine specific fix directory -if [ $machine = "HERA" ]; then +if [ $machine = "WCOSS2" ]; then + export FIXverif_global="/lfs/h2/emc/global/save/emc.global/FIX/fix_NEW/fix_verif" +elif [ $machine = "HERA" ]; then export FIXverif_global="/scratch1/NCEPDEV/global/glopara/fix/fix_verif" elif [ $machine = "ORION" ]; then export FIXverif_global="/work/noaa/global/glopara/fix/fix_verif" -elif [ $machine = "WCOSS_C" ] ; then - export FIXverif_global="/gpfs/hps3/emc/global/noscrub/emc.glopara/git/fv3gfs/fix/fix_verif" -elif [ $machine = "WCOSS_DELL_P3" ]; then - export FIXverif_global="/gpfs/dell2/emc/modeling/noscrub/emc.glopara/git/fv3gfs/fix/fix_verif" elif [ $machine = "S4" ]; then export FIXverif_global="/data/prod/glopara/fix/fix_verif" elif [ $machine = "JET" ]; then export FIXverif_global="/lfs4/HFIP/hfv3gfs/glopara/git/fv3gfs/fix/fix_verif" -elif [ $machine = "WCOSS2" ]; then - export FIXverif_global="/lfs/h2/emc/global/save/emc.global/FIX/fix_NEW/fix_verif" fi ## Set machine specific account, queues, and run settings -if [ $machine = "HERA" ]; then +if [ $machine = "WCOSS2" ]; then + export ACCOUNT="GFS-DEV" + export QUEUE="dev" + export QUEUESHARED="dev_shared" + export QUEUESERV="dev_transfer" + export PARTITION_BATCH="" + export nproc="128" + export MPMD="YES" +elif [ $machine = "HERA" ]; then export ACCOUNT="fv3-cpu" export QUEUE="batch" export QUEUESHARED="batch" @@ -130,18 +134,6 @@ elif [ $machine = "ORION" ]; then export PARTITION_BATCH="orion" export nproc="40" export MPMD="YES" -elif [ $machine = "WCOSS_C" -o $machine = "WCOSS_DELL_P3" ]; then - export ACCOUNT="GFS-DEV" - export QUEUE="dev" - export QUEUESHARED="dev_shared" - export QUEUESERV="dev_transfer" - export PARTITION_BATCH="" - if [ $machine = "WCOSS_C" ]; then - export nproc="24" - elif [ $machine = "WCOSS_DELL_P3" ]; then - export nproc="28" - fi - export MPMD="YES" elif [ $machine = "S4" ]; then export ACCOUNT="star" export QUEUE="s4" @@ -158,18 +150,21 @@ elif [ $machine = "JET" ]; then export PARTITION_BATCH="xjet" export nproc="10" export MPMD="YES" -elif [ $machine = "WCOSS2" ]; then - export ACCOUNT="GFS-DEV" - export QUEUE="dev" - export QUEUESHARED="dev_shared" - export QUEUESERV="dev_transfer" - export PARTITION_BATCH="" - export nproc="128" - export MPMD="YES" fi ## Set machine and user specific directories -if [ $machine = "HERA" ]; then +if [ $machine = "WCOSS2" ]; then + export NWROOT=${NWROOT:-"/lfs/h1/ops/prod"} + export HOMEDIR="/lfs/h2/emc/global/noscrub/$USER" + export STMP="/lfs/h2/emc/stmp/$USER" + export PTMP="/lfs/h2/emc/ptmp/$USER" + export NOSCRUB="$HOMEDIR" + export global_archive="/lfs/h2/emc/vpppg/noscrub/emc.vpppg/verification/global/archive/model_data" + export prepbufr_arch_dir="/lfs/h2/emc/vpppg/noscrub/emc.vpppg/verification/global/archive/obs_data/prepbufr" + export obdata_dir="/lfs/h2/emc/vpppg/noscrub/emc.vpppg/verification/global/archive/obs_data" + export ccpa_24hr_arch_dir="/lfs/h2/emc/vpppg/noscrub/emc.vpppg/verification/global/archive/obs_data/ccpa_accum24hr" + export METviewer_AWS_scripts_dir="/lfs/h2/emc/vpppg/save/emc.vpppg/verification/metplus/metviewer_aws_scripts" +elif [ $machine = "HERA" ]; then export NWROOT="/scratch1/NCEPDEV/global/glopara/nwpara" export HOMEDIR="/scratch1/NCEPDEV/global/$USER" export STMP="/scratch1/NCEPDEV/stmp2/$USER" @@ -191,28 +186,6 @@ elif [ $machine = "ORION" ]; then export obdata_dir="/work/noaa/ovp/mrow/obdata" export ccpa_24hr_arch_dir="/work/noaa/ovp/mrow/obdata/ccpa_accum24hr" export METviewer_AWS_scripts_dir="/work/noaa/ovp/mrow/VRFY/METviewer_AWS" -elif [ $machine = "WCOSS_C" ]; then - export NWROOT=${NWROOT:-"/gpfs/hps/nco/ops/nwprod"} - export HOMEDIR="/gpfs/hps3/emc/global/noscrub/$USER" - export STMP="/gpfs/hps2/stmp/$USER" - export PTMP="/gpfs/hps2/ptmp/$USER" - export NOSCRUB="/gpfs/hps3/emc/global/noscrub/$USER" - export global_archive="/gpfs/dell2/emc/verification/noscrub/emc.verif/global/archive" - export prepbufr_arch_dir="/gpfs/dell2/emc/verification/noscrub/emc.verif/global/archive/prepbufr" - export obdata_dir="/gpfs/dell2/emc/verification/noscrub/emc.verif/global/archive" - export ccpa_24hr_arch_dir="/gpfs/dell2/emc/verification/noscrub/emc.verif/global/archive/ccpa_accum24hr" - export METviewer_AWS_scripts_dir="/gpfs/dell2/emc/verification/noscrub/emc.metplus/METviewer_AWS" -elif [ $machine = "WCOSS_DELL_P3" ]; then - export NWROOT=${NWROOT:-"/gpfs/dell1/nco/ops/nwprod"} - export HOMEDIR="/gpfs/dell2/emc/modeling/noscrub/$USER" - export STMP="/gpfs/dell3/stmp/$USER" - export PTMP="/gpfs/dell3/ptmp/$USER" - export NOSCRUB="/gpfs/dell2/emc/modeling/noscrub/$USER" - export global_archive="/gpfs/dell2/emc/verification/noscrub/emc.verif/global/archive" - export prepbufr_arch_dir="/gpfs/dell2/emc/verification/noscrub/emc.verif/global/archive/prepbufr" - export obdata_dir="/gpfs/dell2/emc/verification/noscrub/emc.verif/global/archive" - export ccpa_24hr_arch_dir="/gpfs/dell2/emc/verification/noscrub/emc.verif/global/archive/ccpa_accum24hr" - export METviewer_AWS_scripts_dir="/gpfs/dell2/emc/verification/noscrub/emc.metplus/METviewer_AWS" elif [ $machine = "S4" ]; then export NWROOT=${NWROOT:-"/data/prod/glopara/nwpara"} export HOMEDIR="/data/users/$USER" @@ -235,17 +208,6 @@ elif [ $machine = "JET" ]; then export obdata_dir="/lfs4/HFIP/hfv3gfs/Mallory.Row/obdata" export ccpa_24hr_arch_dir="/lfs4/HFIP/hfv3gfs/Mallory.Row/obdata/ccpa_accum24hr" export METviewer_AWS_scripts_dir="/lfs4/HFIP/hfv3gfs/Mallory.Row/VRFY/METviewer_AWS" -elif [ $machine = "WCOSS2" ]; then - export NWROOT=${NWROOT:-"/lfs/h1/ops/prod"} - export HOMEDIR="/lfs/h2/emc/global/noscrub/$USER" - export STMP="/lfs/h2/emc/stmp/$USER" - export PTMP="/lfs/h2/emc/ptmp/$USER" - export NOSCRUB="$HOMEDIR" - export global_archive="/lfs/h2/emc/vpppg/noscrub/emc.vpppg/verification/global/archive/model_data" - export prepbufr_arch_dir="/lfs/h2/emc/vpppg/noscrub/emc.vpppg/verification/global/archive/obs_data/prepbufr" - export obdata_dir="/lfs/h2/emc/vpppg/noscrub/emc.vpppg/verification/global/archive/obs_data" - export ccpa_24hr_arch_dir="/lfs/h2/emc/vpppg/noscrub/emc.vpppg/verification/global/archive/obs_data/ccpa_accum24hr" - export METviewer_AWS_scripts_dir="/lfs/h2/emc/vpppg/save/emc.vpppg/verification/metplus/metviewer_aws_scripts" fi ## Set operational directories diff --git a/versions/run.ver b/versions/run.ver index d732fc4..876dbcf 100644 --- a/versions/run.ver +++ b/versions/run.ver @@ -25,5 +25,6 @@ export udunits_ver=2.2.28 export wgrib2_ver=2.0.7 export zlib_ver=1.2.11 -export obsproc_ver=v1.0 +export gfs_ver=v16.3 +export obsproc_ver=v1.1 export verf_precip_ver=v4.5