diff --git a/src/P3Scheme.jl b/src/P3Scheme.jl index 15b1eb5c0..da3605413 100644 --- a/src/P3Scheme.jl +++ b/src/P3Scheme.jl @@ -269,19 +269,18 @@ end # q_rim = 0 and D_min = D_th, D_max = inf function q_rz(p3::PSP3, N_0::FT, λ::FT, D_min::FT) where {FT} x = DSD_μ(p3, λ) + p3.β_va + 1 - return p3.α_va * N_0 / λ^x * (Γ(x) + Γ(x, λ * D_min) - (x - 1) * Γ(x - 1)) + return α_va_si(p3) * N_0 / λ^x * (Γ(x, λ * D_min)) end # q_rim > 0 and D_min = D_th and D_max = D_gr function q_n(p3::PSP3, N_0::FT, λ::FT, D_min::FT, D_max::FT) where {FT} x = DSD_μ(p3, λ) + p3.β_va + 1 - return p3.α_va * N_0 / λ^x * (Γ(x, λ * D_min) - Γ(x, λ * D_max)) + return α_va_si(p3) * N_0 / λ^x * (Γ(x, λ * D_min) - Γ(x, λ * D_max)) end # partially rimed ice or large unrimed ice (upper bound on D is infinity) # q_rim > 0 and D_min = D_cr, D_max = inf function q_r(p3::PSP3, F_r::FT, N_0::FT, λ::FT, D_min::FT) where {FT} x = DSD_μ(p3, λ) + p3.β_va + 1 - return p3.α_va * N_0 / (1 - F_r) / λ^x * - (Γ(x) + Γ(x, λ * D_min) - (x - 1) * Γ(x - 1)) + return α_va_si(p3) * N_0 / (1 - F_r) / λ^x * (Γ(x, λ * D_min)) end """