Merge #2159

2159: Set the default adv test params, fix init adv test condition, add rho to plots r=trontrytel a=trontrytel Co-authored-by: Anna Jaruga <ajaruga@caltech.edu>
CliMA · Sep 26, 2023 · e988c4b · e988c4b
2 parents eb1ffc5 + 40c90b5
commit e988c4b
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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."