Skip to content

Commit 801058f

Browse files
HenryRWinterbottomHenryRWinterbottom
authored
Consolidate npe_node_max (NOAA-EMC#2289)
- The environment variable `npe_node_max` is removed from all files beneath `global-workflow/env`; - The environment variable `npe_node_max` is removed from `parm/config/gefs/config.ufs` and `parm/config/gfs/config.ufs`; - The environment variable `npe_node_max` is maintained only within `parm/config/gefs/config.resources` and `parm/config/gfs/config.resources`. Resolves NOAA-EMC#2133
1 parent b0325e0 commit 801058f

File tree

10 files changed

+0
-116
lines changed

10 files changed

+0
-116
lines changed

‎env/AWSPW.env

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ fi
1414

1515
step=$1
1616

17-
export npe_node_max=36
1817
export launcher="mpiexec.hydra"
1918
export mpmd_opt=""
2019

‎env/CONTAINER.env

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ fi
1414

1515
step=$1
1616

17-
export npe_node_max=40
1817
export launcher="mpirun"
1918
export mpmd_opt="--multi-prog"
2019

‎env/HERA.env

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ fi
1414

1515
step=$1
1616

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

‎env/HERCULES.env

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ fi
1212

1313
step=$1
1414

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

‎env/JET.env

-7
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,6 @@ fi
1414

1515
step=$1
1616

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

‎env/ORION.env

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ fi
1414

1515
step=$1
1616

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

‎env/S4.env

-6
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,7 @@ if [[ $# -ne 1 ]]; then
1313
fi
1414

1515
step=$1
16-
PARTITION_BATCH=${PARTITION_BATCH:-"s4"}
1716

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

‎env/WCOSS2.env

-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ step=$1
1818
export launcher="mpiexec -l"
1919
export mpmd_opt="--cpu-bind verbose,core cfp"
2020

21-
export npe_node_max=128
22-
2321
if [[ "${step}" = "prep" ]] || [[ "${step}" = "prepbufr" ]]; then
2422

2523
nth_max=$((npe_node_max / npe_node_prep))

‎parm/config/gefs/config.ufs

-48
Original file line numberDiff line numberDiff line change
@@ -68,54 +68,6 @@ if [[ "${skip_mom6}" == "false" ]] || [[ "${skip_cice6}" == "false" ]] || [[ "${
6868
skip_mediator=false
6969
fi
7070

71-
case "${machine}" in
72-
"WCOSS2")
73-
npe_node_max=128
74-
;;
75-
"HERA" | "ORION" )
76-
npe_node_max=40
77-
;;
78-
"HERCULES" )
79-
npe_node_max=80
80-
;;
81-
"JET")
82-
case "${PARTITION_BATCH}" in
83-
"xjet")
84-
npe_node_max=24
85-
;;
86-
"vjet" | "sjet")
87-
npe_node_max=16
88-
;;
89-
"kjet")
90-
npe_node_max=40
91-
;;
92-
*)
93-
echo "FATAL ERROR: Unsupported ${machine} PARTITION_BATCH = ${PARTITION_BATCH}, ABORT!"
94-
exit 1
95-
;;
96-
esac
97-
;;
98-
"S4")
99-
case "${PARTITION_BATCH}" in
100-
"s4")
101-
npe_node_max=32
102-
;;
103-
"ivy")
104-
npe_node_max=20
105-
;;
106-
*)
107-
echo "FATAL ERROR: Unsupported ${machine} PARTITION_BATCH = ${PARTITION_BATCH}, ABORT!"
108-
exit 1
109-
;;
110-
esac
111-
;;
112-
*)
113-
echo "FATAL ERROR: Unrecognized machine ${machine}"
114-
exit 14
115-
;;
116-
esac
117-
export npe_node_max
118-
11971
# (Standard) Model resolution dependent variables
12072
case "${fv3_res}" in
12173
"C48")

‎parm/config/gfs/config.ufs

-48
Original file line numberDiff line numberDiff line change
@@ -68,54 +68,6 @@ if [[ "${skip_mom6}" == "false" ]] || [[ "${skip_cice6}" == "false" ]] || [[ "${
6868
skip_mediator=false
6969
fi
7070

71-
case "${machine}" in
72-
"WCOSS2")
73-
npe_node_max=128
74-
;;
75-
"HERA" | "ORION" )
76-
npe_node_max=40
77-
;;
78-
"HERCULES" )
79-
npe_node_max=80
80-
;;
81-
"JET")
82-
case "${PARTITION_BATCH}" in
83-
"xjet")
84-
npe_node_max=24
85-
;;
86-
"vjet" | "sjet")
87-
npe_node_max=16
88-
;;
89-
"kjet")
90-
npe_node_max=40
91-
;;
92-
*)
93-
echo "FATAL ERROR: Unsupported ${machine} PARTITION_BATCH = ${PARTITION_BATCH}, ABORT!"
94-
exit 1
95-
;;
96-
esac
97-
;;
98-
"S4")
99-
case "${PARTITION_BATCH}" in
100-
"s4")
101-
npe_node_max=32
102-
;;
103-
"ivy")
104-
npe_node_max=20
105-
;;
106-
*)
107-
echo "FATAL ERROR: Unsupported ${machine} PARTITION_BATCH = ${PARTITION_BATCH}, ABORT!"
108-
exit 1
109-
;;
110-
esac
111-
;;
112-
*)
113-
echo "FATAL ERROR: Unrecognized machine ${machine}"
114-
exit 14
115-
;;
116-
esac
117-
export npe_node_max
118-
11971
# (Standard) Model resolution dependent variables
12072
case "${fv3_res}" in
12173
"C48")

0 commit comments

Comments
 (0)