Enable MPMD for atmos_products on Hercules. NOAA-EMC#1588

DavidHuber-NOAA · Dec 6, 2023 · 7796272 · 7796272
1 parent 6b1c0af
commit 7796272
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git 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
@@ -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