From a81da33e8fe7541a36f68e7a4f14a384cadd36c8 Mon Sep 17 00:00:00 2001 From: Kate Friedman Date: Tue, 19 Dec 2023 10:22:21 -0500 Subject: [PATCH] Set place=shared for shared jobs on WCOSS2 (develop) (#2156) Set job as shared when not exclusive on WCOSS2 WCOSS2 defaults to exclusive when it is not specified as either exclusive (place=exclhost) or shared (place=shared). Now set shared when job should be shared. Refs #2135 --- ecf/scripts/enkfgdas/analysis/create/jenkfgdas_diag.ecf | 2 +- ecf/scripts/enkfgdas/analysis/recenter/jenkfgdas_sfc.ecf | 2 +- ecf/scripts/gdas/atmos/analysis/jgdas_atmos_analysis_diag.ecf | 2 +- ecf/scripts/gdas/atmos/gempak/jgdas_atmos_gempak.ecf | 2 +- ecf/scripts/gdas/atmos/gempak/jgdas_atmos_gempak_meta_ncdc.ecf | 2 +- .../gdas/atmos/obsproc/dump/jgdas_atmos_tropcy_qc_reloc.ecf | 2 +- .../gdas/atmos/obsproc/prep/jgdas_atmos_emcsfc_sfc_prep.ecf | 2 +- ecf/scripts/gdas/atmos/post/jgdas_atmos_post_manager.ecf | 2 +- .../gdas/atmos/post_processing/jgdas_atmos_chgres_forenkf.ecf | 2 +- ecf/scripts/gdas/atmos/verf/jgdas_atmos_verfozn.ecf | 2 +- ecf/scripts/gdas/atmos/verf/jgdas_atmos_verfrad.ecf | 2 +- ecf/scripts/gdas/atmos/verf/jgdas_atmos_vminmon.ecf | 2 +- ecf/scripts/gdas/wave/init/jgdas_wave_init.ecf | 2 +- ecf/scripts/gdas/wave/post/jgdas_wave_postpnt.ecf | 2 +- ecf/scripts/gdas/wave/post/jgdas_wave_postsbs.ecf | 2 +- ecf/scripts/gdas/wave/prep/jgdas_wave_prep.ecf | 2 +- ecf/scripts/gfs/atmos/gempak/jgfs_atmos_gempak.ecf | 2 +- ecf/scripts/gfs/atmos/gempak/jgfs_atmos_gempak_meta.ecf | 2 +- .../gfs/atmos/gempak/jgfs_atmos_gempak_ncdc_upapgif.ecf | 2 +- .../gfs/atmos/gempak/jgfs_atmos_npoess_pgrb2_0p5deg.ecf | 2 +- ecf/scripts/gfs/atmos/gempak/jgfs_atmos_pgrb2_spec_gempak.ecf | 2 +- .../gfs/atmos/obsproc/dump/jgfs_atmos_tropcy_qc_reloc.ecf | 2 +- .../gfs/atmos/obsproc/prep/jgfs_atmos_emcsfc_sfc_prep.ecf | 2 +- ecf/scripts/gfs/atmos/post/jgfs_atmos_post_manager.ecf | 2 +- .../post_processing/awips_20km_1p0/jgfs_atmos_awips_master.ecf | 2 +- .../post_processing/awips_g2/jgfs_atmos_awips_g2_master.ecf | 2 +- .../gfs/atmos/post_processing/bulletins/jgfs_atmos_fbwind.ecf | 2 +- ecf/scripts/gfs/atmos/verf/jgfs_atmos_vminmon.ecf | 2 +- ecf/scripts/gfs/wave/gempak/jgfs_wave_gempak.ecf | 2 +- ecf/scripts/gfs/wave/init/jgfs_wave_init.ecf | 2 +- ecf/scripts/gfs/wave/post/jgfs_wave_postsbs.ecf | 2 +- ecf/scripts/gfs/wave/post/jgfs_wave_prdgen_bulls.ecf | 2 +- ecf/scripts/gfs/wave/post/jgfs_wave_prdgen_gridded.ecf | 2 +- ecf/scripts/gfs/wave/prep/jgfs_wave_prep.ecf | 2 +- workflow/rocoto/tasks.py | 3 +++ 35 files changed, 37 insertions(+), 34 deletions(-) diff --git a/ecf/scripts/enkfgdas/analysis/create/jenkfgdas_diag.ecf b/ecf/scripts/enkfgdas/analysis/create/jenkfgdas_diag.ecf index 294d5c25d9..08d0185399 100755 --- a/ecf/scripts/enkfgdas/analysis/create/jenkfgdas_diag.ecf +++ b/ecf/scripts/enkfgdas/analysis/create/jenkfgdas_diag.ecf @@ -5,7 +5,7 @@ #PBS -A %PROJ%-%PROJENVIR% #PBS -l walltime=00:06:00 #PBS -l select=1:mpiprocs=48:ompthreads=1:ncpus=48:mem=24GB -#PBS -l place=vscatter +#PBS -l place=vscatter:shared #PBS -l debug=true model=gfs diff --git a/ecf/scripts/enkfgdas/analysis/recenter/jenkfgdas_sfc.ecf b/ecf/scripts/enkfgdas/analysis/recenter/jenkfgdas_sfc.ecf index 39d4ec2e8d..d095742193 100755 --- a/ecf/scripts/enkfgdas/analysis/recenter/jenkfgdas_sfc.ecf +++ b/ecf/scripts/enkfgdas/analysis/recenter/jenkfgdas_sfc.ecf @@ -5,7 +5,7 @@ #PBS -A %PROJ%-%PROJENVIR% #PBS -l walltime=00:06:00 #PBS -l select=1:mpiprocs=80:ompthreads=1:ncpus=80:mem=80GB -#PBS -l place=vscatter +#PBS -l place=vscatter:shared #PBS -l debug=true model=gfs diff --git a/ecf/scripts/gdas/atmos/analysis/jgdas_atmos_analysis_diag.ecf b/ecf/scripts/gdas/atmos/analysis/jgdas_atmos_analysis_diag.ecf index f233fed21e..f766333272 100755 --- a/ecf/scripts/gdas/atmos/analysis/jgdas_atmos_analysis_diag.ecf +++ b/ecf/scripts/gdas/atmos/analysis/jgdas_atmos_analysis_diag.ecf @@ -5,7 +5,7 @@ #PBS -A %PROJ%-%PROJENVIR% #PBS -l walltime=00:10:00 #PBS -l select=1:mpiprocs=96:ompthreads=1:ncpus=96:mem=48GB -#PBS -l place=vscatter +#PBS -l place=vscatter:shared #PBS -l debug=true export model=gfs diff --git a/ecf/scripts/gdas/atmos/gempak/jgdas_atmos_gempak.ecf b/ecf/scripts/gdas/atmos/gempak/jgdas_atmos_gempak.ecf index 039ca56852..0bc2d76455 100755 --- a/ecf/scripts/gdas/atmos/gempak/jgdas_atmos_gempak.ecf +++ b/ecf/scripts/gdas/atmos/gempak/jgdas_atmos_gempak.ecf @@ -5,7 +5,7 @@ #PBS -A %PROJ%-%PROJENVIR% #PBS -l walltime=00:15:00 #PBS -l select=1:ncpus=2:mpiprocs=2:mem=4GB -#PBS -l place=vscatter +#PBS -l place=vscatter:shared #PBS -l debug=true model=gfs diff --git a/ecf/scripts/gdas/atmos/gempak/jgdas_atmos_gempak_meta_ncdc.ecf b/ecf/scripts/gdas/atmos/gempak/jgdas_atmos_gempak_meta_ncdc.ecf index 61f7f0a17f..9d66f4bda1 100755 --- a/ecf/scripts/gdas/atmos/gempak/jgdas_atmos_gempak_meta_ncdc.ecf +++ b/ecf/scripts/gdas/atmos/gempak/jgdas_atmos_gempak_meta_ncdc.ecf @@ -5,7 +5,7 @@ #PBS -A %PROJ%-%PROJENVIR% #PBS -l walltime=00:30:00 #PBS -l select=1:ncpus=1:mem=1GB -#PBS -l place=vscatter +#PBS -l place=vscatter:shared #PBS -l debug=true model=gfs diff --git a/ecf/scripts/gdas/atmos/obsproc/dump/jgdas_atmos_tropcy_qc_reloc.ecf b/ecf/scripts/gdas/atmos/obsproc/dump/jgdas_atmos_tropcy_qc_reloc.ecf index 5322c363ac..2dd0bdf06c 100755 --- a/ecf/scripts/gdas/atmos/obsproc/dump/jgdas_atmos_tropcy_qc_reloc.ecf +++ b/ecf/scripts/gdas/atmos/obsproc/dump/jgdas_atmos_tropcy_qc_reloc.ecf @@ -5,7 +5,7 @@ #PBS -A %PROJ%-%PROJENVIR% #PBS -l walltime=00:05:00 #PBS -l select=1:ncpus=1:mem=1GB -#PBS -l place=vscatter +#PBS -l place=vscatter:shared #PBS -l debug=true model=gfs diff --git a/ecf/scripts/gdas/atmos/obsproc/prep/jgdas_atmos_emcsfc_sfc_prep.ecf b/ecf/scripts/gdas/atmos/obsproc/prep/jgdas_atmos_emcsfc_sfc_prep.ecf index e0ab513b33..7e3282bc95 100755 --- a/ecf/scripts/gdas/atmos/obsproc/prep/jgdas_atmos_emcsfc_sfc_prep.ecf +++ b/ecf/scripts/gdas/atmos/obsproc/prep/jgdas_atmos_emcsfc_sfc_prep.ecf @@ -5,7 +5,7 @@ #PBS -A %PROJ%-%PROJENVIR% #PBS -l walltime=00:08:00 #PBS -l select=1:ncpus=1:mem=2GB -#PBS -l place=vscatter +#PBS -l place=vscatter:shared #PBS -l debug=true model=gfs diff --git a/ecf/scripts/gdas/atmos/post/jgdas_atmos_post_manager.ecf b/ecf/scripts/gdas/atmos/post/jgdas_atmos_post_manager.ecf index 55d7932aaf..1da24c0d46 100755 --- a/ecf/scripts/gdas/atmos/post/jgdas_atmos_post_manager.ecf +++ b/ecf/scripts/gdas/atmos/post/jgdas_atmos_post_manager.ecf @@ -5,7 +5,7 @@ #PBS -A %PROJ%-%PROJENVIR% #PBS -l walltime=01:15:00 #PBS -l select=1:ncpus=1:mem=1GB -#PBS -l place=vscatter +#PBS -l place=vscatter:shared #PBS -l debug=true model=gfs diff --git a/ecf/scripts/gdas/atmos/post_processing/jgdas_atmos_chgres_forenkf.ecf b/ecf/scripts/gdas/atmos/post_processing/jgdas_atmos_chgres_forenkf.ecf index 6993e4ae4f..33fa481a29 100755 --- a/ecf/scripts/gdas/atmos/post_processing/jgdas_atmos_chgres_forenkf.ecf +++ b/ecf/scripts/gdas/atmos/post_processing/jgdas_atmos_chgres_forenkf.ecf @@ -5,7 +5,7 @@ #PBS -A %PROJ%-%PROJENVIR% #PBS -l walltime=00:10:00 #PBS -l select=1:ncpus=3:mpiprocs=3:ompthreads=1:mem=200GB -#PBS -l place=vscatter +#PBS -l place=vscatter:shared #PBS -l debug=true model=gfs diff --git a/ecf/scripts/gdas/atmos/verf/jgdas_atmos_verfozn.ecf b/ecf/scripts/gdas/atmos/verf/jgdas_atmos_verfozn.ecf index 5bf31996d9..9c7a1609e7 100755 --- a/ecf/scripts/gdas/atmos/verf/jgdas_atmos_verfozn.ecf +++ b/ecf/scripts/gdas/atmos/verf/jgdas_atmos_verfozn.ecf @@ -5,7 +5,7 @@ #PBS -A %PROJ%-%PROJENVIR% #PBS -l walltime=00:05:00 #PBS -l select=1:ncpus=1:mem=1GB -#PBS -l place=vscatter +#PBS -l place=vscatter:shared #PBS -l debug=true model=gfs diff --git a/ecf/scripts/gdas/atmos/verf/jgdas_atmos_verfrad.ecf b/ecf/scripts/gdas/atmos/verf/jgdas_atmos_verfrad.ecf index b9ee264998..e2d3bb3463 100755 --- a/ecf/scripts/gdas/atmos/verf/jgdas_atmos_verfrad.ecf +++ b/ecf/scripts/gdas/atmos/verf/jgdas_atmos_verfrad.ecf @@ -5,7 +5,7 @@ #PBS -A %PROJ%-%PROJENVIR% #PBS -l walltime=00:20:00 #PBS -l select=1:ncpus=1:mem=5GB -#PBS -l place=vscatter +#PBS -l place=vscatter:shared #PBS -l debug=true model=gfs diff --git a/ecf/scripts/gdas/atmos/verf/jgdas_atmos_vminmon.ecf b/ecf/scripts/gdas/atmos/verf/jgdas_atmos_vminmon.ecf index 71ef1155a9..9afd0b5083 100755 --- a/ecf/scripts/gdas/atmos/verf/jgdas_atmos_vminmon.ecf +++ b/ecf/scripts/gdas/atmos/verf/jgdas_atmos_vminmon.ecf @@ -5,7 +5,7 @@ #PBS -A %PROJ%-%PROJENVIR% #PBS -l walltime=00:05:00 #PBS -l select=1:ncpus=1:mem=1GB -#PBS -l place=vscatter +#PBS -l place=vscatter:shared #PBS -l debug=true model=gfs diff --git a/ecf/scripts/gdas/wave/init/jgdas_wave_init.ecf b/ecf/scripts/gdas/wave/init/jgdas_wave_init.ecf index 569a7c0894..208ed2cc52 100755 --- a/ecf/scripts/gdas/wave/init/jgdas_wave_init.ecf +++ b/ecf/scripts/gdas/wave/init/jgdas_wave_init.ecf @@ -5,7 +5,7 @@ #PBS -A %PROJ%-%PROJENVIR% #PBS -l walltime=00:10:00 #PBS -l select=1:mpiprocs=11:ompthreads=1:ncpus=11:mem=2GB -#PBS -l place=vscatter +#PBS -l place=vscatter:shared #PBS -l debug=true model=gfs diff --git a/ecf/scripts/gdas/wave/post/jgdas_wave_postpnt.ecf b/ecf/scripts/gdas/wave/post/jgdas_wave_postpnt.ecf index 20db8b240d..1899dc152f 100755 --- a/ecf/scripts/gdas/wave/post/jgdas_wave_postpnt.ecf +++ b/ecf/scripts/gdas/wave/post/jgdas_wave_postpnt.ecf @@ -5,7 +5,7 @@ #PBS -A %PROJ%-%PROJENVIR% #PBS -l walltime=00:12:00 #PBS -l select=4:mpiprocs=50:ompthreads=1:ncpus=50:mem=10GB -#PBS -l place=vscatter +#PBS -l place=vscatter:shared #PBS -l debug=true model=gfs diff --git a/ecf/scripts/gdas/wave/post/jgdas_wave_postsbs.ecf b/ecf/scripts/gdas/wave/post/jgdas_wave_postsbs.ecf index 29d5a467d3..31cca40bed 100755 --- a/ecf/scripts/gdas/wave/post/jgdas_wave_postsbs.ecf +++ b/ecf/scripts/gdas/wave/post/jgdas_wave_postsbs.ecf @@ -5,7 +5,7 @@ #PBS -A %PROJ%-%PROJENVIR% #PBS -l walltime=00:20:00 #PBS -l select=1:mpiprocs=8:ompthreads=1:ncpus=8:mem=10GB -#PBS -l place=vscatter +#PBS -l place=vscatter:shared #PBS -l debug=true model=gfs diff --git a/ecf/scripts/gdas/wave/prep/jgdas_wave_prep.ecf b/ecf/scripts/gdas/wave/prep/jgdas_wave_prep.ecf index 612a29eb71..77b44634a9 100755 --- a/ecf/scripts/gdas/wave/prep/jgdas_wave_prep.ecf +++ b/ecf/scripts/gdas/wave/prep/jgdas_wave_prep.ecf @@ -5,7 +5,7 @@ #PBS -A %PROJ%-%PROJENVIR% #PBS -l walltime=00:10:00 #PBS -l select=1:mpiprocs=5:ompthreads=1:ncpus=5:mem=100GB -#PBS -l place=vscatter +#PBS -l place=vscatter:shared #PBS -l debug=true model=gfs diff --git a/ecf/scripts/gfs/atmos/gempak/jgfs_atmos_gempak.ecf b/ecf/scripts/gfs/atmos/gempak/jgfs_atmos_gempak.ecf index c69a02fedf..1994f238d1 100755 --- a/ecf/scripts/gfs/atmos/gempak/jgfs_atmos_gempak.ecf +++ b/ecf/scripts/gfs/atmos/gempak/jgfs_atmos_gempak.ecf @@ -5,7 +5,7 @@ #PBS -A %PROJ%-%PROJENVIR% #PBS -l walltime=03:00:00 #PBS -l select=1:ncpus=28:mpiprocs=28:mem=2GB -#PBS -l place=vscatter +#PBS -l place=vscatter:shared #PBS -l debug=true model=gfs diff --git a/ecf/scripts/gfs/atmos/gempak/jgfs_atmos_gempak_meta.ecf b/ecf/scripts/gfs/atmos/gempak/jgfs_atmos_gempak_meta.ecf index 69f736b705..e9833baa41 100755 --- a/ecf/scripts/gfs/atmos/gempak/jgfs_atmos_gempak_meta.ecf +++ b/ecf/scripts/gfs/atmos/gempak/jgfs_atmos_gempak_meta.ecf @@ -5,7 +5,7 @@ #PBS -A %PROJ%-%PROJENVIR% #PBS -l walltime=03:00:00 #PBS -l select=1:ncpus=23:mpiprocs=23:mem=2GB -#PBS -l place=vscatter +#PBS -l place=vscatter:shared #PBS -l debug=true model=gfs diff --git a/ecf/scripts/gfs/atmos/gempak/jgfs_atmos_gempak_ncdc_upapgif.ecf b/ecf/scripts/gfs/atmos/gempak/jgfs_atmos_gempak_ncdc_upapgif.ecf index d72622b93a..08686dbca3 100755 --- a/ecf/scripts/gfs/atmos/gempak/jgfs_atmos_gempak_ncdc_upapgif.ecf +++ b/ecf/scripts/gfs/atmos/gempak/jgfs_atmos_gempak_ncdc_upapgif.ecf @@ -5,7 +5,7 @@ #PBS -A %PROJ%-%PROJENVIR% #PBS -l walltime=02:00:00 #PBS -l select=1:ncpus=1:mem=1GB -#PBS -l place=vscatter +#PBS -l place=vscatter:shared #PBS -l debug=true model=gfs diff --git a/ecf/scripts/gfs/atmos/gempak/jgfs_atmos_npoess_pgrb2_0p5deg.ecf b/ecf/scripts/gfs/atmos/gempak/jgfs_atmos_npoess_pgrb2_0p5deg.ecf index 8837e94948..1ff597411a 100755 --- a/ecf/scripts/gfs/atmos/gempak/jgfs_atmos_npoess_pgrb2_0p5deg.ecf +++ b/ecf/scripts/gfs/atmos/gempak/jgfs_atmos_npoess_pgrb2_0p5deg.ecf @@ -5,7 +5,7 @@ #PBS -A %PROJ%-%PROJENVIR% #PBS -l walltime=02:00:00 #PBS -l select=1:ncpus=1:mem=1GB -#PBS -l place=vscatter +#PBS -l place=vscatter:shared #PBS -l debug=true model=gfs diff --git a/ecf/scripts/gfs/atmos/gempak/jgfs_atmos_pgrb2_spec_gempak.ecf b/ecf/scripts/gfs/atmos/gempak/jgfs_atmos_pgrb2_spec_gempak.ecf index aa89d37bfc..04b07c58d1 100755 --- a/ecf/scripts/gfs/atmos/gempak/jgfs_atmos_pgrb2_spec_gempak.ecf +++ b/ecf/scripts/gfs/atmos/gempak/jgfs_atmos_pgrb2_spec_gempak.ecf @@ -5,7 +5,7 @@ #PBS -A %PROJ%-%PROJENVIR% #PBS -l walltime=00:30:00 #PBS -l select=1:ncpus=1:mem=1GB -#PBS -l place=vscatter +#PBS -l place=vscatter:shared #PBS -l debug=true model=gfs diff --git a/ecf/scripts/gfs/atmos/obsproc/dump/jgfs_atmos_tropcy_qc_reloc.ecf b/ecf/scripts/gfs/atmos/obsproc/dump/jgfs_atmos_tropcy_qc_reloc.ecf index 5322c363ac..2dd0bdf06c 100755 --- a/ecf/scripts/gfs/atmos/obsproc/dump/jgfs_atmos_tropcy_qc_reloc.ecf +++ b/ecf/scripts/gfs/atmos/obsproc/dump/jgfs_atmos_tropcy_qc_reloc.ecf @@ -5,7 +5,7 @@ #PBS -A %PROJ%-%PROJENVIR% #PBS -l walltime=00:05:00 #PBS -l select=1:ncpus=1:mem=1GB -#PBS -l place=vscatter +#PBS -l place=vscatter:shared #PBS -l debug=true model=gfs diff --git a/ecf/scripts/gfs/atmos/obsproc/prep/jgfs_atmos_emcsfc_sfc_prep.ecf b/ecf/scripts/gfs/atmos/obsproc/prep/jgfs_atmos_emcsfc_sfc_prep.ecf index f0a1a3346f..bb0bcf8db7 100755 --- a/ecf/scripts/gfs/atmos/obsproc/prep/jgfs_atmos_emcsfc_sfc_prep.ecf +++ b/ecf/scripts/gfs/atmos/obsproc/prep/jgfs_atmos_emcsfc_sfc_prep.ecf @@ -5,7 +5,7 @@ #PBS -A %PROJ%-%PROJENVIR% #PBS -l walltime=00:07:00 #PBS -l select=1:ncpus=1:mem=2GB -#PBS -l place=vscatter +#PBS -l place=vscatter:shared #PBS -l debug=true model=gfs diff --git a/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_manager.ecf b/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_manager.ecf index fc22e941bc..d2e315bcef 100755 --- a/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_manager.ecf +++ b/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_manager.ecf @@ -5,7 +5,7 @@ #PBS -A %PROJ%-%PROJENVIR% #PBS -l walltime=04:00:00 #PBS -l select=1:ncpus=1:mem=1GB -#PBS -l place=vscatter +#PBS -l place=vscatter:shared #PBS -l debug=true model=gfs diff --git a/ecf/scripts/gfs/atmos/post_processing/awips_20km_1p0/jgfs_atmos_awips_master.ecf b/ecf/scripts/gfs/atmos/post_processing/awips_20km_1p0/jgfs_atmos_awips_master.ecf index 2333476033..e146f8df32 100755 --- a/ecf/scripts/gfs/atmos/post_processing/awips_20km_1p0/jgfs_atmos_awips_master.ecf +++ b/ecf/scripts/gfs/atmos/post_processing/awips_20km_1p0/jgfs_atmos_awips_master.ecf @@ -5,7 +5,7 @@ #PBS -A %PROJ%-%PROJENVIR% #PBS -l walltime=00:10:00 #PBS -l select=1:ncpus=1:mem=3GB -#PBS -l place=vscatter +#PBS -l place=vscatter:shared #PBS -l debug=true model=gfs diff --git a/ecf/scripts/gfs/atmos/post_processing/awips_g2/jgfs_atmos_awips_g2_master.ecf b/ecf/scripts/gfs/atmos/post_processing/awips_g2/jgfs_atmos_awips_g2_master.ecf index a175e34e5a..c1edf3de88 100755 --- a/ecf/scripts/gfs/atmos/post_processing/awips_g2/jgfs_atmos_awips_g2_master.ecf +++ b/ecf/scripts/gfs/atmos/post_processing/awips_g2/jgfs_atmos_awips_g2_master.ecf @@ -5,7 +5,7 @@ #PBS -A %PROJ%-%PROJENVIR% #PBS -l walltime=00:05:00 #PBS -l select=1:ncpus=1:mem=3GB -#PBS -l place=vscatter +#PBS -l place=vscatter:shared #PBS -l debug=true model=gfs diff --git a/ecf/scripts/gfs/atmos/post_processing/bulletins/jgfs_atmos_fbwind.ecf b/ecf/scripts/gfs/atmos/post_processing/bulletins/jgfs_atmos_fbwind.ecf index a6fb412f71..7443002a0b 100755 --- a/ecf/scripts/gfs/atmos/post_processing/bulletins/jgfs_atmos_fbwind.ecf +++ b/ecf/scripts/gfs/atmos/post_processing/bulletins/jgfs_atmos_fbwind.ecf @@ -5,7 +5,7 @@ #PBS -A %PROJ%-%PROJENVIR% #PBS -l walltime=00:05:00 #PBS -l select=1:ncpus=1:mem=4GB -#PBS -l place=vscatter +#PBS -l place=vscatter:shared #PBS -l debug=true model=gfs diff --git a/ecf/scripts/gfs/atmos/verf/jgfs_atmos_vminmon.ecf b/ecf/scripts/gfs/atmos/verf/jgfs_atmos_vminmon.ecf index 1e19a0ea3e..e9922e0751 100755 --- a/ecf/scripts/gfs/atmos/verf/jgfs_atmos_vminmon.ecf +++ b/ecf/scripts/gfs/atmos/verf/jgfs_atmos_vminmon.ecf @@ -5,7 +5,7 @@ #PBS -A %PROJ%-%PROJENVIR% #PBS -l walltime=00:05:00 #PBS -l select=1:ncpus=1:mem=1GB -#PBS -l place=vscatter +#PBS -l place=vscatter:shared #PBS -l debug=true model=gfs diff --git a/ecf/scripts/gfs/wave/gempak/jgfs_wave_gempak.ecf b/ecf/scripts/gfs/wave/gempak/jgfs_wave_gempak.ecf index 199f68adeb..2cb7f75949 100755 --- a/ecf/scripts/gfs/wave/gempak/jgfs_wave_gempak.ecf +++ b/ecf/scripts/gfs/wave/gempak/jgfs_wave_gempak.ecf @@ -5,7 +5,7 @@ #PBS -A %PROJ%-%PROJENVIR% #PBS -l walltime=02:00:00 #PBS -l select=1:ncpus=1:mem=1GB -#PBS -l place=vscatter +#PBS -l place=vscatter:shared #PBS -l debug=true model=gfs diff --git a/ecf/scripts/gfs/wave/init/jgfs_wave_init.ecf b/ecf/scripts/gfs/wave/init/jgfs_wave_init.ecf index 569a7c0894..208ed2cc52 100755 --- a/ecf/scripts/gfs/wave/init/jgfs_wave_init.ecf +++ b/ecf/scripts/gfs/wave/init/jgfs_wave_init.ecf @@ -5,7 +5,7 @@ #PBS -A %PROJ%-%PROJENVIR% #PBS -l walltime=00:10:00 #PBS -l select=1:mpiprocs=11:ompthreads=1:ncpus=11:mem=2GB -#PBS -l place=vscatter +#PBS -l place=vscatter:shared #PBS -l debug=true model=gfs diff --git a/ecf/scripts/gfs/wave/post/jgfs_wave_postsbs.ecf b/ecf/scripts/gfs/wave/post/jgfs_wave_postsbs.ecf index a1f18fefd8..0b0e516bc2 100755 --- a/ecf/scripts/gfs/wave/post/jgfs_wave_postsbs.ecf +++ b/ecf/scripts/gfs/wave/post/jgfs_wave_postsbs.ecf @@ -5,7 +5,7 @@ #PBS -A %PROJ%-%PROJENVIR% #PBS -l walltime=03:00:00 #PBS -l select=1:mpiprocs=8:ompthreads=1:ncpus=8:mem=10GB -#PBS -l place=vscatter +#PBS -l place=vscatter:shared #PBS -l debug=true model=gfs diff --git a/ecf/scripts/gfs/wave/post/jgfs_wave_prdgen_bulls.ecf b/ecf/scripts/gfs/wave/post/jgfs_wave_prdgen_bulls.ecf index 5cbd08032b..00f005a877 100755 --- a/ecf/scripts/gfs/wave/post/jgfs_wave_prdgen_bulls.ecf +++ b/ecf/scripts/gfs/wave/post/jgfs_wave_prdgen_bulls.ecf @@ -5,7 +5,7 @@ #PBS -A %PROJ%-%PROJENVIR% #PBS -l walltime=00:20:00 #PBS -l select=1:ncpus=1:mem=1GB -#PBS -l place=vscatter +#PBS -l place=vscatter:shared #PBS -l debug=true model=gfs diff --git a/ecf/scripts/gfs/wave/post/jgfs_wave_prdgen_gridded.ecf b/ecf/scripts/gfs/wave/post/jgfs_wave_prdgen_gridded.ecf index 616f360d28..8197d58020 100755 --- a/ecf/scripts/gfs/wave/post/jgfs_wave_prdgen_gridded.ecf +++ b/ecf/scripts/gfs/wave/post/jgfs_wave_prdgen_gridded.ecf @@ -5,7 +5,7 @@ #PBS -A %PROJ%-%PROJENVIR% #PBS -l walltime=02:00:00 #PBS -l select=1:ncpus=1:mem=1GB -#PBS -l place=vscatter +#PBS -l place=vscatter:shared #PBS -l debug=true model=gfs diff --git a/ecf/scripts/gfs/wave/prep/jgfs_wave_prep.ecf b/ecf/scripts/gfs/wave/prep/jgfs_wave_prep.ecf index 97700528ab..8f93f6d098 100755 --- a/ecf/scripts/gfs/wave/prep/jgfs_wave_prep.ecf +++ b/ecf/scripts/gfs/wave/prep/jgfs_wave_prep.ecf @@ -5,7 +5,7 @@ #PBS -A %PROJ%-%PROJENVIR% #PBS -l walltime=00:10:00 #PBS -l select=1:mpiprocs=65:ompthreads=1:ncpus=65:mem=150GB -#PBS -l place=vscatter +#PBS -l place=vscatter:shared #PBS -l debug=true model=gfs diff --git a/workflow/rocoto/tasks.py b/workflow/rocoto/tasks.py index cfa11059e3..2d44c00d4d 100644 --- a/workflow/rocoto/tasks.py +++ b/workflow/rocoto/tasks.py @@ -159,8 +159,11 @@ def get_resource(self, task_name): native = None if scheduler in ['pbspro']: native = '-l debug=true,place=vscatter' + # Set either exclusive or shared - default on WCOSS2 is exclusive when not set if task_config.get('is_exclusive', False): native += ':exclhost' + else: + native += ':shared' elif scheduler in ['slurm']: native = '--export=NONE'