Skip to content

Commit

Permalink
Mesoscale NAM/RAP Fixes and Additions - no restart (#603)
Browse files Browse the repository at this point in the history
* Updating dev driver scripts

* Updating jobs scripts

* Updating parm files

* Updating exevs scripts

* First update of ush directory

* Second update of ush directory

* Making updates from Wei

* Updating ecf with Wei's change

* Correcting ncpus

* Updating stats ecf for reduction in runtime

* Updating nproc

* Updating ecf and ush files

* Remove unneeded lines

* To fix RESTART_DIR error

* Fix COMOUTsmall

* Updating memory resources for ecf and dev drivers

* Removing remaining log file prints

* Updating headline plot resources

* Removing testing directories

---------

Co-authored-by: perry shafran <[email protected]>
  • Loading branch information
PerryShafran-NOAA and perry shafran authored Nov 19, 2024
1 parent 32258b0 commit d43a207
Show file tree
Hide file tree
Showing 45 changed files with 394 additions and 456 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#PBS -q dev
#PBS -A VERF-DEV
#PBS -l walltime=4:00:00
#PBS -l place=vscatter:exclhost,select=12:ncpus=128:mem=150GB
#PBS -l place=vscatter:exclhost,select=12:ncpus=128:mem=500GB
#PBS -l debug=true

set -x
Expand All @@ -23,7 +23,7 @@ export job=${PBS_JOBNAME:-jevs_mesoscale_grid2obs_plots}
export jobid=$job.${PBS_JOBID:-$$}
export SITE=$(cat /etc/cluster_name)
export USE_CFP=YES
export nproc=128
export nproc=64
export evs_run_mode="production"

# General Verification Settings
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#PBS -q dev
#PBS -A VERF-DEV
#PBS -l walltime=00:30:00
#PBS -l place=vscatter:exclhost,select=1:ncpus=128:mem=150GB:ompthreads=1
#PBS -l place=vscatter:exclhost,select=1:ncpus=16:mem=20GB:ompthreads=1
#PBS -l debug=true

set -x
Expand All @@ -22,7 +22,7 @@ export job=${PBS_JOBNAME:-jevs_mesoscale_headline_plots}
export jobid=$job.${PBS_JOBID:-$$}
export SITE=$(cat /etc/cluster_name)
export USE_CFP=YES
export nproc=128
export nproc=16
export evs_run_mode="production"

# General Verification Settings
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#PBS -S /bin/bash
#PBS -q dev
#PBS -A VERF-DEV
#PBS -l walltime=04:00:00
#PBS -l place=vscatter:exclhost,select=12:ncpus=128:mem=150GB
#PBS -l walltime=05:00:00
#PBS -l place=vscatter:exclhost,select=12:ncpus=128:mem=500GB
#PBS -l debug=true

set -x
Expand Down Expand Up @@ -49,7 +49,7 @@ export PYTHONPATH=$HOMEevs/ush/$COMPONENT:$PYTHONPATH

# Developer Settings
export COMIN=/lfs/h2/emc/vpppg/noscrub/${USER}/$NET/$evs_ver_2d
export DATAROOT=/lfs/h2/emc/ptmp/${USER}/evs_test/$envir/tmp
export DATAROOT=/lfs/h2/emc/stmp/${USER}/evs_test/$envir/tmp
export COMOUT=/lfs/h2/emc/ptmp/${USER}/$NET/$evs_ver_2d/$STEP/$COMPONENT
export vhr=${vhr:-${vhr}}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#PBS -S /bin/bash
#PBS -q dev
#PBS -A VERF-DEV
#PBS -l walltime=3:00:00
#PBS -l place=vscatter:exclhost,select=12:ncpus=128:mem=150GB
#PBS -l walltime=6:00:00
#PBS -l place=vscatter:exclhost,select=12:ncpus=128:mem=500GB
#PBS -l debug=true

set -x
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#PBS -S /bin/bash
#PBS -q "dev"
#PBS -A VERF-DEV
#PBS -l walltime=4:59:00
#PBS -l place=vscatter:exclhost,select=3:ncpus=128:ompthreads=1:mem=150GB
#PBS -l walltime=01:00:00
#PBS -l place=vscatter:exclhost,select=3:ncpus=128:ompthreads=1:mem=500GB
#PBS -l debug=true

set -x
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#PBS -S /bin/bash
#PBS -q "dev"
#PBS -A VERF-DEV
#PBS -l walltime=7:00:00
#PBS -l place=vscatter:exclhost,select=3:ncpus=128:ompthreads=1:mem=150GB
#PBS -l walltime=01:30:00
#PBS -l place=vscatter:exclhost,select=3:ncpus=128:ompthreads=1:mem=500GB
#PBS -l debug=true

set -x
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ if [ -n "%VHR:%" ]; then
else
export vhr=00
fi
export nproc=128
export nproc=64
export evs_run_mode="production"
export USE_CFP=YES
export NET=evs
Expand Down
4 changes: 2 additions & 2 deletions ecf/scripts/plots/mesoscale/jevs_mesoscale_headline_plots.ecf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#PBS -q %QUEUE%
#PBS -A %PROJ%-%PROJENVIR%
#PBS -l walltime=00:15:00
#PBS -l place=vscatter:exclhost,select=1:ncpus=128:ompthreads=1:mem=500GB
#PBS -l place=vscatter:exclhost,select=1:ncpus=16:ompthreads=1:mem=20GB
#PBS -l debug=true

export model=evs
Expand Down Expand Up @@ -50,7 +50,7 @@ if [ -n "%VHR:%" ]; then
else
export vhr=00
fi
export nproc=128
export nproc=16
export USE_CFP=YES
export NET=evs
export RUN=atmos
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#PBS -S /bin/bash
#PBS -q %QUEUE%
#PBS -A %PROJ%-%PROJENVIR%
#PBS -l walltime=06:50:00
#PBS -l walltime=05:00:00
#PBS -l place=vscatter:exclhost,select=12:ncpus=128:mem=500GB
#PBS -l debug=true

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#PBS -S /bin/bash
#PBS -q %QUEUE%
#PBS -A %PROJ%-%PROJENVIR%
#PBS -l walltime=10:15:00
#PBS -l walltime=06:00:00
#PBS -l place=vscatter:exclhost,select=12:ncpus=128:mem=500GB
#PBS -l debug=true

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
#PBS -S /bin/bash
#PBS -q %QUEUE%
#PBS -A %PROJ%-%PROJENVIR%
#PBS -l walltime=04:15:00
##PBS -l walltime=02:10:00
#PBS -l walltime=01:00:00
#PBS -l place=vscatter:exclhost,select=3:ncpus=128:ompthreads=1:mem=500GB
#PBS -l debug=true

Expand Down Expand Up @@ -38,6 +37,7 @@ module load grib_util/${grib_util_ver}
module load wgrib2/${wgrib2_ver}
module load met/${met_ver}
module load metplus/${metplus_ver}
module load bufr/${bufr_ver}
module list

############################################################
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
#PBS -S /bin/bash
#PBS -q %QUEUE%
#PBS -A %PROJ%-%PROJENVIR%
#PBS -l walltime=08:00:00
##PBS -l walltime=04:15:00
#PBS -l walltime=01:30:00
#PBS -l place=vscatter:exclhost,select=3:ncpus=128:ompthreads=1:mem=500GB
#PBS -l debug=true

Expand Down Expand Up @@ -38,6 +37,7 @@ module load grib_util/${grib_util_ver}
module load wgrib2/${wgrib2_ver}
module load met/${met_ver}
module load metplus/${metplus_ver}
module load bufr/${bufr_ver}
module list

############################################################
Expand Down
16 changes: 8 additions & 8 deletions jobs/JEVS_MESOSCALE_PLOTS
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,14 @@ export DATA=${DATA:-${DATAROOT:?}/${jobid:?}}
mkdir -p $DATA
cd $DATA

#################################
# Define NET/RUN variables
#################################
export NET=${NET:-evs}
export STEP=${STEP:-plots}
export COMPONENT=${COMPONENT:-mesoscale}
export RUN=${RUN:-atmos}


####################################
# Set EVS directories
Expand Down Expand Up @@ -80,14 +88,6 @@ else
fi


####################################
# Define NET/RUN variables:
####################################
export NET=${NET:-evs}
export STEP=${STEP:-stats}
export COMPONENT=${COMPONENT:-mesoscale}
export RUN=${RUN:-atmos}

if [ $RUN = atmos ] ; then
export INITDATE=${INITDATE:-$PDYm2}
fi
Expand Down
8 changes: 8 additions & 0 deletions jobs/JEVS_MESOSCALE_STATS
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,14 @@ export DATA=${DATA:-${DATAROOT:?}/${jobid:?}}
mkdir -p $DATA
cd $DATA

################################
# Define NET/RUN variables
################################
export NET=${NET:-evs}
export STEP=${STEP:-stats}
export COMPONENT=${COMPONENT:-mesoscale}
export RUN=${RUN:-atmos}

export machine=${machine:-WCOSS2}
export MET_PLUS_PATH=${MET_PLUS_PATH:-$METPLUS_PATH}
export MET_PATH=$MET_ROOT
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ echo "BEGIN: $(basename ${BASH_SOURCE[0]})"
export MET_PLUS_OUT=${DATA}/${VERIF_CASE}/METplus_output
export MET_CONFIG_OVERRIDES=""

# Logging
export METPLUS_VERBOSITY="DEBUG"
export MET_VERBOSITY="5"

# Time Settings
export FHR_START=0
export FHR_INCR=6
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ echo "BEGIN: $(basename ${BASH_SOURCE[0]})"
export MET_PLUS_OUT=${DATA}/${VERIF_CASE}/METplus_output
export MET_CONFIG_OVERRIDES=""

# Logging
export METPLUS_VERBOSITY="DEBUG"
export MET_VERBOSITY="5"

# Time Settings
export FHR_START=0
export FHR_INCR=1
Expand Down
10 changes: 4 additions & 6 deletions parm/metplus_config/stats/mesoscale/grid2obs/PB2NC_obsMETAR.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ MET_INSTALL_DIR = {ENV[MET_PATH]}
MET_BIN_DIR = {ENV[MET_PATH]}/bin
METPLUS_PARM_BASE = {ENV[MET_PLUS_CONF]}

INPUT_BASE = {ENV[COMINobs]}
INPUT_BASE = {ENV[DATA]}/{ENV[VERIF_CASE]}/data/{ENV[VERIF_TYPE]}/prepbufr
OUTPUT_BASE = {ENV[MET_PLUS_OUT]}/{ENV[VERIF_TYPE]}/{ENV[NEST]}/pb2nc
CONFIG_DIR = {ENV[MET_CONFIG]}
LOG_DIR = {OUTPUT_BASE}/logs
Expand All @@ -16,12 +16,10 @@ PB2NC_INPUT_DIR = {INPUT_BASE}
PB2NC_OUTPUT_DIR = {OUTPUT_BASE}

[filename_templates]
PB2NC_INPUT_TEMPLATE = nam.{da_init?fmt=%Y%m%d}/nam.t{cycle?fmt=%2H}z.prepbufr.tm{offset?fmt=%2H}
PB2NC_INPUT_TEMPLATE = nam.t{cycle?fmt=%2H}z.prepbufr.tm{offset?fmt=%2H}
PB2NC_OUTPUT_TEMPLATE = prepbufr.{MODEL1}.{NEST}.{valid?fmt=%Y%m%d%H}.nc

[config]
LOG_LEVEL = {ENV[METPLUS_VERBOSITY]}
LOG_MET_VERBOSITY = {ENV[MET_VERBOSITY]}
LOG_PB2NC_VERBOSITY = {LOG_MET_VERBOSITY}
LOG_TIMESTAMP_TEMPLATE = %Y%m%d%H%M%S
LOG_TIMESTAMP_USE_DATATIME = no
Expand Down Expand Up @@ -62,7 +60,7 @@ PB2NC_TIME_SUMMARY_VALID_FREQ = 0
PB2NC_TIME_SUMMARY_VALID_THRESH = 0.0
PB2NC_MET_CONFIG_OVERRIDES = obs_prepbufr_map = [ { key = "ZOB"; val = "HGT"; }, { key = "POB"; val = "PRES"; }, { key = "QOB"; val = "SPFH"; }, { key = "TOB"; val = "TMP"; }, { key = "UOB"; val = "UGRD"; }, { key = "VOB"; val = "VGRD"; }, { key = "D_WDIR"; val = "WDIR"; }, { key = "D_WIND"; val = "WIND"; }, { key = "D_RH"; val = "RH"; }, { key = "D_MIXR"; val = "MIXR"; }, { key = "D_PBL"; val = "HPBL"; }, { key = "D_CAPE"; val = "CAPE"; }, { key = "TDO"; val = "DPT"; }, { key = "PMO"; val = "PRMSL"; }, { key = "TOCC"; val = "TCDC"; }, { key = "HOVI"; val = "VIS"; }, { key = "CEILING"; val = "CEILING"; }, { key = "MXGS"; val = "GUST";}, { key = "D_MLCAPE"; val = "MLCAPE"; } ];
PB2NC_OFFSETS = 6, 3
PB2NC_SKIP_TIMES =
PB2NC_SKIP_VALID_TIMES =
PB2NC_MANDATORY = True

LOOP_BY = VALID
Expand All @@ -71,7 +69,7 @@ VALID_TIME_FMT = %Y%m%d%H
VALID_BEG = {ENV[VDATE]}{ENV[VHOUR]}
VALID_END = {ENV[VDATE]}{ENV[VHOUR]}
VALID_INCREMENT = 24H
SKIP_TIMES =
SKIP_VALID_TIMES =
LEAD_SEQ = 0

OMP_NUM_THREADS = 1
Expand Down
10 changes: 4 additions & 6 deletions parm/metplus_config/stats/mesoscale/grid2obs/PB2NC_obsRAOB.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ MET_INSTALL_DIR = {ENV[MET_PATH]}
MET_BIN_DIR = {ENV[MET_PATH]}/bin
METPLUS_PARM_BASE = {ENV[MET_PLUS_CONF]}

INPUT_BASE = {ENV[COMINobs]}
INPUT_BASE = {ENV[DATA]}/{ENV[VERIF_CASE]}/data/{ENV[VERIF_TYPE]}/prepbufr
OUTPUT_BASE = {ENV[MET_PLUS_OUT]}/{ENV[VERIF_TYPE]}/{ENV[NEST]}/pb2nc
CONFIG_DIR = {ENV[MET_CONFIG]}
LOG_DIR = {OUTPUT_BASE}/logs
Expand All @@ -16,12 +16,10 @@ PB2NC_INPUT_DIR = {INPUT_BASE}
PB2NC_OUTPUT_DIR = {OUTPUT_BASE}

[filename_templates]
PB2NC_INPUT_TEMPLATE = gdas.{valid?fmt=%Y%m%d}/{valid?fmt=%2H}/atmos/gdas.t{valid?fmt=%2H}z.prepbufr
PB2NC_INPUT_TEMPLATE = gdas.t{valid?fmt=%2H}z.prepbufr
PB2NC_OUTPUT_TEMPLATE = prepbufr.{MODEL1}.{NEST}.{valid?fmt=%Y%m%d%H}.nc

[config]
LOG_LEVEL = {ENV[METPLUS_VERBOSITY]}
LOG_MET_VERBOSITY = {ENV[MET_VERBOSITY]}
LOG_PB2NC_VERBOSITY = {LOG_MET_VERBOSITY}
LOG_TIMESTAMP_TEMPLATE = %Y%m%d%H%M%S
LOG_TIMESTAMP_USE_DATATIME = no
Expand Down Expand Up @@ -62,7 +60,7 @@ PB2NC_TIME_SUMMARY_VALID_FREQ = 0
PB2NC_TIME_SUMMARY_VALID_THRESH = 0.0
PB2NC_MET_CONFIG_OVERRIDES = obs_prepbufr_map = [ { key = "ZOB"; val = "HGT"; }, { key = "POB"; val = "PRES"; }, { key = "QOB"; val = "SPFH"; }, { key = "TOB"; val = "TMP"; }, { key = "UOB"; val = "UGRD"; }, { key = "VOB"; val = "VGRD"; }, { key = "D_WDIR"; val = "WDIR"; }, { key = "D_WIND"; val = "WIND"; }, { key = "D_RH"; val = "RH"; }, { key = "D_MIXR"; val = "MIXR"; }, { key = "D_PBL"; val = "HPBL"; }, { key = "D_CAPE"; val = "CAPE"; }, { key = "TDO"; val = "DPT"; }, { key = "PMO"; val = "PRMSL"; }, { key = "TOCC"; val = "TCDC"; }, { key = "HOVI"; val = "VIS"; }, { key = "CEILING"; val = "CEILING"; }, { key = "MXGS"; val = "GUST";}, { key = "D_MLCAPE"; val = "MLCAPE"; } ];
PB2NC_OFFSETS = 6, 5, 4, 3, 2, 1
PB2NC_SKIP_TIMES =
PB2NC_SKIP_VALID_TIMES =
PB2NC_MANDATORY = True

LOOP_BY = VALID
Expand All @@ -71,7 +69,7 @@ VALID_TIME_FMT = %Y%m%d%H
VALID_BEG = {ENV[VDATE]}{ENV[VHOUR]}
VALID_END = {ENV[VDATE]}{ENV[VHOUR]}
VALID_INCREMENT = 24H
SKIP_TIMES =
SKIP_VALID_TIMES =
LEAD_SEQ = 0

OMP_NUM_THREADS = 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ POINT_STAT_OUTPUT_TEMPLATE = {MODEL}.{valid?fmt=%Y%m%d}
POINT_STAT_VERIFICATION_MASK_TEMPLATE = {ENV[MASK_POLY_LIST]}

[config]
LOG_LEVEL = {ENV[METPLUS_VERBOSITY]}
LOG_MET_VERBOSITY = {ENV[MET_VERBOSITY]}
LOG_POINT_STAT_VERBOSITY = {LOG_MET_VERBOSITY}
LOG_TIMESTAMP_TEMPLATE = %Y%m%d%H%M%S
LOG_TIMESTAMP_USE_DATATIME = no
Expand All @@ -50,8 +48,8 @@ VALID_TIME_FMT = %Y%m%d%H
VALID_BEG = {ENV[VDATE]}{ENV[VHOUR]}
VALID_END = {ENV[VDATE]}{ENV[VHOUR]}
VALID_INCREMENT = 24H
POINT_STAT_SKIP_TIMES =
SKIP_TIMES =
POINT_STAT_SKIP_VALID_TIMES =
SKIP_VALID_TIMES =
LEAD_SEQ = begin_end_incr({ENV[FHR_START]},{ENV[FHR_END]},{ENV[FHR_INCR]})

# Variables
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ POINT_STAT_OUTPUT_TEMPLATE = {MODEL}.{valid?fmt=%Y%m%d}
POINT_STAT_VERIFICATION_MASK_TEMPLATE = {ENV[MASK_POLY_LIST]}

[config]
LOG_LEVEL = {ENV[METPLUS_VERBOSITY]}
LOG_MET_VERBOSITY = {ENV[MET_VERBOSITY]}
LOG_POINT_STAT_VERBOSITY = {LOG_MET_VERBOSITY}
LOG_TIMESTAMP_TEMPLATE = %Y%m%d%H%M%S
LOG_TIMESTAMP_USE_DATATIME = no
Expand All @@ -51,8 +49,8 @@ VALID_TIME_FMT = %Y%m%d%H
VALID_BEG = {ENV[VDATE]}{ENV[VHOUR]}
VALID_END = {ENV[VDATE]}{ENV[VHOUR]}
VALID_INCREMENT = 24H
POINT_STAT_SKIP_TIMES =
SKIP_TIMES =
POINT_STAT_SKIP_VALID_TIMES =
SKIP_VALID_TIMES =
LEAD_SEQ = {ENV[FHR]}

# Variables
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ POINT_STAT_OUTPUT_TEMPLATE = {MODEL}.{valid?fmt=%Y%m%d}
POINT_STAT_VERIFICATION_MASK_TEMPLATE = {ENV[MASK_POLY_LIST]}

[config]
LOG_LEVEL = {ENV[METPLUS_VERBOSITY]}
LOG_MET_VERBOSITY = {ENV[MET_VERBOSITY]}
LOG_POINT_STAT_VERBOSITY = {LOG_MET_VERBOSITY}
LOG_TIMESTAMP_TEMPLATE = %Y%m%d%H%M%S
LOG_TIMESTAMP_USE_DATATIME = no
Expand All @@ -50,8 +48,8 @@ VALID_TIME_FMT = %Y%m%d%H
VALID_BEG = {ENV[VDATE]}{ENV[VHOUR]}
VALID_END = {ENV[VDATE]}{ENV[VHOUR]}
VALID_INCREMENT = 24H
POINT_STAT_SKIP_TIMES =
SKIP_TIMES =
POINT_STAT_SKIP_VALID_TIMES =
SKIP_VALID_TIMES =
LEAD_SEQ = begin_end_incr({ENV[FHR_START]},{ENV[FHR_END]},{ENV[FHR_INCR]})

# Variables
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ OBS_POINT_STAT_INPUT_TEMPLATE = prepbufr.gfs.{valid?fmt=%Y%m%d%H}.nc
POINT_STAT_OUTPUT_TEMPLATE = {MODEL}.{valid?fmt=%Y%m%d}

[config]
LOG_LEVEL = {ENV[METPLUS_VERBOSITY]}
LOG_MET_VERBOSITY = {ENV[MET_VERBOSITY]}
LOG_POINT_STAT_VERBOSITY = {LOG_MET_VERBOSITY}
LOG_TIMESTAMP_TEMPLATE = %Y%m%d%H%M%S
LOG_TIMESTAMP_USE_DATATIME = no
Expand All @@ -46,8 +44,8 @@ VALID_TIME_FMT = %Y%m%d%H
VALID_BEG = {ENV[VDATE]}{ENV[VHOUR]}
VALID_END = {ENV[VDATE]}{ENV[VHOUR]}
VALID_INCREMENT = 24H
POINT_STAT_SKIP_TIMES =
SKIP_TIMES =
POINT_STAT_SKIP_VALID_TIMES =
SKIP_VALID_TIMES =
LEAD_SEQ = begin_end_incr({ENV[FHR_START]},{ENV[FHR_END]},{ENV[FHR_INCR]})

# Variables
Expand Down
Loading

0 comments on commit d43a207

Please sign in to comment.