limit entrainment

CliMA · Sep 25, 2023 · c4ec75e · c4ec75e
1 parent 2962706
commit c4ec75e
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/prognostic_equations/edmfx_entr_detr.jl b/src/prognostic_equations/edmfx_entr_detr.jl
@@ -124,9 +124,16 @@ function entrainment(
     dt::FT,
     ::ConstantTimescaleEntrainment,
 ) where {FT}
-    entr_tau = CAP.entr_tau(params)
-    entr = min(1 / entr_tau, 1 / dt)
-    return entr
+    if ᶜaʲ >= FT(1)
+        return FT(0)
+    else
+        entr_tau = CAP.entr_tau(params)
+        entr = min(1 / entr_tau, 1 / dt)
+        n = 8
+        damp_coeff = 2^(1 / n + 1) / ((1 / ᶜaʲ)^(1 / n) + (1 / (1 - ᶜaʲ))^(1 / n))
+        entr = entr * damp_coeff
+        return entr
+    end
 end
 
 """