Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resource updates to support WCOSS2 #1070

Merged
Show file tree
Hide file tree
Changes from 51 commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
12d4689
Add WCOSS2 BASE_CPLIC to config.coupled_ic
KateFriedman-NOAA Sep 30, 2022
f79dbdb
Remove errant ) from WCOSS2 hosts file for COMINsyn
KateFriedman-NOAA Sep 30, 2022
686272c
Updates to config.fv3 from WCOSS2 testing
KateFriedman-NOAA Sep 30, 2022
c41265b
Adjust how S2SW resource defaults are used
KateFriedman-NOAA Sep 30, 2022
63d144b
Add "is_exclusive" setting to config.resources
KateFriedman-NOAA Oct 3, 2022
e1e5e33
Add WCOSS2 to machine npe_node_max check in config.resources
KateFriedman-NOAA Oct 3, 2022
6db1a81
Update wave job resources in config.resources
KateFriedman-NOAA Oct 3, 2022
4089bfc
Update awips and gempak resources in config.resources
KateFriedman-NOAA Oct 3, 2022
38a3d60
Remove duplicate wtime_gempak
KateFriedman-NOAA Oct 3, 2022
8ff74c6
Update postsnd job resources in config.resources
KateFriedman-NOAA Oct 3, 2022
f58793d
Change epos thread # from 6 to 4
KateFriedman-NOAA Oct 3, 2022
529dc3d
Update esfc resources in config.resources
KateFriedman-NOAA Oct 3, 2022
bc0f025
Update ecen resources in config.resources
KateFriedman-NOAA Oct 3, 2022
fdc1875
Update eupd resources in config.resources
KateFriedman-NOAA Oct 3, 2022
51df450
Update ediag resources in config.resources
KateFriedman-NOAA Oct 3, 2022
3e32ffd
Reduce eobs walltime to 15 mins in config.resources
KateFriedman-NOAA Oct 3, 2022
cf3901c
Increase memory for archive jobs
KateFriedman-NOAA Oct 3, 2022
bb8e2fc
Set memory for echgres in config.resources
KateFriedman-NOAA Oct 3, 2022
fef343e
Update wafs jobs resources in config.resources
KateFriedman-NOAA Oct 3, 2022
bce25ca
Update post resources in config.resources
KateFriedman-NOAA Oct 3, 2022
ab96ded
Increase gdasfcst walltime to 40mins in config.resources
KateFriedman-NOAA Oct 3, 2022
b9b91c3
Update gldas job resources in config.resources
KateFriedman-NOAA Oct 3, 2022
86836b7
Update analdiag resources in config.resources
KateFriedman-NOAA Oct 3, 2022
9772ca2
Update gldas to check $npe_node_gldas
KateFriedman-NOAA Oct 3, 2022
67747be
Increase efcs walltime
KateFriedman-NOAA Oct 3, 2022
8c247c6
Update anal job resources in config.resources
KateFriedman-NOAA Oct 3, 2022
df24847
Merge branch 'NOAA-EMC:develop' into feature/dev-wcoss2-resources
KateFriedman-NOAA Oct 4, 2022
da11a73
Merge branch 'NOAA-EMC:develop' into feature/dev-wcoss2-resources
KateFriedman-NOAA Oct 4, 2022
4c41f5e
Merge branch 'NOAA-EMC:develop' into feature/dev-wcoss2-resources
KateFriedman-NOAA Oct 4, 2022
16afb53
Merge remote-tracking branch 'upstream/develop' into feature/dev-wcos…
KateFriedman-NOAA Oct 12, 2022
80f295c
Add make_nsstbufr/make_acftbufr to WCOSS2 hosts file
KateFriedman-NOAA Oct 12, 2022
29cf230
Resources updates in config.fv3 from WCOSS2 testing
KateFriedman-NOAA Oct 13, 2022
13ccbc9
WCOSS2 updates from testing in config.resources
KateFriedman-NOAA Oct 13, 2022
d229f8f
Merge branch 'NOAA-EMC:develop' into feature/dev-wcoss2-resources
KateFriedman-NOAA Oct 13, 2022
1049e50
Updates from R&D testing
KateFriedman-NOAA Oct 13, 2022
835a19a
Update anal block in config.resources
KateFriedman-NOAA Oct 13, 2022
df866ad
Merge branch 'feature/dev-wcoss2-resources' of https://github.com/Kat…
KateFriedman-NOAA Oct 13, 2022
11ffd14
Update C384 nth_fv3 and remove _s2sw
KateFriedman-NOAA Oct 13, 2022
cbc655c
Add npe_node_max check for wavepostpnt
KateFriedman-NOAA Oct 13, 2022
aeacceb
Resource updates
KateFriedman-NOAA Oct 19, 2022
3a27926
Merge branch 'NOAA-EMC:develop' into feature/dev-wcoss2-resources
KateFriedman-NOAA Oct 19, 2022
f09d487
Increase wafs blending memory to 15GB
KateFriedman-NOAA Oct 19, 2022
f90a360
Merge branch 'NOAA-EMC:develop' into feature/dev-wcoss2-resources
KateFriedman-NOAA Oct 20, 2022
b021d9d
Increase esfc memory back up to 80GB
KateFriedman-NOAA Oct 20, 2022
0325c13
Address SC2250 linter warnings
KateFriedman-NOAA Oct 20, 2022
0675b4a
Add partition_service to WCOSS2 hosts file
KateFriedman-NOAA Oct 20, 2022
c2b8cdf
Increase esfc memory to 80GB
KateFriedman-NOAA Oct 21, 2022
3b32d63
Merge branch 'NOAA-EMC:develop' into feature/dev-wcoss2-resources
KateFriedman-NOAA Oct 24, 2022
5a6d06e
Update build_ufs.sh to force S2SW on WCOSS2
KateFriedman-NOAA Oct 24, 2022
436ad51
Change WCOSS2 to lowercase wcoss2 in build_ufs.sh
KateFriedman-NOAA Oct 24, 2022
a0c450f
Set hpssarch to NO by default on WCOSS2
KateFriedman-NOAA Oct 24, 2022
c0771f6
Merge branch 'NOAA-EMC:develop' into feature/dev-wcoss2-resources
KateFriedman-NOAA Oct 24, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ecf/scripts/enkfgdas/analysis/recenter/jenkfgdas_sfc.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:06:00
#PBS -l select=1:mpiprocs=80:ompthreads=1:ncpus=80:mem=60GB
#PBS -l select=1:mpiprocs=80:ompthreads=1:ncpus=80:mem=80GB
#PBS -l place=vscatter
#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:30:00
#PBS -l select=1:mpiprocs=1:ompthreads=1:ncpus=1:mem=1GB
#PBS -l select=1:mpiprocs=1:ompthreads=1:ncpus=1:mem=15GB
#PBS -l place=vscatter
#PBS -l debug=true

Expand Down Expand Up @@ -35,6 +35,7 @@ module list
#############################################################
export cyc=%CYC%
export cycle=t%CYC%z
export ICAO2023=no

############################################################
# CALL executable job script here
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:30:00
#PBS -l select=1:mpiprocs=1:ompthreads=1:ncpus=1:mem=5GB
#PBS -l select=1:mpiprocs=18:ompthreads=1:ncpus=18:mem=80GB
#PBS -l place=vscatter
#PBS -l debug=true

Expand All @@ -28,6 +28,7 @@ module load cray-pals/${cray_pals_ver}
module load libjpeg/${libjpeg_ver}
module load grib_util/${grib_util_ver}
module load wgrib2/${wgrib2_ver}
module load cfp/${cfp_ver}

module list

Expand All @@ -36,6 +37,8 @@ module list
#############################################################
export cyc=%CYC%
export cycle=t%CYC%z
export USE_CFP=YES
export ICAO2023=no

############################################################
# CALL executable job script here
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:30:00
#PBS -l select=1:mpiprocs=1:ompthreads=1:ncpus=1:mem=1GB
#PBS -l select=1:mpiprocs=11:ompthreads=1:ncpus=11:mem=80GB
#PBS -l place=vscatter
#PBS -l debug=true

Expand All @@ -28,6 +28,7 @@ module load cray-pals/${cray_pals_ver}
module load libjpeg/${libjpeg_ver}
module load grib_util/${grib_util_ver}
module load wgrib2/${wgrib2_ver}
module load cfp/${cfp_ver}

module list

Expand All @@ -36,6 +37,8 @@ module list
#############################################################
export cyc=%CYC%
export cycle=t%CYC%z
export USE_CFP=YES
export ICAO2023=no

############################################################
# CALL executable job script here
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ module list
export cyc=%CYC%
export cycle=t%CYC%z
export USE_CFP=YES
export ICAO2023=no

############################################################
# CALL executable job script here
Expand Down
4 changes: 3 additions & 1 deletion parm/config/config.coupled_ic
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ echo "BEGIN: config.coupled_ic"
# Get task specific resources
source ${EXPDIR}/config.resources coupled_ic

if [[ "${machine}" == "HERA" ]]; then
if [[ "${machine}" == "WCOSS2" ]]; then
export BASE_CPLIC="/lfs/h2/emc/global/noscrub/emc.global/IC/COUPLED"
elif [[ "${machine}" == "HERA" ]]; then
export BASE_CPLIC="/scratch1/NCEPDEV/climate/role.ufscpara/IC"
elif [[ "${machine}" == "ORION" ]]; then
export BASE_CPLIC="/work/noaa/global/wkolczyn/noscrub/global-workflow/IC"
Expand Down
64 changes: 38 additions & 26 deletions parm/config/config.fv3
Original file line number Diff line number Diff line change
Expand Up @@ -20,28 +20,30 @@ case_in=$1
echo "BEGIN: config.fv3"


if [[ "$machine" = "JET" ]]; then
if [[ "$PARTITION_BATCH" = "xjet" ]]; then
if [[ "${machine}" = "WCOSS2" ]]; then
export npe_node_max=128
elif [[ "${machine}" = "JET" ]]; then
if [[ "${PARTITION_BATCH}" = "xjet" ]]; then
export npe_node_max=24
elif [[ "$PARTITION_BATCH" = "vjet" || "$PARTITION_BATCH" = "sjet" ]]; then
elif [[ "${PARTITION_BATCH}" = "vjet" || "${PARTITION_BATCH}" = "sjet" ]]; then
export npe_node_max=16
elif [[ "$PARTITION_BATCH" = "kjet" ]]; then
elif [[ "${PARTITION_BATCH}" = "kjet" ]]; then
export npe_node_max=40
fi
elif [[ "$machine" = "HERA" ]]; then
elif [[ "${machine}" = "HERA" ]]; then
export npe_node_max=40
elif [[ "$machine" = "S4" ]]; then
if [[ "$PARTITION_BATCH" = "s4" ]]; then
elif [[ "${machine}" = "S4" ]]; then
if [[ "${PARTITION_BATCH}" = "s4" ]]; then
export npe_node_max=32
elif [[ "$PARTITION_BATCH" = "ivy" ]]; then
elif [[ "${PARTITION_BATCH}" = "ivy" ]]; then
export npe_node_max=20
fi
elif [[ "$machine" = "ORION" ]]; then
elif [[ "${machine}" = "ORION" ]]; then
export npe_node_max=40
fi

# (Standard) Model resolution dependent variables
case $case_in in
case ${case_in} in
"C48")
export DELTIM=450
export layout_x=3
Expand All @@ -52,9 +54,11 @@ case $case_in in
export nth_fv3_gfs=2
export cdmbgwd="0.071,2.1,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling
export WRITE_GROUP=1
export WRTTASK_PER_GROUP=$npe_node_max
export WRTTASK_PER_GROUP=64
KateFriedman-NOAA marked this conversation as resolved.
Show resolved Hide resolved
if [[ "${WRTTASK_PER_GROUP}" -gt "${npe_node_max}" ]]; then export WRTTASK_PER_GROUP=${npe_node_max} ; fi
export WRITE_GROUP_GFS=1
export WRTTASK_PER_GROUP_GFS=$npe_node_max
export WRTTASK_PER_GROUP_GFS=64
if [[ "${WRTTASK_PER_GROUP_GFS}" -gt "${npe_node_max}" ]]; then export WRTTASK_PER_GROUP_GFS=${npe_node_max} ; fi
export WRTIOBUF="1M"
;;
"C96")
Expand All @@ -67,9 +71,11 @@ case $case_in in
export nth_fv3_gfs=1
export cdmbgwd="0.14,1.8,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling
export WRITE_GROUP=1
export WRTTASK_PER_GROUP=$npe_node_max
export WRTTASK_PER_GROUP=64
if [[ "${WRTTASK_PER_GROUP}" -gt "${npe_node_max}" ]]; then export WRTTASK_PER_GROUP=${npe_node_max} ; fi
export WRITE_GROUP_GFS=1
export WRTTASK_PER_GROUP_GFS=$npe_node_max
export WRTTASK_PER_GROUP_GFS=64
if [[ "${WRTTASK_PER_GROUP_GFS}" -gt "${npe_node_max}" ]]; then export WRTTASK_PER_GROUP_GFS=${npe_node_max} ; fi
export WRTIOBUF="4M"
export n_split=6
;;
Expand All @@ -79,28 +85,32 @@ case $case_in in
export layout_y=6
export layout_x_gfs=4
export layout_y_gfs=6
export nth_fv3=2
export nth_fv3=1
export nth_fv3_gfs=2
export cdmbgwd="0.23,1.5,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling
export WRITE_GROUP=1
export WRTTASK_PER_GROUP=$npe_node_max
export WRTTASK_PER_GROUP=64
KateFriedman-NOAA marked this conversation as resolved.
Show resolved Hide resolved
if [[ "${WRTTASK_PER_GROUP}" -gt "${npe_node_max}" ]]; then export WRTTASK_PER_GROUP=${npe_node_max} ; fi
export WRITE_GROUP_GFS=2
export WRTTASK_PER_GROUP_GFS=$npe_node_max
export WRTTASK_PER_GROUP_GFS=64
if [[ "${WRTTASK_PER_GROUP_GFS}" -gt "${npe_node_max}" ]]; then export WRTTASK_PER_GROUP_GFS=${npe_node_max} ; fi
export WRTIOBUF="8M"
;;
"C384")
export DELTIM=${DELTIM:-300}
export DELTIM=${DELTIM:-200}
export layout_x=6
export layout_y=8
export layout_x_gfs=${layout_x_gfs:-8}
export layout_y_gfs=${layout_y_gfs:-12}
export nth_fv3=2
export nth_fv3=1
export nth_fv3_gfs=${nth_fv3_gfs:-2}
export cdmbgwd="1.1,0.72,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling
export WRITE_GROUP=1
export WRTTASK_PER_GROUP=$npe_node_max
export WRITE_GROUP=2
export WRTTASK_PER_GROUP=64
if [[ "${WRTTASK_PER_GROUP}" -gt "${npe_node_max}" ]]; then export WRTTASK_PER_GROUP=${npe_node_max} ; fi
export WRITE_GROUP_GFS=${WRITE_GROUP_GFS:-2}
export WRTTASK_PER_GROUP_GFS=${WRTTASK_PER_GROUP_GFS:-$npe_node_max}
export WRTTASK_PER_GROUP_GFS=${WRTTASK_PER_GROUP_GFS:-64}
if [[ "${WRTTASK_PER_GROUP_GFS}" -gt "${npe_node_max}" ]]; then export WRTTASK_PER_GROUP_GFS=${npe_node_max} ; fi
export WRTIOBUF=${WRTIOBUF:-"16M"}
;;
"C768")
Expand All @@ -113,9 +123,11 @@ case $case_in in
export nth_fv3_gfs=4
export cdmbgwd="4.0,0.15,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling
export WRITE_GROUP=2
export WRTTASK_PER_GROUP=$(echo "2*${npe_node_max}" |bc)
export WRTTASK_PER_GROUP=64
if [[ "${WRTTASK_PER_GROUP}" -gt "${npe_node_max}" ]]; then export WRTTASK_PER_GROUP=${npe_node_max} ; fi
export WRITE_GROUP_GFS=4
export WRTTASK_PER_GROUP_GFS=$(echo "2*${npe_node_max}" |bc)
export WRTTASK_PER_GROUP_GFS=64
if [[ "${WRTTASK_PER_GROUP_GFS}" -gt "${npe_node_max}" ]]; then export WRTTASK_PER_GROUP_GFS=${npe_node_max} ; fi
export WRTIOBUF="32M"
;;
"C1152")
Expand Down Expand Up @@ -164,11 +176,11 @@ export kchunk3d=1

# Determine whether to use parallel NetCDF based on resolution
case ${case_in} in
"C48" | "C96" | "C192")
"C48" | "C96" | "C192" | "C384")
export OUTPUT_FILETYPE_ATM="netcdf"
export OUTPUT_FILETYPE_SFC="netcdf"
;;
"C384" | "C768" | "C1152" | "C3072")
"C768" | "C1152" | "C3072")
export OUTPUT_FILETYPE_ATM="netcdf_parallel"
export OUTPUT_FILETYPE_SFC="netcdf_parallel"
;;
Expand Down
Loading