Skip to content

Commit

Permalink
Merge branch 'NOAA-EMC:develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@jderrico-noaa
jderrico-noaa committed Dec 19, 2023
2 parents 2b1a8e3 + a81da33 commit a3ce9db
Show file tree
Hide file tree
Showing 36 changed files with 38 additions and 35 deletions.
2 changes: 1 addition & 1 deletion ecf/scripts/enkfgdas/analysis/create/jenkfgdas_diag.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ecf/scripts/enkfgdas/analysis/recenter/jenkfgdas_sfc.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ecf/scripts/gdas/atmos/analysis/jgdas_atmos_analysis_diag.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ecf/scripts/gdas/atmos/gempak/jgdas_atmos_gempak.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ecf/scripts/gdas/atmos/gempak/jgdas_atmos_gempak_meta_ncdc.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ecf/scripts/gdas/atmos/obsproc/dump/jgdas_atmos_tropcy_qc_reloc.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ecf/scripts/gdas/atmos/obsproc/prep/jgdas_atmos_emcsfc_sfc_prep.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ecf/scripts/gdas/atmos/post/jgdas_atmos_post_manager.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ecf/scripts/gdas/atmos/post_processing/jgdas_atmos_chgres_forenkf.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ecf/scripts/gdas/atmos/verf/jgdas_atmos_verfozn.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ecf/scripts/gdas/atmos/verf/jgdas_atmos_verfrad.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ecf/scripts/gdas/atmos/verf/jgdas_atmos_vminmon.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ecf/scripts/gdas/wave/init/jgdas_wave_init.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ecf/scripts/gdas/wave/post/jgdas_wave_postpnt.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ecf/scripts/gdas/wave/post/jgdas_wave_postsbs.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ecf/scripts/gdas/wave/prep/jgdas_wave_prep.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ecf/scripts/gfs/atmos/gempak/jgfs_atmos_gempak.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ecf/scripts/gfs/atmos/gempak/jgfs_atmos_gempak_meta.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ecf/scripts/gfs/atmos/gempak/jgfs_atmos_gempak_ncdc_upapgif.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ecf/scripts/gfs/atmos/gempak/jgfs_atmos_npoess_pgrb2_0p5deg.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ecf/scripts/gfs/atmos/gempak/jgfs_atmos_pgrb2_spec_gempak.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ecf/scripts/gfs/atmos/obsproc/dump/jgfs_atmos_tropcy_qc_reloc.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ecf/scripts/gfs/atmos/obsproc/prep/jgfs_atmos_emcsfc_sfc_prep.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ecf/scripts/gfs/atmos/post/jgfs_atmos_post_manager.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ecf/scripts/gfs/atmos/post_processing/awips_20km_1p0/jgfs_atmos_awips_master.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ecf/scripts/gfs/atmos/post_processing/awips_g2/jgfs_atmos_awips_g2_master.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ecf/scripts/gfs/atmos/post_processing/bulletins/jgfs_atmos_fbwind.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ecf/scripts/gfs/atmos/verf/jgfs_atmos_vminmon.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ecf/scripts/gfs/wave/gempak/jgfs_wave_gempak.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ecf/scripts/gfs/wave/init/jgfs_wave_init.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ecf/scripts/gfs/wave/post/jgfs_wave_postsbs.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ecf/scripts/gfs/wave/post/jgfs_wave_prdgen_bulls.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ecf/scripts/gfs/wave/post/jgfs_wave_prdgen_gridded.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ecf/scripts/gfs/wave/prep/jgfs_wave_prep.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion sorc/gfs_utils.fd
Submodule gfs_utils.fd updated 7 files
+1 −1 CMakeLists.txt
+19 −0 modulefiles/gfsutils_hercules.lua
+17 −17 src/ocnicepost.fd/masking_mod.F90
+64 −64 src/ocnicepost.fd/ocnicepost.F90
+88 −96 src/ocnicepost.fd/utils_mod.F90
+2 −0 ush/detect_machine.sh
+9 −1 ush/module-setup.sh
3 changes: 3 additions & 0 deletions workflow/rocoto/tasks.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down

0 comments on commit a3ce9db

Please sign in to comment.