-
Notifications
You must be signed in to change notification settings - Fork 310
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #960 from epernod/topo_mapping
[SofaTopologyMapping] Fix crashes in Tetra2TriangleTopologicalMapping
- Loading branch information
Showing
7 changed files
with
385 additions
and
31 deletions.
There are no files selected for viewing
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
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
147 changes: 147 additions & 0 deletions
147
examples/Components/topology/TopologicalModifiers/RemovingTetra2TriangleProcess2.txt
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,147 @@ | ||
| T= 0.1 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 0.15 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 0.2 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 0.25 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 0.3 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 0.35 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 0.4 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 0.45 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 0.50 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 0.55 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 0.6 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 0.65 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 0.7 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 0.75 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 0.8 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 0.85 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 0.9 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 0.95 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 1.0 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 1.05 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 1.1 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 1.15 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 1.2 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 1.25 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 1.3 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 1.35 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 1.4 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 1.45 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 1.5 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 1.55 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 1.6 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 1.65 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 1.7 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 1.75 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 1.8 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 1.85 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 1.9 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 1.95 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 2.0 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 2.05 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 2.1 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 2.15 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 2.2 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 2.25 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 2.3 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 2.35 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 2.4 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 2.45 | ||
| REMOVE= 1 | ||
| 0 | ||
| T= 2.5 | ||
| REMOVE= 1 | ||
| 0 |
84 changes: 84 additions & 0 deletions
84
...es/Components/topology/TopologicalModifiers/RemovingTetra2TriangleProcess_withOptions.scn
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| <?xml version="1.0" ?> | ||
| <!-- Automatic Tetrahedron removing with Tetra2Triangle mapping example: Element removed are define in: ./RemovingTetra2TriangleProcess.txt --> | ||
| <Node name="root" dt="0.01" showBoundingTree="0" gravity="0 -9 0"> | ||
| <VisualStyle displayFlags="showBehaviorModels showVisual showWireframe hideForceFields" /> | ||
| <DefaultPipeline verbose="0" /> | ||
| <BruteForceDetection name="N2" /> | ||
| <DefaultContactManager response="default" /> | ||
| <MinProximityIntersection name="Proximity" alarmDistance="0.8" contactDistance="0.5" /> | ||
| <MeshGmshLoader name="loader" filename="mesh/cube_low_res.msh" /> | ||
|
|
||
| <Node name="TT"> | ||
| <EulerImplicitSolver name="cg_odesolver" rayleighStiffness="0.1" rayleighMass="0.1" /> | ||
| <CGLinearSolver iterations="25" name="linear solver" /> | ||
|
|
||
| <MechanicalObject src="@../loader" name="Volume" translation="4 0 0"/> | ||
| <TetrahedronSetTopologyContainer name="Tetra_topo" tetrahedra="@../loader.tetrahedra" /> | ||
| <TetrahedronSetTopologyModifier name="Modifier" /> | ||
| <TetrahedronSetTopologyAlgorithms name="TopoAlgo" template="Vec3d" /> | ||
| <TetrahedronSetGeometryAlgorithms name="GeomAlgo" template="Vec3d" /> | ||
|
|
||
| <DiagonalMass massDensity="1.0" /> | ||
| <FixedConstraint name="fix" indices="7 8 14 15" /> | ||
| <TetrahedralCorotationalFEMForceField name="FEM" youngModulus="360" poissonRatio="0.3" method="large" /> | ||
|
|
||
| <Node name="T_out"> | ||
| <include href="Objects/TriangleSetTopology.xml" src="@" tags=" " /> | ||
| <Tetra2TriangleTopologicalMapping input="@../Tetra_topo" output="@Container" noNewTriangles="1" /> | ||
| <TriangularFEMForceField name="FEM" youngModulus="60" poissonRatio="0.3" method="large" /> | ||
| <TriangularBendingSprings name="FEM-Bend" stiffness="300" damping="1.0" /> | ||
| <Node name="Visu"> | ||
| <OglModel name="Visual" color="blue" /> | ||
| <IdentityMapping input="@../../Volume" output="@Visual" /> | ||
| </Node> | ||
| </Node> | ||
| <Node name="T_in"> | ||
| <include href="Objects/TriangleSetTopology.xml" src="@" tags=" " /> | ||
| <Tetra2TriangleTopologicalMapping input="@../Tetra_topo" output="@Container" noInitialTriangles="1" /> | ||
| <Node name="Visu"> | ||
| <OglModel name="Visual" color="red" /> | ||
| <IdentityMapping input="@../../Volume" output="@Visual" /> | ||
| </Node> | ||
| </Node> | ||
|
|
||
| <TopologicalChangeProcessor listening="1" filename="RemovingTetra2TriangleProcess.txt" /> | ||
| </Node> | ||
|
|
||
|
|
||
| <Node name="TT"> | ||
| <EulerImplicitSolver name="cg_odesolver" rayleighStiffness="0.1" rayleighMass="0.1" /> | ||
| <CGLinearSolver iterations="25" name="linear solver" /> | ||
|
|
||
| <MechanicalObject src="@../loader" name="Volume" translation="-4 0 0"/> | ||
| <TetrahedronSetTopologyContainer name="Tetra_topo" tetrahedra="@../loader.tetrahedra" /> | ||
| <TetrahedronSetTopologyModifier name="Modifier" /> | ||
| <TetrahedronSetTopologyAlgorithms name="TopoAlgo" template="Vec3d" /> | ||
| <TetrahedronSetGeometryAlgorithms name="GeomAlgo" template="Vec3d" /> | ||
|
|
||
| <DiagonalMass massDensity="1.0" /> | ||
| <FixedConstraint name="fix" indices="7 8 14 15" /> | ||
| <TetrahedralCorotationalFEMForceField name="FEM" youngModulus="360" poissonRatio="0.3" method="large" /> | ||
|
|
||
| <Node name="T_out"> | ||
| <include href="Objects/TriangleSetTopology.xml" src="@" tags=" " /> | ||
| <Tetra2TriangleTopologicalMapping input="@../Tetra_topo" output="@Container" noNewTriangles="1" /> | ||
| <TriangularFEMForceField name="FEM" youngModulus="60" poissonRatio="0.3" method="large" /> | ||
| <TriangularBendingSprings name="FEM-Bend" stiffness="300" damping="1.0" /> | ||
| <Node name="Visu"> | ||
| <OglModel name="Visual" color="blue" /> | ||
| <IdentityMapping input="@../../Volume" output="@Visual" /> | ||
| </Node> | ||
| </Node> | ||
| <Node name="T_in"> | ||
| <include href="Objects/TriangleSetTopology.xml" src="@" tags=" " /> | ||
| <Tetra2TriangleTopologicalMapping input="@../Tetra_topo" output="@Container" noInitialTriangles="1" /> | ||
| <Node name="Visu"> | ||
| <OglModel name="Visual" color="red" /> | ||
| <IdentityMapping input="@../../Volume" output="@Visual" /> | ||
| </Node> | ||
| </Node> | ||
|
|
||
| <TopologicalChangeProcessor listening="1" filename="RemovingTetra2TriangleProcess2.txt" /> | ||
| </Node> | ||
|
|
||
| </Node> |
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
Oops, something went wrong.