Update to cellular automaton stochastic convective organization scheme (

ufs-community#589) * Introduction of CA domain definition * Read/Write and restart capability of CA * Change namelist control parameter so that CA time and space scales are adjusted for various resolutions given the same CA namelist input * Significant cleaning of old ideas * Improved coupling to cumulus convection to be committed in coordination with this issue: NCAR/ccpp-physics#657
mzhangw · Jun 14, 2021 · 14c69ba · 14c69ba
1 parent 00d570e
commit 14c69ba
Show file tree

Hide file tree

Showing 14 changed files with 2,201 additions and 2,177 deletions.
diff --git a/FV3 b/FV3
diff --git a/stochastic_physics b/stochastic_physics
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_orion.intel.log b/tests/RegressionTests_orion.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/parm/control_ca.nml.IN b/tests/parm/control_ca.nml.IN
@@ -181,15 +181,24 @@ deflate_level=1
   do_ca          = @[DO_CA]
   ca_sgs         = @[CA_SGS]
   ca_global      = @[CA_GLOBAL]
-  nlives         = @[NLIVES]
-  nseed          = @[NSEED]
-  nthresh        = @[NTHRESH]
-  ca_trigger     = .true.
-  ca_smooth      = @[CA_SMOOTH]
-  nspinup        = @[NSPINUP]
-  iseed_ca       = @[ISEED_CA]
-  nsmooth        = @[NSMOOTH]
-  ca_amplitude   = @[CA_AMPLITUDE]
+  nca            = 1
+  scells         = 2600
+  tlives         = 1800
+  nseed          = 100
+  nfracseed      = 0.5
+  rcell          = 0.72
+  ca_trigger     = .True.
+  ca_entr        = .False.
+  ca_closure     = .False.
+  nca_g          = 1
+  ncells_g       = 1
+  nlives_g       = 100
+  nseed_g        = 100
+  ca_smooth      = .True.
+  nspinup        = 100
+  iseed_ca       = 12345
+  nsmooth        = 100
+  ca_amplitude   = 0.35
 /
 
 &gfdl_cloud_microphysics_nml

diff --git a/tests/parm/input.mom6_ccpp.nml.IN b/tests/parm/input.mom6_ccpp.nml.IN
@@ -195,11 +195,11 @@
        do_ca          = @[DO_CA]
        ca_sgs         = @[CA_SGS]
        ca_global      = @[CA_GLOBAL]
-       ncells         = 5
-       nlives         = 30
+       scells         = 2600
+       tlives         = 1800
        nseed          = 1000000
        nfracseed      = 0.5
-       nthresh        = 0.
+       rcell          = 0.72
        ca_trigger     = .true.
        ca_entr	      = .false.
        ca_closure     = .false.

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -413,7 +413,7 @@ if [[ $TESTS_FILE =~ '35d' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20210610
+BL_DATE=20210611
 if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]]; then
   RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
 else