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.

Sign up for GitHub

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

Jump to bottom

Remove high order classes #222

Merged
merged 7 commits into from
Apr 25, 2017
Merged

Remove high order classes #222

merged 7 commits into from
Apr 25, 2017

Conversation

hdeling
Copy link
Contributor

@hdeling hdeling commented Mar 28, 2017 •
edited by guparan
Loading

This pull request removes classes implementing High Order simplicial elements from SOFA.
Those classes have been moved to plugin sofaFramework/ plugin.HighOrder
Updates include

  • removing topological classes for High order triangulation and tetrahedral meshes
  • removing tests associated with topological classes
  • removing topological and mechanical mapping between regular and highorder meshes
  • update of MeshMassMatrix by removing code to compute mass of high order elements.

This PR:

  • builds with SUCCESS for all platforms on the CI.
  • does not generate new warnings nor unit test failures.
  • does not break existing scenes.
  • does not break API compatibility.
  • has been reviewed and agreed to be transitional.
  • is more than 1 week old.

Reviewers will merge only if all these checks are true.

@hdeling
update : remove Bezier Topology files
e4e85a6 
REMOVE : Test for BezierTetrahedronTopology
REMOVE : test for BezierTetrahedron Topology
@hdeling
UPDATE : remove Bezier tetrahedron classes
c37f718
@guparan
Copy link
Contributor

guparan commented Mar 29, 2017

Hi Hervé, thank you for this PR!
Couldn't these commits be added to your PR #220 ?

@hdeling
REMOVE : removed toplogy mapping defined for High Order tetrahedron a…
016f42d 
…nd triangle elements (moved to HighOrderFEM and HighOrderTopology plugin)
@hdeling
Copy link
Contributor Author

hdeling commented Mar 29, 2017

These are basically the same commits as PR#220 . This PR lead to a messy situation and should be removed.

@guparan guparan mentioned this pull request Mar 31, 2017
Closed
7 tasks
@hugtalbot hugtalbot self-assigned this Apr 5, 2017
@hugtalbot hugtalbot added the enhancement About a possible enhancement label Apr 5, 2017
@guparan guparan added the pr: status wip Development in the pull-request is still in progress label Apr 12, 2017
@guparan
Copy link
Contributor

guparan commented Apr 12, 2017 •
edited
Loading

Just added "pr: wip" label because we need to fix Flexible plugin (make it use plugin.HighOrder).

@matthieu-nesme
Copy link
Member

If Flexible compiles, this PR is ready to be merged.

@guparan guparan 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 Apr 19, 2017
@guparan
Merge remote-tracking branch 'origin/master' into RemoveHighOrderClasses
a2c8c61 
# Conflicts:
#	modules/SofaGeneralTopology/BezierTetrahedronSetTopologyContainer.cpp
#	modules/SofaGeneralTopology/BezierTriangleSetTopologyContainer.cpp
#	modules/SofaMiscForceField/MeshMatrixMass.inl
#	modules/SofaTopologyMapping/Bezier2MeshTopologicalMapping.cpp
@damienmarchal damienmarchal merged commit 728b1ae into sofa-framework:master Apr 25, 2017
@damienmarchal
Copy link
Contributor

Hi all,

It seems there is new test-scene failure since the merge of this PR.

  • examples/Components/topology/Bezier2MeshMechanicalMapping.scn: [ERROR] [DAGNode "TriangleTopology"] Object type "Bezier2MeshTopologicalMapping" creation Failed
  • examples/Components/topology/Bezier2MeshMechanicalMapping.scn: [ERROR] [DAGNode "TriangleTopology"] Object type "Bezier2MeshMechanicalMapping" creation Failed
  • examples/Components/topology/Bezier2MeshMechanicalMapping.scn: [ERROR] [DAGNode "BezierCubicTriangleTopology"] Object type "BezierTriangleSetTopologyContainer" creation Failed
  • examples/Components/topology/Bezier2MeshMechanicalMapping.scn: [ERROR] [DAGNode "BezierCubicTriangleTopology"] Object type "BezierTetra2BezierTriangleTopologicalMapping" creation Failed
  • examples/Components/topology/Bezier2MeshMechanicalMapping.scn: [ERROR] [DAGNode "BezierCubicTriangleTopology"] Object type "BezierTriangleSetGeometryAlgorithms" creation Failed
  • examples/Components/topology/Bezier2MeshMechanicalMapping.scn: [ERROR] [DAGNode "BezierTriangleMeshFromEngine"] Object type "BezierTetrahedronSetTopologyContainer" creation Failed
  • examples/Components/topology/Bezier2MeshMechanicalMapping.scn: [ERROR] [DAGNode "BezierTriangleMeshFromEngine"] Object type "BezierTetrahedronSetGeometryAlgorithms" creation Failed
    .... more in the logs....

We need to fix that in a new PR.

@guparan guparan added this to the v17.06 milestone Jun 29, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@hugtalbot hugtalbot

Labels
enhancement About a possible enhancement pr: status ready Approved a pull-request, ready to be squashed
Projects
None yet
Milestone
v17.06
Development

Successfully merging this pull request may close these issues.
5 participants
@hdeling @guparan @matthieu-nesme @damienmarchal @hugtalbot