[SofaSimpleFem] Fix row/col indices in hexa fem for bloc-based matrices #2277
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
alxbilger
added
pr: backport todo
|
[ci-build][force-full-build][with-all-tests] |
hugtalbot
reviewed
Aug 3, 2021
| @@ -1197,7 +1197,7 @@ void HexahedronFEMForceField<DataTypes>::addKToBlocMatrix( | |||
| Coord(Ke[3*n1+0][3*n2+0],Ke[3*n1+0][3*n2+1],Ke[3*n1+0][3*n2+2]), | |||
| Coord(Ke[3*n1+1][3*n2+0],Ke[3*n1+1][3*n2+1],Ke[3*n1+1][3*n2+2]), | |||
| Coord(Ke[3*n1+2][3*n2+0],Ke[3*n1+2][3*n2+1],Ke[3*n1+2][3*n2+2])) ) * Rot; | |||
| *crsmat->wbloc(offset + node1, offset + node2, true) += tmp * (-k); | |||
| *crsmat->wbloc(offset / 3 + node1, offset / 3 + node2, true) += tmp * (-k); | |||
There was a problem hiding this comment.
In the other cases of addKToMatrix, it appears that the same offset is used but it is never divided by 3:
r.matrix->add(r.offset + 3 * node1, r.offset + 3 * node2, tmp * (-kFactor));
I guess it comes from the difference between the wbloc and add functions, right?
There was a problem hiding this comment.
Yes, they both accept indices, but they don't represent the same thing
hugtalbot
approved these changes
Aug 4, 2021
fredroy
added
pr: status ready
hugtalbot
added
pr: status ready
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.
Indices were wrong in case of multiple objects under the same linear solver which uses an assembled 3x3 bloc-based matrix.
Bug introduced in #2240
By submitting this pull request, I acknowledge that
I have read, understand, and agree SOFA Developer Certificate of Origin (DCO).
Reviewers will merge this pull-request only if