Fix some issues with parallel BCs #2540
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
Not checking can lead to seqfaults.
The addition / substraction does not preserve parallel fields thus the old code does not work. I am not aware of anybody using that with FCI, so dropping it.
ZedThree
previously approved these changes
Apr 29, 2022
johnomotani
reviewed
Apr 29, 2022
src/field/field3d.cxx
Outdated
| @@ -514,17 +514,12 @@ void Field3D::applyParallelBoundary() { | |||
| TRACE("Field3D::applyParallelBoundary()"); | |||
|
|
|||
| checkData(*this); | |||
| ASSERT1(!yup_fields.empty()); | |||
There was a problem hiding this comment.
Is it worth checking ydown_fields too? They should always be initialised together, but you never know...
There was a problem hiding this comment.
hasParallelSlices() does this, that might also be more explicit:
Suggested change
| ASSERT1(!yup_fields.empty()); | |
| ASSERT1(hasParallelSlices()); |
There was a problem hiding this comment.
I was looking for this function, but didn't search in the header file 🙈
* Is easier to understand * Allows to have checks in a single place * I have never seen a bug where the slices where not in sync, so just checking one field for the optimized case should be sufficient.
|
It looks like this is likely a bug in Github Actions |
ZedThree
reviewed
Apr 29, 2022
Comment on lines
+260
to
+271
| #if CHECK > 2 | ||
| if (yup_fields.size() != ydown_fields.size()) { | ||
| throw BoutException( | ||
| "Field3D::splitParallelSlices: forward/backward parallel slices not in sync.\n" | ||
| " This is an internal library error"); | ||
| } | ||
| #endif | ||
| #if CHECK | ||
| return !yup_fields.empty() and !ydown_fields.empty(); | ||
| #else | ||
| return !yup_fields.empty(); | ||
| #endif |
There was a problem hiding this comment.
Moving the check that the sizes equal here is good idea 👍
The optimisation if CHECK is off feels a little excessive, but I don't think it hurts 😄
ZedThree
approved these changes
Apr 29, 2022
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.
No description provided.