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
kayeekayee · Feb 7, 2024 · 801058f · 801058f
1 parent b0325e0
commit 801058f
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 116 deletions.
diff --git a/env/AWSPW.env b/env/AWSPW.env
@@ -14,7 +14,6 @@ fi
 
 step=$1
 
-export npe_node_max=36
 export launcher="mpiexec.hydra"
 export mpmd_opt=""
 

diff --git a/env/CONTAINER.env b/env/CONTAINER.env
@@ -14,7 +14,6 @@ fi
 
 step=$1
 
-export npe_node_max=40
 export launcher="mpirun"
 export mpmd_opt="--multi-prog"
 

diff --git a/env/HERA.env b/env/HERA.env
@@ -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"
 

diff --git a/env/HERCULES.env b/env/HERCULES.env
@@ -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"
 

diff --git a/env/JET.env b/env/JET.env
@@ -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"
 

diff --git a/env/ORION.env b/env/ORION.env
@@ -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"
 

diff --git a/env/S4.env b/env/S4.env
@@ -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"
 

diff --git a/env/WCOSS2.env b/env/WCOSS2.env
@@ -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))

diff --git a/parm/config/gefs/config.ufs b/parm/config/gefs/config.ufs
@@ -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")

diff --git a/parm/config/gfs/config.ufs b/parm/config/gfs/config.ufs
@@ -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")
-Original file 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 @@