Issue #5 - add new APRUNCFP setting to ORION.env

NOAA-EMC · Aug 4, 2020 · 7c4f8ea · 7c4f8ea
1 parent 5652485
commit 7c4f8ea
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/env/HERA.env b/env/HERA.env
@@ -52,9 +52,9 @@ elif [ $step = "anal" ]; then
     export MKL_NUM_THREADS=4
     export MKL_CBWR=AUTO
 
+    export CFP_MP=${CFP_MP:-"YES"}
     export USE_CFP=${USE_CFP:-"YES"}
-    export CFP_MP="YES"	# For analdiag with SLURM
-    export APRUNCFP="$launcher"
+    export APRUNCFP="$launcher -n \$ncmd --multi-prog"
 
     nth_max=$(($npe_node_max / $npe_node_anal))
 
@@ -80,10 +80,6 @@ elif [ $step = "anal" ]; then
     [[ $NTHREADS_CHGRES -gt $npe_node_max ]] && export NTHREADS_CHGRES=$npe_node_max
     export APRUN_CHGRES=""
 
-    export CFP_MP=${CFP_MP:-"YES"}
-    export USE_CFP=${USE_CFP:-"YES"}
-    export APRUNCFP="$launcher -n \$ncmd --multi-prog"
-
 elif [ $step = "gldas" ]; then
 
     nth_max=$(($npe_node_max / $npe_node_gldas))

diff --git a/env/ORION.env b/env/ORION.env
@@ -53,9 +53,9 @@ elif [ $step = "anal" ]; then
     export MKL_NUM_THREADS=4
     export MKL_CBWR=AUTO
 
+    export CFP_MP=${CFP_MP:-"YES"}
     export USE_CFP=${USE_CFP:-"YES"}
-    export CFP_MP="YES"	# For analdiag with SLURM
-    export APRUNCFP="$launcher"
+    export APRUNCFP="$launcher -n \$ncmd --multi-prog"
 
     nth_max=$(($npe_node_max / $npe_node_anal))
 
@@ -72,7 +72,6 @@ elif [ $step = "anal" ]; then
     npe_cycle=${ntiles:-6}
     export APRUN_CYCLE="$launcher -n $npe_cycle"
 
-
     export NTHREADS_GAUSFCANL=1
     npe_gausfcanl=${npe_gausfcanl:-1}
 
@@ -101,6 +100,10 @@ elif [ $step = "eobs" ]; then
     export MKL_NUM_THREADS=4
     export MKL_CBWR=AUTO
 
+    export CFP_MP=${CFP_MP:-"YES"}
+    export USE_CFP=${USE_CFP:-"YES"}
+    export APRUNCFP="$launcher -n \$ncmd --multi-prog"
+
     nth_max=$(($npe_node_max / $npe_node_eobs))
 
     export NTHREADS_GSI=${nth_eobs:-$nth_max}
@@ -109,6 +112,10 @@ elif [ $step = "eobs" ]; then
 
 elif [ $step = "eupd" ]; then
 
+    export CFP_MP=${CFP_MP:-"YES"}
+    export USE_CFP=${USE_CFP:-"YES"}
+    export APRUNCFP="$launcher -n \$ncmd --multi-prog"
+
     nth_max=$(($npe_node_max / $npe_node_eupd))
 
     export NTHREADS_ENKF=${nth_eupd:-$nth_max}