diff --git a/SofaKernel/modules/SofaBaseLinearSolver/src/SofaBaseLinearSolver/CGLinearSolver.inl b/SofaKernel/modules/SofaBaseLinearSolver/src/SofaBaseLinearSolver/CGLinearSolver.inl index 57663442333..ddbd40a4d39 100644 --- a/SofaKernel/modules/SofaBaseLinearSolver/src/SofaBaseLinearSolver/CGLinearSolver.inl +++ b/SofaKernel/modules/SofaBaseLinearSolver/src/SofaBaseLinearSolver/CGLinearSolver.inl @@ -33,7 +33,7 @@ namespace sofa::component::linearsolver /// Linear system solver using the conjugate gradient iterative algorithm template CGLinearSolver::CGLinearSolver() - : d_maxIter( initData(&d_maxIter,(unsigned)25,"iterations","Maximum number of iterations of the Conjugate Gradient solution") ) + : d_maxIter( initData(&d_maxIter, 25u,"iterations","Maximum number of iterations of the Conjugate Gradient solution") ) , d_tolerance( initData(&d_tolerance,(SReal)1e-5,"tolerance","Desired accuracy of the Conjugate Gradient solution evaluating: |r|²/|b|² (ratio of current residual norm over initial residual norm)") ) , d_smallDenominatorThreshold( initData(&d_smallDenominatorThreshold,(SReal)1e-5,"threshold","Minimum value of the denominator (pT A p)^ in the conjugate Gradient solution") ) , d_warmStart( initData(&d_warmStart,false,"warmStart","Use previous solution as initial solution") ) @@ -49,6 +49,8 @@ CGLinearSolver::CGLinearSolver() template void CGLinearSolver::init() { + Inherit1::init(); + if(d_tolerance.getValue() < 0.0) { msg_warning() << "'tolerance' must be a positive value" << msgendl diff --git a/SofaKernel/modules/SofaDeformable/SofaDeformable_test/RestShapeSpringsForceField_test.cpp b/SofaKernel/modules/SofaDeformable/SofaDeformable_test/RestShapeSpringsForceField_test.cpp index 21f1f635479..ed9def4faa0 100644 --- a/SofaKernel/modules/SofaDeformable/SofaDeformable_test/RestShapeSpringsForceField_test.cpp +++ b/SofaKernel/modules/SofaDeformable/SofaDeformable_test/RestShapeSpringsForceField_test.cpp @@ -62,7 +62,7 @@ sofa::simulation::Node::SPtr RestStiffSpringsForceField_test::createScene(const createObject(theRoot, "DefaultAnimationLoop"); createObject(theRoot, "EulerImplicitSolver"); - createObject(theRoot, "CGLinearSolver"); + createObject(theRoot, "CGLinearSolver", {{ "iterations", "25" }, { "tolerance", "1e-5" }, {"threshold", "1e-5"}}); /// Create an object with a mass and use a rest shape spring ff so it stay /// at the initial position diff --git a/applications/plugins/BulletCollisionDetection/examples/BulletSphere.scn b/applications/plugins/BulletCollisionDetection/examples/BulletSphere.scn index c575a9619f7..f8b57c238e1 100644 --- a/applications/plugins/BulletCollisionDetection/examples/BulletSphere.scn +++ b/applications/plugins/BulletCollisionDetection/examples/BulletSphere.scn @@ -7,7 +7,7 @@ - + diff --git a/applications/plugins/Haption/exemple/haption1.scn b/applications/plugins/Haption/exemple/haption1.scn index 6cb1e8613a3..95e670977b2 100644 --- a/applications/plugins/Haption/exemple/haption1.scn +++ b/applications/plugins/Haption/exemple/haption1.scn @@ -47,7 +47,7 @@ - + diff --git a/applications/plugins/Haption/exemple/temp1.scn b/applications/plugins/Haption/exemple/temp1.scn index c29e9c2956b..24890939ade 100644 --- a/applications/plugins/Haption/exemple/temp1.scn +++ b/applications/plugins/Haption/exemple/temp1.scn @@ -47,7 +47,7 @@ - + diff --git a/applications/plugins/Registration/Registration_run/cubes.scn b/applications/plugins/Registration/Registration_run/cubes.scn index 8149c3b2dd0..66ef774f680 100644 --- a/applications/plugins/Registration/Registration_run/cubes.scn +++ b/applications/plugins/Registration/Registration_run/cubes.scn @@ -9,7 +9,7 @@ - + @@ -28,7 +28,7 @@ - + diff --git a/applications/plugins/Registration/examples/ICPRegistration_MeshSpring.scn b/applications/plugins/Registration/examples/ICPRegistration_MeshSpring.scn index 5e387350f1f..4a869af945d 100644 --- a/applications/plugins/Registration/examples/ICPRegistration_MeshSpring.scn +++ b/applications/plugins/Registration/examples/ICPRegistration_MeshSpring.scn @@ -5,7 +5,7 @@ - + diff --git a/applications/plugins/Registration/examples/ICPRegistration_ShapeMatching_Engine.scn b/applications/plugins/Registration/examples/ICPRegistration_ShapeMatching_Engine.scn index d06f5981f3d..7761ca499ff 100644 --- a/applications/plugins/Registration/examples/ICPRegistration_ShapeMatching_Engine.scn +++ b/applications/plugins/Registration/examples/ICPRegistration_ShapeMatching_Engine.scn @@ -6,7 +6,7 @@ - + diff --git a/applications/plugins/Registration/examples/ICPregistration_frames.scn b/applications/plugins/Registration/examples/ICPregistration_frames.scn index c48083c2f63..66ead350a2e 100644 --- a/applications/plugins/Registration/examples/ICPregistration_frames.scn +++ b/applications/plugins/Registration/examples/ICPregistration_frames.scn @@ -7,7 +7,7 @@ - + diff --git a/applications/plugins/Registration/examples/imageregistration.scn b/applications/plugins/Registration/examples/imageregistration.scn index 21bfc777178..b0072d2f44c 100644 --- a/applications/plugins/Registration/examples/imageregistration.scn +++ b/applications/plugins/Registration/examples/imageregistration.scn @@ -7,7 +7,7 @@ - + diff --git a/applications/plugins/Registration/examples/test_InertiaAlign.scn b/applications/plugins/Registration/examples/test_InertiaAlign.scn index a02080461ed..c5446e9cf1e 100644 --- a/applications/plugins/Registration/examples/test_InertiaAlign.scn +++ b/applications/plugins/Registration/examples/test_InertiaAlign.scn @@ -4,7 +4,7 @@ - + diff --git a/applications/plugins/Registration/examples/test_InertiaAlign2.scn b/applications/plugins/Registration/examples/test_InertiaAlign2.scn index a0946df85a5..da526e8b5ef 100644 --- a/applications/plugins/Registration/examples/test_InertiaAlign2.scn +++ b/applications/plugins/Registration/examples/test_InertiaAlign2.scn @@ -4,7 +4,7 @@ - + diff --git a/applications/plugins/Registration/examples/test_InertiaAlign3.scn b/applications/plugins/Registration/examples/test_InertiaAlign3.scn index eadf35da6ef..35426b9ccbc 100644 --- a/applications/plugins/Registration/examples/test_InertiaAlign3.scn +++ b/applications/plugins/Registration/examples/test_InertiaAlign3.scn @@ -4,7 +4,7 @@ - + diff --git a/applications/plugins/Sensable/examples/SimpleBox-Method2.scn b/applications/plugins/Sensable/examples/SimpleBox-Method2.scn index a48f99847a9..f1c743478c8 100644 --- a/applications/plugins/Sensable/examples/SimpleBox-Method2.scn +++ b/applications/plugins/Sensable/examples/SimpleBox-Method2.scn @@ -32,7 +32,7 @@ - + diff --git a/applications/plugins/SofaCUDA/examples/SPHFluidForceFieldCUDA.scn b/applications/plugins/SofaCUDA/examples/SPHFluidForceFieldCUDA.scn index e282e8f5bb4..a1c04a6e1c1 100644 --- a/applications/plugins/SofaCUDA/examples/SPHFluidForceFieldCUDA.scn +++ b/applications/plugins/SofaCUDA/examples/SPHFluidForceFieldCUDA.scn @@ -5,7 +5,7 @@ + --> - + - + - - + - + - + diff --git a/applications/plugins/SofaOpenCL/examples/PCISPHFluidForceFieldCPU.scn b/applications/plugins/SofaOpenCL/examples/PCISPHFluidForceFieldCPU.scn index b4c852e3692..ab8437c24cd 100644 --- a/applications/plugins/SofaOpenCL/examples/PCISPHFluidForceFieldCPU.scn +++ b/applications/plugins/SofaOpenCL/examples/PCISPHFluidForceFieldCPU.scn @@ -4,7 +4,7 @@ - + <-- --> diff --git a/applications/plugins/SofaSimpleGUI/examples/oneTet.scn b/applications/plugins/SofaSimpleGUI/examples/oneTet.scn index 42f347756fa..f5e3e48d9d3 100644 --- a/applications/plugins/SofaSimpleGUI/examples/oneTet.scn +++ b/applications/plugins/SofaSimpleGUI/examples/oneTet.scn @@ -3,7 +3,7 @@ - + diff --git a/applications/plugins/image/examples/ImageToRigidMass.scn b/applications/plugins/image/examples/ImageToRigidMass.scn index 3ea06a71cd5..6d79efb6494 100644 --- a/applications/plugins/image/examples/ImageToRigidMass.scn +++ b/applications/plugins/image/examples/ImageToRigidMass.scn @@ -17,7 +17,7 @@ - + diff --git a/applications/plugins/image/examples/ImageTransform.scn b/applications/plugins/image/examples/ImageTransform.scn index a7febc3913c..db5ea60231e 100644 --- a/applications/plugins/image/examples/ImageTransform.scn +++ b/applications/plugins/image/examples/ImageTransform.scn @@ -5,7 +5,7 @@ - + diff --git a/applications/plugins/image/examples/sampler_HexaFEM.scn b/applications/plugins/image/examples/sampler_HexaFEM.scn index 05a7fce6f16..8f9b27c977f 100644 --- a/applications/plugins/image/examples/sampler_HexaFEM.scn +++ b/applications/plugins/image/examples/sampler_HexaFEM.scn @@ -12,7 +12,7 @@ - + diff --git a/applications/plugins/image/examples/sampler_meshSpring.scn b/applications/plugins/image/examples/sampler_meshSpring.scn index e6e919aeb2b..75458956e62 100644 --- a/applications/plugins/image/examples/sampler_meshSpring.scn +++ b/applications/plugins/image/examples/sampler_meshSpring.scn @@ -12,7 +12,7 @@ - + diff --git a/examples/Benchmark/TopologicalChanges/AffineMovementConstraint__RemovingMeshTest.scn b/examples/Benchmark/TopologicalChanges/AffineMovementConstraint__RemovingMeshTest.scn index ee3ca5a42f9..9969aaa41e0 100644 --- a/examples/Benchmark/TopologicalChanges/AffineMovementConstraint__RemovingMeshTest.scn +++ b/examples/Benchmark/TopologicalChanges/AffineMovementConstraint__RemovingMeshTest.scn @@ -18,7 +18,7 @@ - + diff --git a/examples/Benchmark/TopologicalChanges/FixedConstraint_RemovingMeshTest.scn b/examples/Benchmark/TopologicalChanges/FixedConstraint_RemovingMeshTest.scn index e2ce325b7e5..5c4f4b5c124 100644 --- a/examples/Benchmark/TopologicalChanges/FixedConstraint_RemovingMeshTest.scn +++ b/examples/Benchmark/TopologicalChanges/FixedConstraint_RemovingMeshTest.scn @@ -18,7 +18,7 @@ - + diff --git a/examples/Benchmark/TopologicalChanges/FixedPlaneConstraint_RemovingMeshTest.scn b/examples/Benchmark/TopologicalChanges/FixedPlaneConstraint_RemovingMeshTest.scn index 2943ff8ab5e..685fc1b251f 100644 --- a/examples/Benchmark/TopologicalChanges/FixedPlaneConstraint_RemovingMeshTest.scn +++ b/examples/Benchmark/TopologicalChanges/FixedPlaneConstraint_RemovingMeshTest.scn @@ -18,7 +18,7 @@ - + diff --git a/examples/Benchmark/TopologicalChanges/LinearMovementConstraint_RemovingMeshTest.scn b/examples/Benchmark/TopologicalChanges/LinearMovementConstraint_RemovingMeshTest.scn index 673743b543c..4039f522921 100644 --- a/examples/Benchmark/TopologicalChanges/LinearMovementConstraint_RemovingMeshTest.scn +++ b/examples/Benchmark/TopologicalChanges/LinearMovementConstraint_RemovingMeshTest.scn @@ -18,7 +18,7 @@ - + diff --git a/examples/Benchmark/TopologicalChanges/ProjectDirectionConstraint_RemovingMeshTest.scn b/examples/Benchmark/TopologicalChanges/ProjectDirectionConstraint_RemovingMeshTest.scn index 11ca6609b6e..088288fc9c7 100644 --- a/examples/Benchmark/TopologicalChanges/ProjectDirectionConstraint_RemovingMeshTest.scn +++ b/examples/Benchmark/TopologicalChanges/ProjectDirectionConstraint_RemovingMeshTest.scn @@ -18,7 +18,7 @@ - + diff --git a/examples/Benchmark/TopologicalChanges/ProjectToLineConstraint_RemovingMeshTest.scn b/examples/Benchmark/TopologicalChanges/ProjectToLineConstraint_RemovingMeshTest.scn index 8f782ab4ebe..d9e061c20e9 100644 --- a/examples/Benchmark/TopologicalChanges/ProjectToLineConstraint_RemovingMeshTest.scn +++ b/examples/Benchmark/TopologicalChanges/ProjectToLineConstraint_RemovingMeshTest.scn @@ -18,7 +18,7 @@ - + diff --git a/examples/Benchmark/TopologicalChanges/ProjectToPlaneConstraint_RemovingMeshTest.scn b/examples/Benchmark/TopologicalChanges/ProjectToPlaneConstraint_RemovingMeshTest.scn index 83fccf3ef5f..a6497aa445a 100644 --- a/examples/Benchmark/TopologicalChanges/ProjectToPlaneConstraint_RemovingMeshTest.scn +++ b/examples/Benchmark/TopologicalChanges/ProjectToPlaneConstraint_RemovingMeshTest.scn @@ -18,7 +18,7 @@ - + diff --git a/examples/Benchmark/TopologicalChanges/ProjectToPointConstraint_RemovingMeshTest.scn b/examples/Benchmark/TopologicalChanges/ProjectToPointConstraint_RemovingMeshTest.scn index 8087574663a..e4d7d1973e9 100644 --- a/examples/Benchmark/TopologicalChanges/ProjectToPointConstraint_RemovingMeshTest.scn +++ b/examples/Benchmark/TopologicalChanges/ProjectToPointConstraint_RemovingMeshTest.scn @@ -18,7 +18,7 @@ - + diff --git a/examples/Benchmark/TopologicalChanges/TriangularBendingSprings_RemovingMeshTest.scn b/examples/Benchmark/TopologicalChanges/TriangularBendingSprings_RemovingMeshTest.scn index 7357d8623b8..dc8aa1d7dcf 100644 --- a/examples/Benchmark/TopologicalChanges/TriangularBendingSprings_RemovingMeshTest.scn +++ b/examples/Benchmark/TopologicalChanges/TriangularBendingSprings_RemovingMeshTest.scn @@ -18,7 +18,7 @@ - + diff --git a/examples/Benchmark/TopologicalChanges/TriangularFEMForceField_RemovingMeshTest.scn b/examples/Benchmark/TopologicalChanges/TriangularFEMForceField_RemovingMeshTest.scn index 9ab9dc24bd2..1fcde9dcea9 100644 --- a/examples/Benchmark/TopologicalChanges/TriangularFEMForceField_RemovingMeshTest.scn +++ b/examples/Benchmark/TopologicalChanges/TriangularFEMForceField_RemovingMeshTest.scn @@ -18,7 +18,7 @@ - + diff --git a/examples/Components/collision/OBBOBBFaceEdge.scn b/examples/Components/collision/OBBOBBFaceEdge.scn index 2f333bf4d05..e417d4714d1 100644 --- a/examples/Components/collision/OBBOBBFaceEdge.scn +++ b/examples/Components/collision/OBBOBBFaceEdge.scn @@ -9,7 +9,7 @@ - + diff --git a/examples/Components/linearsolver/GlobalSystemMatrixExporter.scn b/examples/Components/linearsolver/GlobalSystemMatrixExporter.scn index c663b76027c..6d685a9bf2c 100644 --- a/examples/Components/linearsolver/GlobalSystemMatrixExporter.scn +++ b/examples/Components/linearsolver/GlobalSystemMatrixExporter.scn @@ -20,7 +20,7 @@ - + diff --git a/examples/Components/misc/WriteState.xml b/examples/Components/misc/WriteState.xml index 9fc10d984ff..510ecf32f63 100644 --- a/examples/Components/misc/WriteState.xml +++ b/examples/Components/misc/WriteState.xml @@ -3,7 +3,7 @@ - + diff --git a/examples/Components/solver/NewmarkImplicitSolver.scn b/examples/Components/solver/NewmarkImplicitSolver.scn index 78fcc729329..20991c5e2b1 100644 --- a/examples/Components/solver/NewmarkImplicitSolver.scn +++ b/examples/Components/solver/NewmarkImplicitSolver.scn @@ -29,7 +29,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/examples/Components/topology/TopologicalModifiers/AddingTetra2TriangleProcess.scn b/examples/Components/topology/TopologicalModifiers/AddingTetra2TriangleProcess.scn index 92815b530ee..a8200f1d08c 100644 --- a/examples/Components/topology/TopologicalModifiers/AddingTetra2TriangleProcess.scn +++ b/examples/Components/topology/TopologicalModifiers/AddingTetra2TriangleProcess.scn @@ -18,7 +18,7 @@ - + diff --git a/examples/Components/topology/TopologicalModifiers/AddingTetraProcess.scn b/examples/Components/topology/TopologicalModifiers/AddingTetraProcess.scn index 48e206f234f..d33305dd5ca 100644 --- a/examples/Components/topology/TopologicalModifiers/AddingTetraProcess.scn +++ b/examples/Components/topology/TopologicalModifiers/AddingTetraProcess.scn @@ -14,7 +14,7 @@ - + diff --git a/examples/Components/topology/TopologicalModifiers/AddingTriangle2EdgeProcess.scn b/examples/Components/topology/TopologicalModifiers/AddingTriangle2EdgeProcess.scn index 09fb35440a6..3a319332877 100644 --- a/examples/Components/topology/TopologicalModifiers/AddingTriangle2EdgeProcess.scn +++ b/examples/Components/topology/TopologicalModifiers/AddingTriangle2EdgeProcess.scn @@ -16,7 +16,7 @@ - + diff --git a/examples/Components/topology/TopologicalModifiers/AddingTrianglesProcess.scn b/examples/Components/topology/TopologicalModifiers/AddingTrianglesProcess.scn index 063b13151ef..5b43a054b59 100644 --- a/examples/Components/topology/TopologicalModifiers/AddingTrianglesProcess.scn +++ b/examples/Components/topology/TopologicalModifiers/AddingTrianglesProcess.scn @@ -16,7 +16,7 @@ - + diff --git a/examples/Components/topology/TopologicalModifiers/RemovingTetra2TriangleProcess.scn b/examples/Components/topology/TopologicalModifiers/RemovingTetra2TriangleProcess.scn index e78eca5a2fc..9a2d965bc20 100644 --- a/examples/Components/topology/TopologicalModifiers/RemovingTetra2TriangleProcess.scn +++ b/examples/Components/topology/TopologicalModifiers/RemovingTetra2TriangleProcess.scn @@ -20,7 +20,7 @@ - + @@ -52,7 +52,7 @@ - + diff --git a/examples/Components/topology/TopologicalModifiers/RemovingTetra2Triangle_options1.scn b/examples/Components/topology/TopologicalModifiers/RemovingTetra2Triangle_options1.scn index 621b8a5a29c..3a8f80989c8 100644 --- a/examples/Components/topology/TopologicalModifiers/RemovingTetra2Triangle_options1.scn +++ b/examples/Components/topology/TopologicalModifiers/RemovingTetra2Triangle_options1.scn @@ -20,7 +20,7 @@ - + diff --git a/examples/Components/topology/TopologicalModifiers/RemovingTetra2Triangle_options2.scn b/examples/Components/topology/TopologicalModifiers/RemovingTetra2Triangle_options2.scn index 33131e789cf..650923e1cb4 100644 --- a/examples/Components/topology/TopologicalModifiers/RemovingTetra2Triangle_options2.scn +++ b/examples/Components/topology/TopologicalModifiers/RemovingTetra2Triangle_options2.scn @@ -20,7 +20,7 @@ - + diff --git a/examples/Components/topology/TopologicalModifiers/RemovingTetraProcess.scn b/examples/Components/topology/TopologicalModifiers/RemovingTetraProcess.scn index 0639316b038..9836d232e24 100644 --- a/examples/Components/topology/TopologicalModifiers/RemovingTetraProcess.scn +++ b/examples/Components/topology/TopologicalModifiers/RemovingTetraProcess.scn @@ -15,7 +15,7 @@ - + diff --git a/examples/Components/topology/TopologicalModifiers/RemovingTetraProcess_withCollisionModel.scn b/examples/Components/topology/TopologicalModifiers/RemovingTetraProcess_withCollisionModel.scn index 97b2d196018..ebc51031434 100644 --- a/examples/Components/topology/TopologicalModifiers/RemovingTetraProcess_withCollisionModel.scn +++ b/examples/Components/topology/TopologicalModifiers/RemovingTetraProcess_withCollisionModel.scn @@ -17,7 +17,7 @@ - + diff --git a/examples/Components/topology/TopologicalModifiers/RemovingTriangle2EdgeProcess.scn b/examples/Components/topology/TopologicalModifiers/RemovingTriangle2EdgeProcess.scn index e0466c01a23..42f23e18780 100644 --- a/examples/Components/topology/TopologicalModifiers/RemovingTriangle2EdgeProcess.scn +++ b/examples/Components/topology/TopologicalModifiers/RemovingTriangle2EdgeProcess.scn @@ -18,7 +18,7 @@ - + diff --git a/examples/Components/topology/TopologicalModifiers/RemovingTrianglesProcess.scn b/examples/Components/topology/TopologicalModifiers/RemovingTrianglesProcess.scn index 3975fcae13f..bfa2e9c09b6 100644 --- a/examples/Components/topology/TopologicalModifiers/RemovingTrianglesProcess.scn +++ b/examples/Components/topology/TopologicalModifiers/RemovingTrianglesProcess.scn @@ -18,7 +18,7 @@ - + diff --git a/examples/Demos/rigidifiedSectionsInBeam.scn b/examples/Demos/rigidifiedSectionsInBeam.scn index 46b6ce5221f..a94b887f0b8 100644 --- a/examples/Demos/rigidifiedSectionsInBeam.scn +++ b/examples/Demos/rigidifiedSectionsInBeam.scn @@ -28,7 +28,7 @@ The distances do not vary over time for the rigidified beam, whereas we can obse - + @@ -61,7 +61,7 @@ The distances do not vary over time for the rigidified beam, whereas we can obse - + diff --git a/examples/Tutorials/Collision/MultipleObjectsDynamicCollisionGroups.scn b/examples/Tutorials/Collision/MultipleObjectsDynamicCollisionGroups.scn index 5c2e3ec0a40..88913559771 100644 --- a/examples/Tutorials/Collision/MultipleObjectsDynamicCollisionGroups.scn +++ b/examples/Tutorials/Collision/MultipleObjectsDynamicCollisionGroups.scn @@ -12,7 +12,7 @@ - + @@ -22,7 +22,7 @@ - + @@ -32,7 +32,7 @@ - + @@ -44,7 +44,7 @@ - + diff --git a/modules/SofaBoundaryCondition/SofaBoundaryCondition_test/ConstantForceField_test.cpp b/modules/SofaBoundaryCondition/SofaBoundaryCondition_test/ConstantForceField_test.cpp index 8ed16aba89e..f15966bfb65 100644 --- a/modules/SofaBoundaryCondition/SofaBoundaryCondition_test/ConstantForceField_test.cpp +++ b/modules/SofaBoundaryCondition/SofaBoundaryCondition_test/ConstantForceField_test.cpp @@ -81,7 +81,7 @@ struct ConstantForceField_test : public BaseSimulationTest, NumericTest" " \n" " \n" - " \n" + " \n" " \n" " \n" " \n" diff --git a/modules/SofaExporter/SofaExporter_test/WriteState_test.cpp b/modules/SofaExporter/SofaExporter_test/WriteState_test.cpp index bf24a50eaee..4de4e59c015 100644 --- a/modules/SofaExporter/SofaExporter_test/WriteState_test.cpp +++ b/modules/SofaExporter/SofaExporter_test/WriteState_test.cpp @@ -96,6 +96,9 @@ namespace sofa { root->addObject(eulerSolver); } CGLinearSolver::SPtr cgLinearSolver = New (); + cgLinearSolver->d_maxIter.setValue(25u); + cgLinearSolver->d_tolerance.setValue(1e-5); + cgLinearSolver->d_smallDenominatorThreshold.setValue(1e-5); root->addObject(cgLinearSolver); simulation::Node::SPtr childNode = root->createChild("Particle"); diff --git a/modules/SofaGeneralDeformable/SofaGeneralDeformable_test/TriangularBendingSprings_test.cpp b/modules/SofaGeneralDeformable/SofaGeneralDeformable_test/TriangularBendingSprings_test.cpp index 965c710708a..a35c675653b 100644 --- a/modules/SofaGeneralDeformable/SofaGeneralDeformable_test/TriangularBendingSprings_test.cpp +++ b/modules/SofaGeneralDeformable/SofaGeneralDeformable_test/TriangularBendingSprings_test.cpp @@ -110,7 +110,7 @@ class TriangularBendingSprings_test : public BaseTest Node::SPtr FNode = sofa::simpleapi::createChild(m_root, "SpringNode"); createObject(FNode, "EulerImplicitSolver"); - createObject(FNode, "CGLinearSolver", { { "iterations", "20" }, { "threshold", "1e-8" } }); + createObject(FNode, "CGLinearSolver", {{ "iterations", "20" }, { "tolerance", "1e-5" }, {"threshold", "1e-8"}}); createObject(FNode, "MechanicalObject", { {"name","dof"}, {"template","Vec3d"}, {"position", "@../grid.position"} }); createObject(FNode, "TriangleSetTopologyContainer", { diff --git a/modules/SofaGeneralSimpleFem/SofaGeneralSimpleFem_test/BeamFEMForceField_test.cpp b/modules/SofaGeneralSimpleFem/SofaGeneralSimpleFem_test/BeamFEMForceField_test.cpp index 16a95c43ed3..54f24f57c5e 100644 --- a/modules/SofaGeneralSimpleFem/SofaGeneralSimpleFem_test/BeamFEMForceField_test.cpp +++ b/modules/SofaGeneralSimpleFem/SofaGeneralSimpleFem_test/BeamFEMForceField_test.cpp @@ -85,7 +85,7 @@ class BeamFEMForceField_test : public BaseTest createObject(m_root, "DefaultVisualManagerLoop"); createObject(m_root, "EulerImplicitSolver"); - createObject(m_root, "CGLinearSolver", { { "iterations", "20" }, { "threshold", "1e-8" } }); + createObject(m_root, "CGLinearSolver", { { "iterations", "20" }, { "threshold", "1e-8" }, {"tolerance", "1e-5"} }); createObject(m_root, "MechanicalObject", {{"template","Rigid3d"}, {"position", "0 0 1 0 0 0 1 1 0 1 0 0 0 1 2 0 1 0 0 0 1 3 0 1 0 0 0 1"} }); createObject(m_root, "EdgeSetTopologyContainer", { {"edges","0 1 1 2 2 3"} }); createObject(m_root, "EdgeSetTopologyModifier"); diff --git a/modules/SofaMiscFem/SofaMiscFem_test/TriangleFEMForceField_test.cpp b/modules/SofaMiscFem/SofaMiscFem_test/TriangleFEMForceField_test.cpp index 8748f39419b..75208ac9f6d 100644 --- a/modules/SofaMiscFem/SofaMiscFem_test/TriangleFEMForceField_test.cpp +++ b/modules/SofaMiscFem/SofaMiscFem_test/TriangleFEMForceField_test.cpp @@ -146,7 +146,7 @@ class TriangleFEMForceField_test : public BaseTest { Node::SPtr FEMNode = sofa::simpleapi::createChild(m_root, nodeName); createObject(FEMNode, "EulerImplicitSolver"); - createObject(FEMNode, "CGLinearSolver", {{ "iterations", "20" }, { "threshold", "1e-6" }}); + createObject(FEMNode, "CGLinearSolver", {{ "iterations", "20" }, { "tolerance", "1e-5" }, {"threshold", "1e-6"}}); createObject(FEMNode, "MechanicalObject", { {"name","dof"}, {"template","Vec3d"}, {"position", "@../grid.position"} });