Skip to content

Commit 6542b24

Browse files
szy21trontrytel
authored andcommitted
Use lwp instead of q_liq for the cldn function, use log - log
1 parent 0ca8fbd commit 6542b24

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

src/callbacks/callbacks.jl

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,14 @@ NVTX.@annotate function rrtmgp_model_callback!(integrator)
302302
end
303303
end
304304

305+
lwp_col = p.scratch.temp_field_level
306+
ᶜliquid_water_mass_concentration =
307+
@. lazy(cloud_liquid_water_content * Y.c.ρ)
308+
Operators.column_integral_definite!(
309+
lwp_col,
310+
ᶜliquid_water_mass_concentration,
311+
)
312+
305313
@. ᶜreliq = ifelse(
306314
cloud_liquid_water_content > FT(0),
307315
CM.CloudDiagnostics.effective_radius_Liu_Hallet_97(
@@ -313,8 +321,7 @@ NVTX.@annotate function rrtmgp_model_callback!(integrator)
313321
dust_aero_conc,
314322
seasalt_aero_conc,
315323
SO4_aero_conc,
316-
cloud_liquid_water_content /
317-
max(eps(FT), cloud_fraction),
324+
lwp_col,
318325
),
319326
FT(0),
320327
FT(0),

src/parameterized_tendencies/microphysics/microphysics_wrappers.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ function ml_N_cloud_liquid_droplets(cmc, c_dust, c_seasalt, c_SO4, q_liq)
5454
FT = eltype(N₀)
5555
return N₀ * (
5656
FT(1) +
57-
α_dust * log(max(c_dust, eps(FT)) / c₀_dust) +
58-
α_seasalt * log(max(c_seasalt, eps(FT)) / c₀_seasalt) +
59-
α_SO4 * log(max(c_SO4, eps(FT)) / c₀_SO4) +
60-
α_q_liq * log(max(q_liq, eps(FT)) / q₀_liq)
57+
α_dust * (log(max(c_dust, eps(FT))) - log(c₀_dust)) +
58+
α_seasalt * (log(max(c_seasalt, eps(FT))) - log(c₀_seasalt)) +
59+
α_SO4 * (log(max(c_SO4, eps(FT))) - log(c₀_SO4)) +
60+
α_q_liq * (log(max(q_liq, eps(FT))) - log(q₀_liq))
6161
)
6262
end
6363

0 commit comments

Comments
 (0)