Issue #1: refactor CFP in DA sections of HERA.env and WCOSS_DELL_P3.env

jkhender · Jul 23, 2020 · d175130 · d175130
1 parent 145f810
commit d175130
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/env/HERA.env b/env/HERA.env
@@ -53,7 +53,6 @@ elif [ $step = "anal" ]; then
     export NTHREADS_GSI=${nth_anal:-$nth_max}
     [[ $NTHREADS_GSI -gt $nth_max ]] && export NTHREADS_GSI=$nth_max
     export APRUN_GSI="$launcher"
-    export CFP_MP="YES"
 
     export NTHREADS_CALCINC=${nth_calcinc:-1}
     [[ $NTHREADS_CALCINC -gt $nth_max ]] && export NTHREADS_CALCINC=$nth_max
@@ -73,8 +72,9 @@ 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"
+    export APRUNCFP="$launcher -n \$ncmd --multi-prog"
 
 elif [ $step = "gldas" ]; then
 
@@ -105,6 +105,10 @@ elif [ $step = "eobs" ]; then
     [[ $NTHREADS_GSI -gt $nth_max ]] && export NTHREADS_GSI=$nth_max
     export APRUN_GSI="$launcher"
 
+    export CFP_MP=${CFP_MP:-"YES"}
+    export USE_CFP=${USE_CFP:-"YES"}
+    export APRUNCFP="$launcher -n \$ncmd --multi-prog"
+
 elif [ $step = "eupd" ]; then
 
     nth_max=$(($npe_node_max / $npe_node_eupd))
@@ -113,6 +117,10 @@ elif [ $step = "eupd" ]; then
     [[ $NTHREADS_ENKF -gt $nth_max ]] && export NTHREADS_ENKF=$nth_max
     export APRUN_ENKF="$launcher"
 
+    export CFP_MP=${CFP_MP:-"YES"}
+    export USE_CFP=${USE_CFP:-"YES"}
+    export APRUNCFP="$launcher -n \$ncmd --multi-prog"
+
 elif [ $step = "fcst" ]; then
 
     nth_max=$(($npe_node_max / $npe_node_fcst))

diff --git a/env/WCOSS_DELL_P3.env b/env/WCOSS_DELL_P3.env
@@ -70,9 +70,9 @@ elif [ $step = "anal" ]; then
     [[ $NTHREADS_CHGRES -gt $npe_node_max ]] && export NTHREADS_CHGRES=$npe_node_max
     export APRUN_CHGRES=""
 
-    if [ ${USE_CFP:-"NO"} = "YES" ]; then
-        export APRUNCFP="$launcher \$ncmd $mpmd"
-    fi
+    export CFP_MP=${CFP_MP:-"NO"}
+    export USE_CFP=${USE_CFP:-"YES"}
+    export APRUNCFP="$launcher \$ncmd $mpmd"
 
 elif [ $step = "gldas" ]; then
 
@@ -96,9 +96,9 @@ elif [ $step = "eobs" ]; then
     [[ $NTHREADS_GSI -gt $nth_max ]] && export NTHREADS_GSI=$nth_max
     export APRUN_GSI="$launcher ${npe_gsi:-${npe_eobs:-$PBS_NP}}"
 
-    if [ ${USE_CFP:-"NO"} = "YES" ]; then
-        export APRUNCFP="$launcher \$ncmd $mpmd"
-    fi
+    export CFP_MP=${CFP_MP:-"NO"}
+    export USE_CFP=${USE_CFP:-"YES"}
+    export APRUNCFP="$launcher \$ncmd $mpmd"
 
 elif [ $step = "eupd" ]; then
 
@@ -108,9 +108,9 @@ elif [ $step = "eupd" ]; then
     [[ $NTHREADS_ENKF -gt $nth_max ]] && export NTHREADS_ENKF=$nth_max
     export APRUN_ENKF="$launcher ${npe_enkf:-${npe_eupd:-$PBS_NP}}"
 
-    if [ ${USE_CFP:-"NO"} = "YES" ]; then
-        export APRUNCFP="$launcher \$ncmd $mpmd"
-    fi
+    export CFP_MP=${CFP_MP:-"NO"}
+    export USE_CFP=${USE_CFP:-"YES"}
+    export APRUNCFP="$launcher \$ncmd $mpmd"
 
 elif [ $step = "fcst" ]; then