From 259e8766d0498e2b4efdec45cfe502f68142baff Mon Sep 17 00:00:00 2001
From: Zhaoyi Shen <11598433+szy21@users.noreply.github.com>
Date: Mon, 16 Oct 2023 16:30:51 -0700
Subject: [PATCH] constant coefficient entrainment

---
 config/model_configs/advective_edmfx_bomex_box.yml       | 2 +-
 config/model_configs/advective_edmfx_dycoms_rf01_box.yml | 2 +-
 config/model_configs/advective_edmfx_gabls_box.yml       | 4 ++--
 config/model_configs/advective_edmfx_rico_box.yml        | 2 +-
 config/model_configs/advective_edmfx_trmm_box.yml        | 2 +-
 src/cache/precomputed_quantities.jl                      | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/config/model_configs/advective_edmfx_bomex_box.yml b/config/model_configs/advective_edmfx_bomex_box.yml
index e6ade08d706..e33fc87bae6 100644
--- 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
index 23f80838b26..89c6ee3d59f 100644
--- 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
index 630c94521e1..ea42077f69e 100644
--- 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
index e1181c624a5..5875a17aed3 100644
--- 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
index 3bb3470370a..2688641e274 100644
--- 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
index 9ab1a912ab6..0349a4b0896 100644
--- 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,