Skip to content

Commit

Permalink
Merge #2159
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
bors[bot] and trontrytel authored Sep 26, 2023
2 parents 6957b1a + 40c90b5 commit ef652d0
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 5 deletions.
6 changes: 4 additions & 2 deletions config/model_configs/edmfx_adv_test_box.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
1 change: 1 addition & 0 deletions post_processing/contours_and_profiles.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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 = (
Expand Down
1 change: 1 addition & 0 deletions src/callbacks/callbacks.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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 = (;
Expand Down
4 changes: 2 additions & 2 deletions src/initial_conditions/initial_conditions.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion toml/edmfx_box_advection.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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."

0 comments on commit ef652d0

Please sign in to comment.