constant entrainment

CliMA · Oct 16, 2023 · 5eea65c · 5eea65c
1 parent b723f1a
commit 5eea65c
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 47 deletions.
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -734,15 +734,6 @@ steps:
         soft_fail: true
         agents:
           slurm_mem: 20GB
-
-      - label: ":genie: Advective EDMFX advection test central in a box"
-        command: >
-          julia --color=yes --project=examples examples/hybrid/driver.jl
-          --config_file $CONFIG_PATH/advective_edmfx_adv_test_central_box.yml
-        artifact_paths: "advective_edmfx_adv_test_central_box/*"
-        soft_fail: true
-        agents:
-          slurm_mem: 20GB
 
       - label: ":genie: Advective EDMFX GABLS in a box"
         command: >

diff --git a/config/model_configs/advective_edmfx_adv_test_central_box.yml b/config/model_configs/advective_edmfx_adv_test_central_box.yml
diff --git a/config/model_configs/advective_edmfx_bomex_box.yml b/config/model_configs/advective_edmfx_bomex_box.yml
@@ -6,7 +6,7 @@ ls_adv: "Bomex"
 surface_setup: "Bomex"
 turbconv: "advective_edmfx"
 edmfx_upwinding: first_order
-edmfx_entr_model: "ConstantCoefficient"
+edmfx_entr_model: "ConstantTimescale"
 edmfx_detr_model: "ConstantCoefficient"
 edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true

diff --git a/config/model_configs/advective_edmfx_gabls_box.yml b/config/model_configs/advective_edmfx_gabls_box.yml
@@ -4,7 +4,7 @@ edmf_coriolis: GABLS
 surface_setup: GABLS
 turbconv: "advective_edmfx"
 edmfx_upwinding: "first_order"
-edmfx_entr_model: "ConstantCoefficient"
+edmfx_entr_model: "ConstantTimescale"
 edmfx_detr_model: "ConstantCoefficient"
 edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true

diff --git a/config/model_configs/advective_edmfx_rico_box.yml b/config/model_configs/advective_edmfx_rico_box.yml
@@ -5,7 +5,7 @@ ls_adv: "Rico"
 surface_setup: "Rico"
 turbconv: "advective_edmfx"
 edmfx_upwinding: first_order
-edmfx_entr_model: "ConstantCoefficient"
+edmfx_entr_model: "ConstantTimescale"
 edmfx_detr_model: "ConstantCoefficient"
 edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true

diff --git a/config/model_configs/advective_edmfx_trmm_box.yml b/config/model_configs/advective_edmfx_trmm_box.yml
@@ -4,7 +4,7 @@ rad: TRMM_LBA
 surface_setup: TRMM_LBA
 turbconv: advective_edmfx
 edmfx_upwinding: first_order
-edmfx_entr_model: "ConstantCoefficient"
+edmfx_entr_model: "ConstantTimescale"
 edmfx_detr_model: "ConstantCoefficient"
 edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true

diff --git a/src/prognostic_equations/advection.jl b/src/prognostic_equations/advection.jl
@@ -158,11 +158,6 @@ NVTX.@annotate function explicit_vertical_advection_tendency!(Yₜ, Y, p, t)
                     ᶠinterp(ᶜρʲs.:($$j)[colidx] - ᶜρ_ref[colidx]) *
                     ᶠgradᵥ_ᶜΦ[colidx]
                 ) / ᶠinterp(ᶜρʲs.:($$j)[colidx])
-            # @. Yₜ.f.sgsʲs.:($$j).u₃[colidx] -=
-            #     (
-            #         ᶠinterp(ᶜρʲs.:($$j)[colidx] - Y.c.ρ[colidx]) *
-            #         ᶠgradᵥ_ᶜΦ[colidx]
-            #     ) / ᶠinterp(ᶜρʲs.:($$j)[colidx])
         end
 
         # TODO: Move this to implicit_vertical_advection_tendency!.

diff --git a/src/prognostic_equations/edmfx_entr_detr.jl b/src/prognostic_equations/edmfx_entr_detr.jl
@@ -106,10 +106,7 @@ function entrainment(
     ::ConstantCoefficientEntrainment,
 ) where {FT}
     entr_coeff = CAP.entr_coeff(params)
-    min_area_limiter = FT(2e-3) * exp(-12 * ᶜaʲ)
-    #entr = min(entr_coeff * abs(ᶜwʲ) / (ᶜz - z_sfc), 1 / dt)
-    entr =
-        min(abs(ᶜwʲ) * (entr_coeff / (ᶜz - z_sfc) + min_area_limiter), 1 / dt)
+    entr = min(entr_coeff * abs(ᶜwʲ) / (ᶜz - z_sfc), 1 / dt)
     return entr
 end
 

diff --git a/toml/advective_edmfx_box.toml b/toml/advective_edmfx_box.toml
@@ -18,7 +18,7 @@ alias = "entr_coeff"
 value = 0.1
 type = "float"
 
-[pressure_normalmode_buoy_coeff1]
-alias = "pressure_normalmode_buoy_coeff1"
-value = 0.144
+[entr_tau]
+alias = "entr_tau"
+value = 1800
 type = "float"