diff --git a/bindings/Modules/tests/SofaConstraintSolver/matrix_access.py b/bindings/Modules/tests/SofaConstraintSolver/matrix_access.py index ba2b07a0a..037796fe3 100644 --- a/bindings/Modules/tests/SofaConstraintSolver/matrix_access.py +++ b/bindings/Modules/tests/SofaConstraintSolver/matrix_access.py @@ -39,7 +39,7 @@ def simulate_pendulum(self): ext.addObject("DistanceMapping", name="distanceMapping", topology="@../edge_container") ext.addObject("UniformConstraint", template="Vec1d", iterative=True) - Sofa.Simulation.init(root) + Sofa.Simulation.initRoot(root) Sofa.Simulation.animate(root, 0.0001) return root diff --git a/bindings/Modules/tests/SofaDeformable/SpringForceField.py b/bindings/Modules/tests/SofaDeformable/SpringForceField.py index 72d721b6a..052f335e5 100644 --- a/bindings/Modules/tests/SofaDeformable/SpringForceField.py +++ b/bindings/Modules/tests/SofaDeformable/SpringForceField.py @@ -38,7 +38,7 @@ class Test(unittest.TestCase): def setUp(self) -> None: self.root = Sofa.Core.Node() create_scene(self.root) - Sofa.Simulation.init(self.root) + Sofa.Simulation.initRoot(self.root) def tearDown(self) -> None: Sofa.Simulation.unload(self.root) diff --git a/bindings/Modules/tests/SofaLinearSolver/matrix_access.py b/bindings/Modules/tests/SofaLinearSolver/matrix_access.py index 5c8c54eeb..d69a0f9ce 100644 --- a/bindings/Modules/tests/SofaLinearSolver/matrix_access.py +++ b/bindings/Modules/tests/SofaLinearSolver/matrix_access.py @@ -26,7 +26,7 @@ def simulate_beam(self, linear_solver_template): root.addObject('FixedConstraint', indices="@box.indices") root.addObject('HexahedronFEMForceField', name="FEM", youngModulus="4000", poissonRatio="0.3", method="large") - Sofa.Simulation.init(root) + Sofa.Simulation.initRoot(root) Sofa.Simulation.animate(root, 0.0001) return root diff --git a/bindings/Sofa/package/__init__.py b/bindings/Sofa/package/__init__.py index 8486b4d3b..8926e8cee 100644 --- a/bindings/Sofa/package/__init__.py +++ b/bindings/Sofa/package/__init__.py @@ -13,7 +13,7 @@ n.addChild("Node2") n.addObject("MechanicalObject", name="dofs") - Sofa.Simulation.init(n) + Sofa.Simulation.initRoot(n) Sofa.Simulation.print(n) """ diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Node_doc.h b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Node_doc.h index 4caeb56c6..12761f47f 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Node_doc.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Node_doc.h @@ -48,7 +48,7 @@ static auto Class = # Add a mechanical component to MyNode n.addObject("MechanicalObject", name="dofs") - Sofa.Simulation.init(root) + Sofa.Simulation.initRoot(root) Sofa.Simulation.print(root) The child nodes, components and parents can be accessed using generator attributes. diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Core/Submodule_Core.cpp b/bindings/Sofa/src/SofaPython3/Sofa/Core/Submodule_Core.cpp index 3e4612864..f56b278ea 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Core/Submodule_Core.cpp +++ b/bindings/Sofa/src/SofaPython3/Sofa/Core/Submodule_Core.cpp @@ -100,7 +100,7 @@ PYBIND11_MODULE(Core, core) # Add a mechanical component to MyNode n.addObject("MechanicalObject", name="dofs") - Sofa.Simulation.init(root) + Sofa.Simulation.initRoot(root) Sofa.Simulation.print(root) )doc"; diff --git a/bindings/Sofa/src/SofaPython3/Sofa/Simulation/Submodule_Simulation_doc.h b/bindings/Sofa/src/SofaPython3/Sofa/Simulation/Submodule_Simulation_doc.h index d03d9d3f2..8d5839f05 100644 --- a/bindings/Sofa/src/SofaPython3/Sofa/Simulation/Submodule_Simulation_doc.h +++ b/bindings/Sofa/src/SofaPython3/Sofa/Simulation/Submodule_Simulation_doc.h @@ -37,7 +37,7 @@ static auto Class = SofaRuntime.importPlugin("SofaComponentAll") n = Sofa.Core.Node("MyNode") - Sofa.Simulation.init(n) + Sofa.Simulation.initRoot(n) Sofa.Simulation.print(n) )"; static auto print = diff --git a/bindings/Sofa/tests/Core/BaseData.py b/bindings/Sofa/tests/Core/BaseData.py index e4b1e418f..bd3cdf0f5 100644 --- a/bindings/Sofa/tests/Core/BaseData.py +++ b/bindings/Sofa/tests/Core/BaseData.py @@ -255,7 +255,7 @@ def test_DataAsContainerNumpyArray_testIsDirtyOnDoubleAccess_(self): root.addObject("PointSetTopologyContainer", points=[[0, 0, 0], [1, 0, 0]]) modifier = root.addObject("PointSetTopologyModifier") mo = root.addObject("MechanicalObject") - Sofa.Simulation.init(root) + Sofa.Simulation.initRoot(root) modifier.addPoints(10, True) self.assertEqual(len(mo.position), 12) @@ -269,7 +269,7 @@ def test_DataAsContainerNumpyArray_testIsDirtyOnDoubleWriteAccess_(self): root.addObject("PointSetTopologyContainer", points=[[0, 0, 0], [1, 0, 0]]) modifier = root.addObject("PointSetTopologyModifier") mo = root.addObject("MechanicalObject") - Sofa.Simulation.init(root) + Sofa.Simulation.initRoot(root) modifier.addPoints(10, True) with mo.position.writeable() as w: @@ -283,7 +283,7 @@ def test_DataAsContainerNumpyArray_(self): root = create_scene("rootNode") v = numpy.array([[0, 0, 0], [1, 1, 1], [2, 2, 2], [3, 3, 3]]) c = root.addObject("MechanicalObject", name="t", position=v.tolist()) - Sofa.Simulation.init(root) + Sofa.Simulation.initRoot(root) numpy.testing.assert_array_equal(c.position.array(), v) diff --git a/bindings/Sofa/tests/Core/Controller.py b/bindings/Sofa/tests/Core/Controller.py index 2ab698434..a9c09625b 100644 --- a/bindings/Sofa/tests/Core/Controller.py +++ b/bindings/Sofa/tests/Core/Controller.py @@ -77,7 +77,7 @@ def test_events(self): self.assertTrue( hasattr(controller, "iterations") ) - Sofa.Simulation.init(node) + Sofa.Simulation.initRoot(node) for i in range(10): Sofa.Simulation.animate(node, 0.01) diff --git a/bindings/Sofa/tests/Core/Events.py b/bindings/Sofa/tests/Core/Events.py index 53456aa16..2281f0280 100644 --- a/bindings/Sofa/tests/Core/Events.py +++ b/bindings/Sofa/tests/Core/Events.py @@ -45,7 +45,7 @@ def test_events(self): node.addObject("BlockGaussSeidelConstraintSolver", name="constraintSolver") controller = node.addObject( MyController() ) - Sofa.Simulation.init(node) + Sofa.Simulation.initRoot(node) for i in range(10): Sofa.Simulation.animate(node, 0.01) diff --git a/bindings/Sofa/tests/Core/ForceField.py b/bindings/Sofa/tests/Core/ForceField.py index 0eed00686..da429b64c 100644 --- a/bindings/Sofa/tests/Core/ForceField.py +++ b/bindings/Sofa/tests/Core/ForceField.py @@ -67,7 +67,7 @@ def test_0_explicit(self): use_iterative_solver=False) # do some steps here - Sofa.Simulation.init(root) + Sofa.Simulation.initRoot(root) for i in range(0, 100): Sofa.Simulation.animate(root, root.dt.value) @@ -80,7 +80,7 @@ def test_1_implicit_iterative(self): root = rssffScene(use_implicit_scheme=True, use_iterative_solver=True) # do some steps here - Sofa.Simulation.init(root) + Sofa.Simulation.initRoot(root) for i in range(0, 100): Sofa.Simulation.animate(root, root.dt.value) @@ -93,7 +93,7 @@ def test_2_implicit_direct(self): root = rssffScene(use_implicit_scheme=True, use_iterative_solver=False) # do some steps here - Sofa.Simulation.init(root) + Sofa.Simulation.initRoot(root) for i in range(0, 100): Sofa.Simulation.animate(root, root.dt.value) @@ -127,7 +127,7 @@ def simulate_beam(linear_solver_template): root.addObject('FixedConstraint', indices="@box.indices") root.addObject('HexahedronFEMForceField', name="FEM", youngModulus="4000", poissonRatio="0.3", method="large") - Sofa.Simulation.init(root) + Sofa.Simulation.initRoot(root) Sofa.Simulation.animate(root, 0.0001) return root diff --git a/bindings/Sofa/tests/Core/Mass.py b/bindings/Sofa/tests/Core/Mass.py index b5ed4cdea..5de8bb5a3 100644 --- a/bindings/Sofa/tests/Core/Mass.py +++ b/bindings/Sofa/tests/Core/Mass.py @@ -34,7 +34,7 @@ def simulate_beam(linear_solver_template): root.addObject('FixedConstraint', indices="@box.indices") root.addObject('HexahedronFEMForceField', name="FEM", youngModulus="4000", poissonRatio="0.3", method="large") - Sofa.Simulation.init(root) + Sofa.Simulation.initRoot(root) Sofa.Simulation.animate(root, 0.0001) return root diff --git a/docs/sphinx/source/content/UsingThePlugin.rst b/docs/sphinx/source/content/UsingThePlugin.rst index 0f1492d71..ae6416ef2 100644 --- a/docs/sphinx/source/content/UsingThePlugin.rst +++ b/docs/sphinx/source/content/UsingThePlugin.rst @@ -188,7 +188,7 @@ Within a python3 interpreter, your simulation requires more than only the ``crea createScene(root) # Once defined, initialization of the scene graph - Sofa.Simulation.init(root) + Sofa.Simulation.initRoot(root) # Run as many simulation steps (here 10 steps are computed) for iteration in range(10): @@ -219,7 +219,7 @@ By structuring your scripts this way, you get the advantage to have a script loa createScene(root) # Once defined, initialization of the scene graph - Sofa.Simulation.init(root) + Sofa.Simulation.initRoot(root) # Launch the GUI (imgui is now by default, to use Qt please refer to the example "basic-useQtGui.py") import SofaImGui @@ -429,7 +429,7 @@ Here is the entire code of the scene : createScene(root) # Once defined, initialization of the scene graph - Sofa.Simulation.init(root) + Sofa.Simulation.initRoot(root) # Launch the GUI (imgui is now by default, to use Qt please refer to the example "basic-useQtGui.py") Sofa.Gui.GUIManager.Init("myscene", "imgui") @@ -596,7 +596,7 @@ In the same way, Data can be modified (write access) using the ``.value`` access createScene(root) # Once defined, initialization of the scene graph - Sofa.Simulation.init(root) + Sofa.Simulation.initRoot(root) # Run the simulation for 10 steps for iteration in range(10): diff --git a/examples/access_energy.py b/examples/access_energy.py index 56b2cf910..07fe88e8d 100644 --- a/examples/access_energy.py +++ b/examples/access_energy.py @@ -82,7 +82,7 @@ def main(): mu = .1 root = Sofa.Core.Node("root") createScene(root, dt=1e-4, m=m, g=g, mu=mu, L=1000) - Sofa.Simulation.init(root) + Sofa.Simulation.initRoot(root) Sofa.Simulation.animate(root, root.dt.value) Ks, Us = [], []