Skip to content

Commit 424638e

Browse files
hugtalbothugtalbot
authored
Merge pull request #176 from bakpaul/26_06_apply_new_integration_schemes_changes
Apply changes from SOFA PR #6117
2 parents d1363e3 + 20c4ac3 commit 424638e

26 files changed

Lines changed: 39 additions & 39 deletions

‎examples/bouncingBall/softSphereFalling.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
'Sofa.Component.LinearSolver.Direct',
1919
'Sofa.Component.Mapping.Linear',
2020
'Sofa.Component.Mass',
21-
'Sofa.Component.ODESolver.Backward',
21+
'Sofa.Component.IntegrationScheme.Backward',
2222
'Sofa.Component.SolidMechanics.FEM.Elastic',
2323
'Sofa.Component.StateContainer',
2424
'Sofa.Component.Topology.Container.Constant',
@@ -42,7 +42,7 @@ def createScene(rootNode):
4242
rootNode.addObject('LocalMinDistance', name="Proximity", alarmDistance="8.0", contactDistance="0.5", angleCone="0.01")
4343

4444
solverNode = rootNode.addChild('solverNode')
45-
solverNode.addObject('EulerImplicitSolver', name='odesolver',firstOrder="false", rayleighStiffness='0.0', rayleighMass='0.0')
45+
solverNode.addObject('EulerImplicitIntegrationScheme', name='odesolver',firstOrder="false", rayleighStiffness='0.0', rayleighMass='0.0')
4646
solverNode.addObject('SparseLDLSolver', name="preconditioner", template="CompressedRowSparseMatrixd")
4747
solverNode.addObject('GenericConstraintCorrection', linearSolver='@preconditioner',printLog=True, name='ResReso')
4848

‎examples/bouncingBall/softSphereFalling_reduced.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
'Sofa.Component.LinearSolver.Direct', # Needed to use components [SparseLDLSolver]
2424
'Sofa.Component.Mapping.Linear', # Needed to use components [BarycentricMapping]
2525
'Sofa.Component.Mass', # Needed to use components [UniformMass]
26-
'Sofa.Component.ODESolver.Backward', # Needed to use components [EulerImplicitSolver]
26+
'Sofa.Component.IntegrationScheme.Backward', # Needed to use components [EulerImplicitIntegrationScheme]
2727
'Sofa.Component.SolidMechanics.FEM.Elastic', # Needed to use components [TetrahedronFEMForceField]
2828
'Sofa.Component.SolidMechanics.Spring', # Needed to use components [RestShapeSpringsForceField]
2929
'Sofa.Component.StateContainer', # Needed to use components [MechanicalObject]
@@ -46,7 +46,7 @@ def createScene(rootNode):
4646
rootNode.addObject('LocalMinDistance', name="Proximity", alarmDistance="8.0", contactDistance="0.5", angleCone="0.01")
4747

4848
solverNode = rootNode.addChild('solverNode')
49-
solverNode.addObject('EulerImplicitSolver', name='odesolver',firstOrder="false", rayleighStiffness='0.0', rayleighMass='0.0')
49+
solverNode.addObject('EulerImplicitIntegrationScheme', name='odesolver',firstOrder="false", rayleighStiffness='0.0', rayleighMass='0.0')
5050
solverNode.addObject('SparseLDLSolver', name="preconditioner", template="CompressedRowSparseMatrixd")
5151
solverNode.addObject('GenericConstraintCorrection', linearSolver='@preconditioner',printLog=True, name='ResReso')
5252

‎examples/organs/liver/liverFineHyperElastic.pyscn‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def createScene(rootNode):
1414
rootNode.addObject('RequiredPlugin', name='Sofa.Component.LinearSolver.Direct') # Needed to use components [SparseLDLSolver]
1515
rootNode.addObject('RequiredPlugin', name='Sofa.Component.Mapping.Linear') # Needed to use components [BarycentricMapping]
1616
rootNode.addObject('RequiredPlugin', name='Sofa.Component.Mass') # Needed to use components [UniformMass]
17-
rootNode.addObject('RequiredPlugin', name='Sofa.Component.ODESolver.Backward') # Needed to use components [EulerImplicitSolver]
17+
rootNode.addObject('RequiredPlugin', name='Sofa.Component.IntegrationScheme.Backward') # Needed to use components [EulerImplicitIntegrationScheme]
1818
rootNode.addObject('RequiredPlugin', name='Sofa.Component.SolidMechanics.FEM.HyperElastic') # Needed to use components [TetrahedronHyperelasticityFEMForceField]
1919
rootNode.addObject('RequiredPlugin', name='Sofa.Component.SolidMechanics.Spring') # Needed to use components [RestShapeSpringsForceField]
2020
rootNode.addObject('RequiredPlugin', name='Sofa.Component.StateContainer') # Needed to use components [MechanicalObject]
@@ -29,7 +29,7 @@ def createScene(rootNode):
2929
rootNode.addObject('DefaultAnimationLoop')
3030

3131
liver = rootNode.addChild('liver')
32-
liver.addObject('EulerImplicitSolver', rayleighStiffness = 0.0, rayleighMass = 0.0)
32+
liver.addObject('EulerImplicitIntegrationScheme', rayleighStiffness = 0.0, rayleighMass = 0.0)
3333
liver.addObject('SparseLDLSolver',template="CompressedRowSparseMatrixMat3x3d")
3434
liver.addObject('MeshVTKLoader', name="loader", filename=meshPath+'liverFine.vtu')
3535
liver.addObject('TetrahedronSetTopologyContainer', src="@loader")

‎examples/organs/liver/liverFine_gravity.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
'Sofa.Component.LinearSolver.Direct', # Needed to use components [SparseLDLSolver]
1818
'Sofa.Component.Mapping.Linear', # Needed to use components [BarycentricMapping]
1919
'Sofa.Component.Mass', # Needed to use components [UniformMass]
20-
'Sofa.Component.ODESolver.Backward', # Needed to use components [EulerImplicitSolver]
20+
'Sofa.Component.IntegrationScheme.Backward', # Needed to use components [EulerImplicitIntegrationScheme]
2121
'Sofa.Component.SolidMechanics.FEM.Elastic', # Needed to use components [TetrahedronFEMForceField]
2222
'Sofa.Component.SolidMechanics.Spring', # Needed to use components [RestShapeSpringsForceField]
2323
'Sofa.Component.StateContainer', # Needed to use components [MechanicalObject]
@@ -35,7 +35,7 @@ def createScene(rootNode):
3535
surfaceColor=[0.7, 0.7, 0.7, 0.7]
3636

3737
liver = rootNode.addChild('liver')
38-
liver.addObject('EulerImplicitSolver', rayleighStiffness = 0.0, rayleighMass = 0.0)
38+
liver.addObject('EulerImplicitIntegrationScheme', rayleighStiffness = 0.0, rayleighMass = 0.0)
3939
liver.addObject('SparseLDLSolver',template="CompressedRowSparseMatrixMat3x3d")
4040
liver.addObject('MeshVTKLoader', name="loader", filename=meshPath+'liverFine.vtu')
4141
liver.addObject('TetrahedronSetTopologyContainer', src="@loader")

‎examples/organs/liver/liverFine_rotationalActuation.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
'Sofa.Component.LinearSolver.Direct', # Needed to use components [SparseLDLSolver]
1818
'Sofa.Component.Mapping.Linear', # Needed to use components [BarycentricMapping]
1919
'Sofa.Component.Mass', # Needed to use components [UniformMass]
20-
'Sofa.Component.ODESolver.Backward', # Needed to use components [EulerImplicitSolver]
20+
'Sofa.Component.IntegrationScheme.Backward', # Needed to use components [EulerImplicitIntegrationScheme]
2121
'Sofa.Component.SolidMechanics.FEM.Elastic', # Needed to use components [TetrahedronFEMForceField]
2222
'Sofa.Component.SolidMechanics.Spring', # Needed to use components [RestShapeSpringsForceField]
2323
'Sofa.Component.StateContainer', # Needed to use components [MechanicalObject]
@@ -37,7 +37,7 @@ def createScene(rootNode):
3737
rootNode.addObject('DefaultAnimationLoop')
3838

3939
liver = rootNode.addChild('liver')
40-
liver.addObject('EulerImplicitSolver', rayleighStiffness = 0.0, rayleighMass = 0.0)
40+
liver.addObject('EulerImplicitIntegrationScheme', rayleighStiffness = 0.0, rayleighMass = 0.0)
4141
liver.addObject('SparseLDLSolver',template="CompressedRowSparseMatrixMat3x3d")
4242
liver.addObject('MeshVTKLoader', name="loader", filename=meshPath+'liverFine.vtu')
4343
liver.addObject('TetrahedronSetTopologyContainer', src="@loader")

‎examples/organs/liver/reduced/liver/reduced_liverFine.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def Reduced_test(
6464
modelRoot = attachedTo.addChild(name)
6565

6666
liver_MOR = modelRoot.addChild('liver_MOR')
67-
liver_MOR.addObject('EulerImplicitSolver' , rayleighStiffness = 0.0, rayleighMass = 0.0)
67+
liver_MOR.addObject('EulerImplicitIntegrationScheme' , rayleighStiffness = 0.0, rayleighMass = 0.0)
6868
liver_MOR.addObject('SparseLDLSolver' , template = 'CompressedRowSparseMatrixMat3x3d')
6969
liver_MOR.addObject('MechanicalObject' , template = 'Vec1d', position = [0]*nbrOfModes)
7070

‎examples/organs/liver/reduced/liver_hyperElastic/reduced_liverFineHyperElastic.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def Reduced_test(
6464
modelRoot = attachedTo.addChild(name)
6565

6666
liver_MOR = modelRoot.addChild('liver_MOR')
67-
liver_MOR.addObject('EulerImplicitSolver' , rayleighStiffness = 0.0, rayleighMass = 0.0)
67+
liver_MOR.addObject('EulerImplicitIntegrationScheme' , rayleighStiffness = 0.0, rayleighMass = 0.0)
6868
liver_MOR.addObject('SparseLDLSolver' , template = 'CompressedRowSparseMatrixMat3x3d')
6969
liver_MOR.addObject('MechanicalObject' , template = 'Vec1d', position = [0]*nbrOfModes)
7070

‎examples/others/SphereOnAPlane/softSphereFalling.pyscn‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def createScene(rootNode):
1515
rootNode.addObject('RequiredPlugin', name='Sofa.Component.Collision.Detection.Intersection') # Needed to use components [LocalMinDistance]
1616
rootNode.addObject('RequiredPlugin', name='Sofa.Component.Collision.Response.Contact') # Needed to use components [CollisionResponse]
1717
rootNode.addObject('RequiredPlugin', name='Sofa.Component.Constraint.Lagrangian.Solver') # Needed to use components [GenericConstraintSolver]
18-
rootNode.addObject('RequiredPlugin', name='Sofa.Component.ODESolver.Backward') # Needed to use components [EulerImplicitSolver]
18+
rootNode.addObject('RequiredPlugin', name='Sofa.Component.IntegrationScheme.Backward') # Needed to use components [EulerImplicitIntegrationScheme]
1919
rootNode.addObject('RequiredPlugin', name='Sofa.Component.Visual') # Needed to use components [VisualStyle]
2020
rootNode.addObject('RequiredPlugin', name='Sofa.Component.Constraint.Lagrangian.Correction') # Needed to use components [GenericConstraintCorrection]
2121
rootNode.addObject('RequiredPlugin', name='Sofa.Component.LinearSolver.Direct') # Needed to use components [SparseLDLSolver]
@@ -55,7 +55,7 @@ def createScene(rootNode):
5555
rootNode.addObject('LocalMinDistance', name="Proximity", alarmDistance="1.0", contactDistance="0.5", angleCone="0.01")
5656

5757
solverNode = rootNode.addChild('solverNode')
58-
solverNode.addObject('EulerImplicitSolver', name='odesolver',firstOrder="false", rayleighStiffness='0.1', rayleighMass='0.1', printLog="0")
58+
solverNode.addObject('EulerImplicitIntegrationScheme', name='odesolver',firstOrder="false", rayleighStiffness='0.1', rayleighMass='0.1', printLog="0")
5959
solverNode.addObject('SparseLDLSolver', name="preconditioner", template="CompressedRowSparseMatrixMat3x3d")
6060
solverNode.addObject('GenericConstraintCorrection', printLog=True, name='ResReso')
6161

‎examples/others/caduceus/caduceusNG.pyscn‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def createScene(rootNode):
2222
rootNode.addObject('RequiredPlugin', name='Sofa.Component.LinearSolver.Direct') # Needed to use components [SparseLDLSolver]
2323
rootNode.addObject('RequiredPlugin', name='Sofa.Component.Mapping.Linear') # Needed to use components [BarycentricMapping]
2424
rootNode.addObject('RequiredPlugin', name='Sofa.Component.Mass') # Needed to use components [UniformMass]
25-
rootNode.addObject('RequiredPlugin', name='Sofa.Component.ODESolver.Backward') # Needed to use components [EulerImplicitSolver]
25+
rootNode.addObject('RequiredPlugin', name='Sofa.Component.IntegrationScheme.Backward') # Needed to use components [EulerImplicitIntegrationScheme]
2626
rootNode.addObject('RequiredPlugin', name='Sofa.Component.SolidMechanics.FEM.Elastic') # Needed to use components [TetrahedronFEMForceField]
2727
rootNode.addObject('RequiredPlugin', name='Sofa.Component.StateContainer') # Needed to use components [MechanicalObject]
2828
rootNode.addObject('RequiredPlugin', name='Sofa.Component.Topology.Container.Constant') # Needed to use components [MeshTopology]
@@ -54,7 +54,7 @@ def createScene(rootNode):
5454

5555

5656
Snake = rootNode.addChild("Snake")
57-
Snake.addObject('EulerImplicitSolver',rayleighStiffness="0.1", rayleighMass="0.1")
57+
Snake.addObject('EulerImplicitIntegrationScheme',rayleighStiffness="0.1", rayleighMass="0.1")
5858
Snake.addObject('SparseLDLSolver',name='preconditioner')
5959
Snake.addObject('MeshVTKLoader', name='loader', filename=meshPath+'snake0.vtu', rotation=[-90, 0, 0], translation=[0,5,0])
6060
Snake.addObject('TetrahedronSetTopologyContainer',src = '@loader')

‎examples/others/caduceus/reduced/reduced_caduceusNG.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def Reduced_test(
6464
modelRoot = attachedTo.addChild(name)
6565

6666
Snake_MOR = modelRoot.addChild('Snake_MOR')
67-
Snake_MOR.addObject('EulerImplicitSolver' , rayleighStiffness = '0.1', rayleighMass = '0.1')
67+
Snake_MOR.addObject('EulerImplicitIntegrationScheme' , rayleighStiffness = '0.1', rayleighMass = '0.1')
6868
Snake_MOR.addObject('SparseLDLSolver' , name = 'preconditioner')
6969
Snake_MOR.addObject('GenericConstraintCorrection' , linearSolver = '@preconditioner')
7070
Snake_MOR.addObject('MechanicalObject' , template = 'Vec1d', position = [0]*nbrOfModes)

0 commit comments

Comments
 (0)