constant coefficient entrainment

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

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
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: "ConstantTimescale"
+edmfx_entr_model: "ConstantCoefficient"
 edmfx_detr_model: "ConstantCoefficient"
 edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true

diff --git a/config/model_configs/advective_edmfx_dycoms_rf01_box.yml b/config/model_configs/advective_edmfx_dycoms_rf01_box.yml
@@ -6,7 +6,7 @@ rad: DYCOMS_RF01
 surface_setup: DYCOMS_RF01
 turbconv: advective_edmfx
 edmfx_upwinding: first_order
-edmfx_entr_model: "ConstantTimescale"
+edmfx_entr_model: "ConstantCoefficient"
 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: "ConstantTimescale"
+edmfx_entr_model: "ConstantCoefficient"
 edmfx_detr_model: "ConstantCoefficient"
 edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true
@@ -23,7 +23,7 @@ z_elem: 8
 z_stretch: false
 dt: "5secs"
 t_end: "9hours"
-dt_save_to_disk: "1mins"
+dt_save_to_disk: "10mins"
 perturb_initstate: false
 FLOAT_TYPE: "Float64"
 toml: [toml/advective_edmfx_box.toml]
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: "ConstantTimescale"
+edmfx_entr_model: "ConstantCoefficient"
 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: "ConstantTimescale"
+edmfx_entr_model: "ConstantCoefficient"
 edmfx_detr_model: "ConstantCoefficient"
 edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true

diff --git a/src/cache/precomputed_quantities.jl b/src/cache/precomputed_quantities.jl
@@ -195,7 +195,7 @@ function set_velocity_at_top!(Y, turbconv_model)
         Spaces.nlevels(axes(Y.c)) + half,
     )
     @. top_u₃ = 0
-    if turbconv_model isa EDMFX
+    if turbconv_model isa EDMFX || turbconv_model isa AdvectiveEDMFX
         for j in 1:n_mass_flux_subdomains(turbconv_model)
             top_u₃ʲ = Fields.level(
                 Y.f.sgsʲs.:($j).u₃.components.data.:1,