Skip to content

Commit

Permalink
[Scenes] Fix warnings in scenes init
Browse files Browse the repository at this point in the history
  • Loading branch information
@epernod
epernod committed Dec 19, 2024
1 parent 4273f27 commit b2bb09a
Show file tree
Hide file tree
Showing 11 changed files with 12 additions and 9 deletions.
4 changes: 2 additions & 2 deletions scenes/Benchmarks/Scenario-02_squareTissue_diagonal-cut.scn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<RequiredPlugin name="Sofa.Component.Topology.Container.Dynamic"/> <!-- Needed to use components [TriangleSetGeometryAlgorithms, TriangleSetTopologyContainer, TriangleSetTopologyModifier] -->
<RequiredPlugin name="Sofa.Component.Visual"/> <!-- Needed to use components [VisualStyle] -->
<RequiredPlugin name="Sofa.GL.Component.Rendering3D"/> <!-- Needed to use components [OglModel] -->
<RequiredPlugin name="tearing"/>
<RequiredPlugin name="Tearing"/>
</Node>


Expand Down Expand Up @@ -55,7 +55,7 @@
<BoxROI template="Vec3d" name="PulledSide" box="-0.1 0.1 0.1 10.1 -0.1 -0.1" drawBoxes="1"/>
<ConstantForceField name="CFF" indices="@PulledSide.indices" forces="0 -100 0" showArrowSize=".01" />

<TearingEngine name="TearingEngine" input_position="@Mo.position"
<TearingScenarioEngine name="TearingEngine" input_position="@Mo.position"
startVertexId="1" startDirection="0.707 0.707 0.0" startLength="3.5"/>

<TriangularFEMForceField name="FEM" youngModulus="60" poissonRatio="0.3" method="large" computePrincipalStress="true"/>
Expand Down
4 changes: 2 additions & 2 deletions scenes/Benchmarks/Scenario-03_squareTissue_corner-horizontal-cut.scn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<RequiredPlugin name="Sofa.Component.Topology.Container.Dynamic"/> <!-- Needed to use components [TriangleSetGeometryAlgorithms, TriangleSetTopologyContainer, TriangleSetTopologyModifier] -->
<RequiredPlugin name="Sofa.Component.Visual"/> <!-- Needed to use components [VisualStyle] -->
<RequiredPlugin name="Sofa.GL.Component.Rendering3D"/> <!-- Needed to use components [OglModel] -->
<RequiredPlugin name="tearing"/>
<RequiredPlugin name="Tearing"/>
</Node>


Expand Down Expand Up @@ -55,7 +55,7 @@
<BoxROI template="Vec3d" name="PullCorner" box="9.9 0.1 0.1 10.1 -0.1 -0.1" drawBoxes="1"/>
<ConstantForceField name="CFF" indices="@PullCorner.indices" forces="0 -130 0" showArrowSize=".02" />

<TearingEngine name="TearingEngine" input_position="@Mo.position"
<TearingScenarioEngine name="TearingEngine" input_position="@Mo.position"
startVertexId="45" startDirection="1.0 0.0 0.0" startLength="2.0"/>

<TriangularFEMForceField name="FEM" youngModulus="60" poissonRatio="0.3" method="large" computePrincipalStress="true"/>
Expand Down
2 changes: 1 addition & 1 deletion scenes/Benchmarks/Scenario-04_squareTissue_corner-vertical-cut.scn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<BoxROI template="Vec3d" name="PullCorner" box="9.9 0.1 0.1 10.1 -0.1 -0.1" drawBoxes="1"/>
<ConstantForceField name="CFF" indices="@PullCorner.indices" forces="0 -130 0" showArrowSize=".02" />

<TearingEngine name="TearingEngine" input_position="@Mo.position"
<TearingScenarioEngine name="TearingEngine" input_position="@Mo.position"
startVertexId="51" startDirection="0.0 1.0 0.0" startLength="10"/>

<TriangularFEMForceField name="FEM" youngModulus="60" poissonRatio="0.3" method="large" computePrincipalStress="true"/>
Expand Down
2 changes: 1 addition & 1 deletion scenes/Benchmarks/Scenario-05_squareTissue-hole-vertical-cut.scn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<TriangularBendingSprings name="FEM-Bend" stiffness="300" damping="1.0" />
<TriangleCollisionModel />

<TearingEngine name="TearingEngine" input_position="@Mo.position"
<TearingScenarioEngine name="TearingEngine" input_position="@Mo.position"
startVertexId="318" startDirection="0.0 1.0 0.0" startLength="2.5"/>

<Node >
Expand Down
2 changes: 1 addition & 1 deletion scenes/Benchmarks/Scenario-06_squareTissue-hole-diagonal-cut.scn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<BoxROI template="Vec3d" name="PulledSide" box="-0.1 0.1 0.1 10.1 -0.1 -0.1" drawBoxes="1"/>
<ConstantForceField name="CFF" indices="@PulledSide.indices" forces="0 -100 0" showArrowSize=".01" />

<TearingEngine name="TearingEngine" input_position="@Mo.position"
<TearingScenarioEngine name="TearingEngine" input_position="@Mo.position"
startVertexId="282" startDirection="0.707 -0.707 0.0" startLength="5.0"/>

<TriangularFEMForceField name="FEM" youngModulus="60" poissonRatio="0.3" method="large" computePrincipalStress="true"/>
Expand Down
2 changes: 1 addition & 1 deletion scenes/Benchmarks/TestCase-01_bad-cutted-mesh.scn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ On fixe un coté et nous tirons de façon uniforme du côté opposé avec une in
<TriangularBendingSprings name="FEM-Bend" stiffness="300" damping="1.0" />
<TriangleCollisionModel />

<TearingEngine name="TearingEngine" input_position="@Mo.position" stressThreshold="0.1" step="0" nbFractureMax="100"/>
<TearingScenarioEngine name="TearingEngine" input_position="@Mo.position" stressThreshold="0.1" step="0" nbFractureMax="100"
startVertexId="318" startDirection="0.0 1.0 0.0" startLength="2.5"/>

<Node >
Expand Down
2 changes: 1 addition & 1 deletion scenes/Benchmarks/TestCase-03_vertexConnectedTriangles.scn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ On fixe un coté et nous tirons de façon uniforme du côté opposé avec une in
<EulerImplicitSolver name="cg_odesolver" printLog="false" rayleighStiffness="0.1" rayleighMass="0.1" />
<CGLinearSolver iterations="25" name="linear solver" tolerance="1.0e-9" threshold="1.0e-9" />
<!--MeshGmshLoader name="meshLoader" filename="mesh/square3.msh" scale="10" createSubelements="true" /-->
<MeshOBJLoader name="meshLoader" filename="mesh/sablier.obj" scale="1" createSubelements="true"/>
<MeshOBJLoader name="meshLoader" filename="../TearingEngine/mesh/sablier.obj" scale="1" createSubelements="true"/>

<TriangleSetTopologyContainer name="Container" src="@meshLoader" fileTopology="" tags=" " />
<TriangleSetTopologyModifier name="Modifier" />
Expand Down
1 change: 1 addition & 0 deletions scenes/TearingEngine/SquareTissue_01_gravity.scn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<RequiredPlugin name="Sofa.Component.LinearSolver.Iterative"/> <!-- Needed to use components [CGLinearSolver] -->
<RequiredPlugin name="Sofa.Component.Mapping.Linear"/> <!-- Needed to use components [IdentityMapping] -->
<RequiredPlugin name="Sofa.Component.Mass"/> <!-- Needed to use components [DiagonalMass] -->
<RequiredPlugin name="Sofa.Component.MechanicalLoad"/> <!-- Needed to use components [PlaneForceField] -->
<RequiredPlugin name="Sofa.Component.ODESolver.Backward"/> <!-- Needed to use components [EulerImplicitSolver] -->
<RequiredPlugin name="Sofa.Component.SceneUtility"/> <!-- Needed to use components [InfoComponent] -->
<RequiredPlugin name="Sofa.Component.SolidMechanics.FEM.Elastic"/> <!-- Needed to use components [TriangularFEMForceField] -->
Expand Down
1 change: 1 addition & 0 deletions scenes/TearingEngine/SquareTissue_01_gravity_interaction.scn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<RequiredPlugin name="Sofa.Component.LinearSolver.Iterative"/> <!-- Needed to use components [CGLinearSolver] -->
<RequiredPlugin name="Sofa.Component.Mapping.Linear"/> <!-- Needed to use components [IdentityMapping] -->
<RequiredPlugin name="Sofa.Component.Mass"/> <!-- Needed to use components [DiagonalMass] -->
<RequiredPlugin name="Sofa.Component.MechanicalLoad"/> <!-- Needed to use components [PlaneForceField] -->
<RequiredPlugin name="Sofa.Component.ODESolver.Backward"/> <!-- Needed to use components [EulerImplicitSolver] -->
<RequiredPlugin name="Sofa.Component.SceneUtility"/> <!-- Needed to use components [InfoComponent] -->
<RequiredPlugin name="Sofa.Component.SolidMechanics.FEM.Elastic"/> <!-- Needed to use components [TriangularFEMForceField] -->
Expand Down
1 change: 1 addition & 0 deletions scenes/TearingEngine/SquareTissue_05_circleHole_gravity.scn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<RequiredPlugin name="Sofa.Component.LinearSolver.Iterative"/> <!-- Needed to use components [CGLinearSolver] -->
<RequiredPlugin name="Sofa.Component.Mapping.Linear"/> <!-- Needed to use components [IdentityMapping] -->
<RequiredPlugin name="Sofa.Component.Mass"/> <!-- Needed to use components [DiagonalMass] -->
<RequiredPlugin name="Sofa.Component.MechanicalLoad"/> <!-- Needed to use components [PlaneForceField] -->
<RequiredPlugin name="Sofa.Component.ODESolver.Backward"/> <!-- Needed to use components [EulerImplicitSolver] -->
<RequiredPlugin name="Sofa.Component.SceneUtility"/> <!-- Needed to use components [InfoComponent] -->
<RequiredPlugin name="Sofa.Component.SolidMechanics.FEM.Elastic"/> <!-- Needed to use components [TriangularFEMForceField] -->
Expand Down
0 ...e_10_circleHole_pressureBorder - Copy.scn → ...reTissue_10_circleHole_pressureBorder.scn
View file
File renamed without changes.

0 comments on commit b2bb09a

Please sign in to comment.