-
Notifications
You must be signed in to change notification settings - Fork 9
Adding new data to AIDA calibrations #520
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.
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
Conversation
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #520 +/- ##
==========================================
+ Coverage 91.53% 92.65% +1.11%
==========================================
Files 45 45
Lines 1654 1660 +6
==========================================
+ Hits 1514 1538 +24
+ Misses 140 122 -18
🚀 New features to boost your workflow:
|
260f5db
to
a1d573f
Compare
19d4dc9
to
b46b7ec
Compare
Looks like the calibration tests are failing on this PR:
|
parcel/ParcelTendencies.jl
Outdated
@@ -131,7 +131,7 @@ function immersion_freezing(params::ABIFM, PSD_liq, state) | |||
Δa_w = CMO.a_w_eT(tps, e, T) - CMO.a_w_ice(tps, T) | |||
|
|||
J = CMI_het.ABIFM_J(aerosol, Δa_w) | |||
return min((J * Nₗ * A_aer), (Nₗ / const_dt)) | |||
return min(max(FT(0), (J * Nₗ * A_aer)), (Nₗ / const_dt)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why can J
become negative?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was keeping it consistent with the ABDINM, I can change it back. I think I implemented it before because the parcel was giving negative radii and N_l values because there wasn't a limit on the condensation/depositional growth tendencies
parcel/ParcelTendencies.jl
Outdated
FT = eltype(state) | ||
Sᵢ = ξ(tps, T) * Sₗ | ||
Gᵢ = CMO.G_func(aps, tps, T, TD.Ice()) | ||
return 4 * FT(π) / ρ_air * (Sᵢ - 1) * Gᵢ * PSD_ice.r * Nᵢ | ||
dqᵢ_dt = 4 * FT(π) / ρ_air * (Sᵢ - 1) * Gᵢ * PSD_ice.r * Nᵢ | ||
return qᵢ + dqᵢ_dt * const_dt > 0 ? dqᵢ_dt : -qᵢ / const_dt |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you try limiting the tendency in a similar way as we do in other places? For example this is what we have in immersion freezing
return ifelse(
cond_rate > FT(0),
min(cond_rate, limit(qᵥ, dt, 1)),
-min(abs(cond_rate), limit(qₗ, dt, 1)),
)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I'll update the limiting in condensational growth the same way too
@@ -115,7 +116,10 @@ see DOI: 10.1039/C3FD00035D | |||
Returns zero for unsupported aerosol types. | |||
""" | |||
function ABIFM_J( | |||
dust::Union{CMP.DesertDust, CMP.Illite, CMP.Kaolinite, CMP.ArizonaTestDust}, | |||
dust::Union{ | |||
CMP.DesertDust, CMP.Illite, CMP.Kaolinite, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So much dust!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🧹💨
765cd3e
to
0e080fd
Compare
dc09696
to
e977f1f
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you!
Purpose
To-do
Content