Skip to content

Consolidate npe_node_max #2289

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.

Sign up for GitHub

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

Merged
WalterKolczynski-NOAA merged 5 commits into from
Feb 7, 2024
Merged

Consolidate npe_node_max #2289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
42a3e04
Cleanup npe_node_max throughout code base.
henrywinterbottom-wxdev Feb 5, 2024
fbdebab
Debugging.
henrywinterbottom-wxdev Feb 5, 2024
a63de7a
Removed npe_node_max from all supported environment files.
henrywinterbottom-wxdev Feb 5, 2024
530be91
Removed npe_node_max from config.ufs; maintain npe_node_max in config…
henrywinterbottom-wxdev Feb 5, 2024
da429e2
npe_node_max not defined only in config.resources.
henrywinterbottom-wxdev Feb 5, 2024
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
1 change: 0 additions & 1 deletion env/AWSPW.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ fi

step=$1

export npe_node_max=36
export launcher="mpiexec.hydra"
export mpmd_opt=""

Expand Down
1 change: 0 additions & 1 deletion env/CONTAINER.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ fi

step=$1

export npe_node_max=40
export launcher="mpirun"
export mpmd_opt="--multi-prog"

Expand Down
1 change: 0 additions & 1 deletion env/HERA.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ fi

step=$1

export npe_node_max=40
export launcher="srun -l --export=ALL"
export mpmd_opt="--multi-prog --output=mpmd.%j.%t.out"

Expand Down
1 change: 0 additions & 1 deletion env/HERCULES.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ fi

step=$1

export npe_node_max=80
export launcher="srun -l --export=ALL"
export mpmd_opt="--multi-prog --output=mpmd.%j.%t.out"

Expand Down
7 changes: 0 additions & 7 deletions env/JET.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,6 @@ fi

step=$1

if [[ "${PARTITION_BATCH}" = "xjet" ]]; then
export npe_node_max=24
elif [[ "${PARTITION_BATCH}" = "vjet" ]]; then
export npe_node_max=16
elif [[ "${PARTITION_BATCH}" = "kjet" ]]; then
export npe_node_max=40
fi
export launcher="srun -l --epilog=/apps/local/bin/report-mem --export=ALL"
export mpmd_opt="--multi-prog --output=mpmd.%j.%t.out"

Expand Down
1 change: 0 additions & 1 deletion env/ORION.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ fi

step=$1

export npe_node_max=40
export launcher="srun -l --export=ALL"
export mpmd_opt="--multi-prog --output=mpmd.%j.%t.out"

Expand Down
6 changes: 0 additions & 6 deletions env/S4.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,7 @@ if [[ $# -ne 1 ]]; then
fi

step=$1
PARTITION_BATCH=${PARTITION_BATCH:-"s4"}

if [[ ${PARTITION_BATCH} = "s4" ]]; then
export npe_node_max=32
elif [[ ${PARTITION_BATCH} = "ivy" ]]; then
export npe_node_max=20
fi
export launcher="srun -l --export=ALL"
export mpmd_opt="--multi-prog --output=mpmd.%j.%t.out"

Expand Down
2 changes: 0 additions & 2 deletions env/WCOSS2.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ step=$1
export launcher="mpiexec -l"
export mpmd_opt="--cpu-bind verbose,core cfp"

export npe_node_max=128

if [[ "${step}" = "prep" ]] || [[ "${step}" = "prepbufr" ]]; then

nth_max=$((npe_node_max / npe_node_prep))
Expand Down
48 changes: 0 additions & 48 deletions parm/config/gefs/config.ufs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,54 +68,6 @@ if [[ "${skip_mom6}" == "false" ]] || [[ "${skip_cice6}" == "false" ]] || [[ "${
skip_mediator=false
fi

case "${machine}" in
"WCOSS2")
npe_node_max=128
;;
"HERA" | "ORION" )
npe_node_max=40
;;
"HERCULES" )
npe_node_max=80
;;
"JET")
case "${PARTITION_BATCH}" in
"xjet")
npe_node_max=24
;;
"vjet" | "sjet")
npe_node_max=16
;;
"kjet")
npe_node_max=40
;;
*)
echo "FATAL ERROR: Unsupported ${machine} PARTITION_BATCH = ${PARTITION_BATCH}, ABORT!"
exit 1
;;
esac
;;
"S4")
case "${PARTITION_BATCH}" in
"s4")
npe_node_max=32
;;
"ivy")
npe_node_max=20
;;
*)
echo "FATAL ERROR: Unsupported ${machine} PARTITION_BATCH = ${PARTITION_BATCH}, ABORT!"
exit 1
;;
esac
;;
*)
echo "FATAL ERROR: Unrecognized machine ${machine}"
exit 14
;;
esac
export npe_node_max

# (Standard) Model resolution dependent variables
case "${fv3_res}" in
"C48")
Expand Down
48 changes: 0 additions & 48 deletions parm/config/gfs/config.ufs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,54 +68,6 @@ if [[ "${skip_mom6}" == "false" ]] || [[ "${skip_cice6}" == "false" ]] || [[ "${
skip_mediator=false
fi

case "${machine}" in
"WCOSS2")
npe_node_max=128
;;
"HERA" | "ORION" )
npe_node_max=40
;;
"HERCULES" )
npe_node_max=80
;;
"JET")
case "${PARTITION_BATCH}" in
"xjet")
npe_node_max=24
;;
"vjet" | "sjet")
npe_node_max=16
;;
"kjet")
npe_node_max=40
;;
*)
echo "FATAL ERROR: Unsupported ${machine} PARTITION_BATCH = ${PARTITION_BATCH}, ABORT!"
exit 1
;;
esac
;;
"S4")
case "${PARTITION_BATCH}" in
"s4")
npe_node_max=32
;;
"ivy")
npe_node_max=20
;;
*)
echo "FATAL ERROR: Unsupported ${machine} PARTITION_BATCH = ${PARTITION_BATCH}, ABORT!"
exit 1
;;
esac
;;
*)
echo "FATAL ERROR: Unrecognized machine ${machine}"
exit 14
;;
esac
export npe_node_max

# (Standard) Model resolution dependent variables
case "${fv3_res}" in
"C48")
Expand Down