diff --git a/config/model_configs/edmfx_adv_test_box.yml b/config/model_configs/edmfx_adv_test_box.yml index 9a54b0105be..5ec3535702d 100644 --- a/config/model_configs/edmfx_adv_test_box.yml +++ b/config/model_configs/edmfx_adv_test_box.yml @@ -10,12 +10,14 @@ hyperdiff: "true" kappa_4: 1e8 x_max: 1e4 y_max: 1e4 -z_max: 3e4 +z_max: 5.5e4 x_elem: 2 y_elem: 2 -z_elem: 45 +z_elem: 63 dz_bottom: 30.0 +dz_top: 3000.0 dt: "10secs" t_end: "3600secs" dt_save_to_disk: "100secs" +FLOAT_TYPE: "Float64" toml: [toml/edmfx_box_advection.toml] diff --git a/post_processing/contours_and_profiles.jl b/post_processing/contours_and_profiles.jl index 080c6c59f3f..7b01ddec4a8 100644 --- a/post_processing/contours_and_profiles.jl +++ b/post_processing/contours_and_profiles.jl @@ -429,6 +429,7 @@ function contours_and_profiles(output_dir, ref_job_id = nothing) (all_categories, :w_velocity), (all_categories, :buoyancy), (all_categories, :specific_enthalpy), + (all_categories, :density), ) if has_moisture profile_variables = ( diff --git a/src/callbacks/callbacks.jl b/src/callbacks/callbacks.jl index f07039909a1..ff13a84e647 100644 --- a/src/callbacks/callbacks.jl +++ b/src/callbacks/callbacks.jl @@ -219,6 +219,7 @@ function common_diagnostics(p, ᶜu, ᶜts) potential_temperature = TD.dry_pottemp.(thermo_params, ᶜts), specific_enthalpy = TD.specific_enthalpy.(thermo_params, ᶜts), buoyancy = CAP.grav(p.params) .* (p.ᶜρ_ref .- ᶜρ) ./ ᶜρ, + density = TD.air_density.(thermo_params, ᶜts), ) if !(p.atmos.moisture_model isa DryModel) diagnostics = (; diff --git a/src/initial_conditions/initial_conditions.jl b/src/initial_conditions/initial_conditions.jl index 38762a61a9d..ca71174e567 100644 --- a/src/initial_conditions/initial_conditions.jl +++ b/src/initial_conditions/initial_conditions.jl @@ -470,10 +470,10 @@ Base.@kwdef struct MoistAdiabaticProfileEDMFX <: InitialCondition end draft_area(::Type{FT}) where {FT} = - z -> FT(0.5) * exp(-(z - FT(4000.0))^2 / 2 / FT(1000.0)^2) + z -> z < 0.7e4 ? FT(0.5) * exp(-(z - FT(4e3))^2 / 2 / FT(1e3)^2) : FT(0) edmfx_q_tot(::Type{FT}) where {FT} = - z -> FT(0.001) * exp(-(z - FT(4000.0))^2 / 2 / FT(1000.0)^2) + z -> z < 0.7e4 ? FT(1e-3) * exp(-(z - FT(4e3))^2 / 2 / FT(1e3)^2) : FT(0) function (initial_condition::MoistAdiabaticProfileEDMFX)(params) (; perturb) = initial_condition diff --git a/toml/edmfx_box_advection.toml b/toml/edmfx_box_advection.toml index d39ecbfaa8f..fbffbcba315 100644 --- a/toml/edmfx_box_advection.toml +++ b/toml/edmfx_box_advection.toml @@ -5,6 +5,6 @@ type = "float" [EDMF_min_area] alias = "min_area" -value = 1.0e-2 +value = 1.0e-3 type = "float" description = "Minimum area fraction per updraft. Parameter not described in the literature."