change ownership of d_multithreading

Author: bakpaul

Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/BuiltConstraintSolver.cpp

@@ -28,6 +28,18 @@
 
 namespace sofa::component::constraint::lagrangian::solver
 {
+BuiltConstraintSolver::BuiltConstraintSolver()
+: d_multithreading(initData(&d_multithreading, false, "multithreading", "Build compliances concurrently"))
+{}
+
+void BuiltConstraintSolver::init()
+{
+    Inherit1::init();
+    if(d_multithreading.getValue())
+    {
+        simulation::MainTaskSchedulerFactory::createInRegistry()->init();
+    }
+}
 
 void BuiltConstraintSolver::doBuildSystem( const core::ConstraintParams *cParams, unsigned int numConstraints)
 {

Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/BuiltConstraintSolver.h

@@ -37,10 +37,12 @@ class SOFA_COMPONENT_CONSTRAINT_LAGRANGIAN_SOLVER_API BuiltConstraintSolver : pu
 
 public:
     SOFA_CLASS(BuiltConstraintSolver, GenericConstraintSolver);
+    Data<bool> d_multithreading; ///< Build compliances concurrently
 
-
+    BuiltConstraintSolver();
     virtual void doBuildSystem( const core::ConstraintParams *cParams, unsigned int numConstraints) override;
 
+    virtual void init() override;
 private:
 
     struct ComplianceWrapper

Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/GenericConstraintSolver.cpp

@@ -70,7 +70,6 @@ GenericConstraintSolver::GenericConstraintSolver()
     , d_regularizationTerm(initData(&d_regularizationTerm, 0.0_sreal, "regularizationTerm", "Add regularization factor times the identity matrix to the compliance W when solving constraints"))
     , d_scaleTolerance(initData(&d_scaleTolerance, true, "scaleTolerance", "Scale the error tolerance with the number of constraints"))
     , d_allVerified(initData(&d_allVerified, false, "allVerified", "All constraints must be verified (each constraint's error < tolerance)"))
-    , d_multithreading(initData(&d_multithreading, false, "multithreading", "Build compliances concurrently"))
     , d_computeGraphs(initData(&d_computeGraphs, false, "computeGraphs", "Compute graphs of errors and forces during resolution"))
     , d_graphErrors(initData(&d_graphErrors, "graphErrors", "Sum of the constraints' errors at each iteration"))
     , d_graphConstraints(initData(&d_graphConstraints, "graphConstraints", "Graph of each constraint's error at the end of the resolution"))
@@ -139,13 +138,6 @@ void GenericConstraintSolver::  init()
         dx.realloc(&vop,false,true, core::VecIdProperties{"constraint_dx", GetClass()->className});
         m_dxId = dx.id();
     }
-
-    if(d_multithreading.getValue())
-    {
-        simulation::MainTaskSchedulerFactory::createInRegistry()->init();
-    }
-
-
 }
 
 void GenericConstraintSolver::initializeConstraintProblems()

Sofa/Component/Constraint/Lagrangian/Solver/src/sofa/component/constraint/lagrangian/solver/GenericConstraintSolver.h

@@ -66,7 +66,6 @@ class SOFA_COMPONENT_CONSTRAINT_LAGRANGIAN_SOLVER_API GenericConstraintSolver :
     Data< SReal > d_regularizationTerm; ///< add regularization*Id to W when solving for constraints
     Data<bool> d_scaleTolerance; ///< Scale the error tolerance with the number of constraints
     Data<bool> d_allVerified; ///< All constraints must be verified (each constraint's error < tolerance)
-    Data<bool> d_multithreading; ///< Build compliances concurrently
     Data<bool> d_computeGraphs; ///< Compute graphs of errors and forces during resolution
     Data<std::map < std::string, sofa::type::vector<SReal> > > d_graphErrors; ///< Sum of the constraints' errors at each iteration
     Data<std::map < std::string, sofa::type::vector<SReal> > > d_graphConstraints; ///< Graph of each constraint's error at the end of the resolution