Merge pull request #3842 from CliMA/cc/add_inv_tau_pigroup_entr

Add entr_inv_tau to PiGroups entr

Author: costachris

src/prognostic_equations/edmfx_entr_detr.jl

@@ -66,6 +66,7 @@ function entrainment(
         ref_H = ᶜp / (ᶜρ * g)
 
         entr_param_vec = CAP.entr_param_vec(turbconv_params)
+        entr_inv_tau = CAP.entr_tau(turbconv_params)
 
         # non-dimensional pi-groups
         Π₁ = (ᶜz - z_sfc) * (ᶜbuoyʲ - ᶜbuoy⁰) / ((ᶜwʲ - ᶜw⁰)^2 + eps(FT)) / 100
@@ -78,15 +79,16 @@ function entrainment(
         Π₂ = min(max(Π₂, -1), 1)
 
         entr =
-            ((FT(1) - min(ᶜaʲ, FT(1)))^entr_mult_limiter_coeff) *
-            abs(ᶜwʲ - ᶜw⁰) / (ᶜz - z_sfc) * (
-                entr_param_vec[1] * abs(Π₁) +
-                entr_param_vec[2] * abs(Π₂) +
-                entr_param_vec[3] * abs(Π₃) +
-                entr_param_vec[4] * abs(Π₄) +
-                entr_param_vec[5] * abs(Π₅) +
-                entr_param_vec[6]
-            )
+            ((FT(1) - min(ᶜaʲ, FT(1)))^entr_mult_limiter_coeff) * (
+                abs(ᶜwʲ - ᶜw⁰) / (ᶜz - z_sfc) * (
+                    entr_param_vec[1] * abs(Π₁) +
+                    entr_param_vec[2] * abs(Π₂) +
+                    entr_param_vec[3] * abs(Π₃) +
+                    entr_param_vec[4] * abs(Π₄) +
+                    entr_param_vec[5] * abs(Π₅) +
+                    entr_param_vec[6]
+                )
+            ) + entr_inv_tau
 
         return max(entr, 0)
     end

toml/prognostic_edmfx_bomex_pigroup.toml

@@ -37,6 +37,10 @@ type = "float"
 value = 1.4362168064049219
 type = "float"
 
+[entr_inv_tau]
+value = 0
+type = "float"
+
 [entr_param_vec]
 value = [-1.2633841186916668, -0.4599815783034937, -0.46293146485015296, 1.4203614863252911, 0.5642481281364011, 0.32604896101664416, -0.09664796099945236, 0.7220191192213364, 0.16903223715665835, 3.2461705926260187, -1.028004360914299, 0.3402928311687101]
 type = "float"
@@ -61,10 +65,6 @@ type = "float"
 value = 0.8133326091843176
 type = "float"
 
-[entr_inv_tau]
-value = 0.00018836212008341437
-type = "float"
-
 [mixing_length_static_stab_coeff]
 value = 0.8242481923752288
 type = "float"

toml/prognostic_edmfx_calibrated.toml

@@ -14,6 +14,10 @@ type = "float"
 value = [0.8232451844623447, 0.058776909570673115, 0.3812876963832981, 1.7521400508808318, -0.32149828410236075, -0.019764881527468917, -0.05926889361439075, 0.3610260801159997, 0.5411236315642174, -0.4681505113638351, 1.0674945161351919, 0.38794618444184004]
 type = "float"
 
+[entr_inv_tau]
+value = 0
+type = "float"
+
 [EDMF_surface_area]
 value = 0.09964843547415161
 type = "float"

toml/prognostic_edmfx_implicit_scm_calibrated_5_cases_shallow_deep_v1.toml

@@ -25,6 +25,9 @@ value = 0.7
 [precipitation_timescale]
 value = 1919.9324772692971
 
+[entr_inv_tau]
+value = 0
+
 [entr_mult_limiter_coeff]
 value = 1.092018003548091