Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Wip on adding prescribed cloud droplet number concentration #3179

Merged
merged 1 commit into from
Jul 9, 2024
Merged

Wip on adding prescribed cloud droplet number concentration #3179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/parameterized_tendencies/microphysics/microphysics_wrappers.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import Thermodynamics as TD
import CloudMicrophysics.Microphysics0M as CM0
import CloudMicrophysics.Microphysics1M as CM1
import CloudMicrophysics.Microphysics2M as CM2
import CloudMicrophysics.MicrophysicsNonEq as CMNe
import CloudMicrophysics.Parameters as CMP

Expand Down Expand Up @@ -172,10 +173,12 @@ function compute_precipitation_sources!(

#! format: off
# rain autoconversion: q_liq -> q_rain
@. Sᵖ = min(
limit(qₗ(thp, ts), dt, 5),
@. Sᵖ = ifelse(
mp.Ndp <= 0,
CM1.conv_q_liq_to_q_rai(mp.pr.acnv1M, qₗ(thp, ts), true),
CM2.conv_q_liq_to_q_rai(mp.var, qₗ(thp, ts), ρ, mp.Ndp),
)
@. Sᵖ = min(limit(qₗ(thp, ts), dt, 5), Sᵖ)
@. Sqₜᵖ -= Sᵖ
@. Sqᵣᵖ += Sᵖ
@. Seₜᵖ -= Sᵖ * (Iₗ(thp, ts) + Φ)
Expand Down
6 changes: 6 additions & 0 deletions src/parameters/create_parameters.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,12 @@ function create_parameter_set(config::AtmosConfig)
ce = CM.Parameters.CollisionEff(toml_dict),
tv = CM.Parameters.Blk1MVelType(toml_dict),
aps = CM.Parameters.AirProperties(toml_dict),
var = CM.Parameters.VarTimescaleAcnv(toml_dict),
Ndp = CP.get_parameter_values(
toml_dict,
"prescribed_cloud_droplet_number_concentration",
"ClimaAtmos",
).prescribed_cloud_droplet_number_concentration,
)
else
error("Invalid precip_model $(precip_model)")
Expand Down
3 changes: 3 additions & 0 deletions toml/single_column_precipitation_test.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
[C_H]
value = 0.0

[prescribed_cloud_droplet_number_concentration]
value = 0.0
Loading