Skip to content

Commit 372cdfd

Browse files
hugtalbothugtalbot
authored
Fix names in example scenes (#628)
* Fix names in example scenes * Fix test with updated source links
1 parent d6c3609 commit 372cdfd

2 files changed

Lines changed: 14 additions & 14 deletions

File tree

‎examples/SofaUnitsExample.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,14 @@ def createScene(root):
5757

5858
root.addObject('VisualStyle', displayFlags="showCollisionModels")
5959

60-
root.addObject('MeshOBJLoader', name="LiverSurface", filename="mesh/liver-smooth.obj")
60+
root.addObject('MeshOBJLoader', name="surface_mesh_loader", filename="mesh/liver-smooth.obj")
6161

6262
liver = root.addChild('Liver')
63-
liver.addObject('EulerImplicitSolver', name="cg_odesolver")
64-
liver.addObject('CGLinearSolver', name="linear_solver", iterations= 25, tolerance= scene_unit(1e-9, m**2) , threshold= scene_unit(1e-9, m**2) )
65-
liver.addObject('MeshGmshLoader', name="meshLoader", filename="mesh/liver.msh")
66-
liver.addObject('TetrahedronSetTopologyContainer', name="topo", src="@meshLoader")
67-
liver.addObject('MechanicalObject', name="dofs", src="@meshLoader")
63+
liver.addObject('EulerImplicitSolver', name="integration_scheme")
64+
liver.addObject('CGLinearSolver', name="iterative_linear_solver", iterations= 25, tolerance= scene_unit(1e-9, m**2) , threshold= scene_unit(1e-9, m**2) )
65+
liver.addObject('MeshGmshLoader', name="volume_mesh_loader", filename="mesh/liver.msh")
66+
liver.addObject('TetrahedronSetTopologyContainer', name="topo", src="@volume_mesh_loader")
67+
liver.addObject('MechanicalObject', name="dofs", src="@volume_mesh_loader")
6868
liver.addObject('TetrahedronSetGeometryAlgorithms', template="Vec3d", name="GeomAlgo")
6969

7070
# You can create values that have a dimension by multiplying a float/int by a unit
@@ -86,7 +86,7 @@ def createScene(root):
8686
liver.addObject('RestShapeSpringsForceField', name="WeakConstraint", points=[3, 39, 64], stiffness=scene_unit(stiffness))
8787

8888
visu = liver.addChild('Visu')
89-
visu.addObject('OglModel', name="VisualModel", src="@../../LiverSurface")
89+
visu.addObject('OglModel', name="VisualModel", src="@../../surface_mesh_loader")
9090
visu.addObject('BarycentricMapping', name="VisualMapping", input="@../dofs", output="@VisualModel")
9191

9292
return root

‎examples/liver.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,21 +52,21 @@ def createScene(root):
5252
root.addObject('CollisionResponse', name="CollisionResponse", response="PenalityContactForceField")
5353
root.addObject('DiscreteIntersection')
5454

55-
root.addObject('MeshOBJLoader', name="LiverSurface", filename="mesh/liver-smooth.obj")
55+
root.addObject('MeshOBJLoader', name="surface_mesh_loader", filename="mesh/liver-smooth.obj")
5656

5757
liver = root.addChild('Liver')
58-
liver.addObject('EulerImplicitSolver', name="cg_odesolver", rayleighStiffness="0.1", rayleighMass="0.1")
59-
liver.addObject('CGLinearSolver', name="linear_solver", iterations="25", tolerance="1e-09", threshold="1e-09")
60-
liver.addObject('MeshGmshLoader', name="meshLoader", filename="mesh/liver.msh")
61-
liver.addObject('TetrahedronSetTopologyContainer', name="topo", src="@meshLoader")
62-
liver.addObject('MechanicalObject', name="dofs", src="@meshLoader")
58+
liver.addObject('EulerImplicitSolver', name="integration_scheme", rayleighStiffness="0.1", rayleighMass="0.1")
59+
liver.addObject('CGLinearSolver', name="iterative_linear_solver", iterations="25", tolerance="1e-09", threshold="1e-09")
60+
liver.addObject('MeshGmshLoader', name="volume_mesh_loader", filename="mesh/liver.msh")
61+
liver.addObject('TetrahedronSetTopologyContainer', name="topo", src="@volume_mesh_loader")
62+
liver.addObject('MechanicalObject', name="dofs", src="@volume_mesh_loader")
6363
liver.addObject('TetrahedronSetGeometryAlgorithms', template="Vec3d", name="GeomAlgo")
6464
liver.addObject('DiagonalMass', name="Mass", massDensity="1.0")
6565
liver.addObject('TetrahedralCorotationalFEMForceField', template="Vec3d", name="FEM", method="large", poissonRatio="0.3", youngModulus="3000", computeGlobalMatrix="0")
6666
liver.addObject('FixedProjectiveConstraint', name="FixedConstraint", indices="3 39 64")
6767

6868
visu = liver.addChild('Visu')
69-
visu.addObject('OglModel', name="VisualModel", src="@../../LiverSurface")
69+
visu.addObject('OglModel', name="VisualModel", src="@../../surface_mesh_loader")
7070
visu.addObject('BarycentricMapping', name="VisualMapping", input="@../dofs", output="@VisualModel")
7171

7272
surf = liver.addChild('Surf')

0 commit comments

Comments
 (0)