-
Notifications
You must be signed in to change notification settings - Fork 8
mo_sethet pt 2 - sethet
#295
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
9336444 to
defd7b9
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #295 +/- ##
==========================================
- Coverage 96.16% 96.07% -0.09%
==========================================
Files 43 44 +1
Lines 9486 9651 +165
==========================================
+ Hits 9122 9272 +150
- Misses 364 379 +15
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
defd7b9 to
d782df2
Compare
a267a1c to
ad27d8d
Compare
|
This is finally ready to go! With help from @odiazib and @mjs271 yesterday - we tracked down the last of the indexing issues. The outstanding discrepancy is around |
jeff-cohere
left a comment
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.
Looks pretty good to me! I've left a couple of minor comments. Is there anything specific that you'd like a closer look at?
ad27d8d to
f006392
Compare
|
I removed the Kokkos for loop in gas_washout and that seemed to fix the precision issues I was seeing - let me know if we want to look into putting that back. Please forgive the embarrassingly long lead time on this - ready for final review @jeff-cohere @mjs271 @odiazib @singhbalwinder @overfelt |
singhbalwinder
left a comment
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.
Very nice work! Thanks! I have some minor comments but overall looks good to me.
src/mam4xx/mo_sethet.hpp
Outdated
| precip(kk) = cmfdqr(kk) + nrain(kk) - nevapr(kk); | ||
| }); | ||
|
|
||
| for (int kk = 0; kk < pver; kk++) { |
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.
We may need to change this for loop to a Kokkos::parallel_for.
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.
Let's use Kokkos::ThreadVectorRange.
| }); | ||
| team.team_barrier(); | ||
|
|
||
| for (int kk = ktop; kk < pver; kk++) { |
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.
Kokkos::parallel_for here.
| // ... part 2, in-cloud solve for low henry constant | ||
| // hno3 and h2o2 have both in and under cloud | ||
| //----------------------------------------------------------------- | ||
| for (int kk = ktop; kk < pver; kk++) { |
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.
Kokkos::parallel_for.
src/mam4xx/mo_sethet.hpp
Outdated
|
|
||
| for (int mm = 0; mm < gas_wetdep_cnt; mm++) { | ||
| int mm2 = wetdep_map[mm]; | ||
| for (int kk = 0; kk < ktop; kk++) { |
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.
Kokkos::parallel_for.
06f50fa to
cc24f32
Compare
|
a few more parallel_fors to add and the passing tolerance for sethet is 1e-3 which seems a little too big |
4ddf27f to
31f3869
Compare
17669e8 to
d4099e7
Compare
|
close in favor of #373 |
The bulk of the port is there - some resulting questions though:
wetdep_map?get_spc_ndxandget_het_ndx- does that just correlate to GasId?het_rates. Also check for Missing values? Don't need to do the write so don't needhetratestrg?gas_pcnst==pcnst==gas_wetdep_cnt?