Skip to content

[SofaBaseLinearSolver] CGLinearSolver must call super init() to check required Data #2419

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guparan merged 9 commits into from
Oct 23, 2021
Merged

[SofaBaseLinearSolver] CGLinearSolver must call super init() to check required Data #2419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
79d029d
[SofaBaseLinearSolver] CGLinearSolver must call super init() to check…
alxbilger Oct 15, 2021
2dfbaa6
Missing required Data
alxbilger Oct 15, 2021
74ecfb0
Missing required Data
alxbilger Oct 15, 2021
c3302d0
Merge remote-tracking branch 'origin/cg_init' into cg_init
alxbilger Oct 15, 2021
614da4e
Missing required Data
alxbilger Oct 15, 2021
25d9e16
Missing required Data
alxbilger Oct 18, 2021
1110718
Missing required Data
alxbilger Oct 22, 2021
aeb2465
Merge remote-tracking branch 'upstream/master' into cg_init
alxbilger Oct 22, 2021
68c2a33
Missing required Data
alxbilger Oct 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion SofaKernel/modules/SofaBaseLinearSolver/src/SofaBaseLinearSolver/CGLinearSolver.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ namespace sofa::component::linearsolver
/// Linear system solver using the conjugate gradient iterative algorithm
template<class TMatrix, class TVector>
CGLinearSolver<TMatrix,TVector>::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") )
Expand All @@ -49,6 +49,8 @@ CGLinearSolver<TMatrix,TVector>::CGLinearSolver()
template<class TMatrix, class TVector>
void CGLinearSolver<TMatrix,TVector>::init()
{
Inherit1::init();

if(d_tolerance.getValue() < 0.0)
{
msg_warning() << "'tolerance' must be a positive value" << msgendl
Expand Down
2 changes: 1 addition & 1 deletion SofaKernel/modules/SofaDeformable/SofaDeformable_test/RestShapeSpringsForceField_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion applications/plugins/BulletCollisionDetection/examples/BulletSphere.scn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<DefaultContactManager name="Response" response="default" />
<DefaultCollisionGroupManager name="Group" />
<EulerImplicitSolver name="Implicit Euler Solver" rayleighMass="0" rayleighStiffness="0.1" />
<CGLinearSolver template="GraphScattered" name="Conjugate Gradient" />
<CGLinearSolver template="GraphScattered" iterations="25" tolerance="1e-5" threshold="1e-5" name="Conjugate Gradient"/>
<BulletIntersection name="1" contactDistance="0.04" />
<Node name="RigMec" gravity="0 0 0" >
<MechanicalObject template="Vec3d" name="falling_particle" position="0 0 5 3 3 6 6 7 7" velocity="0 0 -0.01 0 0 -0.01 0 0 -0.01" force="0 0 0" externalForce="0 0 0" derivX="0 0 0" restScale="1" reserve="0" />
Expand Down
2 changes: 1 addition & 1 deletion applications/plugins/Haption/exemple/haption1.scn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
</Node>
<Node name="Object" gravity="0 -9.81 0" showVisualModels="1" showBehaviorModels="0" showCollisionModels="0" showBoundingCollisionModels="0" showMappings="0" showMechanicalMappings="0" showForceFields="0" showInteractionForceFields="0" showWireFrame="0" showNormals="0" >
<EulerImplicitSolver name="Implicit Euler Solver" />
<CGLinearSolver template="GraphScattered" name="Conjugate Gradient" />
<CGLinearSolver template="GraphScattered" iterations="25" tolerance="1e-5" threshold="1e-5" name="Conjugate Gradient"/>
<SparseGridTopology name="Embedded Sparse Grid" fileTopology="mesh/liver.obj" n="7 6 5" />
<MechanicalObject template="Vec3d" name="Particles" position="0 0 0" velocity="0 0 0" force="0 0 0" externalForce="0 0 0" derivX="0 0 0" restScale="1" />
<UniformMass template="Vec3d" name="Mass" mass="0.1" totalmass="2" />
Expand Down
2 changes: 1 addition & 1 deletion applications/plugins/Haption/exemple/temp1.scn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
</Node>
<Node name="Object" gravity="0 -9.81 0" showVisualModels="1" showBehaviorModels="0" showCollisionModels="0" showBoundingCollisionModels="0" showMappings="0" showMechanicalMappings="0" showForceFields="0" showInteractionForceFields="0" showWireFrame="0" showNormals="0" >
<EulerImplicitSolver name="Implicit Euler Solver" />
<CGLinearSolver template="GraphScattered" name="Conjugate Gradient" />
<CGLinearSolver template="GraphScattered" iterations="25" tolerance="1e-5" threshold="1e-5" name="Conjugate Gradient"/>
<SparseGridTopology name="Embedded Sparse Grid" fileTopology="mesh/liver.obj" n="7 6 5" />
<MechanicalObject template="Vec3d" name="Particles" position="0 0 0" velocity="0 0 0" force="0 0 0" externalForce="0 0 0" derivX="0 0 0" restScale="1" />
<UniformMass template="Vec3d" name="Mass" mass="0.1" totalmass="2" />
Expand Down
4 changes: 2 additions & 2 deletions applications/plugins/Registration/Registration_run/cubes.scn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<!-- Using a rigid cube using collision triangles, lines and points -->
<Node name="Cube1">
<EulerImplicitSolver name="EulerImplicit" rayleighStiffness="0.1" rayleighMass="0.1" />
<CGLinearSolver name="CG Solver" />
<CGLinearSolver iterations="25" tolerance="1e-5" threshold="1e-5" name="CG Solver"/>
<MechanicalObject name="Cube1 RigidDOF" template="Rigid3d" dy="0" />
<UniformMass name="UniformMass1" totalMass="10.0" />
<UncoupledConstraintCorrection />
Expand All @@ -28,7 +28,7 @@
</Node>
<Node name="Cube2">
<EulerImplicitSolver name="EulerImplicit" />
<CGLinearSolver name="CG Solver" />
<CGLinearSolver iterations="25" tolerance="1e-5" threshold="1e-5" name="CG Solver"/>
<MechanicalObject name="Cube2 RigidDOF" template="Rigid3d" dy="0" dx="0" />
<UniformMass name="UniformMass2" totalMass="10.0" />
<UncoupledConstraintCorrection />
Expand Down
2 changes: 1 addition & 1 deletion applications/plugins/Registration/examples/ICPRegistration_MeshSpring.scn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<VisualStyle displayFlags="showBehavior showVisual" />
<EulerImplicitSolver rayleighStiffness="0.5" rayleighMass="0.5" vdamping="0.01"/>
<CGLinearSolver template="GraphScattered" iterations="15" threshold="1e-008" />
<CGLinearSolver template="GraphScattered" iterations="15" threshold="1e-008" tolerance="1e-5"/>

<Node name="target">
<MeshObjLoader name="meshLoader_0" filename="data/femur_f.obj" handleSeams="1" />
Expand Down
2 changes: 1 addition & 1 deletion applications/plugins/Registration/examples/ICPRegistration_ShapeMatching_Engine.scn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<VisualStyle displayFlags="showForceFields showVisual" />

<EulerImplicitSolver rayleighStiffness="0.5" rayleighMass="0.5" />
<CGLinearSolver template="GraphScattered" iterations="25" threshold="1e-008" />
<CGLinearSolver template="GraphScattered" iterations="25" threshold="1e-008" tolerance="1e-5"/>

<Node name="target">
<MeshObjLoader name="meshLoader_1" filename="data/femur_f.obj" handleSeams="1" />
Expand Down
2 changes: 1 addition & 1 deletion applications/plugins/Registration/examples/ICPregistration_frames.scn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<VisualStyle displayFlags="showForceFields showVisual" />
<EulerImplicitSolver rayleighStiffness="0.1" rayleighMass="0.1" />
<CGLinearSolver template="GraphScattered" iterations="15" threshold="1e-008" />
<CGLinearSolver template="GraphScattered" iterations="15" threshold="1e-008" tolerance="1e-5" />

<Node name="target">
<MeshObjLoader name="meshLoader_0" filename="data/femur_f.obj" handleSeams="1" />
Expand Down
2 changes: 1 addition & 1 deletion applications/plugins/Registration/examples/imageregistration.scn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<VisualStyle displayFlags="showForceFields showVisual" />

<EulerImplicitSolver rayleighStiffness="0.2" rayleighMass="0.2" />
<CGLinearSolver template="GraphScattered" iterations="25" threshold="1e-008" />
<CGLinearSolver template="GraphScattered" iterations="25" threshold="1e-008" tolerance="1e-5"/>

<Node name="target">
<ImageContainer name="image" filename="data/thigh.raw"/>
Expand Down
2 changes: 1 addition & 1 deletion applications/plugins/Registration/examples/test_InertiaAlign.scn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<RequiredPlugin name="Registration" printLog="1" pluginName="Registration" />
<VisualStyle name="visualStyle1" displayFlags="showVisual showForceFields" />
<EulerImplicitSolver name="eulerImplicitSolver1" rayleighStiffness="0.1" rayleighMass="0.1" />
<CGLinearSolver template="GraphScattered" name="cGLinearSolver1" iterations="15" threshold="1e-08" />
<CGLinearSolver template="GraphScattered" name="cGLinearSolver1" iterations="15" threshold="1e-08" tolerance="1e-5"/>
<Node name="target" >
<MeshObjLoader name="meshLoader_0" filename="data/boxes.obj" translation="0 0 0" rotation="0 0 0" scale3d="1 1 1" handleSeams="1" />
<OglModel template="ExtVec3f" name="Femur1" src="@meshLoader_0" material="Default Diffuse 1 0.333333 0.666667 0 1 Ambient 1 0 0.333333 0 1 Specular 0 0.494118 0.4 1 1 Emissive 0 0.494118 0.4 1 1 Shininess 0 45 " primitiveType="DEFAULT" blendEquation="GL_FUNC_ADD" sfactor="GL_SRC_ALPHA" dfactor="GL_ONE_MINUS_SRC_ALPHA" />
Expand Down
2 changes: 1 addition & 1 deletion applications/plugins/Registration/examples/test_InertiaAlign2.scn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<RequiredPlugin name="Registration" printLog="1" pluginName="Registration" />
<VisualStyle name="visualStyle1" displayFlags="showVisual showForceFields" />
<EulerImplicitSolver name="eulerImplicitSolver1" rayleighStiffness="0.1" rayleighMass="0.1" />
<CGLinearSolver template="GraphScattered" name="cGLinearSolver1" iterations="15" threshold="1e-08" />
<CGLinearSolver template="GraphScattered" name="cGLinearSolver1" iterations="15" threshold="1e-08" tolerance="1e-5"/>
<Node name="target" >
<MeshObjLoader name="meshLoader_0" filename="data/femur_m.obj" translation="0 0 0" rotation="0 0 0" scale3d="1 1 1" handleSeams="1" />
<OglModel template="ExtVec3f" name="Femur1" src="@meshLoader_0" material="Default Diffuse 1 0.333333 0.666667 0 1 Ambient 1 0 0.333333 0 1 Specular 0 0.494118 0.4 1 1 Emissive 0 0.494118 0.4 1 1 Shininess 0 45 " primitiveType="DEFAULT" blendEquation="GL_FUNC_ADD" sfactor="GL_SRC_ALPHA" dfactor="GL_ONE_MINUS_SRC_ALPHA" />
Expand Down
2 changes: 1 addition & 1 deletion applications/plugins/Registration/examples/test_InertiaAlign3.scn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<RequiredPlugin name="Registration" printLog="1" pluginName="Registration" />
<VisualStyle name="visualStyle1" displayFlags="showVisual showForceFields" />
<EulerImplicitSolver name="eulerImplicitSolver1" rayleighStiffness="0.1" rayleighMass="0.1" />
<CGLinearSolver template="GraphScattered" name="cGLinearSolver1" iterations="15" threshold="1e-08" />
<CGLinearSolver template="GraphScattered" name="cGLinearSolver1" iterations="15" threshold="1e-08" tolerance="1e-5"/>
<Node name="target" >
<MeshObjLoader name="meshLoader_0" filename="data/femur_m.obj" translation="3 2 1" rotation="30 40 50" scale3d="1 1 1" handleSeams="1" />
<OglModel template="ExtVec3f" name="Femur1" src="@meshLoader_0" material="Default Diffuse 1 0.494118 0.4 1 1 Ambient 1 0.0941176 0.0784314 0.2 1 Specular 0 0.494118 0.4 1 1 Emissive 0 0.494118 0.4 1 1 Shininess 0 45 " primitiveType="DEFAULT" blendEquation="GL_FUNC_ADD" sfactor="GL_SRC_ALPHA" dfactor="GL_ONE_MINUS_SRC_ALPHA" />
Expand Down
2 changes: 1 addition & 1 deletion applications/plugins/Sensable/examples/SimpleBox-Method2.scn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

<Node name="Tool">
<EulerImplicitSolver rayleighStiffness="0.1" rayleighMass="0.1" />
<CGLinearSolver />
<CGLinearSolver iterations="25" tolerance="1e-5" threshold="1e-5"/>

<MechanicalObject name="ms" template="Rigid3d"/>
<UniformMass totalMass="0.1" />
Expand Down
2 changes: 1 addition & 1 deletion applications/plugins/SofaCUDA/examples/SPHFluidForceFieldCUDA.scn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<RungeKutta4Solver/>
<!--<CentralDifferenceSolver/>-->
<!--<EulerImplicitSolver rayleighStiffness="0.1" rayleighMass="0.1" />
<CGLinearSolver/>-->
<CGLinearSolver iterations="25" tolerance="1e-5" threshold="1e-5"/>-->
<MechanicalObject name="MModel" template="CudaVec3f" />
<!-- A topology is used here just to set initial particles positions. It is a bad idea because this object has no real topology, but it works... -->
<RegularGridTopology
Expand Down
2 changes: 1 addition & 1 deletion applications/plugins/SofaCUDA/examples/beam10x10x46-fem-implicit-CPU.scn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<Node name="M1">
<!--<CGImplicit iterations="10" />-->
<EulerImplicitSolver rayleighStiffness="0.1" rayleighMass="0.1" />
<CGLinearSolver iterations="10"/>
<CGLinearSolver iterations="10" tolerance="1e-5" threshold="1e-5"/>
<RegularGridTopology
nx="10" ny="10" nz="46"
xmin="-1.5" xmax="1.5"
Expand Down
2 changes: 1 addition & 1 deletion applications/plugins/SofaCUDA/examples/beam10x10x46-hexafem-implicit-CPU.scn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<Node name="M1" processor="0">
<EulerImplicitSolver rayleighStiffness="0.1" rayleighMass="0.1" />
<CGLinearSolver iterations="10"/>
<CGLinearSolver iterations="10" tolerance="1e-5" threshold="1e-5"/>
<MechanicalObject template="Vec3"/>
<UniformMass totalMass="200" />
<RegularGridTopology
Expand Down
3 changes: 1 addition & 2 deletions applications/plugins/SofaCUDA/examples/beam16x16x76-fem-implicit-CPU.scn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,8 @@
</Node>
</Node>
<Node name="M1">
<!--<CGImplicit iterations="10" />-->
<EulerImplicitSolver rayleighStiffness="0.1" rayleighMass="0.1" />
<CGLinearSolver iterations="10"/>
<CGLinearSolver iterations="10" tolerance="1e-5" threshold="1e-5"/>
<RegularGridTopology
nx="16" ny="16" nz="76"
xmin="-1.5" xmax="1.5"
Expand Down
2 changes: 1 addition & 1 deletion applications/plugins/SofaCUDA/examples/quadSpringSphere.scn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</Node>
<Node name="SquareCloth1">
<EulerImplicitSolver rayleighMass="0.05" rayleighStiffness="0.1" />
<CGLinearSolver iterations="10" threshold="0.000001"/>
<CGLinearSolver iterations="10" threshold="0.000001" tolerance="1e-5"/>
<RegularGridTopology
nx="100" ny="1" nz="100"
xmin="12" xmax="-12"
Expand Down
2 changes: 1 addition & 1 deletion applications/plugins/SofaHAPI/examples/SofaHAPI1.scn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

<Node name="Tool1">
<EulerImplicitSolver rayleighStiffness="0.1" rayleighMass="0.1" />
<CGLinearSolver />
<CGLinearSolver iterations="25" tolerance="1e-5" threshold="1e-5"/>

<MechanicalObject name="ms" template="Rigid3d" position="7.13718 -5.81916 23.8066 0.807871 0.160225 -0.1368 0.550416"/>
<UniformMass totalmass="0.1" />
Expand Down
2 changes: 1 addition & 1 deletion applications/plugins/SofaOpenCL/examples/PCISPHFluidForceFieldCPU.scn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<!--<RungeKutta4Solver/>-->
<!--<CentralDifferenceSolver/>-->
<EulerImplicitSolver rayleighStiffness="0.1" rayleighMass="0.1" />
<CGLinearSolver/>
<CGLinearSolver iterations="25" tolerance="1e-5" threshold="1e-5"/>
<!----> <MechanicalObject name="MModel" template="Vec3f"/> <-- -->
<!-- <MechanicalObject name="MModel" template="Vec3f" position="0 6 0" /> -->
<!-- A topology is used here just to set initial particles positions. It is a bad idea because this object has no real topology, but it works... -->
Expand Down
2 changes: 1 addition & 1 deletion applications/plugins/SofaSimpleGUI/examples/oneTet.scn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Node name="root" gravity="0 -10 0" dt="0.01" time="0" animate="0" >
<RequiredPlugin name="SofaOpenglVisual"/>
<EulerImplicitSolver name="solver" printLog="0" rayleighStiffness="0.1" rayleighMass="0.1" />
<CGLinearSolver />
<CGLinearSolver iterations="25" tolerance="1e-5" threshold="1e-5"/>
<MechanicalObject template="Vec3d" name="DOF" position="0 10 0 10 0 0 -5 0 8.66 -5 0 -8.66" velocity="0 0 0 0 0 0 0 0 0 0 0 0" force="0 0 0 0 0 0 0 0 0 0 0 0" externalForce="0 0 0 0 0 0 0 0 0 0 0 0" derivX="0 0 0 0 0 0 0 0 0 0 0 0" free_position="0 10 0 10 0 0 -5 0 8.66 -5 0 -8.66" free_velocity="0 0 0 0 0 0 0 0 0 0 0 0" rest_position="0 10 0 10 0 0 -5 0 8.66 -5 0 -8.66" reset_position="0 10 0 10 0 0 -5 0 8.66 -5 0 -8.66" restScale="1" showObject="1" showObjectScale="10" />
<UniformMass template="Vec3d" name="mass" mass="2" totalmass="8" />
<MeshTopology name="mesh topology" edges="0 1 0 2 0 3 1 2 1 3 2 3 " triangles="1 3 2 0 2 3 0 3 1 0 1 2 " tetrahedra="0 1 2 3 " />
Expand Down
2 changes: 1 addition & 1 deletion applications/plugins/image/examples/ImageToRigidMass.scn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<Node name="rigid" >

<EulerImplicitSolver rayleighStiffness="0.1" rayleighMass="0.1" />
<CGLinearSolver iterations="25"/>
<CGLinearSolver iterations="25" tolerance="1e-5" threshold="1e-5"/>

<MechanicalObject template="Rigid3d" position="@../imagemass.position" showObject="0" showObjectScale="1"/>

Expand Down
2 changes: 1 addition & 1 deletion applications/plugins/image/examples/ImageTransform.scn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<RequiredPlugin pluginName="image"/>

<EulerImplicitSolver rayleighStiffness="0.1" rayleighMass="0.1" />
<CGLinearSolver template="GraphScattered" iterations="200" threshold="1e-12" />
<CGLinearSolver template="GraphScattered" iterations="200" threshold="1e-12" tolerance="1e-5"/>

<MechanicalObject name="meca" template="Rigid3d" translation="7 7 0" />
<UniformMass template="Rigid3d" totalmass="10"/>
Expand Down
2 changes: 1 addition & 1 deletion applications/plugins/image/examples/sampler_HexaFEM.scn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<Node name="simu" >
<EulerImplicitSolver rayleighMass="1" rayleighStiffness="0.03" />
<CGLinearSolver />
<CGLinearSolver iterations="25" tolerance="1e-5" threshold="1e-5"/>
<MeshTopology src="@../sampler" />
<MechanicalObject />
<UniformMass totalMass="1000.0" />
Expand Down
2 changes: 1 addition & 1 deletion applications/plugins/image/examples/sampler_meshSpring.scn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<Node name="simu" >
<EulerImplicitSolver rayleighMass="1" rayleighStiffness="0.03" />
<CGLinearSolver />
<CGLinearSolver iterations="25" tolerance="1e-5" threshold="1e-5"/>
<MeshTopology src="@../sampler" />
<MechanicalObject />
<UniformMass totalmass="100.0" />
Expand Down
2 changes: 1 addition & 1 deletion examples/Benchmark/TopologicalChanges/AffineMovementConstraint__RemovingMeshTest.scn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<MinProximityIntersection name="Proximity" alarmDistance="0.8" contactDistance="0.5" />
<Node name="SquareGravity">
<EulerImplicitSolver name="cg_odesolver" rayleighStiffness="0.1" rayleighMass="0.1" />
<CGLinearSolver iterations="25" name="linear solver" />
<CGLinearSolver iterations="25" name="linear solver" tolerance="1e-5" threshold="1e-5"/>
<MeshGmshLoader name="loader" filename="mesh/square3.msh" createSubelements="true" />
<MechanicalObject name="dofs" src="@loader" template="Vec3d" />
<TriangleSetTopologyContainer name="Triangle_topo" src="@loader"/>
Expand Down
2 changes: 1 addition & 1 deletion examples/Benchmark/TopologicalChanges/FixedConstraint_RemovingMeshTest.scn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<MinProximityIntersection name="Proximity" alarmDistance="0.8" contactDistance="0.5" />
<Node name="SquareGravity">
<EulerImplicitSolver name="cg_odesolver" rayleighStiffness="0.1" rayleighMass="0.1" />
<CGLinearSolver iterations="25" name="linear solver" />
<CGLinearSolver iterations="25" tolerance="1e-5" threshold="1e-5" name="linear solver"/>
<MeshGmshLoader name="loader" filename="mesh/square3.msh" createSubelements="true" />
<MechanicalObject name="dofs" src="@loader" template="Vec3d" />
<TriangleSetTopologyContainer name="Triangle_topo" src="@loader"/>
Expand Down
2 changes: 1 addition & 1 deletion examples/Benchmark/TopologicalChanges/FixedPlaneConstraint_RemovingMeshTest.scn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<MinProximityIntersection name="Proximity" alarmDistance="0.8" contactDistance="0.5" />
<Node name="SquareGravity">
<EulerImplicitSolver name="cg_odesolver" rayleighStiffness="0.1" rayleighMass="0.1" />
<CGLinearSolver iterations="25" name="linear solver" />
<CGLinearSolver iterations="25" tolerance="1e-5" threshold="1e-5" name="linear solver"/>
<MeshGmshLoader name="loader" filename="mesh/square3.msh" createSubelements="true" />
<MechanicalObject name="dofs" src="@loader" template="Vec3d" />
<TriangleSetTopologyContainer name="Triangle_topo" src="@loader"/>
Expand Down
2 changes: 1 addition & 1 deletion examples/Benchmark/TopologicalChanges/LinearMovementConstraint_RemovingMeshTest.scn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<MinProximityIntersection name="Proximity" alarmDistance="0.8" contactDistance="0.5" />
<Node name="SquareGravity">
<EulerImplicitSolver name="cg_odesolver" rayleighStiffness="0.1" rayleighMass="0.1" />
<CGLinearSolver iterations="25" name="linear solver" />
<CGLinearSolver iterations="25" tolerance="1e-5" threshold="1e-5" name="linear solver"/>
<MeshGmshLoader name="loader" filename="mesh/square3.msh" createSubelements="true" />
<MechanicalObject name="dofs" src="@loader" template="Vec3d" />
<TriangleSetTopologyContainer name="Triangle_topo" src="@loader"/>
Expand Down
2 changes: 1 addition & 1 deletion examples/Benchmark/TopologicalChanges/ProjectDirectionConstraint_RemovingMeshTest.scn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<MinProximityIntersection name="Proximity" alarmDistance="0.8" contactDistance="0.5" />
<Node name="SquareGravity">
<EulerImplicitSolver name="cg_odesolver" rayleighStiffness="0.1" rayleighMass="0.1" />
<CGLinearSolver iterations="25" name="linear solver" />
<CGLinearSolver iterations="25" tolerance="1e-5" threshold="1e-5" name="linear solver"/>
<MeshGmshLoader name="loader" filename="mesh/square3.msh" createSubelements="true" />
<MechanicalObject name="dofs" src="@loader" template="Vec3d" />
<TriangleSetTopologyContainer name="Triangle_topo" src="@loader"/>
Expand Down
2 changes: 1 addition & 1 deletion examples/Benchmark/TopologicalChanges/ProjectToLineConstraint_RemovingMeshTest.scn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<MinProximityIntersection name="Proximity" alarmDistance="0.8" contactDistance="0.5" />
<Node name="SquareGravity">
<EulerImplicitSolver name="cg_odesolver" rayleighStiffness="0.1" rayleighMass="0.1" />
<CGLinearSolver iterations="25" name="linear solver" />
<CGLinearSolver iterations="25" tolerance="1e-5" threshold="1e-5" name="linear solver"/>
<MeshGmshLoader name="loader" filename="mesh/square3.msh" createSubelements="true" />
<MechanicalObject name="dofs" src="@loader" template="Vec3d" />
<TriangleSetTopologyContainer name="Triangle_topo" src="@loader"/>
Expand Down
2 changes: 1 addition & 1 deletion examples/Benchmark/TopologicalChanges/ProjectToPlaneConstraint_RemovingMeshTest.scn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<MinProximityIntersection name="Proximity" alarmDistance="0.8" contactDistance="0.5" />
<Node name="SquareGravity">
<EulerImplicitSolver name="cg_odesolver" rayleighStiffness="0.1" rayleighMass="0.1" />
<CGLinearSolver iterations="25" name="linear solver" />
<CGLinearSolver iterations="25" tolerance="1e-5" threshold="1e-5" name="linear solver"/>
<MeshGmshLoader name="loader" filename="mesh/square3.msh" createSubelements="true" />
<MechanicalObject name="dofs" src="@loader" template="Vec3d" />
<TriangleSetTopologyContainer name="Triangle_topo" src="@loader"/>
Expand Down
Loading