Repository navigation
Khairoutdinov and Kogan (2000) autoconversion and accretion as 1-mome… - #814
Merged
Merged
Conversation
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #814 +/- ##
==========================================
+ Coverage 93.57% 93.62% +0.04%
==========================================
Files 59 59
Lines 3177 3201 +24
==========================================
+ Hits 2973 2997 +24
Misses 204 204
🚀 New features to boost your workflow:
|
trontrytel
force-pushed
the
aj/kk2000-1m-option
branch
from
October 15, 2026 00:13
6d58c12 to
4bb8711
Compare
trontrytel
marked this pull request as ready for review
October 15, 2026 00:15
tapios
force-pushed
the
aj/kk2000-1m-option
branch
2 times, most recently
from
October 18, 2026 19:15
6e1a182 to
89f77f3
Compare
tapios
self-requested a review
October 18, 2026 19:25
tapios
approved these changes
Oct 18, 2026
tapios
force-pushed
the
aj/kk2000-1m-option
branch
from
October 18, 2026 19:26
89f77f3 to
85599cd
Compare
Member
|
@sajjadazimi @szy21 Could you please review this? I'd like to get it merged, as I am changing CMP on top of this, and it'll get messy if this lingers (Ania is out next week). I did go over the PR and made some changes in the second commit (and in ClimaParams). With those, it looks good to me. |
tapios
force-pushed
the
aj/kk2000-1m-option
branch
from
October 18, 2026 20:45
85599cd to
ddd627e
Compare
szy21
reviewed
Oct 18, 2026
szy21
approved these changes
Oct 18, 2026
szy21
left a comment
szy21
left a comment
Member
There was a problem hiding this comment.
Some tests are redundant, but we can clean them up later.
tapios
force-pushed
the
aj/kk2000-1m-option
branch
2 times, most recently
from
October 18, 2026 22:39
c9ec305 to
94b558d
Compare
…irings Move the Khairoutdinov and Kogan (2000) autoconversion and accretion kernels to Common.jl, where both the 1-moment and the 2-moment scheme call them, so Microphysics1M no longer imports Microphysics2M and the include order is back to 1M before 2M. Normalize the dimensional inputs of the fractional powers: the rates now read A q_lcl^a (Nc / N_ref)^b (ρ / ρ_ref)^c and A (q_lcl q_rai)^a (ρ / ρ_ref)^b, with N_ref (1 cm⁻³) and ρ_ref (1 kg m⁻³) read from the new ClimaParams entries and the coefficients A in s⁻¹. This needs ClimaParams 1.3.3 (CliMA/ClimaParams.jl#335), where A changes from 7.42e13 to the published 1350; the rates agree to 0.02 %. For the 1-moment options, store only the parameters each one reads (AcnvKK2000 and AccrKK2000 instead of the full KK2000 struct) and fold the factor A (Nc / N_ref)^b of the prescribed droplet number into a coefficient computed once at construction. Check the cloud liquid + rain accretion option against its parameters, as rain autoconversion already does, so a mismatched pairing raises an ArgumentError instead of a MethodError or a field-access error. Give rain_autoconversion_timescale a KK2000 method that raises an ArgumentError, since the rate is nonlinear in q_lcl and has no state-independent timescale. Require a positive prescribed droplet number for PrescribedNd as well. Docs: attribute the density dependence to Wood (2005) Table 1, state the units of Nc, update the 2-moment tables, and list the shared kernels in the API reference.
tapios
force-pushed
the
aj/kk2000-1m-option
branch
from
October 18, 2026 22:40
94b558d to
ebc5b57
Compare
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR adds Khairoutdinov and Kogan 2000 Sc based autoconversion and accretion rates. They are of the form we wanted to test in the last meeting: