sofa-framework · damienmarchal · Aug 25, 2026 · Aug 25, 2026 · Aug 26, 2026 · Aug 26, 2026
diff --git a/Sofa/Component/Collision/Detection/Algorithm/tests/CollisionPipeline_test.cpp b/Sofa/Component/Collision/Detection/Algorithm/tests/CollisionPipeline_test.cpp
@@ -34,9 +34,6 @@ using sofa::core::objectmodel::BaseComponent ;
 #include <sofa/component/collision/detection/algorithm/CollisionPipeline.h>
 using sofa::component::collision::detection::algorithm::CollisionPipeline ;
 
-#include <sofa/simulation/graph/DAGSimulation.h>
-using sofa::simulation::graph::DAGSimulation ;
-
 #include <sofa/simulation/Node.h>
 using sofa::simulation::Node ;
 

diff --git a/Sofa/Component/Collision/Detection/Intersection/tests/LocalMinDistance_test.cpp b/Sofa/Component/Collision/Detection/Intersection/tests/LocalMinDistance_test.cpp
@@ -29,8 +29,8 @@ using std::string;
 #include <sofa/testing/BaseSimulationTest.h>
 using sofa::testing::BaseSimulationTest;
 
-#include <sofa/simulation/graph/DAGSimulation.h>
-using sofa::simulation::graph::DAGSimulation ;
+#include <sofa/simulation/Simulation.h>
+using sofa::simulation::Simulation ;
 using sofa::simulation::Node ;
 
 #include <sofa/simulation/common/SceneLoaderXML.h>
@@ -73,7 +73,7 @@ void TestLocalMinDistance::checkBasicIntersectionTests()
 {
     ExpectMessage warning(Message::Warning) ;
 
-    assert(sofa::simulation::getSimulation());
+    assert(sofa::simulation::MainSimulation::getSimulation());
 
     std::stringstream scene ;
     scene << "<?xml version='1.0'?>                                                          \n"
@@ -102,7 +102,7 @@ void TestLocalMinDistance::checkMissingRequiredAttributes()
 {
     ExpectMessage warning(Message::Warning) ;
 
-    assert(sofa::simulation::getSimulation());
+    assert(sofa::simulation::MainSimulation::getSimulation());
 
     std::stringstream scene ;
     scene << "<?xml version='1.0'?>                                                          \n"
@@ -125,7 +125,7 @@ void TestLocalMinDistance::checkMissingRequiredAttributes()
 
 void TestLocalMinDistance::checkAttributes()
 {
-    assert(sofa::simulation::getSimulation());
+    assert(sofa::simulation::MainSimulation::getSimulation());
 
     std::stringstream scene ;
     scene << "<?xml version='1.0'?>                                                          \n"
@@ -158,7 +158,7 @@ void TestLocalMinDistance::checkAttributes()
 
 void TestLocalMinDistance::checkDoubleInit()
 {
-    assert(sofa::simulation::getSimulation());
+    assert(sofa::simulation::MainSimulation::getSimulation());
 
     std::stringstream scene ;
     scene << "<?xml version='1.0'?>                                                          \n"
@@ -186,7 +186,7 @@ void TestLocalMinDistance::checkDoubleInit()
 
 void TestLocalMinDistance::checkInitReinit()
 {
-    assert(sofa::simulation::getSimulation());
+    assert(sofa::simulation::MainSimulation::getSimulation());
 
     std::stringstream scene ;
     scene << "<?xml version='1.0'?>                                                          \n"

diff --git a/...onent/Constraint/Lagrangian/Model/tests/BilateralInteractionLagrangianConstraint_test.cpp b/...onent/Constraint/Lagrangian/Model/tests/BilateralInteractionLagrangianConstraint_test.cpp
@@ -20,7 +20,6 @@
 * Contact information: contact@sofa-framework.org                             *
 ******************************************************************************/
 
-#include <SofaSimulationGraph/DAGSimulation.h>
 #include <sofa/defaulttype/VecTypes.h>
 #include <SofaBaseTopology/PointSetTopologyContainer.h>
 #include <SofaConstraint/BilateralInteractionLangrangianConstraint.h>
@@ -74,7 +73,7 @@ struct BilateralInteractionLangrangianConstraint_test : public NumericTest<>
         sofa::simpleapi::importPlugin("Sofa.Component.Collision.Detection.Intersection");
         sofa::simpleapi::importPlugin("Sofa.Component.Collision.Response.Contact");
         sofa::simpleapi::importPlugin("Sofa.GL.Component.Rendering3D");
-        assert(sofa::simulation::getSimulation());
+        assert(sofa::simulation::MainSimulation::getSimulation());
     }
 
     void TearDown() override
@@ -180,7 +179,7 @@ void BilateralInteractionLangrangianConstraint_test<Vec3Types>::init_Vec3Setup()
     // a scene independently of the data template to use.
     std::string sceneName = "BilateralInteractionLangrangianConstraint.scn";
     std::string fileName  = std::string(SOFATEST_SCENES_DIR) + "/" + sceneName;
-    root = sofa::simulation::getSimulation()->load(fileName.c_str()).get();
+    root = sofa::simulation::MainSimulation::getSimulation()->load(fileName.c_str()).get();
 
     //TODO(dmarchal): I'm very surprised that scene.loadSucceed could contain
     // a state about the load results that happens "before" maybe a side effect
@@ -196,7 +195,7 @@ void BilateralInteractionLangrangianConstraint_test<Vec3Types>::init_Vec3Setup()
 
 
     /// Init
-    sofa::simulation::getSimulation()->init(root.get());
+    sofa::simulation::MainSimulation::getSimulation()->init(root.get());
 }
 
 template<>
@@ -214,7 +213,7 @@ bool BilateralInteractionLangrangianConstraint_test<Vec3Types>::test_Vec3Constra
     }
 
     for(int i=0; i<10; i++)
-        sofa::simulation::getSimulation()->animate(root.get(),(double)0.001);
+        sofa::simulation::MainSimulation::getSimulation()->animate(root.get(),(double)0.001);
 
     if(meca.size()==2)
     {

diff --git a/Sofa/Component/Constraint/Projective/tests/AffineMovementProjectiveConstraint_test.cpp b/Sofa/Component/Constraint/Projective/tests/AffineMovementProjectiveConstraint_test.cpp
@@ -24,7 +24,6 @@ using sofa::testing::BaseSimulationTest;
 #include <sofa/testing/NumericTest.h>
 using sofa::testing::NumericTest;
 
-#include <sofa/simulation/graph/DAGSimulation.h>
 #include <sofa/component/statecontainer/MechanicalObject.h>
 #include <sofa/component/solidmechanics/spring/MeshSpringForceField.h>
 #include <sofa/component/constraint/projective/AffineMovementProjectiveConstraint.h>
@@ -73,9 +72,9 @@ struct AffineMovementProjectiveConstraint_test : public BaseSimulationTest, Nume
      void doSetUp() override
      {
          // Init simulation
-         simulation = sofa::simulation::getSimulation();
+         simulation = sofa::simulation::MainSimulation::getSimulation();
 
-         root = simulation::getSimulation()->createNewGraph("root");
+         root = simulation::MainSimulation::getSimulation()->createNewGraph("root");
 
          // Init seed with a random value between 0 and 100
          randomGenerator.initSeed( (long)time(0) );

diff --git a/Sofa/Component/Constraint/Projective/tests/DirectionProjectiveConstraint_test.cpp b/Sofa/Component/Constraint/Projective/tests/DirectionProjectiveConstraint_test.cpp
@@ -24,7 +24,6 @@ using sofa::testing::BaseSimulationTest;
 #include <sofa/testing/NumericTest.h>
 using sofa::testing::NumericTest;
 
-#include <sofa/simulation/graph/DAGSimulation.h>
 #include <sofa/defaulttype/VecTypes.h>
 #include <sofa/component/topology/container/dynamic/PointSetTopologyContainer.h>
 #include <sofa/component/constraint/projective/DirectionProjectiveConstraint.h>
@@ -72,7 +71,7 @@ struct DirectionProjectiveConstraint_test : public BaseSimulationTest, NumericTe
     void doSetUp() override
     {
         //Init
-        simulation = sofa::simulation::getSimulation();
+        simulation = sofa::simulation::MainSimulation::getSimulation();
         ASSERT_NE(simulation, nullptr);
 
         /// Create the scene

diff --git a/Sofa/Component/Constraint/Projective/tests/FixedPlaneProjectiveConstraint_test.cpp b/Sofa/Component/Constraint/Projective/tests/FixedPlaneProjectiveConstraint_test.cpp
@@ -26,7 +26,6 @@ using sofa::testing::BaseSimulationTest;
 #include <sofa/component/constraint/projective/FixedPlaneProjectiveConstraint.h>
 #include <sofa/defaulttype/VecTypes.h>
 #include <sofa/simulation/Simulation.h>
-#include <sofa/simulation/graph/DAGSimulation.h>
 #include <sofa/simulation/Node.h>
 #include <sofa/component/statecontainer/MechanicalObject.h>
 #include <sofa/component/mass/UniformMass.h>
@@ -69,7 +68,7 @@ struct FixedPlaneProjectiveConstraint_test : public BaseSimulationTest
 
         /// Scene initialization
         sofa::simulation::Simulation* simulation;
-        simulation = sofa::simulation::getSimulation();
+        simulation = sofa::simulation::MainSimulation::getSimulation();
         simulation::Node::SPtr root = simulation->createNewGraph("root");
         root->setGravity( type::Vec3(0,0,0) );
 

diff --git a/Sofa/Component/Constraint/Projective/tests/FixedProjectiveConstraint_test.cpp b/Sofa/Component/Constraint/Projective/tests/FixedProjectiveConstraint_test.cpp
@@ -23,7 +23,6 @@
 #include <sofa/component/constraint/projective/FixedProjectiveConstraint.h>
 #include <sofa/defaulttype/VecTypes.h>
 #include <sofa/simulation/Simulation.h>
-#include <sofa/simulation/graph/DAGSimulation.h>
 #include <sofa/simulation/Node.h>
 #include <sofa/component/statecontainer/MechanicalObject.h>
 #include <sofa/component/mass/UniformMass.h>
@@ -69,7 +68,7 @@ struct FixedProjectiveConstraint_test : public BaseTest
     {
         //Init
 
-        simulation::Simulation* simulation = sofa::simulation::getSimulation();
+        simulation::Simulation* simulation = sofa::simulation::MainSimulation::getSimulation();
         assert(simulation);
 
         Coord initCoord1, initCoord2;
@@ -151,7 +150,7 @@ struct FixedProjectiveConstraint_test : public BaseTest
 
     bool testTopologicalChanges()
     {
-        simulation::Simulation* simulation = sofa::simulation::getSimulation();
+        simulation::Simulation* simulation = sofa::simulation::MainSimulation::getSimulation();
         assert(simulation);
 
         /// Scene creation

diff --git a/Sofa/Component/Constraint/Projective/tests/LineProjectiveConstraint_test.cpp b/Sofa/Component/Constraint/Projective/tests/LineProjectiveConstraint_test.cpp
@@ -24,7 +24,6 @@ using sofa::testing::BaseSimulationTest;
 #include <sofa/testing/NumericTest.h>
 using sofa::testing::NumericTest;
 
-#include <sofa/simulation/graph/DAGSimulation.h>
 #include <sofa/defaulttype/VecTypes.h>
 #include <sofa/component/topology/container/dynamic/PointSetTopologyContainer.h>
 #include <sofa/component/constraint/projective/LineProjectiveConstraint.h>
@@ -70,7 +69,7 @@ struct LineProjectiveConstraint_test : public BaseSimulationTest, NumericTest<ty
     /// Create the context for the tests.
     void doSetUp() override
     {
-        simulation = sofa::simulation::getSimulation();
+        simulation = sofa::simulation::MainSimulation::getSimulation();
         ASSERT_NE(simulation, nullptr);
 
         /// Create the scene

diff --git a/Sofa/Component/Constraint/Projective/tests/PartialFixedProjectiveConstraint_test.cpp b/Sofa/Component/Constraint/Projective/tests/PartialFixedProjectiveConstraint_test.cpp
@@ -25,7 +25,6 @@ using sofa::testing::BaseSimulationTest;
 #include <sofa/component/constraint/projective/PartialFixedProjectiveConstraint.h>
 #include <sofa/defaulttype/VecTypes.h>
 #include <sofa/simulation/Simulation.h>
-#include <sofa/simulation/graph/DAGSimulation.h>
 #include <sofa/simulation/Node.h>
 #include <sofa/component/statecontainer/MechanicalObject.h>
 #include <sofa/component/mass/UniformMass.h>
@@ -67,7 +66,7 @@ struct PartialFixedProjectiveConstraint_test : public BaseSimulationTest
         typename sofa::component::statecontainer::MechanicalObject<DataTypes>::SPtr  mstate;
 
         /// Scene initialization
-        sofa::simulation::Simulation* simulation = sofa::simulation::getSimulation();
+        sofa::simulation::Simulation* simulation = sofa::simulation::MainSimulation::getSimulation();
         assert(simulation);
         const simulation::Node::SPtr root = simulation->createNewGraph("root");
 

diff --git a/Sofa/Component/Constraint/Projective/tests/PlaneProjectiveConstraint_test.cpp b/Sofa/Component/Constraint/Projective/tests/PlaneProjectiveConstraint_test.cpp
@@ -24,7 +24,6 @@ using sofa::testing::BaseSimulationTest;
 #include <sofa/testing/NumericTest.h>
 using sofa::testing::NumericTest;
 
-#include <sofa/simulation/graph/DAGSimulation.h>
 #include <sofa/defaulttype/VecTypes.h>
 #include <sofa/component/topology/container/dynamic/PointSetTopologyContainer.h>
 #include <sofa/component/constraint/projective/PlaneProjectiveConstraint.h>
@@ -71,7 +70,7 @@ struct PlaneProjectiveConstraint_test : public BaseSimulationTest, NumericTest<t
     /// Create the context for the matrix tests.
     void doSetUp() override
     {
-        simulation = sofa::simulation::getSimulation();
+        simulation = sofa::simulation::MainSimulation::getSimulation();
         ASSERT_NE(simulation, nullptr);
 
         /// Create the scene

diff --git a/Sofa/Component/Constraint/Projective/tests/PointProjectiveConstraint_test.cpp b/Sofa/Component/Constraint/Projective/tests/PointProjectiveConstraint_test.cpp
@@ -24,7 +24,6 @@ using sofa::testing::BaseSimulationTest;
 #include <sofa/testing/NumericTest.h>
 using sofa::testing::NumericTest;
 
-#include <sofa/simulation/graph/DAGSimulation.h>
 #include <sofa/defaulttype/VecTypes.h>
 #include <sofa/component/topology/container/dynamic/PointSetTopologyContainer.h>
 #include <sofa/component/constraint/projective/PointProjectiveConstraint.h>
@@ -71,7 +70,7 @@ struct PointProjectiveConstraint_test : public BaseSimulationTest, NumericTest<t
     /// Create the context for the tests.
     void doSetUp() override
     {
-        simulation = sofa::simulation::getSimulation();
+        simulation = sofa::simulation::MainSimulation::getSimulation();
         ASSERT_NE(simulation, nullptr);
 
         /// Create the scene

diff --git a/Sofa/Component/Diffusion/tests/TetrahedronDiffusionFEMForceField_test.cpp b/Sofa/Component/Diffusion/tests/TetrahedronDiffusionFEMForceField_test.cpp
@@ -22,8 +22,6 @@
 #include <sofa/testing/BaseSimulationTest.h>
 using sofa::testing::BaseSimulationTest;
 
-#include <sofa/simulation/graph/DAGSimulation.h>
-
 #include <sofa/component/statecontainer/MechanicalObject.h>
 #include <sofa/component/topology/container/grid/RegularGridTopology.h>
 #include <sofa/component/diffusion/TetrahedronDiffusionFEMForceField.h>
@@ -100,7 +98,7 @@ struct TetrahedronDiffusionFEMForceField_test : public BaseSimulationTest
         timeStep = 0.0001;
         idMiddlePoint = 1270;
 
-        simulation::Simulation* simu = sofa::simulation::getSimulation();
+        simulation::Simulation* simu = sofa::simulation::MainSimulation::getSimulation();
         assert(simu);
 
         /// Load the scene

diff --git a/Sofa/Component/Engine/Analyze/tests/AverageCoord_test.cpp b/Sofa/Component/Engine/Analyze/tests/AverageCoord_test.cpp
@@ -27,12 +27,11 @@ using sofa::testing::BaseSimulationTest;
 #include <sofa/component/statecontainer/MechanicalObject.h>
 using sofa::component::statecontainer::MechanicalObject ;
 
-#include <sofa/simulation/graph/DAGSimulation.h>
+#include <sofa/simulation/Simulation.h>
 using sofa::simulation::Simulation ;
 using sofa::simulation::Node ;
 using sofa::core::objectmodel::New ;
 using sofa::core::objectmodel::BaseData ;
-using sofa::simulation::graph::DAGSimulation;
 
 #include <sofa/component/engine/analyze/AverageCoord.h>
 using sofa::component::engine::analyze::AverageCoord ;
@@ -59,7 +58,7 @@ struct AverageCoord_test : public BaseSimulationTest,
 
     void doSetUp() override
     {
-        m_simu = sofa::simulation::getSimulation();
+        m_simu = sofa::simulation::MainSimulation::getSimulation();
         ASSERT_NE(m_simu, nullptr);
 
         m_node = m_simu->createNewGraph("root");

diff --git a/Sofa/Component/Engine/Analyze/tests/ClusteringEngine_test.cpp b/Sofa/Component/Engine/Analyze/tests/ClusteringEngine_test.cpp
@@ -26,12 +26,10 @@ using sofa::testing::BaseSimulationTest;
 #include <sofa/component/statecontainer/MechanicalObject.h>
 using sofa::component::statecontainer::MechanicalObject ;
 
-#include <sofa/simulation/graph/DAGSimulation.h>
 using sofa::simulation::Simulation ;
 using sofa::simulation::Node ;
 using sofa::core::objectmodel::New ;
 using sofa::core::objectmodel::BaseData ;
-using sofa::simulation::graph::DAGSimulation;
 
 #include <sofa/core/visual/VisualParams.h>
 using sofa::core::visual::VisualParams;
@@ -59,7 +57,7 @@ struct ClusteringEngine_test : public BaseSimulationTest,
 
     void doSetUp() override
     {
-        m_simu = sofa::simulation::getSimulation();
+        m_simu = sofa::simulation::MainSimulation::getSimulation();
         ASSERT_NE(m_simu, nullptr);
 
         m_node = m_simu->createNewGraph("root");

diff --git a/Sofa/Component/Engine/Generate/tests/ExtrudeEdgesAndGenerateQuads_test.cpp b/Sofa/Component/Engine/Generate/tests/ExtrudeEdgesAndGenerateQuads_test.cpp
@@ -25,12 +25,11 @@ using sofa::testing::BaseSimulationTest;
 
 #include <sofa/helper/BackTrace.h>
 
-#include <sofa/simulation/graph/DAGSimulation.h>
+#include <sofa/simulation/Simulation.h>
 using sofa::simulation::Simulation ;
 using sofa::simulation::Node ;
 using sofa::core::objectmodel::New ;
 using sofa::core::objectmodel::BaseData ;
-using sofa::simulation::graph::DAGSimulation;
 
 #include <sofa/component/engine/generate/ExtrudeEdgesAndGenerateQuads.h>
 using sofa::component::engine::generate::ExtrudeEdgesAndGenerateQuads ;
@@ -57,7 +56,7 @@ struct ExtrudeEdgesAndGenerateQuads_test : public BaseSimulationTest,
 
     void doSetUp() override
     {
-        m_simu = sofa::simulation::getSimulation();
+        m_simu = sofa::simulation::MainSimulation::getSimulation();
         ASSERT_NE(m_simu, nullptr);
 
         m_node = m_simu->createNewGraph("root");

diff --git a/Sofa/Component/Engine/Generate/tests/MergePoints_test.cpp b/Sofa/Component/Engine/Generate/tests/MergePoints_test.cpp
@@ -22,8 +22,7 @@
 #include <sofa/testing/BaseSimulationTest.h>
 using sofa::testing::BaseSimulationTest;
 
-#include <sofa/simulation/graph/DAGSimulation.h>
-using sofa::simulation::graph::DAGSimulation;
+#include <sofa/simulation/Simulation.h>
 using sofa::simulation::Simulation ;
 using sofa::core::objectmodel::New ;
 
@@ -51,7 +50,7 @@ struct MergePoints_test : public BaseSimulationTest,
 
     void doSetUp() override
     {
-        m_simu = sofa::simulation::getSimulation();
+        m_simu = sofa::simulation::MainSimulation::getSimulation();
         ASSERT_NE(m_simu, nullptr);
 
         m_thisObject = New<ThisClass >();

diff --git a/Sofa/Component/Engine/Generate/tests/VolumeFromTriangles_test.cpp b/Sofa/Component/Engine/Generate/tests/VolumeFromTriangles_test.cpp
@@ -40,7 +40,7 @@ using sofa::defaulttype::Vec3Types ;
 #include <sofa/simulation/common/SceneLoaderXML.h>
 using sofa::simulation::SceneLoaderXML ;
 
-#include <sofa/simulation/graph/DAGSimulation.h>
+#include <sofa/simulation/Simulation.h>
 using sofa::simulation::Simulation ;
 #include <sofa/simulation/Node.h>
 using sofa::simulation::Node ;
@@ -84,7 +84,7 @@ struct VolumeFromTrianglesTest : public sofa::testing::BaseTest, VolumeFromTrian
 
     void normalTests()
     {
-        Node::SPtr node = sofa::simulation::getSimulation()->createNewGraph("root");
+        Node::SPtr node = sofa::simulation::MainSimulation::getSimulation()->createNewGraph("root");
         typename MechanicalObject<DataTypes>::SPtr mecaobject = New<MechanicalObject<DataTypes> >() ;
         typename ThisClass::SPtr thisobject = New<ThisClass >() ;
         mecaobject->init() ;
@@ -119,7 +119,7 @@ struct VolumeFromTrianglesTest : public sofa::testing::BaseTest, VolumeFromTrian
 
     double volumeComputationTest()
     {
-        Node::SPtr node = sofa::simulation::getSimulation()->createNewGraph("root");
+        Node::SPtr node = sofa::simulation::MainSimulation::getSimulation()->createNewGraph("root");
 
         typename MeshTopology::SPtr                mesh       = New< MeshTopology >() ;
         typename MechanicalObject<DataTypes>::SPtr mecaobject = New< MechanicalObject<DataTypes> >() ;