rename component into scenes

sofa-framework · Nov 22, 2024 · 1c92d51 · 1c92d51
1 parent 1ae8405
commit 1c92d51
Show file tree

Hide file tree

Showing 16 changed files with 20 additions and 20 deletions.
diff --git a/...nent/LinearSolver/Iterative/src/sofa/component/linearsolver/iterative/PCGLinearSolver.inl b/...nent/LinearSolver/Iterative/src/sofa/component/linearsolver/iterative/PCGLinearSolver.inl
@@ -28,7 +28,7 @@
 #include <sofa/helper/map.h>
 #include <sofa/helper/AdvancedTimer.h>
 #include <sofa/helper/ScopedAdvancedTimer.h>
-
+ 
 #include <cmath>
 
 namespace sofa::component::linearsolver::iterative

diff --git a/applications/plugins/SofaCUDA/examples/raptor-cpu.scn b/applications/plugins/SofaCUDA/examples/raptor-cpu.scn
@@ -6,7 +6,7 @@
 <!--    <MeshOBJLoader name="surface" filename="mesh/raptor8k1.obj" />-->
 		<EulerImplicitSolver rayleighMass="0.01" rayleighStiffness="0.01" />
 		<CGLinearSolver iterations="25" tolerance="1e-6" threshold="1e-20"/>
-<!--	<ShewchukPCGLinearSolver iterations="25" tolerance="1e-3" preconditioner="@precond" />
+<!--	<PCGLinearSolver iterations="25" tolerance="1e-3" preconditioner="@precond" />
 		<JacobiPreconditioner template="CudaDiagonalMatrixf" name="precond" /> -->
 		<MeshTopology src="@volume" />
 		<MechanicalObject template="Vec3" />

diff --git a/applications/plugins/SofaCUDA/examples/raptor-cuda.scn b/applications/plugins/SofaCUDA/examples/raptor-cuda.scn
@@ -13,7 +13,7 @@
 	<!--    <MeshOBJLoader name="surface" filename="mesh/raptor8k1.obj" />-->
 		<EulerImplicitSolver rayleighStiffness="0.1" rayleighMass="0.1" />
 		<CGLinearSolver iterations="25" tolerance="1e-6" threshold="1e-20"/>
-        <!--	<ShewchukPCGLinearSolver iterations="25" tolerance="1e-3" preconditioner="@precond" />
+        <!--	<PCGLinearSolver iterations="25" tolerance="1e-3" preconditioner="@precond" />
 		<JacobiPreconditioner template="CudaDiagonalMatrixf" name="precond" /> -->
 		<MeshTopology src="@volume" />
 		<MechanicalObject template="CudaVec3f" />

diff --git a/applications/plugins/SofaCUDA/examples/raptor.scn b/applications/plugins/SofaCUDA/examples/raptor.scn
@@ -1,7 +1,7 @@
 <Node name="root" dt="0.04" showBehaviorModels="0" showCollisionModels="0" showMappings="0" showForceFields="1">
     <RequiredPlugin name="Sofa.Component.Engine.Transform"/> <!-- Needed to use components [IndexValueMapper] -->
     <RequiredPlugin name="Sofa.Component.IO.Mesh"/> <!-- Needed to use components [MeshVTKLoader] -->
-    <RequiredPlugin name="Sofa.Component.LinearSolver.Iterative"/> <!-- Needed to use components [ShewchukPCGLinearSolver] -->
+    <RequiredPlugin name="Sofa.Component.LinearSolver.Iterative"/> <!-- Needed to use components [PCGLinearSolver] -->
     <RequiredPlugin name="Sofa.Component.LinearSolver.Preconditioner"/> <!-- Needed to use components [JacobiPreconditioner] -->
     <RequiredPlugin name="Sofa.Component.Mapping.Linear"/> <!-- Needed to use components [IdentityMapping] -->
     <RequiredPlugin name="Sofa.Component.ODESolver.Backward"/> <!-- Needed to use components [EulerImplicitSolver] -->
@@ -16,7 +16,7 @@
 <!--    <MeshOBJLoader name="surface" filename="mesh/raptor8k1.obj" />-->
     <EulerImplicitSolver rayleighStiffness="0.1" rayleighMass="0.1" />
 <!--    <CGLinearSolver iterations="30" tolerance="1e-10" threshold="1e-10"/>-->
-        <ShewchukPCGLinearSolver iterations="30" tolerance="1e-10" preconditioner="@precond" />
+        <PCGLinearSolver iterations="30" tolerance="1e-10" preconditioner="@precond" />
 	<JacobiPreconditioner template="CudaDiagonalMatrixf" name="precond" />
     <MeshTopology src="@volume" />
 	<MechanicalObject template="CudaVec3f" />

diff --git a/examples/Component/LinearSolver/Iterative/FEMBAR_ShewchukPCGLinearSolver.scn b/examples/Component/LinearSolver/Iterative/FEMBAR_ShewchukPCGLinearSolver.scn
@@ -2,7 +2,7 @@
 
     <include href="../FEMBAR-common.xml"/>
 
-    <ShewchukPCGLinearSolver iterations="1000" />
+    <PCGLinearSolver iterations="1000" />
     <HexahedronFEMForceField name="FEM" youngModulus="4000" poissonRatio="0.3" method="large" />
 
 </Node>
diff --git a/examples/Component/LinearSolver/Preconditioner/FEMBAR_PCG_AsyncSparseLDLSolver.scn b/examples/Component/LinearSolver/Preconditioner/FEMBAR_PCG_AsyncSparseLDLSolver.scn
@@ -2,7 +2,7 @@
 
     <include href="../FEMBAR-common.xml"/>
 
-    <ShewchukPCGLinearSolver name="PCG" iterations="1000" preconditioner="@preconditioner"/>
+    <PCGLinearSolver name="PCG" iterations="1000" preconditioner="@preconditioner"/>
     <AsyncSparseLDLSolver name="preconditioner"/>
     <HexahedronFEMForceField name="FEM" youngModulus="4000" poissonRatio="0.45" method="large" />
 

diff --git a/examples/Component/LinearSolver/Preconditioner/FEMBAR_PCG_BlockJacobiPreconditioner.scn b/examples/Component/LinearSolver/Preconditioner/FEMBAR_PCG_BlockJacobiPreconditioner.scn
@@ -2,7 +2,7 @@
 
     <include href="../FEMBAR-common.xml"/>
 
-    <ShewchukPCGLinearSolver name="PCG" iterations="1000" preconditioner="@preconditioner"/>
+    <PCGLinearSolver name="PCG" iterations="1000" preconditioner="@preconditioner"/>
     <BlockJacobiPreconditioner name="preconditioner"/>
     <HexahedronFEMForceField name="FEM" youngModulus="4000" poissonRatio="0.3" method="large" />
 

diff --git a/examples/Component/LinearSolver/Preconditioner/FEMBAR_PCG_JacobiPreconditioner.scn b/examples/Component/LinearSolver/Preconditioner/FEMBAR_PCG_JacobiPreconditioner.scn
@@ -2,7 +2,7 @@
 
     <include href="../FEMBAR-common.xml"/>
 
-    <ShewchukPCGLinearSolver name="PCG" iterations="1000" preconditioner="@preconditioner"/>
+    <PCGLinearSolver name="PCG" iterations="1000" preconditioner="@preconditioner"/>
     <JacobiPreconditioner name="preconditioner"/>
     <HexahedronFEMForceField name="FEM" youngModulus="4000" poissonRatio="0.3" method="large" />
 

diff --git a/examples/Component/LinearSolver/Preconditioner/FEMBAR_PCG_NoPreconditioner.scn b/examples/Component/LinearSolver/Preconditioner/FEMBAR_PCG_NoPreconditioner.scn
@@ -2,7 +2,7 @@
 
     <include href="../FEMBAR-common.xml"/>
 
-    <ShewchukPCGLinearSolver name="PCG" iterations="1000" use_precond="false"/>
+    <PCGLinearSolver name="PCG" iterations="1000" use_precond="false"/>
     <HexahedronFEMForceField name="FEM" youngModulus="4000" poissonRatio="0.3" method="large" />
 
 </Node>
diff --git a/examples/Component/LinearSolver/Preconditioner/FEMBAR_PCG_PrecomputedWarpPreconditioner.scn b/examples/Component/LinearSolver/Preconditioner/FEMBAR_PCG_PrecomputedWarpPreconditioner.scn
@@ -2,7 +2,7 @@
 
     <include href="../FEMBAR-common.xml"/>
 
-    <ShewchukPCGLinearSolver name="PCG" iterations="1000" preconditioner="@preconditioner"/>
+    <PCGLinearSolver name="PCG" iterations="1000" preconditioner="@preconditioner"/>
     <PrecomputedWarpPreconditioner name="preconditioner" linearSolver="@initSolver" printLog="true"/>
     <SparseLDLSolver name="initSolver" template="CompressedRowSparseMatrix" />
     <TetrahedronFEMForceField name="FEM" youngModulus="4000" poissonRatio="0.3" method="large" />

diff --git a/examples/Component/LinearSolver/Preconditioner/FEMBAR_PCG_SSORPreconditioner.scn b/examples/Component/LinearSolver/Preconditioner/FEMBAR_PCG_SSORPreconditioner.scn
@@ -2,7 +2,7 @@
 
     <include href="../FEMBAR-common.xml"/>
 
-    <ShewchukPCGLinearSolver name="PCG" iterations="1000" preconditioner="@preconditioner"/>
+    <PCGLinearSolver name="PCG" iterations="1000" preconditioner="@preconditioner"/>
     <SSORPreconditioner name="preconditioner"/>
     <HexahedronFEMForceField name="FEM" youngModulus="4000" poissonRatio="0.3" method="large" />
 

diff --git a/examples/Component/LinearSolver/Preconditioner/FEMBAR_PCG_WarpPreconditioner.scn b/examples/Component/LinearSolver/Preconditioner/FEMBAR_PCG_WarpPreconditioner.scn
@@ -2,7 +2,7 @@
 
     <include href="../FEMBAR-common.xml"/>
 
-    <ShewchukPCGLinearSolver name="PCG" iterations="1000" preconditioner="@preconditioner"/>
+    <PCGLinearSolver name="PCG" iterations="1000" preconditioner="@preconditioner"/>
     <WarpPreconditioner name="preconditioner" linearSolver="@initSolver" printLog="true"/>
     <SparseLDLSolver name="initSolver" template="CompressedRowSparseMatrixMat3x3" />
     <HexahedronFEMForceField name="FEM" youngModulus="4000" poissonRatio="0.3" method="large" />

diff --git a/examples/Component/LinearSolver/Preconditioner/FEMBAR_PCG_WarpedAsyncSparseLDLSolver.scn b/examples/Component/LinearSolver/Preconditioner/FEMBAR_PCG_WarpedAsyncSparseLDLSolver.scn
@@ -2,7 +2,7 @@
 
     <include href="../FEMBAR-common.xml"/>
 
-    <ShewchukPCGLinearSolver name="PCG" iterations="1000" preconditioner="@preconditioner" update_step="1"/>
+    <PCGLinearSolver name="PCG" iterations="1000" preconditioner="@preconditioner" update_step="1"/>
     <WarpPreconditioner name="preconditioner" linearSolver="@factorization" update_step="15"/>
     <AsyncSparseLDLSolver name="factorization" template="CompressedRowSparseMatrixMat3x3"/>
     <HexahedronFEMForceField name="FEM" youngModulus="4000" poissonRatio="0.3" method="large" />

diff --git a/examples/Component/SolidMechanics/FEM/Heterogeneous-TetrahedronFEMForceField.scn b/examples/Component/SolidMechanics/FEM/Heterogeneous-TetrahedronFEMForceField.scn
@@ -8,7 +8,7 @@
     <RequiredPlugin name="Sofa.Component.Engine.Select"/> <!-- Needed to use components [BoxROI] -->
     <RequiredPlugin name="Sofa.Component.Engine.Transform"/> <!-- Needed to use components [IndexValueMapper] -->
     <RequiredPlugin name="Sofa.Component.LinearSolver.Direct"/> <!-- Needed to use components [SparseLDLSolver] -->
-    <RequiredPlugin name="Sofa.Component.LinearSolver.Iterative"/> <!-- Needed to use components [ShewchukPCGLinearSolver] -->
+    <RequiredPlugin name="Sofa.Component.LinearSolver.Iterative"/> <!-- Needed to use components [PCGLinearSolver] -->
     <RequiredPlugin name="Sofa.Component.Mapping.Linear"/> <!-- Needed to use components [BarycentricMapping IdentityMapping] -->
     <RequiredPlugin name="Sofa.Component.Mass"/> <!-- Needed to use components [UniformMass] -->
     <RequiredPlugin name="Sofa.Component.MechanicalLoad"/> <!-- Needed to use components [ConstantForceField] -->
@@ -39,7 +39,7 @@
 
     <Node name="FEM">
         <EulerImplicitSolver rayleighMass="0.1" rayleighStiffness="0.1" _velocityDamping="0.5"/>
-        <ShewchukPCGLinearSolver preconditioner="@precond" update_step="15"/>
+        <PCGLinearSolver preconditioner="@precond" update_step="15"/>
         <SparseLDLSolver name="precond" template="CompressedRowSparseMatrixMat3x3"/>
 
         <TetrahedronSetTopologyContainer name="Container" position="@../Topology/HexaTop.position" tetrahedra="@../Topology/Container.tetrahedra"/>

diff --git a/examples/Component/SolidMechanics/Spring/TriangularBendingSprings.scn b/examples/Component/SolidMechanics/Spring/TriangularBendingSprings.scn
@@ -4,7 +4,7 @@
         <RequiredPlugin name="Sofa.Component.Constraint.Projective"/> <!-- Needed to use components [FixedProjectiveConstraint] -->
         <RequiredPlugin name="Sofa.Component.IO.Mesh"/> <!-- Needed to use components [MeshGmshLoader] -->
         <RequiredPlugin name="Sofa.Component.LinearSolver.Direct"/> <!-- Needed to use components [AsyncSparseLDLSolver] -->
-        <RequiredPlugin name="Sofa.Component.LinearSolver.Iterative"/> <!-- Needed to use components [ShewchukPCGLinearSolver] -->
+        <RequiredPlugin name="Sofa.Component.LinearSolver.Iterative"/> <!-- Needed to use components [PCGLinearSolver] -->
         <RequiredPlugin name="Sofa.Component.Mapping.Linear"/> <!-- Needed to use components [IdentityMapping] -->
         <RequiredPlugin name="Sofa.Component.Mass"/> <!-- Needed to use components [DiagonalMass] -->
         <RequiredPlugin name="Sofa.Component.ODESolver.Backward"/> <!-- Needed to use components [EulerImplicitSolver] -->
@@ -20,7 +20,7 @@
 
     <Node name="SquareGravity">
         <EulerImplicitSolver name="cg_odesolver" printLog="false"  rayleighStiffness="0.1" rayleighMass="0.1" />
-        <ShewchukPCGLinearSolver preconditioner="@preconditioner"/>
+        <PCGLinearSolver preconditioner="@preconditioner"/>
         <AsyncSparseLDLSolver name="preconditioner" template="CompressedRowSparseMatrixMat3x3"/>
         <MeshGmshLoader name="loader" filename="mesh/square3.msh" createSubelements="true"/>
         <MechanicalObject src="@loader" scale="10" />

diff --git a/examples/Demos/fallingBeamLagrangianCollision.scn b/examples/Demos/fallingBeamLagrangianCollision.scn
@@ -10,7 +10,7 @@
         <RequiredPlugin name="Sofa.Component.Constraint.Lagrangian.Correction"/> <!-- Needed to use components [LinearSolverConstraintCorrection] -->
         <RequiredPlugin name="Sofa.Component.Constraint.Lagrangian.Solver"/> <!-- Needed to use components [GenericConstraintSolver] -->
         <RequiredPlugin name="Sofa.Component.LinearSolver.Direct"/> <!-- Needed to use components [SparseLDLSolver] -->
-        <RequiredPlugin name="Sofa.Component.LinearSolver.Iterative"/> <!-- Needed to use components [ShewchukPCGLinearSolver] -->
+        <RequiredPlugin name="Sofa.Component.LinearSolver.Iterative"/> <!-- Needed to use components [PCGLinearSolver] -->
         <RequiredPlugin name="Sofa.Component.Mapping.Linear"/> <!-- Needed to use components [IdentityMapping] -->
         <RequiredPlugin name="Sofa.Component.Mass"/> <!-- Needed to use components [UniformMass] -->
         <RequiredPlugin name="Sofa.Component.ODESolver.Backward"/> <!-- Needed to use components [EulerImplicitSolver] -->
@@ -44,7 +44,7 @@
 
     <Node name="FEM">
         <EulerImplicitSolver firstOrder="false" rayleighMass="0.1" rayleighStiffness="0.1"/>
-        <ShewchukPCGLinearSolver preconditioner="@precond"/>
+        <PCGLinearSolver preconditioner="@precond"/>
         <SparseLDLSolver name="precond" template="CompressedRowSparseMatrixMat3x3" parallelInverseProduct="true" />
 
         <TetrahedronSetTopologyContainer name="Container" position="@../BEAMVOLUME/HexaTop.position"