Merge PR #121 and resolve conflicts #3
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
This was referenced Nov 8, 2023
Add a condition to turn off samfdeepcnv when MYNN shallow convection active
lisa-bengtsson
pushed a commit
that referenced
this pull request
Jul 15, 2024
Random fixes for HR4 GWD update
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.
Merges these changes:
ufs-community#121
and resolves conflicts.
Tests pass with these changes. This is a draft because that 121 PR has not been merged yet. Once it has, I'll merge ufs/dev into my branch and change this into a non-draft PR