Refactored construction of Laplacian viscosity#797
Merged
Conversation
- Moved setting of (constant) mod_Leith to outside of loops - Moved calculation of div_xx to after calculation of h_u,h_v - Used h_u,h_v in div_xx (avoids repeated computations) - Put calculation of div_xx, vort_xy into a conditional block - Aligned comments with code
- The logic for constructing viscosity involved nested if's and
alternate pathways.
- This refactor avoids large pathway branches and has not nested
if's, thereby simplifying the logic:
- The only case where extra steps occur are when Smagorinsky and
Leith are both disabled and better_bound is enabled. In this case
more conditionals are encountered sequentially.
- Added comments to:
- indicate contributions that are resolution scaled or not;
- indicate contributions that are additive rather than maxed.
Collaborator
Author
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
2 participants
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 builds on #795 (i.e. requires #795 to be accepted).
From the commit message:
alternate pathways.
if's, thereby simplifying the logic:
Leith are both disabled and better_bound is enabled. In this case
more conditionals are encountered sequentially.