merge _base into mixedmode branch #1180
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
rem1776
requested review from
J-Lentz,
mlee03 and
mcallic2
and removed request for
thomas-robinson
mlee03
reviewed
Apr 5, 2023
diag_manager/diag_manager.F90
Outdated
| @@ -1473,6 +1473,7 @@ LOGICAL FUNCTION send_data_3d(diag_field_id, field, time, is_in, js_in, ks_in, & | |||
| ie_in=ie_in, je_in=je_in, ke_in=ke_in, weight=weight, err_msg=err_msg) | |||
| endif | |||
| END FUNCTION send_data_3d | |||
|
|
|||
There was a problem hiding this comment.
Is it ok if we get rid of this extra line?
There was a problem hiding this comment.
yeah must've snuck in when i fixed the conflict, should be fixed now
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.
Description
merge mixedmode_base into the mixedmode branch
last time we merged main into both but merges should really go
main -> mixedmode_base -> mixedmode
Checklist:
make distcheckpasses