Fix FEPointEvaluation for non-zero starting component #12786
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
kronbichler
reviewed
Oct 2, 2021
Comment on lines
753
to
768
| { | ||
| bool found_base_element = false; | ||
| for (component_in_base_element = 0; | ||
| component_in_base_element < | ||
| fe.element_multiplicity(base_element_number); | ||
| ++component_in_base_element, ++component) | ||
| if (component == first_selected_component) | ||
| { | ||
| found_base_element = true; | ||
|
|
||
| if (component_in_base_element + n_components > | ||
| fe.element_multiplicity(base_element_number)) | ||
| same_base_element = false; | ||
| break; | ||
| } | ||
| if (found_base_element == true) |
There was a problem hiding this comment.
Shouldn't this also work:
Suggested change
| { | |
| bool found_base_element = false; | |
| for (component_in_base_element = 0; | |
| component_in_base_element < | |
| fe.element_multiplicity(base_element_number); | |
| ++component_in_base_element, ++component) | |
| if (component == first_selected_component) | |
| { | |
| found_base_element = true; | |
| if (component_in_base_element + n_components > | |
| fe.element_multiplicity(base_element_number)) | |
| same_base_element = false; | |
| break; | |
| } | |
| if (found_base_element == true) | |
| if (component + fe.element_multiplicity(base_element_number) > | |
| first_selected_component) | |
| { | |
| if (first_selected_component + n_components > | |
| component + fe.element_multiplicity(base_element_number)) | |
| same_base_element = false; | |
| component_in_base_element = first_selected_component - component; |
gassmoeller
force-pushed
the
fix_fepointevaluation_middle_component
branch
from
d73e243
to
acc9fa6
Compare
|
Good catch, I rewrote this first and did not realize afterwards I could have used the existing loop. Fixed. |
|
/rebuild |
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.
As described in the changelog, this fixes a bug in FEPointEvaluation.
The FEPointEvaluation class always evaluated a solution starting at the component 0 of the selected vector-valued base element, even if a different component was selected by the caller. This has been fixed to correctly start evaluating at the selected component.
Reported in geodynamics/aspect#4356 and fixed by a workaround in ASPECT (also for older deal.II versions) in geodynamics/aspect#4360.