Skip to content

Commit

Permalink
Bugfix/cam fixes 3 (NOAA-EMC#597)
Browse files Browse the repository at this point in the history
* Fix Look-in dir for gather3

* Bugzilla 1547: Run child processes in separate working directories

* Bugzilla 1547: Run child processes in separate working directories
(severe and radar plots jobs)

* Fix ASNOW verification + adjust snowfall graphics

* Adjust precip graphics

* Fix HRRR TCDC field configuration

* Add CONUS E/W/C/S graphics

* update walltime

* Adjust severe prep resource allocation + match ecf with dev

* Fix input template for merged ptype file

* Fix metric config

* Use verbose option for cp commands

* Bugzilla 1547: Run child processes in separate working directories
(precip prep jobs)

* use cfp + reduce resources

* Look in main output dir for firewx mask input

* Adjust walltimes + match ecf with dev walltimes

* Match ecf with dev driver walltime

* set and adjust mem allocation

* Match ecf with dev resource requests

* Reduce mem allocation

* Reduce mem allocation (ecf)

* Match ecf with dev driver allocations (plots)

* Add memory allocation

* Increase mem allocation

* Use single cpu + match ecf with dev resources

---------

Co-authored-by: marcel caron <[email protected]>
Co-authored-by: marcel caron <[email protected]>
Co-authored-by: marcel caron <[email protected]>
Co-authored-by: marcel caron <[email protected]>
Co-authored-by: marcel caron <[email protected]>
Co-authored-by: Marcel Caron <Marcel.Caron@hfe01.(none)>
  • Loading branch information
7 people authored Nov 12, 2024
1 parent 9cbba58 commit c2451c5
Show file tree
Hide file tree
Showing 158 changed files with 2,134 additions and 369 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#PBS -S /bin/bash
#PBS -q dev
#PBS -A VERF-DEV
#PBS -l walltime=2:30:00
#PBS -l place=vscatter:exclhost,select=12:ncpus=128:mem=220GB
#PBS -l walltime=8:00:00
#PBS -l place=vscatter:exclhost,select=12:ncpus=128:mem=300GB
#PBS -l debug=true

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

Expand Down
2 changes: 1 addition & 1 deletion dev/drivers/scripts/plots/cam/jevs_cam_headline_plots.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#PBS -q dev
#PBS -A VERF-DEV
#PBS -l walltime=00:30:00
#PBS -l place=vscatter:exclhost,select=1:ncpus=128:ompthreads=1
#PBS -l place=vscatter:exclhost,select=1:ncpus=128:ompthreads=1:mem=50GB
#PBS -l debug=true

set -x
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#PBS -q dev
#PBS -A VERF-DEV
#PBS -l walltime=00:15:00
#PBS -l place=vscatter:exclhost,select=1:ncpus=128:ompthreads=1:mem=128GB
#PBS -l place=vscatter:exclhost,select=1:ncpus=3:ompthreads=1:mem=128GB
#PBS -l debug=true

set -x
Expand All @@ -21,8 +21,8 @@ export SENDDBN_NTC=
export job=${PBS_JOBNAME:-jevs_cam_hireswarw_precip_prep}
export jobid=$job.${PBS_JOBID:-$$}
export SITE=$(cat /etc/cluster_name)
export USE_CFP=NO
export nproc=128
export USE_CFP=YES
export nproc=3

# General Verification Settings
export NET="evs"
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=0:30:00
#PBS -l place=shared,select=1:ncpus=1:mem=10GB
#PBS -l place=shared,select=1:ncpus=1:mem=15GB
#PBS -l debug=true


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#PBS -q dev
#PBS -A VERF-DEV
#PBS -l walltime=00:15:00
#PBS -l place=vscatter:exclhost,select=1:ncpus=128:ompthreads=1:mem=128GB
#PBS -l place=vscatter:exclhost,select=1:ncpus=3:ompthreads=1:mem=128GB
#PBS -l debug=true

set -x
Expand All @@ -21,8 +21,8 @@ export SENDDBN_NTC=
export job=${PBS_JOBNAME:-jevs_cam_hireswarwmem2_precip_prep}
export jobid=$job.${PBS_JOBID:-$$}
export SITE=$(cat /etc/cluster_name)
export USE_CFP=NO
export nproc=128
export USE_CFP=YES
export nproc=3

# General Verification Settings
export NET="evs"
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=0:30:00
#PBS -l place=shared,select=1:ncpus=1:mem=10GB
#PBS -l place=shared,select=1:ncpus=1:mem=15GB
#PBS -l debug=true


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#PBS -q dev
#PBS -A VERF-DEV
#PBS -l walltime=00:15:00
#PBS -l place=vscatter:exclhost,select=1:ncpus=128:ompthreads=1:mem=128GB
#PBS -l place=vscatter:exclhost,select=1:ncpus=3:ompthreads=1:mem=128GB
#PBS -l debug=true

set -x
Expand All @@ -21,8 +21,8 @@ export SENDDBN_NTC=
export job=${PBS_JOBNAME:-jevs_cam_hireswfv3_precip_prep}
export jobid=$job.${PBS_JOBID:-$$}
export SITE=$(cat /etc/cluster_name)
export USE_CFP=NO
export nproc=128
export USE_CFP=YES
export nproc=3

# General Verification Settings
export NET="evs"
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=0:30:00
#PBS -l place=shared,select=1:ncpus=1:mem=10GB
#PBS -l place=shared,select=1:ncpus=1:mem=15GB
#PBS -l debug=true


Expand Down
6 changes: 3 additions & 3 deletions dev/drivers/scripts/prep/cam/jevs_cam_hrrr_precip_prep.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#PBS -q dev
#PBS -A VERF-DEV
#PBS -l walltime=00:15:00
#PBS -l place=vscatter:exclhost,select=1:ncpus=128:ompthreads=1:mem=128GB
#PBS -l place=vscatter:exclhost,select=1:ncpus=3:ompthreads=1:mem=128GB
#PBS -l debug=true

set -x
Expand All @@ -21,8 +21,8 @@ export SENDDBN_NTC=
export job=${PBS_JOBNAME:-jevs_cam_hrrr_precip_prep}
export jobid=$job.${PBS_JOBID:-$$}
export SITE=$(cat /etc/cluster_name)
export USE_CFP=NO
export nproc=128
export USE_CFP=YES
export nproc=3

# General Verification Settings
export NET="evs"
Expand Down
2 changes: 1 addition & 1 deletion dev/drivers/scripts/prep/cam/jevs_cam_hrrr_severe_prep.sh
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=0:30:00
#PBS -l place=shared,select=1:ncpus=1:mem=10GB
#PBS -l place=shared,select=1:ncpus=1:mem=15GB
#PBS -l debug=true


Expand Down
6 changes: 3 additions & 3 deletions dev/drivers/scripts/prep/cam/jevs_cam_namnest_precip_prep.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#PBS -q dev
#PBS -A VERF-DEV
#PBS -l walltime=00:15:00
#PBS -l place=vscatter:exclhost,select=1:ncpus=128:ompthreads=1:mem=128GB
#PBS -l place=vscatter:exclhost,select=1:ncpus=3:ompthreads=1:mem=128GB
#PBS -l debug=true

set -x
Expand All @@ -21,8 +21,8 @@ export SENDDBN_NTC=
export job=${PBS_JOBNAME:-jevs_cam_namnest_precip_prep}
export jobid=$job.${PBS_JOBID:-$$}
export SITE=$(cat /etc/cluster_name)
export USE_CFP=NO
export nproc=128
export USE_CFP=YES
export nproc=3

# General Verification Settings
export NET="evs"
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=0:30:00
#PBS -l place=shared,select=1:ncpus=1:mem=10GB
#PBS -l place=shared,select=1:ncpus=1:mem=75GB
#PBS -l debug=true


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=0:30:00
#PBS -l place=vscatter:exclhost,select=1:ncpus=3:mem=500GB
#PBS -l place=vscatter:exclhost,select=1:ncpus=3:mem=50GB
#PBS -l debug=true


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=0:30:00
#PBS -l place=exclhost,select=1:ncpus=5:mem=500MB
#PBS -l place=exclhost,select=1:ncpus=1:mem=500MB
#PBS -l debug=true


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=0:30:00
#PBS -l place=vscatter:exclhost,select=1:ncpus=3:mem=500GB
#PBS -l place=vscatter:exclhost,select=1:ncpus=3:mem=50GB
#PBS -l debug=true


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=0:30:00
#PBS -l place=exclhost,select=1:ncpus=5:mem=500MB
#PBS -l place=exclhost,select=1:ncpus=1:mem=500MB
#PBS -l debug=true


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

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=0:30:00
#PBS -l place=vscatter:exclhost,select=1:ncpus=3:mem=500GB
#PBS -l place=vscatter:exclhost,select=1:ncpus=3:mem=50GB
#PBS -l debug=true


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=0:30:00
#PBS -l place=exclhost,select=1:ncpus=5:mem=500MB
#PBS -l place=exclhost,select=1:ncpus=1:mem=500MB
#PBS -l debug=true


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=0:30:00
#PBS -l place=exclhost,select=1:ncpus=5:mem=500MB
#PBS -l place=exclhost,select=1:ncpus=1:mem=500MB
#PBS -l debug=true


Expand Down
2 changes: 1 addition & 1 deletion dev/drivers/scripts/stats/cam/jevs_cam_hrrr_radar_stats.sh
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=0:30:00
#PBS -l place=vscatter:exclhost,select=1:ncpus=3:mem=500GB
#PBS -l place=vscatter:exclhost,select=1:ncpus=3:mem=50GB
#PBS -l debug=true


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=0:30:00
#PBS -l place=exclhost,select=1:ncpus=5:mem=500MB
#PBS -l place=exclhost,select=1:ncpus=1:mem=500MB
#PBS -l debug=true


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#PBS -S /bin/bash
#PBS -q dev
#PBS -A VERF-DEV
#PBS -l walltime=02:15:00
#PBS -l walltime=02:50:00
#PBS -l place=vscatter:exclhost,select=1:ncpus=128:ompthreads=1:mem=256GB
#PBS -l debug=true

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#PBS -q dev
#PBS -A VERF-DEV
#PBS -l walltime=01:30:00
#PBS -l place=vscatter:exclhost,select=1:ncpus=128:ompthreads=1
#PBS -l place=vscatter:exclhost,select=1:ncpus=128:ompthreads=1:mem=125GB
#PBS -l debug=true

set -x
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=3:mem=500GB
#PBS -l place=vscatter:exclhost,select=1:ncpus=3:mem=50GB
#PBS -l debug=true


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=exclhost,select=1:ncpus=5:mem=500MB
#PBS -l place=exclhost,select=1:ncpus=1:mem=500MB
#PBS -l debug=true


Expand Down
4 changes: 2 additions & 2 deletions ecf/scripts/plots/cam/jevs_cam_grid2obs_plots_last31days.ecf
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#PBS -S /bin/bash
#PBS -q %QUEUE%
#PBS -A %PROJ%-%PROJENVIR%
#PBS -l walltime=2:30:00
#PBS -l place=vscatter:exclhost,select=12:ncpus=128:mem=220GB
#PBS -l walltime=8:00:00
#PBS -l place=vscatter:exclhost,select=12:ncpus=128:mem=300GB
#PBS -l debug=true

export model=evs
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=4:30:00
#PBS -l walltime=8:00:00
#PBS -l place=vscatter:exclhost,select=12:ncpus=128:mem=330GB
#PBS -l debug=true

Expand Down
4 changes: 2 additions & 2 deletions ecf/scripts/plots/cam/jevs_cam_headline_plots.ecf
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#PBS -S /bin/bash
#PBS -q %QUEUE%
#PBS -A %PROJ%-%PROJENVIR%
#PBS -l walltime=00:40:00
#PBS -l place=vscatter:exclhost,select=1:ncpus=128:ompthreads=1:mem=150GB
#PBS -l walltime=00:30:00
#PBS -l place=vscatter:exclhost,select=1:ncpus=128:ompthreads=1:mem=50GB
#PBS -l debug=true

export model=evs
Expand Down
2 changes: 1 addition & 1 deletion ecf/scripts/plots/cam/jevs_cam_precip_plots_last90days.ecf
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=04:35:00
#PBS -l walltime=04:30:00
#PBS -l place=vscatter:exclhost,select=4:ncpus=128:mem=200GB
#PBS -l debug=true

Expand Down
2 changes: 1 addition & 1 deletion ecf/scripts/plots/cam/jevs_cam_snowfall_plots.ecf
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=04:30:00
#PBS -l walltime=05:30:00
#PBS -l place=vscatter:exclhost,select=4:ncpus=128:mem=150GB
#PBS -l debug=true

Expand Down
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:10:00
#PBS -l place=vscatter:exclhost,select=1:ncpus=128:ompthreads=1:mem=128GB
#PBS -l place=vscatter:exclhost,select=1:ncpus=3:ompthreads=1:mem=128GB
#PBS -l debug=true

export model=evs
Expand Down Expand Up @@ -42,13 +42,13 @@ module list
############################################################
# Specify environment variables
############################################################
export nproc=128
export nproc=3
if [ -n "%VHR:%" ]; then
export vhr=${vhr:-%VHR:%}
else
export vhr=00
fi
export USE_CFP=NO
export USE_CFP=YES
export NET="evs"
export RUN="atmos"
export VERIF_CASE="precip"
Expand Down
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:10:00
#PBS -l place=shared,select=1:ncpus=1:mem=40GB
#PBS -l place=shared,select=1:ncpus=1:mem=15GB
#PBS -l debug=true

export model=evs
Expand Down
Loading

0 comments on commit c2451c5

Please sign in to comment.