Fixes Rayleigh bottom drag that wasn't applied unless Rayleigh drag applied #285
Conversation
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
Fixes a bug that prevents Rayleigh bottom drag from being applied if Rayleigh drag isn't being applied.
Contributor
Author
|
@mark-petersen, given we don't need this for E3SM, I'm thinking a quick merge into |
mark-petersen
approved these changes
Jun 19, 2019
Contributor
mark-petersen
left a comment
mark-petersen
left a comment
There was a problem hiding this comment.
Yes, an obvious mistake. Merge into ocean/coastal now, and I'll merge accumulations from ocean/coastal onto ocean/develop when I get a chance. Thanks.
pwolfram
added a commit
that referenced
this pull request
Jun 19, 2019
This merge allows bottom Rayleigh drag to be computed. * Fixes a bug that prevents Rayleigh bottom drag from being applied if Rayleigh drag isn't being applied.
Contributor
Author
|
Thanks @mark-petersen! |
mark-petersen
added a commit
that referenced
this pull request
Oct 19, 2019
mark-petersen
added a commit
that referenced
this pull request
Oct 19, 2019
ashwathsv
pushed a commit
to ashwathsv/MPAS-Model
that referenced
this pull request
Jul 21, 2020
This merge allows bottom Rayleigh drag to be computed. * Fixes a bug that prevents Rayleigh bottom drag from being applied if Rayleigh drag isn't being applied.
ashwathsv
pushed a commit
to ashwathsv/MPAS-Model
that referenced
this pull request
Jul 21, 2020
This PR is an accumulation of PRs into the ocean/coastal branch. We are bringing them in at once for efficiency: MPAS-Dev#285, MPAS-Dev#289, MPAS-Dev#284, MPAS-Dev#295, MPAS-Dev#310, MPAS-Dev#311, MPAS-Dev#312, MPAS-Dev#335, MPAS-Dev#354, MPAS-Dev#356, MPAS-Dev#358, MPAS-Dev#359, MPAS-Dev#365, MPAS-Dev#371
mark-petersen
added a commit
to mark-petersen/MPAS-Model
that referenced
this pull request
Jan 11, 2021
This PR is an accumulation of PRs into the ocean/coastal branch. We are bringing them in at once for efficiency: MPAS-Dev#285, MPAS-Dev#289, MPAS-Dev#284, MPAS-Dev#295, MPAS-Dev#310, MPAS-Dev#311, MPAS-Dev#312, MPAS-Dev#335, MPAS-Dev#354, MPAS-Dev#356, MPAS-Dev#358, MPAS-Dev#359, MPAS-Dev#365, MPAS-Dev#371
caozd999
pushed a commit
to caozd999/MPAS-Model
that referenced
this pull request
Jan 14, 2021
This PR is an accumulation of PRs into the ocean/coastal branch. We are bringing them in at once for efficiency: MPAS-Dev#285, MPAS-Dev#289, MPAS-Dev#284, MPAS-Dev#295, MPAS-Dev#310, MPAS-Dev#311, MPAS-Dev#312, MPAS-Dev#335, MPAS-Dev#354, MPAS-Dev#356, MPAS-Dev#358, MPAS-Dev#359, MPAS-Dev#365, MPAS-Dev#371
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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 one line fix ensures that Rayleigh bottom drag is applied even if entire-water column Rayleigh drag isn't applied, e.g.,
cc @sbrus89- thanks for the fruitful discussion yesterday!