diff --git a/examples/SofaUnitsExample.py b/examples/SofaUnitsExample.py index f0a1fc56..8e85cc0b 100644 --- a/examples/SofaUnitsExample.py +++ b/examples/SofaUnitsExample.py @@ -57,14 +57,14 @@ def createScene(root): root.addObject('VisualStyle', displayFlags="showCollisionModels") - root.addObject('MeshOBJLoader', name="LiverSurface", filename="mesh/liver-smooth.obj") + root.addObject('MeshOBJLoader', name="surface_mesh_loader", filename="mesh/liver-smooth.obj") liver = root.addChild('Liver') - liver.addObject('EulerImplicitSolver', name="cg_odesolver") - liver.addObject('CGLinearSolver', name="linear_solver", iterations= 25, tolerance= scene_unit(1e-9, m**2) , threshold= scene_unit(1e-9, m**2) ) - liver.addObject('MeshGmshLoader', name="meshLoader", filename="mesh/liver.msh") - liver.addObject('TetrahedronSetTopologyContainer', name="topo", src="@meshLoader") - liver.addObject('MechanicalObject', name="dofs", src="@meshLoader") + liver.addObject('EulerImplicitSolver', name="integration_scheme") + liver.addObject('CGLinearSolver', name="iterative_linear_solver", iterations= 25, tolerance= scene_unit(1e-9, m**2) , threshold= scene_unit(1e-9, m**2) ) + liver.addObject('MeshGmshLoader', name="volume_mesh_loader", filename="mesh/liver.msh") + liver.addObject('TetrahedronSetTopologyContainer', name="topo", src="@volume_mesh_loader") + liver.addObject('MechanicalObject', name="dofs", src="@volume_mesh_loader") liver.addObject('TetrahedronSetGeometryAlgorithms', template="Vec3d", name="GeomAlgo") # You can create values that have a dimension by multiplying a float/int by a unit @@ -86,7 +86,7 @@ def createScene(root): liver.addObject('RestShapeSpringsForceField', name="WeakConstraint", points=[3, 39, 64], stiffness=scene_unit(stiffness)) visu = liver.addChild('Visu') - visu.addObject('OglModel', name="VisualModel", src="@../../LiverSurface") + visu.addObject('OglModel', name="VisualModel", src="@../../surface_mesh_loader") visu.addObject('BarycentricMapping', name="VisualMapping", input="@../dofs", output="@VisualModel") return root diff --git a/examples/liver.py b/examples/liver.py index 0acb3fed..cc274ffe 100644 --- a/examples/liver.py +++ b/examples/liver.py @@ -52,21 +52,21 @@ def createScene(root): root.addObject('CollisionResponse', name="CollisionResponse", response="PenalityContactForceField") root.addObject('DiscreteIntersection') - root.addObject('MeshOBJLoader', name="LiverSurface", filename="mesh/liver-smooth.obj") + root.addObject('MeshOBJLoader', name="surface_mesh_loader", filename="mesh/liver-smooth.obj") liver = root.addChild('Liver') - liver.addObject('EulerImplicitSolver', name="cg_odesolver", rayleighStiffness="0.1", rayleighMass="0.1") - liver.addObject('CGLinearSolver', name="linear_solver", iterations="25", tolerance="1e-09", threshold="1e-09") - liver.addObject('MeshGmshLoader', name="meshLoader", filename="mesh/liver.msh") - liver.addObject('TetrahedronSetTopologyContainer', name="topo", src="@meshLoader") - liver.addObject('MechanicalObject', name="dofs", src="@meshLoader") + liver.addObject('EulerImplicitSolver', name="integration_scheme", rayleighStiffness="0.1", rayleighMass="0.1") + liver.addObject('CGLinearSolver', name="iterative_linear_solver", iterations="25", tolerance="1e-09", threshold="1e-09") + liver.addObject('MeshGmshLoader', name="volume_mesh_loader", filename="mesh/liver.msh") + liver.addObject('TetrahedronSetTopologyContainer', name="topo", src="@volume_mesh_loader") + liver.addObject('MechanicalObject', name="dofs", src="@volume_mesh_loader") liver.addObject('TetrahedronSetGeometryAlgorithms', template="Vec3d", name="GeomAlgo") liver.addObject('DiagonalMass', name="Mass", massDensity="1.0") liver.addObject('TetrahedralCorotationalFEMForceField', template="Vec3d", name="FEM", method="large", poissonRatio="0.3", youngModulus="3000", computeGlobalMatrix="0") liver.addObject('FixedProjectiveConstraint', name="FixedConstraint", indices="3 39 64") visu = liver.addChild('Visu') - visu.addObject('OglModel', name="VisualModel", src="@../../LiverSurface") + visu.addObject('OglModel', name="VisualModel", src="@../../surface_mesh_loader") visu.addObject('BarycentricMapping', name="VisualMapping", input="@../dofs", output="@VisualModel") surf = liver.addChild('Surf')