Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SofaMiscForceField] Fix MeshMatrixMass duplicate Data parameters #2192

Merged
merged 4 commits into from
Jul 1, 2021

Conversation

epernod
Copy link
Contributor

@epernod epernod commented Jun 18, 2021

There was normal vector Data:

Data< sofa::helper::vector< Real > > d_vertexMass;
Data< sofa::helper::vector< Real > > d_edgeMass;
...
, d_vertexMass( initData(&d_vertexMass, "vertexMass", "Specify a vector giving the mass of each vertex. If unspecified or wrongly set, another mass information is used.") )
, d_edgeMass( initData(&d_edgeMass, "edgeMass", "values of the particles masses on edges") )

and topological Data with mechanism to update each other then they are changed or topological changes occurs.

/// Values of the particles masses stored on vertices
topology::PointData<helper::vector<MassType> >  d_vertexMass;
/// Values of the particles masses stored on edges
topology::EdgeData<helper::vector<MassType> >   d_edgeMass;
...
, d_vertexMassInfo( initData(&d_vertexMassInfo, "vertexMassInfo", "internal values of the particles masses on vertices, supporting topological changes") )
, d_edgeMassInfo( initData(&d_edgeMassInfo, "edgeMassInfo", "internal values of the particles masses on edges, supporting topological changes") )

No need to have 2 sets of Data, topological Data can be used directly as PointData and EdgeData inherite from Data and support topological changes.

-> Remove the normal Data but keep the names vertexMass and edgeMass which are used in code and scenes.


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

  • it builds with SUCCESS for all platforms on the CI.
  • it does not generate new warnings.
  • it does not generate new unit test failures.
  • it does not generate new scene test failures.
  • it does not break API compatibility.
  • it is more than 1 week old (or has fast-merge label).

@epernod epernod added pr: fix Fix a bug pr: status to review To notify reviewers to review this pull-request labels Jun 18, 2021
@epernod epernod self-assigned this Jun 18, 2021
@epernod epernod added pr: status wip Development in the pull-request is still in progress and removed pr: status to review To notify reviewers to review this pull-request labels Jun 18, 2021
@epernod epernod added pr: status to review To notify reviewers to review this pull-request and removed pr: status wip Development in the pull-request is still in progress labels Jun 21, 2021
@epernod epernod changed the title [SofaMiscFF] Fix MeshMatrixMass init and topologicalChanges [SofaMiscFF] Fix MeshMatrixMass duplicate Data parameters Jun 21, 2021
@epernod
Copy link
Contributor Author

epernod commented Jun 21, 2021

[ci-build][with-all-tests]

@alxbilger alxbilger added the pr: breaking Change possibly inducing a compilation error label Jun 23, 2021
@guparan guparan changed the title [SofaMiscFF] Fix MeshMatrixMass duplicate Data parameters [SofaMiscForceField] Fix MeshMatrixMass duplicate Data parameters Jun 30, 2021
@fredroy fredroy added pr: status wip Development in the pull-request is still in progress and removed pr: status to review To notify reviewers to review this pull-request labels Jun 30, 2021
@epernod epernod requested a review from fredroy June 30, 2021 13:23
@fredroy
Copy link
Contributor

fredroy commented Jun 30, 2021

[ci-build][with-all-tests]

@fredroy fredroy added pr: status ready Approved a pull-request, ready to be squashed and removed pr: status wip Development in the pull-request is still in progress labels Jul 1, 2021
@fredroy fredroy merged commit b1fc3f4 into sofa-framework:master Jul 1, 2021
@epernod epernod deleted the inf_MMMass branch July 10, 2021 12:54
@guparan guparan added this to the v21.12 milestone Oct 1, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr: breaking Change possibly inducing a compilation error pr: fix Fix a bug pr: status ready Approved a pull-request, ready to be squashed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants