[FEM.Elastic] Remove addKToMatrix override as it is duplicated from b…

…ase class (sofa-framework#4779)
mimesis-inria · Jun 22, 2024 · 167bc93 · 167bc93
1 parent ca70b0f
commit 167bc93
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 22 deletions.
diff --git a/...tic/src/sofa/component/solidmechanics/fem/elastic/FastTetrahedralCorotationalForceField.h b/...tic/src/sofa/component/solidmechanics/fem/elastic/FastTetrahedralCorotationalForceField.h
@@ -154,8 +154,8 @@ class FastTetrahedralCorotationalForceField : public core::behavior::ForceField<
         return 0.0;
     }
 
+    using Inherit1::addKToMatrix;
     void addKToMatrix(sofa::linearalgebra::BaseMatrix *m, SReal kFactor, unsigned int &offset) override;
-    void addKToMatrix(const core::MechanicalParams* /*mparams*/, const sofa::core::behavior::MultiMatrixAccessor* /*matrix*/ ) override;
     void buildStiffnessMatrix(core::behavior::StiffnessMatrix* matrix) override;
     void buildDampingMatrix(core::behavior::DampingMatrix* matrix) override;
 

diff --git a/...c/src/sofa/component/solidmechanics/fem/elastic/FastTetrahedralCorotationalForceField.inl b/...c/src/sofa/component/solidmechanics/fem/elastic/FastTetrahedralCorotationalForceField.inl
@@ -481,16 +481,6 @@ void FastTetrahedralCorotationalForceField<DataTypes>::addDForce(const sofa::cor
     datadF.endEdit();
 }
 
-template<class DataTypes>
-void FastTetrahedralCorotationalForceField<DataTypes>::addKToMatrix(const core::MechanicalParams* mparams, const sofa::core::behavior::MultiMatrixAccessor* matrix )
-{
-    sofa::core::behavior::MultiMatrixAccessor::MatrixRef r = matrix->getMatrix(this->mstate);
-    if (r)
-        addKToMatrix(r.matrix, sofa::core::mechanicalparams::kFactorIncludingRayleighDamping(mparams, this->rayleighStiffness.getValue()), r.offset);
-    else
-        msg_error() << "addKToMatrix found no valid matrix accessor.";
-}
-
 template <class DataTypes>
 void FastTetrahedralCorotationalForceField<DataTypes>::buildStiffnessMatrix(
     core::behavior::StiffnessMatrix* matrix)

diff --git a/...nics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TetrahedronFEMForceField.h b/...nics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TetrahedronFEMForceField.h
@@ -283,8 +283,8 @@ class TetrahedronFEMForceField : public core::behavior::ForceField<DataTypes>, p
     // getPotentialEnergy is implemented for small method
     SReal getPotentialEnergy(const core::MechanicalParams*, const DataVecCoord&   x) const override;
 
+    using Inherit1::addKToMatrix;
     void addKToMatrix(sofa::linearalgebra::BaseMatrix *m, SReal kFactor, unsigned int &offset) override;
-    void addKToMatrix(const core::MechanicalParams* /*mparams*/, const sofa::core::behavior::MultiMatrixAccessor* /*matrix*/ ) override;
     void buildStiffnessMatrix(core::behavior::StiffnessMatrix* matrix) override;
     void buildDampingMatrix(core::behavior::DampingMatrix* /*matrix*/) final;
 

diff --git a/...cs/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TetrahedronFEMForceField.inl b/...cs/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TetrahedronFEMForceField.inl
@@ -2069,16 +2069,6 @@ void TetrahedronFEMForceField<DataTypes>::draw(const core::visual::VisualParams*
 
 }
 
-
-template<class DataTypes>
-void TetrahedronFEMForceField<DataTypes>::addKToMatrix(const core::MechanicalParams* mparams, const sofa::core::behavior::MultiMatrixAccessor* matrix )
-{
-    sofa::core::behavior::MultiMatrixAccessor::MatrixRef r = matrix->getMatrix(this->mstate);
-    if (r)
-        addKToMatrix(r.matrix, sofa::core::mechanicalparams::kFactorIncludingRayleighDamping(mparams, this->rayleighStiffness.getValue()), r.offset);
-    else dmsg_error() << "The function addKToMatrix found no valid matrix accessor." ;
-}
-
 template<class DataTypes>
 void TetrahedronFEMForceField<DataTypes>::addKToMatrix(sofa::linearalgebra::BaseMatrix *mat, SReal k, unsigned int &offset)
 {