Noah MP updates for Prototype 8 (GFSv17) (#927)

* modification for additional land outputs
ufs-community · Dec 2, 2021 · 5a461c1 · 5a461c1
1 parent b884a61
commit 5a461c1
Show file tree

Hide file tree

Showing 17 changed files with 2,485 additions and 2,102 deletions.
diff --git a/FV3 b/FV3
diff --git a/tests/RegressionTests_cheyenne.gnu.log b/tests/RegressionTests_cheyenne.gnu.log
diff --git a/tests/RegressionTests_cheyenne.intel.log b/tests/RegressionTests_cheyenne.intel.log
diff --git a/tests/RegressionTests_gaea.intel.log b/tests/RegressionTests_gaea.intel.log
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
diff --git a/tests/RegressionTests_jet.intel.log b/tests/RegressionTests_jet.intel.log
diff --git a/tests/RegressionTests_wcoss_cray.log b/tests/RegressionTests_wcoss_cray.log
diff --git a/tests/RegressionTests_wcoss_dell_p3.log b/tests/RegressionTests_wcoss_dell_p3.log
diff --git a/tests/opnReqTests/cmp_proc_bind.sh b/tests/opnReqTests/cmp_proc_bind.sh
@@ -11,17 +11,16 @@ elif [[ $rc == 'thr' ]]; then
   OMP_ENV="OMP_PROC_BIND=true OMP_NUM_THREADS=$THRD"
   if [[ $application != 'regional' ]]; then
     atm_total=$((INPES*JNPES*6))
-    for i in $(seq 0 $((atm_total-1))); do
-      MPI_PROC_BIND="$MPI_PROC_BIND$((i*2))+$((i*2+1)),"
-    done
-    for i in $(seq $((atm_total*2)) $((TASKS+atm_total-1))); do
-      MPI_PROC_BIND="$MPI_PROC_BIND$i,"
-    done
   elif [[ $application == 'regional' ]]; then
-    for i in $(seq 0 $((TASKS-1))); do
-      MPI_PROC_BIND="$MPI_PROC_BIND$((i*2))+$((i*2+1)),"
-    done
+    atm_total=$((INPES*JNPES))
   fi
+
+  for i in $(seq 0 $((atm_total-1))); do
+    MPI_PROC_BIND="$MPI_PROC_BIND$((i*2))+$((i*2+1)),"
+  done
+  for i in $(seq $((atm_total*2)) $((TASKS+atm_total-1))); do
+    MPI_PROC_BIND="$MPI_PROC_BIND$i,"
+  done
 fi
 
 MPI_PROC_BIND=$(echo -n $MPI_PROC_BIND | sed -e "s/,$//")
diff --git a/tests/opnReqTests/dcp.sh b/tests/opnReqTests/dcp.sh
@@ -14,7 +14,7 @@ elif [[ $application == 'regional' ]]; then
   if [[ $CI_TEST == 'true' ]]; then
     INPES=10
     JNPES=3
-    TASKS=$((INPES*JNPES))
+    TASKS=$((INPES*JNPES + WRITE_GROUP*WRTTASK_PER_GROUP))
     NODES=$(((TASKS+TPN-1)/TPN))
   else
     INPES=5

diff --git a/tests/opnReqTests/std.sh b/tests/opnReqTests/std.sh
@@ -14,7 +14,8 @@ elif [[ $application == 'regional' ]]; then
   if [[ $CI_TEST == 'true' ]]; then
     INPES=4
     JNPES=6
-    TASKS=$((INPES*JNPES))
+    WRTTASK_PER_GROUP=8
+    TASKS=$((INPES*JNPES + WRITE_GROUP*WRTTASK_PER_GROUP))
   fi
 elif [[ $application == 'cpld' ]]; then
   if [ $CI_TEST == 'true' ]; then

diff --git a/tests/opnReqTests/thr.sh b/tests/opnReqTests/thr.sh
@@ -8,6 +8,11 @@ if [[ $application == 'global' ]]; then
   TPN=$((TPN/THRD))
   NODES=$(((TASKS+TPN-1)/TPN))
 elif [[ $application == 'regional' ]]; then
+  if [[ $CI_TEST == 'true' ]]; then
+    INPES=4
+    JNPES=4
+    TASKS=$((INPES*JNPES + WRITE_GROUP*WRTTASK_PER_GROUP))
+  fi
   TPN=$((TPN/THRD))
   NODES=$(((TASKS+TPN-1)/TPN))
 elif [[ $application == 'cpld' ]]; then

diff --git a/tests/parm/params_grib2_tbl_new b/tests/parm/params_grib2_tbl_new
@@ -294,6 +294,7 @@
    0   7   204   1 EFHL
    0   3   222   1 EFSH
    0   7     9   0 EHLX
+   2   0   237   1 EIWATER
    4   2     1   0 ELCDEN
    4   0     1   0 ELECTMP
   10   3   194   1 ELEV
@@ -461,6 +462,8 @@
   10   0    43   0 KSSEDW
    0   7     2   0 KX
    0   7   198   1 LAI
+   2   0   234   1 LAKEFRC
+   2   0   233   1 LANDFRC
    1   2     8   0 LANDIL
    2   0   218   1 LANDN
    2   0     8   0 LANDU
@@ -642,6 +645,7 @@
    0  14   200   1 OZMAX1
    0  14   201   1 OZMAX8
   10   3   196   1 P2OMLT
+   2   0   235   1 PAHFLX
    3   3     2   0 PBINFRC
    3   3     1   0 PBLIFRC
    0  19    12   0 PBLREG
@@ -658,6 +662,7 @@
    0   1   200   1 PEVPR
    0   4    10   0 PHOTAR
    3   0     8   0 PIXST
+   2   0   238   1 PLANTTR
    0   7     0   0 PLI
    0   3   200   1 PLPL
    4   2     0   0 PLSMDEN
@@ -817,6 +822,16 @@
    3 192    52   0 SBTAGR7
    3 192    53   0 SBTAGR8
    3 192    54   0 SBTAGR9
+   3 192    69   0 SBTAHI10
+   3 192    70   0 SBTAHI11
+   3 192    71   0 SBTAHI12
+   3 192    72   0 SBTAHI13
+   3 192    73   0 SBTAHI14
+   3 192    74   0 SBTAHI15
+   3 192    75   0 SBTAHI16
+   3 192    66   0 SBTAHI7
+   3 192    67   0 SBTAHI8
+   3 192    68   0 SBTAHI9
    3   0     2   0 SBTMP
    0   7   210   1 SCCP
    4   2    10   0 SCINT
@@ -914,6 +929,7 @@
    2   0     3   0 SOILM
    2   0    22   0 SOILM
    2   3    15   0 SOILP
+   2   0   239   1 SOILSE
    2   3    18   0 SOILTMP
    2   0    38   0 SOILVIC
    2   0   192   1 SOILW
@@ -947,6 +963,10 @@
    0   3    22   0 SSGSO
   10   3   195   1 SSHG
    3   5     2   0 SSKSSTMP
+   3 192    62   0 SSMS1715
+   3 192    63   0 SSMS1716
+   3 192    64   0 SSMS1717
+   3 192    65   0 SSMS1718
    0   1    86   0 SSNOWW
    1   0     6   0 SSRUN
    1   0   193   1 SSRUN
@@ -1197,6 +1217,7 @@
    0   2   192   1 VWSH
   10   4    17   0 WATDENA
   10   4    16   0 WATERDEN
+   2   0   236   1 WATERSA
   10   4    20   0 WATPDENA
   10   4    19   0 WATPDEN
   10   4    18   0 WATPTEMP