diff --git a/config/model_configs/edmfx_bomex_box.yml b/config/model_configs/edmfx_bomex_box.yml index 97b1602b69..8aed4c6a7c 100644 --- a/config/model_configs/edmfx_bomex_box.yml +++ b/config/model_configs/edmfx_bomex_box.yml @@ -10,7 +10,7 @@ edmfx_entr_model: "ConstantCoefficient" edmfx_detr_model: "ConstantCoefficient" edmfx_sgs_mass_flux: true edmfx_sgs_diffusive_flux: true -edmfx_nh_pressure: false +edmfx_nh_pressure: true prognostic_tke: false moist: "equil" config: "box" @@ -24,7 +24,7 @@ y_elem: 2 z_elem: 60 z_stretch: false perturb_initstate: false -dt: "1secs" -t_end: "10800secs" +dt: "2secs" +t_end: "3hours" dt_save_to_disk: "10secs" toml: [toml/edmfx_box.toml] diff --git a/config/model_configs/edmfx_dycoms_rf01_box.yml b/config/model_configs/edmfx_dycoms_rf01_box.yml index cb03f62a17..c59a9f7158 100644 --- a/config/model_configs/edmfx_dycoms_rf01_box.yml +++ b/config/model_configs/edmfx_dycoms_rf01_box.yml @@ -10,7 +10,7 @@ edmfx_entr_model: "ConstantCoefficient" edmfx_detr_model: "ConstantCoefficient" edmfx_sgs_mass_flux: true edmfx_sgs_diffusive_flux: true -edmfx_nh_pressure: false +edmfx_nh_pressure: true prognostic_tke: false moist: equil config: box @@ -23,7 +23,7 @@ x_elem: 2 y_elem: 2 z_elem: 30 z_stretch: false -dt: 1secs -t_end: 2400secs -dt_save_to_disk: 2secs +dt: 2secs +t_end: 4hours +dt_save_to_disk: 10secs toml: [toml/edmfx_box.toml] diff --git a/config/model_configs/edmfx_gabls_box.yml b/config/model_configs/edmfx_gabls_box.yml index 09faa71aef..c61d11f7b1 100644 --- a/config/model_configs/edmfx_gabls_box.yml +++ b/config/model_configs/edmfx_gabls_box.yml @@ -8,7 +8,7 @@ edmfx_entr_model: "ConstantCoefficient" edmfx_detr_model: "ConstantCoefficient" edmfx_sgs_mass_flux: true edmfx_sgs_diffusive_flux: true -edmfx_nh_pressure: false +edmfx_nh_pressure: true prognostic_tke: false moist: "equil" config: "box" diff --git a/config/model_configs/edmfx_rico_box.yml b/config/model_configs/edmfx_rico_box.yml index 4d9ea5c474..af02f49bb3 100644 --- a/config/model_configs/edmfx_rico_box.yml +++ b/config/model_configs/edmfx_rico_box.yml @@ -9,7 +9,7 @@ edmfx_entr_model: "ConstantCoefficient" edmfx_detr_model: "ConstantCoefficient" edmfx_sgs_mass_flux: true edmfx_sgs_diffusive_flux: true -edmfx_nh_pressure: false +edmfx_nh_pressure: true prognostic_tke: false moist: "equil" #precip_model: "0M" diff --git a/config/model_configs/edmfx_trmm_box.yml b/config/model_configs/edmfx_trmm_box.yml index d61f1c670b..3720fec2f3 100644 --- a/config/model_configs/edmfx_trmm_box.yml +++ b/config/model_configs/edmfx_trmm_box.yml @@ -8,7 +8,7 @@ edmfx_entr_model: "ConstantCoefficient" edmfx_detr_model: "ConstantCoefficient" edmfx_sgs_mass_flux: true edmfx_sgs_diffusive_flux: true -edmfx_nh_pressure: false +edmfx_nh_pressure: true prognostic_tke: false moist: equil apply_limiter: false diff --git a/src/prognostic_equations/edmfx_closures.jl b/src/prognostic_equations/edmfx_closures.jl index ef8c612a77..31d332414b 100644 --- a/src/prognostic_equations/edmfx_closures.jl +++ b/src/prognostic_equations/edmfx_closures.jl @@ -79,7 +79,7 @@ edmfx_nh_pressure_tendency!(Yₜ, Y, p, t, colidx, turbconv_model) = nothing function edmfx_nh_pressure_tendency!(Yₜ, Y, p, t, colidx, turbconv_model::EDMFX) n = n_mass_flux_subdomains(turbconv_model) - (; params, ᶜρʲs, ᶜρ_ref, ᶠgradᵥ_ᶜΦ, ᶜuʲs, ᶜu⁰, ᶠu₃⁰) = p + (; params, ᶜρʲs, ᶜρ_ref, ᶜp, ᶜp_ref, ᶠgradᵥ_ᶜΦ, ᶠu₃⁰) = p FT = eltype(Y) ᶜz = Fields.coordinate_field(Y.c).z z_sfc = Fields.level(Fields.coordinate_field(Y.f).z, Fields.half) @@ -107,7 +107,7 @@ function edmfx_nh_pressure_tendency!(Yₜ, Y, p, t, colidx, turbconv_model::EDMF p.atmos.edmfx_nh_pressure, ᶠlg[colidx], ᶠbuoyancy( - ᶠinterp(ᶜρ_ref[colidx]), + ᶠinterp(Y.c.ρ[colidx]), ᶠinterp(ᶜρʲs.:($$j)[colidx]), ᶠgradᵥ_ᶜΦ[colidx], ), diff --git a/toml/edmfx_box.toml b/toml/edmfx_box.toml index 4f58178f41..81f07f3921 100644 --- a/toml/edmfx_box.toml +++ b/toml/edmfx_box.toml @@ -13,3 +13,8 @@ alias = "min_area" value = 1.0e-3 type = "float" description = "Minimum area fraction per updraft. Parameter not described in the literature." + +[entr_coeff] +alias = "entr_coeff" +value = 0.1 +type = "float"