From 779627225e1f3d1e4de203587a9efb9bced175d9 Mon Sep 17 00:00:00 2001
From: David Huber <david.huber@noaa.gov>
Date: Wed, 6 Dec 2023 15:21:13 -0600
Subject: [PATCH] Enable MPMD for atmos_products on Hercules. #1588

---
 env/HERCULES.env                   | 13 ++-----------
 scripts/exglobal_atmos_products.sh |  2 +-
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/env/HERCULES.env b/env/HERCULES.env
index 798549eed8..3721be2b66 100755
--- a/env/HERCULES.env
+++ b/env/HERCULES.env
@@ -62,17 +62,8 @@ elif [[ "${step}" = "upp" ]]; then
     [[ ${NTHREADS_UPP} -gt ${nth_max} ]] && export NTHREADS_UPP=${nth_max}
     export APRUN_UPP="${launcher} -n ${npe_upp} --cpus-per-task=${NTHREADS_UPP}"
 
-elif [[ "${step}" = "post" ]]; then
+elif [[ "${step}" = "atmos_products" ]]; then
 
-    nth_max=$((npe_node_max / npe_node_post))
-
-    export NTHREADS_NP=${nth_np:-1}
-    [[ ${NTHREADS_NP} -gt ${nth_max} ]] && export NTHREADS_NP=${nth_max}
-    export APRUN_NP="${launcher} -n ${npe_post} --cpus-per-task=${NTHREADS_NP}"
-
-    export USE_CFP="YES"  # Use MPMD for downstream product generation on Hercules
-    export NTHREADS_DWN=${nth_dwn:-1}
-    [[ ${NTHREADS_DWN} -gt ${nth_max} ]] && export NTHREADS_DWN=${nth_max}
-    export APRUN_DWN="${launcher} -n ${npe_dwn} --cpus-per-task=${NTHREADS_DWN}"
+    export USE_CFP="YES"  # Use MPMD for downstream product generation
 
 fi
diff --git a/scripts/exglobal_atmos_products.sh b/scripts/exglobal_atmos_products.sh
index beeea99161..d2c0ed7466 100755
--- a/scripts/exglobal_atmos_products.sh
+++ b/scripts/exglobal_atmos_products.sh
@@ -133,7 +133,7 @@ for (( nset=1 ; nset <= downset ; nset++ )); do
     export err=$?
   else
     chmod 755 "${DATA}/poescript"
-    bash +x "${DATA}/poescript" 2>&1 mpmd.out
+    bash +x "${DATA}/poescript" > mpmd.out 2>&1
     export err=$?
   fi
   err_chk