From fc2c5ea7e3ddde5312370922b3ab51a8d33c22c5 Mon Sep 17 00:00:00 2001
From: AntonMFernando-NOAA
 <167725623+AntonMFernando-NOAA@users.noreply.github.com>
Date: Wed, 30 Oct 2024 07:15:37 -0400
Subject: [PATCH] Disabling hyper-threading (#2965)

Hera, Hercules, and Orion (and possibly Jet) enable hyper-threading by
default. This should be disabled explicitly by adding the `sbatch/srun`
flag `--hint=nomultithread`.

Resolves #2863
---
 env/HERA.env     | 4 ++--
 env/HERCULES.env | 4 ++--
 env/ORION.env    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/env/HERA.env b/env/HERA.env
index 09743967b5..80cd7cddaf 100755
--- a/env/HERA.env
+++ b/env/HERA.env
@@ -9,7 +9,7 @@ fi
 
 step=$1
 
-export launcher="srun -l --export=ALL"
+export launcher="srun -l --export=ALL --hint=nomultithread"
 export mpmd_opt="--multi-prog --output=mpmd.%j.%t.out"
 
 #export POSTAMBLE_CMD='report-mem'
@@ -50,7 +50,7 @@ if [[ "${step}" = "prep" ]] || [[ "${step}" = "prepbufr" ]]; then
     export POE="NO"
     export BACK="NO"
     export sys_tp="HERA"
-    export launcher_PREP="srun"
+    export launcher_PREP="srun --hint=nomultithread"
 
 elif [[ "${step}" = "prepsnowobs" ]]; then
 
diff --git a/env/HERCULES.env b/env/HERCULES.env
index 9ec112c699..bed1d11281 100755
--- a/env/HERCULES.env
+++ b/env/HERCULES.env
@@ -9,7 +9,7 @@ fi
 
 step=$1
 
-export launcher="srun -l --export=ALL"
+export launcher="srun -l --export=ALL --hint=nomultithread"
 export mpmd_opt="--multi-prog --output=mpmd.%j.%t.out"
 
 # Configure MPI environment
@@ -48,7 +48,7 @@ case ${step} in
     export POE="NO"
     export BACK=${BACK:-"YES"}
     export sys_tp="HERCULES"
-    export launcher_PREP="srun"
+    export launcher_PREP="srun --hint=nomultithread"
  ;;
  "prepsnowobs")
 
diff --git a/env/ORION.env b/env/ORION.env
index 3b8053d060..45fd607aa5 100755
--- a/env/ORION.env
+++ b/env/ORION.env
@@ -9,7 +9,7 @@ fi
 
 step=$1
 
-export launcher="srun -l --export=ALL"
+export launcher="srun -l --export=ALL --hint=nomultithread"
 export mpmd_opt="--multi-prog --output=mpmd.%j.%t.out"
 
 # Configure MPI environment
@@ -45,7 +45,7 @@ if [[ "${step}" = "prep" ]] || [[ "${step}" = "prepbufr" ]]; then
     export POE="NO"
     export BACK=${BACK:-"YES"}
     export sys_tp="ORION"
-    export launcher_PREP="srun"
+    export launcher_PREP="srun --hint=nomultithread"
 
 elif [[ "${step}" = "prepsnowobs" ]]; then