forked from mom-ocean/MOM6
-
Notifications
You must be signed in to change notification settings - Fork 20
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
Add KPP nonlocal term to passive tracers #202
Merged
gustavo-marques
merged 35 commits into
NCAR:dev/ncar
from
mnlevy1981:extend_KPP_nonlocal
Mar 9, 2022
Merged
Changes from 3 commits
Commits
Show all changes
35 commits
Select commit
Hold shift + click to select a range
420a0e6
Add KPP nonlocal term to passive tracers
mnlevy1981 c0f6f81
Shorten long lines
mnlevy1981 eaaaa07
Fix build error in OpenMP test
mnlevy1981 af095e0
Add KPP nonlocal diags for passive tracers
mnlevy1981 cecb61d
Cleanup to pass doxygen CI test
mnlevy1981 bd1089a
Refactor MOM_CFC_cap
mnlevy1981 eb8dfd7
Refactor MOM_CVMix_KPP.F90
mnlevy1981 80508d9
Add NLT budget contibution to Tr diags
mnlevy1981 f11f12c
Only define KPP tracer diags when using KPP
mnlevy1981 882e173
Commit to pass OpenMP tests
mnlevy1981 f51681b
Can pass tr_ptr to KPP_NonLocalTransport()
mnlevy1981 fec61e0
Refactor MOM_tracer_registry.F90
mnlevy1981 301ed51
register_tracer() can return tracer_type pointer
mnlevy1981 c435aad
Remove declaration of unused variable
mnlevy1981 9b1f46b
Add KPP nonlocal terms to pseudo-salt tracer
mnlevy1981 cfe90aa
Tracers call KPP nonlocal before tracer_vertdiff
mnlevy1981 312743d
pseudo-salt was using wrong salt flux
mnlevy1981 f9d6247
Rearrange some code computing nonlocal transport
mnlevy1981 9c9860c
Clean up diagnostics
mnlevy1981 8aad2c3
Remove use_KPP from tracer_flow_control_CS
mnlevy1981 45c6b76
Change id_net_surfflux longname
mnlevy1981 3913856
Let register_tracer set more diag metadata
mnlevy1981 44885df
Remove use_KPP from MOM control structure
mnlevy1981 4f7621f
Clean up diag names and scale factors
mnlevy1981 a7eeab4
Code cleanup following review
mnlevy1981 59423ac
APPLY_NONLOCAL_TRANSPORT applies to all tracers
mnlevy1981 124ef06
Remove matrix multiplication from post_data call
mnlevy1981 ba5d8c4
Cleanup following more code review
mnlevy1981 89e0746
Break up long lines
mnlevy1981 d5e9629
Merge branch 'dev/ncar' into extend_KPP_nonlocal
mnlevy1981 900f6cf
shorten line length to pass CI test
mnlevy1981 3e4f827
Clean up two comments
mnlevy1981 728fe16
Remove unused variable from MOM_forcing_type.F90
mnlevy1981 9fb0643
Rename CFC_tracer_metadata -> CFC_tracer_data
mnlevy1981 e3d278e
Fix inaccurate comments
mnlevy1981 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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.
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.
Is it desirable to call
KPP_NonLocalTransport_passive_tracers
whenapplyNonLocalTrans = False
?If yes, perhaps
dtracer
should only be calculated ifapplyNonLocalTrans = True
or its diagnostic has been requested. If not, it would make more sense if this condition was outside ofKPP_NonLocalTransport_passive_tracers
.The same comment applies for
KPP_NonLocalTransport_temp
andKPP_NonLocalTransport_saln
.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.
The real issue is that I haven't plumbed in any diagnostics yet - for
KPP_NonLocalTransport_temp
andKPP_NonLocalTransport_saln
, ifapplyNonLocalTrans
is false then you still compute the terms and post the data, you just don't add the terms to the tracer quantities themselves... but when I first started working on this branch I got a little stuck trying to figure out how to include diagnostics and then I didn't come back to that before opening this PR