Skip to content

Commit 5c03697

Browse files
KateFriedman-NOAAKateFriedman-NOAA
authored
Resource updates to support WCOSS2 (#1070)
* Add WCOSS2 BASE_CPLIC to config.coupled_ic * Remove errant ) from WCOSS2 hosts file for COMINsyn * Updates to config.fv3 from WCOSS2 testing * Add "is_exclusive" setting to config.resources * Add WCOSS2 to machine npe_node_max check in config.resources * Update resources in config.resources * Update build_ufs.sh to set S2SW as default app on WCOSS2 * Set hpssarch to NO by default on WCOSS2 Refs #419
1 parent d01de06 commit 5c03697

File tree

10 files changed

+218
-109
lines changed

10 files changed

+218
-109
lines changed

‎ecf/scripts/enkfgdas/analysis/recenter/jenkfgdas_sfc.ecf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#PBS -q %QUEUE%
55
#PBS -A %PROJ%-%PROJENVIR%
66
#PBS -l walltime=00:06:00
7-
#PBS -l select=1:mpiprocs=80:ompthreads=1:ncpus=80:mem=60GB
7+
#PBS -l select=1:mpiprocs=80:ompthreads=1:ncpus=80:mem=80GB
88
#PBS -l place=vscatter
99
#PBS -l debug=true
1010

‎ecf/scripts/gfs/atmos/post_processing/grib2_wafs/jgfs_atmos_wafs_blending_0p25.ecf‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#PBS -q %QUEUE%
55
#PBS -A %PROJ%-%PROJENVIR%
66
#PBS -l walltime=00:30:00
7-
#PBS -l select=1:mpiprocs=1:ompthreads=1:ncpus=1:mem=1GB
7+
#PBS -l select=1:mpiprocs=1:ompthreads=1:ncpus=1:mem=15GB
88
#PBS -l place=vscatter
99
#PBS -l debug=true
1010

@@ -35,6 +35,7 @@ module list
3535
#############################################################
3636
export cyc=%CYC%
3737
export cycle=t%CYC%z
38+
export ICAO2023=no
3839

3940
############################################################
4041
# CALL executable job script here

‎ecf/scripts/gfs/atmos/post_processing/grib2_wafs/jgfs_atmos_wafs_grib2.ecf‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#PBS -q %QUEUE%
55
#PBS -A %PROJ%-%PROJENVIR%
66
#PBS -l walltime=00:30:00
7-
#PBS -l select=1:mpiprocs=1:ompthreads=1:ncpus=1:mem=5GB
7+
#PBS -l select=1:mpiprocs=18:ompthreads=1:ncpus=18:mem=80GB
88
#PBS -l place=vscatter
99
#PBS -l debug=true
1010

@@ -28,6 +28,7 @@ module load cray-pals/${cray_pals_ver}
2828
module load libjpeg/${libjpeg_ver}
2929
module load grib_util/${grib_util_ver}
3030
module load wgrib2/${wgrib2_ver}
31+
module load cfp/${cfp_ver}
3132

3233
module list
3334

@@ -36,6 +37,8 @@ module list
3637
#############################################################
3738
export cyc=%CYC%
3839
export cycle=t%CYC%z
40+
export USE_CFP=YES
41+
export ICAO2023=no
3942

4043
############################################################
4144
# CALL executable job script here

‎ecf/scripts/gfs/atmos/post_processing/grib2_wafs/jgfs_atmos_wafs_grib2_0p25.ecf‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#PBS -q %QUEUE%
55
#PBS -A %PROJ%-%PROJENVIR%
66
#PBS -l walltime=00:30:00
7-
#PBS -l select=1:mpiprocs=1:ompthreads=1:ncpus=1:mem=1GB
7+
#PBS -l select=1:mpiprocs=11:ompthreads=1:ncpus=11:mem=80GB
88
#PBS -l place=vscatter
99
#PBS -l debug=true
1010

@@ -28,6 +28,7 @@ module load cray-pals/${cray_pals_ver}
2828
module load libjpeg/${libjpeg_ver}
2929
module load grib_util/${grib_util_ver}
3030
module load wgrib2/${wgrib2_ver}
31+
module load cfp/${cfp_ver}
3132

3233
module list
3334

@@ -36,6 +37,8 @@ module list
3637
#############################################################
3738
export cyc=%CYC%
3839
export cycle=t%CYC%z
40+
export USE_CFP=YES
41+
export ICAO2023=no
3942

4043
############################################################
4144
# CALL executable job script here

‎ecf/scripts/gfs/atmos/post_processing/jgfs_atmos_wafs_gcip.ecf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ module list
4040
export cyc=%CYC%
4141
export cycle=t%CYC%z
4242
export USE_CFP=YES
43+
export ICAO2023=no
4344

4445
############################################################
4546
# CALL executable job script here

‎parm/config/config.coupled_ic‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ echo "BEGIN: config.coupled_ic"
77
# Get task specific resources
88
source ${EXPDIR}/config.resources coupled_ic
99

10-
if [[ "${machine}" == "HERA" ]]; then
10+
if [[ "${machine}" == "WCOSS2" ]]; then
11+
export BASE_CPLIC="/lfs/h2/emc/global/noscrub/emc.global/IC/COUPLED"
12+
elif [[ "${machine}" == "HERA" ]]; then
1113
export BASE_CPLIC="/scratch1/NCEPDEV/climate/role.ufscpara/IC"
1214
elif [[ "${machine}" == "ORION" ]]; then
1315
export BASE_CPLIC="/work/noaa/global/wkolczyn/noscrub/global-workflow/IC"

‎parm/config/config.fv3‎

Lines changed: 38 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -20,28 +20,30 @@ case_in=$1
2020
echo "BEGIN: config.fv3"
2121

2222

23-
if [[ "$machine" = "JET" ]]; then
24-
if [[ "$PARTITION_BATCH" = "xjet" ]]; then
23+
if [[ "${machine}" = "WCOSS2" ]]; then
24+
export npe_node_max=128
25+
elif [[ "${machine}" = "JET" ]]; then
26+
if [[ "${PARTITION_BATCH}" = "xjet" ]]; then
2527
export npe_node_max=24
26-
elif [[ "$PARTITION_BATCH" = "vjet" || "$PARTITION_BATCH" = "sjet" ]]; then
28+
elif [[ "${PARTITION_BATCH}" = "vjet" || "${PARTITION_BATCH}" = "sjet" ]]; then
2729
export npe_node_max=16
28-
elif [[ "$PARTITION_BATCH" = "kjet" ]]; then
30+
elif [[ "${PARTITION_BATCH}" = "kjet" ]]; then
2931
export npe_node_max=40
3032
fi
31-
elif [[ "$machine" = "HERA" ]]; then
33+
elif [[ "${machine}" = "HERA" ]]; then
3234
export npe_node_max=40
33-
elif [[ "$machine" = "S4" ]]; then
34-
if [[ "$PARTITION_BATCH" = "s4" ]]; then
35+
elif [[ "${machine}" = "S4" ]]; then
36+
if [[ "${PARTITION_BATCH}" = "s4" ]]; then
3537
export npe_node_max=32
36-
elif [[ "$PARTITION_BATCH" = "ivy" ]]; then
38+
elif [[ "${PARTITION_BATCH}" = "ivy" ]]; then
3739
export npe_node_max=20
3840
fi
39-
elif [[ "$machine" = "ORION" ]]; then
41+
elif [[ "${machine}" = "ORION" ]]; then
4042
export npe_node_max=40
4143
fi
4244

4345
# (Standard) Model resolution dependent variables
44-
case $case_in in
46+
case ${case_in} in
4547
"C48")
4648
export DELTIM=450
4749
export layout_x=3
@@ -52,9 +54,11 @@ case $case_in in
5254
export nth_fv3_gfs=2
5355
export cdmbgwd="0.071,2.1,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling
5456
export WRITE_GROUP=1
55-
export WRTTASK_PER_GROUP=$npe_node_max
57+
export WRTTASK_PER_GROUP=64
58+
if [[ "${WRTTASK_PER_GROUP}" -gt "${npe_node_max}" ]]; then export WRTTASK_PER_GROUP=${npe_node_max} ; fi
5659
export WRITE_GROUP_GFS=1
57-
export WRTTASK_PER_GROUP_GFS=$npe_node_max
60+
export WRTTASK_PER_GROUP_GFS=64
61+
if [[ "${WRTTASK_PER_GROUP_GFS}" -gt "${npe_node_max}" ]]; then export WRTTASK_PER_GROUP_GFS=${npe_node_max} ; fi
5862
export WRTIOBUF="1M"
5963
;;
6064
"C96")
@@ -67,9 +71,11 @@ case $case_in in
6771
export nth_fv3_gfs=1
6872
export cdmbgwd="0.14,1.8,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling
6973
export WRITE_GROUP=1
70-
export WRTTASK_PER_GROUP=$npe_node_max
74+
export WRTTASK_PER_GROUP=64
75+
if [[ "${WRTTASK_PER_GROUP}" -gt "${npe_node_max}" ]]; then export WRTTASK_PER_GROUP=${npe_node_max} ; fi
7176
export WRITE_GROUP_GFS=1
72-
export WRTTASK_PER_GROUP_GFS=$npe_node_max
77+
export WRTTASK_PER_GROUP_GFS=64
78+
if [[ "${WRTTASK_PER_GROUP_GFS}" -gt "${npe_node_max}" ]]; then export WRTTASK_PER_GROUP_GFS=${npe_node_max} ; fi
7379
export WRTIOBUF="4M"
7480
export n_split=6
7581
;;
@@ -79,28 +85,32 @@ case $case_in in
7985
export layout_y=6
8086
export layout_x_gfs=4
8187
export layout_y_gfs=6
82-
export nth_fv3=2
88+
export nth_fv3=1
8389
export nth_fv3_gfs=2
8490
export cdmbgwd="0.23,1.5,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling
8591
export WRITE_GROUP=1
86-
export WRTTASK_PER_GROUP=$npe_node_max
92+
export WRTTASK_PER_GROUP=64
93+
if [[ "${WRTTASK_PER_GROUP}" -gt "${npe_node_max}" ]]; then export WRTTASK_PER_GROUP=${npe_node_max} ; fi
8794
export WRITE_GROUP_GFS=2
88-
export WRTTASK_PER_GROUP_GFS=$npe_node_max
95+
export WRTTASK_PER_GROUP_GFS=64
96+
if [[ "${WRTTASK_PER_GROUP_GFS}" -gt "${npe_node_max}" ]]; then export WRTTASK_PER_GROUP_GFS=${npe_node_max} ; fi
8997
export WRTIOBUF="8M"
9098
;;
9199
"C384")
92-
export DELTIM=${DELTIM:-300}
100+
export DELTIM=${DELTIM:-200}
93101
export layout_x=6
94102
export layout_y=8
95103
export layout_x_gfs=${layout_x_gfs:-8}
96104
export layout_y_gfs=${layout_y_gfs:-12}
97-
export nth_fv3=2
105+
export nth_fv3=1
98106
export nth_fv3_gfs=${nth_fv3_gfs:-2}
99107
export cdmbgwd="1.1,0.72,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling
100-
export WRITE_GROUP=1
101-
export WRTTASK_PER_GROUP=$npe_node_max
108+
export WRITE_GROUP=2
109+
export WRTTASK_PER_GROUP=64
110+
if [[ "${WRTTASK_PER_GROUP}" -gt "${npe_node_max}" ]]; then export WRTTASK_PER_GROUP=${npe_node_max} ; fi
102111
export WRITE_GROUP_GFS=${WRITE_GROUP_GFS:-2}
103-
export WRTTASK_PER_GROUP_GFS=${WRTTASK_PER_GROUP_GFS:-$npe_node_max}
112+
export WRTTASK_PER_GROUP_GFS=${WRTTASK_PER_GROUP_GFS:-64}
113+
if [[ "${WRTTASK_PER_GROUP_GFS}" -gt "${npe_node_max}" ]]; then export WRTTASK_PER_GROUP_GFS=${npe_node_max} ; fi
104114
export WRTIOBUF=${WRTIOBUF:-"16M"}
105115
;;
106116
"C768")
@@ -113,9 +123,11 @@ case $case_in in
113123
export nth_fv3_gfs=4
114124
export cdmbgwd="4.0,0.15,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling
115125
export WRITE_GROUP=2
116-
export WRTTASK_PER_GROUP=$(echo "2*${npe_node_max}" |bc)
126+
export WRTTASK_PER_GROUP=64
127+
if [[ "${WRTTASK_PER_GROUP}" -gt "${npe_node_max}" ]]; then export WRTTASK_PER_GROUP=${npe_node_max} ; fi
117128
export WRITE_GROUP_GFS=4
118-
export WRTTASK_PER_GROUP_GFS=$(echo "2*${npe_node_max}" |bc)
129+
export WRTTASK_PER_GROUP_GFS=64
130+
if [[ "${WRTTASK_PER_GROUP_GFS}" -gt "${npe_node_max}" ]]; then export WRTTASK_PER_GROUP_GFS=${npe_node_max} ; fi
119131
export WRTIOBUF="32M"
120132
;;
121133
"C1152")
@@ -164,11 +176,11 @@ export kchunk3d=1
164176

165177
# Determine whether to use parallel NetCDF based on resolution
166178
case ${case_in} in
167-
"C48" | "C96" | "C192")
179+
"C48" | "C96" | "C192" | "C384")
168180
export OUTPUT_FILETYPE_ATM="netcdf"
169181
export OUTPUT_FILETYPE_SFC="netcdf"
170182
;;
171-
"C384" | "C768" | "C1152" | "C3072")
183+
"C768" | "C1152" | "C3072")
172184
export OUTPUT_FILETYPE_ATM="netcdf_parallel"
173185
export OUTPUT_FILETYPE_SFC="netcdf_parallel"
174186
;;

0 commit comments

Comments
 (0)