[SofaBaseMechanics] Fix UniformMass topology changes handling mode. #2377
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
…on callback method was missing during add/remove process
…directly from the topologyData
… engine in variable names and comments
…ng the queue of events to the handlers
…r Data indices and remove handleTopologyChange method.
…t of indices and also display the points involved
…re removed. At the end of the events, recompute the current mass.
epernod
added
pr: fix
|
[ci-build][with-all-tests] |
hugtalbot
reviewed
Oct 6, 2021
SofaKernel/modules/SofaBaseMechanics/src/SofaBaseMechanics/UniformMass.inl
Outdated
Show resolved
Hide resolved
hugtalbot
requested changes
Oct 12, 2021
SofaKernel/modules/SofaBaseMechanics/src/SofaBaseMechanics/UniformMass.inl
Outdated
Show resolved
Hide resolved
hugtalbot
reviewed
Oct 12, 2021
| @@ -65,8 +69,7 @@ class UniformMass : public core::behavior::Mass<DataTypes> | |||
| /// indices outside of this range are discarded (useful for parallelization | |||
| /// using mesh partitionning) | |||
| Data< type::Vec<2,int> > d_localRange; | |||
| Data< type::vector<int> > d_indices; ///< optional local DOF indices. Any computation involving only indices outside of this list are discarded | |||
|
|
|||
| SetIndex d_indices; ///< optional local DOF indices. Any computation involving only indices outside of this list are discarded | |||
There was a problem hiding this comment.
the same SetIndex is actually quite confusing, it's hiding that it corresponds to a data..
There was a problem hiding this comment.
Ok what name do you want?
This is the same typedef as in all constraints component. Like FixedConstraint
…formMass.inl Co-authored-by: Hugo <hugo.talbot@sofa-framework.org>
epernod
added
pr: status wip
hugtalbot
reviewed
Oct 13, 2021
| @@ -65,8 +69,7 @@ class UniformMass : public core::behavior::Mass<DataTypes> | |||
| /// indices outside of this range are discarded (useful for parallelization | |||
| /// using mesh partitionning) | |||
| Data< type::Vec<2,int> > d_localRange; | |||
| Data< type::vector<int> > d_indices; ///< optional local DOF indices. Any computation involving only indices outside of this list are discarded | |||
|
|
|||
| SetIndex d_indices; ///< optional local DOF indices. Any computation involving only indices outside of this list are discarded | |||
| Data<bool> d_handleTopologicalChanges; ///< The mass and totalMass are recomputed on particles add/remove. | |||
There was a problem hiding this comment.
We could add the info specifying why this option exists (UniformMass works also only with DOFs - without TopologyContainer in the scene)
There was a problem hiding this comment.
New proposal: remove the data, and keep it as a private variable of the UniformMass class.
This boolean variable should be true if a Container is found, false else.
…formMass.inl Co-authored-by: Hugo <hugo.talbot@sofa-framework.org>
…otalMass, massDensity to send warnings only if values are strictly negatives
…default if the topology is dynamic register callback on DataSetIndex
epernod
removed
the
pr: status wip
epernod
added
the
pr: status to review
|
[ci-build][with-all-tests] |
fredroy
reviewed
Oct 27, 2021
| { | ||
| msg_info() << "link to Topology container should be set to ensure right behavior. First Topology found in current context will be used."; | ||
| l_topology.set(this->getContext()->getMeshTopologyLink()); | ||
| Real newVertexMass = d_totalMass.getValue() / Real(newSize); |
|
Just tested it @epernod it works as a charm 👍 👍 👍 👍 |
hugtalbot
approved these changes
Oct 27, 2021
epernod
added
pr: status ready
epernod
added
pr: status to review
fredroy
approved these changes
Oct 28, 2021
fredroy
added
pr: status ready
fredroy
added a commit
to fredroy/sofa
that referenced
this pull request
Nov 8, 2021
…ofa-framework#2377) This PR depends on sofa-framework#2374 sofa-framework#2375 and sofa-framework#2376 and should be rebased before review. - Remove old method `handleTopologyChange` - Turn d_indices into TopologySubsetIndices, this automatically fix the topological changes update. - Fix the use of subset indices combined with topology changes. - Add callback on endingEvent to update the totalMass/vertexMass - Fix the center of gravity display when using subset of indices ______________________________________________________ Co-authored-by: Hugo <hugo.talbot@sofa-framework.org> Co-authored-by: Frederick Roy <fredroy@users.noreply.github.com>
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.
This PR depends on #2374 #2375 and #2376 and should be rebased before review.
handleTopologyChangeHere is an example of scenes RemovingTrianglesProcess.scn using a subset of indices (yellow points)
<UniformMass template="Vec3d,double" name="mass" totalMass="1.0" handleTopologicalChanges="1" indices="0 1 2 3 4 5 6 7 8 9"/>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