MYNN fix for numerical stability issues with mixing snow (#1754)

*removal of the snow mixing, reverting back to the RRFS Base E configuration. *change to table values of Leaf Area Index * increase resource to fix gaea out-of-memory issue * Reset default TPN=24 on gaea
ufs-community · Jun 12, 2023 · bf60924 · bf60924
1 parent 2f71156
commit bf60924
Show file tree

Hide file tree

Showing 13 changed files with 5,316 additions and 5,304 deletions.
diff --git a/FV3 b/FV3
diff --git a/tests/bl_date.conf b/tests/bl_date.conf
@@ -1 +1,2 @@
-export BL_DATE=20230601
+export BL_DATE=20230608
+
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -202,7 +202,7 @@ elif [[ $MACHINE_ID = s4 ]]; then
 
 elif [[ $MACHINE_ID = gaea ]]; then
 
-  TPN=36
+  TPN=24
 
   INPES_dflt=3 ; JNPES_dflt=8
   INPES_thrd=3 ; JNPES_thrd=4

diff --git a/tests/logs/RegressionTests_acorn.log b/tests/logs/RegressionTests_acorn.log
diff --git a/tests/logs/RegressionTests_cheyenne.log b/tests/logs/RegressionTests_cheyenne.log
diff --git a/tests/logs/RegressionTests_gaea.log b/tests/logs/RegressionTests_gaea.log
diff --git a/tests/logs/RegressionTests_hera.log b/tests/logs/RegressionTests_hera.log
diff --git a/tests/logs/RegressionTests_jet.log b/tests/logs/RegressionTests_jet.log
diff --git a/tests/logs/RegressionTests_orion.log b/tests/logs/RegressionTests_orion.log
diff --git a/tests/logs/RegressionTests_wcoss2.log b/tests/logs/RegressionTests_wcoss2.log
diff --git a/tests/tests/datm_cdeps_lnd_gswp3 b/tests/tests/datm_cdeps_lnd_gswp3
@@ -55,3 +55,7 @@ export mosaic_file="INPUT/C96_mosaic.nc"
 export coupling_interval_sec=3600
 export TOPOEDITS=""
 export FV3_RUN="lnd_datm_cdeps_gswp.IN noahmp_run.IN"
+
+if [[ $MACHINE_ID = gaea ]]; then
+  TPN=36
+fi
diff --git a/tests/tests/hafs_regional_specified_moving_1nest_atm b/tests/tests/hafs_regional_specified_moving_1nest_atm
@@ -121,3 +121,6 @@ export MODEL_CONFIGURE="model_configure_hafs.IN"
 export NEMS_CONFIGURE="nems.configure.hafs_atm.IN"
 export FV3_RUN="hafs_fv3_run.IN"
 
+if [[ $MACHINE_ID = gaea ]]; then
+  TPN=36
+fi
diff --git a/tests/tests/regional_2dwrtdecomp b/tests/tests/regional_2dwrtdecomp
@@ -44,3 +44,7 @@ WRITE_GROUP=1
 WRTTASK_PER_GROUP=10
 NTILES=1
 export ITASKS=2
+
+if [[ $MACHINE_ID = gaea ]]; then
+  TPN=36
+fi
-Original file line number
+Diff line change
@@ Expand Up / @@ -202,7 +202,7 @@ elif [[ $MACHINE_ID = s4 ]]; then @@
     elif [[ $MACHINE_ID = gaea ]]; then
-      TPN=36
+      TPN=24
       INPES_dflt=3 ; JNPES_dflt=8
       INPES_thrd=3 ; JNPES_thrd=4
@@ Expand Down @@