Add compatibility layer for buildStiffnessMatrix (#82)

For components not implementing it already
SofaDefrost · Nov 10, 2023 · 11fa735 · 11fa735
1 parent f4cf2e4
commit 11fa735
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 0 deletions.
diff --git a/src/ModelOrderReduction/component/forcefield/HyperReducedHexahedronFEMForceField.h b/src/ModelOrderReduction/component/forcefield/HyperReducedHexahedronFEMForceField.h
@@ -144,6 +144,7 @@ class HyperReducedHexahedronFEMForceField : public virtual HexahedronFEMForceFie
     // getPotentialEnergy is implemented for polar method
 
     void addKToMatrix(const core::MechanicalParams* mparams, const sofa::core::behavior::MultiMatrixAccessor* matrix) override;
+    void buildStiffnessMatrix(core::behavior::StiffnessMatrix* /* matrix */) override;
 
     void draw(const core::visual::VisualParams* vparams) override;
 

diff --git a/src/ModelOrderReduction/component/forcefield/HyperReducedHexahedronFEMForceField.inl b/src/ModelOrderReduction/component/forcefield/HyperReducedHexahedronFEMForceField.inl
@@ -451,6 +451,13 @@ void HyperReducedHexahedronFEMForceField<DataTypes>::addKToMatrix(const core::Me
     }
 }
 
+template <class DataTypes>
+void HyperReducedHexahedronFEMForceField<DataTypes>::buildStiffnessMatrix(
+    core::behavior::StiffnessMatrix* matrix)
+{
+    core::behavior::ForceField<DataTypes>::buildStiffnessMatrix(matrix);
+}
+
 
 template<class DataTypes>
 void HyperReducedHexahedronFEMForceField<DataTypes>::draw(const core::visual::VisualParams* vparams)

diff --git a/src/ModelOrderReduction/component/forcefield/HyperReducedRestShapeSpringsForceField.h b/src/ModelOrderReduction/component/forcefield/HyperReducedRestShapeSpringsForceField.h
@@ -106,6 +106,8 @@ class HyperReducedRestShapeSpringsForceField : public virtual RestShapeSpringsFo
     /// Brings ForceField contribution to the global system stiffness matrix.
     virtual void addKToMatrix(const core::MechanicalParams* mparams, const sofa::core::behavior::MultiMatrixAccessor* matrix ) override;
 
+    void buildStiffnessMatrix(core::behavior::StiffnessMatrix* /* matrix */) override;
+
     virtual void draw(const core::visual::VisualParams* vparams) override;
 
     const DataVecCoord* getExtPosition() const;

diff --git a/src/ModelOrderReduction/component/forcefield/HyperReducedRestShapeSpringsForceField.inl b/src/ModelOrderReduction/component/forcefield/HyperReducedRestShapeSpringsForceField.inl
@@ -488,6 +488,13 @@ void HyperReducedRestShapeSpringsForceField<DataTypes>::addKToMatrix(const Mecha
     }
 }
 
+template <class DataTypes>
+void HyperReducedRestShapeSpringsForceField<DataTypes>::buildStiffnessMatrix(
+    core::behavior::StiffnessMatrix* matrix)
+{
+    core::behavior::ForceField<DataTypes>::buildStiffnessMatrix(matrix);
+}
+
 } // namespace sofa::component::solidmechanics::spring
 
 
diff --git a/...delOrderReduction/component/forcefield/HyperReducedTetrahedralCorotationalFEMForceField.h b/...delOrderReduction/component/forcefield/HyperReducedTetrahedralCorotationalFEMForceField.h
@@ -131,6 +131,7 @@ class HyperReducedTetrahedralCorotationalFEMForceField : public virtual Tetrahed
     virtual void addDForce(const core::MechanicalParams* mparams, DataVecDeriv& d_df, const DataVecDeriv& d_dx) override;
 
     virtual void addKToMatrix(sofa::linearalgebra::BaseMatrix *m, SReal kFactor, unsigned int &offset) override;
+    void buildStiffnessMatrix(core::behavior::StiffnessMatrix* /* matrix */) override;
 
     void draw(const core::visual::VisualParams* vparams) override;
 

diff --git a/...lOrderReduction/component/forcefield/HyperReducedTetrahedralCorotationalFEMForceField.inl b/...lOrderReduction/component/forcefield/HyperReducedTetrahedralCorotationalFEMForceField.inl
@@ -756,4 +756,12 @@ void HyperReducedTetrahedralCorotationalFEMForceField<DataTypes>::addKToMatrix(s
         }
     }
 }
+
+template <class DataTypes>
+void HyperReducedTetrahedralCorotationalFEMForceField<DataTypes>::
+buildStiffnessMatrix(core::behavior::StiffnessMatrix* matrix)
+{
+    core::behavior::ForceField<DataTypes>::buildStiffnessMatrix(matrix);
+}
+
 } // namespace sofa::component::solidmechanics::fem::elastic
diff --git a/...OrderReduction/component/forcefield/HyperReducedTetrahedronHyperelasticityFEMForceField.h b/...OrderReduction/component/forcefield/HyperReducedTetrahedronHyperelasticityFEMForceField.h
@@ -118,6 +118,7 @@ public :
     virtual void addForce(const core::MechanicalParams* mparams /* PARAMS FIRST */, DataVecDeriv& d_f, const DataVecCoord& d_x, const DataVecDeriv& d_v) override;
     virtual void addDForce(const core::MechanicalParams* mparams /* PARAMS FIRST */, DataVecDeriv& d_df, const DataVecDeriv& d_dx) override;
     virtual void addKToMatrix(sofa::linearalgebra::BaseMatrix *mat, SReal k, unsigned int &offset) override;
+    void buildStiffnessMatrix(core::behavior::StiffnessMatrix* /* matrix */) override;
 
     void draw(const core::visual::VisualParams* vparams) override;
 

diff --git a/...derReduction/component/forcefield/HyperReducedTetrahedronHyperelasticityFEMForceField.inl b/...derReduction/component/forcefield/HyperReducedTetrahedronHyperelasticityFEMForceField.inl
@@ -573,6 +573,12 @@ void HyperReducedTetrahedronHyperelasticityFEMForceField<DataTypes>::addKToMatri
     m_edgeInfo.endEdit();
 }
 
+template <class DataTypes>
+void HyperReducedTetrahedronHyperelasticityFEMForceField<DataTypes>::
+buildStiffnessMatrix(core::behavior::StiffnessMatrix* matrix)
+{
+    core::behavior::ForceField<DataTypes>::buildStiffnessMatrix(matrix);
+}
 
 
 template<class DataTypes>