Fix split-explicit upwinded advection #6047
Merged
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
cbegeman
added
mpas-ocean
bug fix PR
non-BFB
cbegeman
changed the title
TestingThis PR introduces machine-precision-level changes in the tests included in the compass PR suite, which was run on Chrysalis with intel, openmpi. This PR was tested with upwinding on for the |
|
Tested with gnu on chrysalis with both debug and optimized. Passes nightly suite with default flags and matches master bfb as expected. I also added these flags to compass: and this branch passes nightly suite with both gnu debug and optimized. When I compare to master using upwind, I get small differences, as expected: diffs:
|
mark-petersen
approved these changes
Nov 16, 2023
|
@jonbob I think this should be labeled 'BFB' as it pertains to tested E3SM simulations. We could even add |
|
Thanks for the testing @mark-petersen. I'll change the label but test in E3SM as well before merging |
jonbob
added
BFB
|
@mark-petersen Thank you for your review and testing! |
|
notes: ready but low priority |
jonbob
added a commit
that referenced
this pull request
Dec 13, 2023
…6047) Fix split-explicit upwinded advection This PR introduces a new variable to track the baroclinic water column thickness for the barotropic subcycles. The method of storing the baroclinic water column thickness in a bottomDepthEdge variable was problematic for upwinding because the upwinded cell can change between the baroclinic cycle and the barotropic subcycle. We now store the baroclinic (upwinded or centered) water column thickness at edges and then apply it along with the barotropic (upwinded or centered) ssh on edges to determine the barotropic water column thickness at edges. Fixes #6048 [BFB]
|
passes:
merged to next |
|
merged to master |
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.
This PR introduces a new variable to track the baroclinic water column thickness for the barotropic subcycles. The method of storing the baroclinic water column thickness in a
bottomDepthEdgevariable was problematic for upwinding because the upwinded cell can change between the baroclinic cycle and the barotropic subcycle. We now store the baroclinic (upwinded or centered) water column thickness at edges and then apply it along with the barotropic (upwinded or centered) ssh on edges to determine the barotropic water column thickness at edges.Fixes #6048
[BFB]