changes after updating 2-moment distribution parameters #394
Conversation
This file contains 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
crocicc
added
documentation
crocicc
force-pushed
the
cc/reff_rr_correction
branch
from
50f1cc0
to
79e2bed
Compare
trontrytel
reviewed
May 9, 2024
| @@ -116,7 +116,7 @@ The default free parameter values are: | |||
| |``\nu`` | ``2`` | | |||
| |``A`` | ``400`` | | |||
| |``a`` | ``0.7`` | | |||
| |``c`` | ``3`` | | |||
| |``b`` | ``3`` | | |||
There was a problem hiding this comment.
Do we still need to define c that is used in autoconversion? (line 106?)
There was a problem hiding this comment.
There was an error in the documentation. Following the SB2006 paper and ClimaParams, c=4 is the accretion parameter, while in the autoconversion formula we have two parameters a and b, which are equal to 0.7 and 3. In the formula in line 106, b and c must be replaced with a and b respectively. I just change it in the last commit.
trontrytel
reviewed
May 9, 2024
src/Microphysics2M.jl
Outdated
| - `q_rai` - rain water specific humidity | ||
| - `N_liq` - cloud droplet number density | ||
| - `N_rai` - rain droplet number density | ||
| - `N_liq` - cloud droplet number density |
There was a problem hiding this comment.
Looks like during rebasing we accepted both lines. We only need one N_liq etc :)
trontrytel
reviewed
May 9, 2024
src/Microphysics2M.jl
Outdated
| - `q_rai` - rain water specific humidity | ||
| - `N_liq` - cloud droplet number density | ||
| - `N_rai` - rain droplet number density | ||
| - `N_liq` - cloud droplet number density |
There was a problem hiding this comment.
Same here, the arguments are repeated
trontrytel
reviewed
May 9, 2024
src/Microphysics2M.jl
Outdated
| Br = | ||
| (xr == 0) ? FT(0) : | ||
| ((SF.gamma(FT(νr + 1) / μr) * xr / SF.gamma(FT(νr + 2) / μr))^(-μr)) | ||
| Ac = (N_liq * Bc^(FT(νc + 1))) / SF.gamma(FT(νc + 1)) | ||
| Ac = (μc * N_liq * Bc^(FT(νc + 1) / μc)) / SF.gamma(FT(νc + 1) / μc) |
There was a problem hiding this comment.
Suggested change
| Ac = (μc * N_liq * Bc^(FT(νc + 1) / μc)) / SF.gamma(FT(νc + 1) / μc) | |
| Ac = μc * N_liq * Bc^(FT(νc + 1) / μc) / SF.gamma(FT(νc + 1) / μc) |
trontrytel
reviewed
May 9, 2024
src/Microphysics2M.jl
Outdated
| xc = (N_liq < τ_N) ? FT(0) : ((q_liq * ρ_air) / N_liq) | ||
| xr = (N_rai < τ_N) ? FT(0) : ((q_rai * ρ_air) / N_rai) | ||
| C = FT((4 / 3) * π * ρ_w) | ||
|
|
||
| Bc = | ||
| (xc == 0) ? FT(0) : | ||
| (SF.gamma(FT(νc + 1)) * xc / SF.gamma(FT(νc + 2)))^(-1) | ||
| ((SF.gamma(FT(νc + 1) / μc) * xc / SF.gamma(FT(νc + 2) / μc))^(-μc)) |
There was a problem hiding this comment.
Suggested change
| ((SF.gamma(FT(νc + 1) / μc) * xc / SF.gamma(FT(νc + 2) / μc))^(-μc)) | |
| (SF.gamma(FT(νc + 1) / μc) * xc / SF.gamma(FT(νc + 2) / μc))^(-μc) |
trontrytel
reviewed
May 9, 2024
src/Microphysics2M.jl
Outdated
| - `q_liq` - cloud water specific humidity | ||
| - `q_rai` - rain water specific humidity | ||
| - `N_liq` - cloud droplet number density | ||
| - `N_rai` - rain droplet number density | ||
| - `N_liq` - cloud droplet number density |
trontrytel
reviewed
May 9, 2024
src/parameters/Microphysics2M.jl
Outdated
| $(DocStringExtensions.FIELDS) | ||
| """ | ||
| Base.@kwdef struct CloudParticlePDF_SB2006{FT} <: ParametersType{FT} | ||
| "Raindrop size distribution coefficient νc" |
There was a problem hiding this comment.
Suggested change
| "Raindrop size distribution coefficient νc" | |
| "Cloud droplet size distribution coefficient νc" |
trontrytel
reviewed
May 9, 2024
src/parameters/Microphysics2M.jl
Outdated
| Base.@kwdef struct CloudParticlePDF_SB2006{FT} <: ParametersType{FT} | ||
| "Raindrop size distribution coefficient νc" | ||
| νc::FT | ||
| "Raindrop size distribution coefficient μc" |
There was a problem hiding this comment.
Suggested change
| "Raindrop size distribution coefficient μc" | |
| "Cloud droplet size distribution coefficient μc" |
trontrytel
reviewed
May 9, 2024
src/Microphysics2M.jl
Outdated
| xc = (N_liq < τ_N) ? FT(0) : ((q_liq * ρ_air) / N_liq) | ||
| xr = (N_rai < τ_N) ? FT(0) : ((q_rai * ρ_air) / N_rai) | ||
| C = FT(4 / 3 * π * ρ_w) | ||
| Z₀ = FT(1e-18) | ||
|
|
||
| Bc = | ||
| (xc == 0) ? FT(0) : | ||
| (SF.gamma(FT(νc + 1)) * xc / SF.gamma(FT(νc + 2)))^FT(-1) | ||
| ((SF.gamma(FT(νc + 1) / μc) * xc / SF.gamma(FT(νc + 2) / μc))^(-μc)) |
There was a problem hiding this comment.
Suggested change
| ((SF.gamma(FT(νc + 1) / μc) * xc / SF.gamma(FT(νc + 2) / μc))^(-μc)) | |
| (SF.gamma(FT(νc + 1) / μc) * xc / SF.gamma(FT(νc + 2) / μc))^(-μc) |
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #394 +/- ##
==========================================
+ Coverage 94.87% 96.99% +2.11%
==========================================
Files 36 35 -1
Lines 1386 1363 -23
==========================================
+ Hits 1315 1322 +7
+ Misses 71 41 -30
|
crocicc
force-pushed
the
cc/reff_rr_correction
branch
from
789df7c
to
58d5728
Compare
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.
Purpose
To-do
Content