From cf6a78d17362ead73fb0fc856db50fff181888c4 Mon Sep 17 00:00:00 2001 From: hugtalbot Date: Tue, 27 May 2025 22:34:53 +0200 Subject: [PATCH] Apply template method on BaseForceField --- .../component/forcefield/HyperReducedHexahedronFEMForceField.h | 2 +- .../forcefield/HyperReducedHexahedronFEMForceField.inl | 2 +- .../forcefield/HyperReducedRestShapeSpringsForceField.h | 2 +- .../forcefield/HyperReducedRestShapeSpringsForceField.inl | 2 +- .../HyperReducedTetrahedralCorotationalFEMForceField.h | 2 +- .../HyperReducedTetrahedralCorotationalFEMForceField.inl | 2 +- .../component/forcefield/HyperReducedTetrahedronFEMForceField.h | 2 +- .../forcefield/HyperReducedTetrahedronFEMForceField.inl | 2 +- .../HyperReducedTetrahedronHyperelasticityFEMForceField.h | 2 +- .../HyperReducedTetrahedronHyperelasticityFEMForceField.inl | 2 +- .../component/forcefield/HyperReducedTriangleFEMForceField.h | 2 +- .../component/forcefield/HyperReducedTriangleFEMForceField.inl | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/ModelOrderReduction/component/forcefield/HyperReducedHexahedronFEMForceField.h b/src/ModelOrderReduction/component/forcefield/HyperReducedHexahedronFEMForceField.h index f6c32edb..75a79107 100644 --- a/src/ModelOrderReduction/component/forcefield/HyperReducedHexahedronFEMForceField.h +++ b/src/ModelOrderReduction/component/forcefield/HyperReducedHexahedronFEMForceField.h @@ -141,7 +141,7 @@ class HyperReducedHexahedronFEMForceField : public virtual HexahedronFEMForceFie using InheritForceField::getPotentialEnergy; // getPotentialEnergy is implemented for polar method - void buildStiffnessMatrix(core::behavior::StiffnessMatrix* /* matrix */) override; + void doBuildStiffnessMatrix(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 index 20ffcb01..50ede7a7 100644 --- a/src/ModelOrderReduction/component/forcefield/HyperReducedHexahedronFEMForceField.inl +++ b/src/ModelOrderReduction/component/forcefield/HyperReducedHexahedronFEMForceField.inl @@ -389,7 +389,7 @@ template template -void HyperReducedHexahedronFEMForceField::buildStiffnessMatrix( +void HyperReducedHexahedronFEMForceField::doBuildStiffnessMatrix( core::behavior::StiffnessMatrix* matrix) { sofa::Index e { 0 }; //index of the element in the topology diff --git a/src/ModelOrderReduction/component/forcefield/HyperReducedRestShapeSpringsForceField.h b/src/ModelOrderReduction/component/forcefield/HyperReducedRestShapeSpringsForceField.h index 7e3281d6..cacd592d 100644 --- a/src/ModelOrderReduction/component/forcefield/HyperReducedRestShapeSpringsForceField.h +++ b/src/ModelOrderReduction/component/forcefield/HyperReducedRestShapeSpringsForceField.h @@ -103,7 +103,7 @@ class HyperReducedRestShapeSpringsForceField : public virtual RestShapeSpringsFo virtual void addDForce(const core::MechanicalParams* mparams, DataVecDeriv& df, const DataVecDeriv& dx) override; - void buildStiffnessMatrix(core::behavior::StiffnessMatrix* /* matrix */) override; + void doBuildStiffnessMatrix(core::behavior::StiffnessMatrix* /* matrix */) override; virtual void draw(const core::visual::VisualParams* vparams) override; diff --git a/src/ModelOrderReduction/component/forcefield/HyperReducedRestShapeSpringsForceField.inl b/src/ModelOrderReduction/component/forcefield/HyperReducedRestShapeSpringsForceField.inl index a556f03a..55c0d39f 100644 --- a/src/ModelOrderReduction/component/forcefield/HyperReducedRestShapeSpringsForceField.inl +++ b/src/ModelOrderReduction/component/forcefield/HyperReducedRestShapeSpringsForceField.inl @@ -458,7 +458,7 @@ void HyperReducedRestShapeSpringsForceField::draw(const VisualParams } template -void HyperReducedRestShapeSpringsForceField::buildStiffnessMatrix( +void HyperReducedRestShapeSpringsForceField::doBuildStiffnessMatrix( core::behavior::StiffnessMatrix* matrix) { const VecReal& k = d_stiffness.getValue(); diff --git a/src/ModelOrderReduction/component/forcefield/HyperReducedTetrahedralCorotationalFEMForceField.h b/src/ModelOrderReduction/component/forcefield/HyperReducedTetrahedralCorotationalFEMForceField.h index ba55b664..e743bdf5 100644 --- a/src/ModelOrderReduction/component/forcefield/HyperReducedTetrahedralCorotationalFEMForceField.h +++ b/src/ModelOrderReduction/component/forcefield/HyperReducedTetrahedralCorotationalFEMForceField.h @@ -129,7 +129,7 @@ class HyperReducedTetrahedralCorotationalFEMForceField : public virtual Tetrahed virtual void addForce(const core::MechanicalParams* mparams, DataVecDeriv& d_f, const DataVecCoord& d_x, const DataVecDeriv& d_v) override; virtual void addDForce(const core::MechanicalParams* mparams, DataVecDeriv& d_df, const DataVecDeriv& d_dx) override; - void buildStiffnessMatrix(core::behavior::StiffnessMatrix* /* matrix */) override; + void doBuildStiffnessMatrix(core::behavior::StiffnessMatrix* /* matrix */) override; void draw(const core::visual::VisualParams* vparams) override; diff --git a/src/ModelOrderReduction/component/forcefield/HyperReducedTetrahedralCorotationalFEMForceField.inl b/src/ModelOrderReduction/component/forcefield/HyperReducedTetrahedralCorotationalFEMForceField.inl index cd4b5e72..93216517 100644 --- a/src/ModelOrderReduction/component/forcefield/HyperReducedTetrahedralCorotationalFEMForceField.inl +++ b/src/ModelOrderReduction/component/forcefield/HyperReducedTetrahedralCorotationalFEMForceField.inl @@ -678,7 +678,7 @@ void HyperReducedTetrahedralCorotationalFEMForceField::draw(const cor template void HyperReducedTetrahedralCorotationalFEMForceField:: -buildStiffnessMatrix(core::behavior::StiffnessMatrix* matrix) +doBuildStiffnessMatrix(core::behavior::StiffnessMatrix* matrix) { StiffnessMatrix JKJt, RJKJtRt; sofa::type::Mat<3, 3, Real> localMatrix(type::NOINIT); diff --git a/src/ModelOrderReduction/component/forcefield/HyperReducedTetrahedronFEMForceField.h b/src/ModelOrderReduction/component/forcefield/HyperReducedTetrahedronFEMForceField.h index bb7eb2c9..2150316e 100644 --- a/src/ModelOrderReduction/component/forcefield/HyperReducedTetrahedronFEMForceField.h +++ b/src/ModelOrderReduction/component/forcefield/HyperReducedTetrahedronFEMForceField.h @@ -132,7 +132,7 @@ class HyperReducedTetrahedronFEMForceField : public virtual TetrahedronFEMForceF // Make other overloaded version of getPotentialEnergy() to show up in subclass. using TetrahedronFEMForceField::getPotentialEnergy; - virtual void buildStiffnessMatrix(core::behavior::StiffnessMatrix* matrix) override; + virtual void doBuildStiffnessMatrix(core::behavior::StiffnessMatrix* matrix) override; void draw(const core::visual::VisualParams* vparams) override; protected: diff --git a/src/ModelOrderReduction/component/forcefield/HyperReducedTetrahedronFEMForceField.inl b/src/ModelOrderReduction/component/forcefield/HyperReducedTetrahedronFEMForceField.inl index de8af6e2..50a0a55f 100644 --- a/src/ModelOrderReduction/component/forcefield/HyperReducedTetrahedronFEMForceField.inl +++ b/src/ModelOrderReduction/component/forcefield/HyperReducedTetrahedronFEMForceField.inl @@ -640,7 +640,7 @@ void HyperReducedTetrahedronFEMForceField::draw(const core::visual::V } template -void HyperReducedTetrahedronFEMForceField::buildStiffnessMatrix(core::behavior::StiffnessMatrix* matrix) +void HyperReducedTetrahedronFEMForceField::doBuildStiffnessMatrix(core::behavior::StiffnessMatrix* matrix) { StiffnessMatrix JKJt, RJKJtRt; sofa::type::Mat<3, 3, Real> localMatrix(type::NOINIT); diff --git a/src/ModelOrderReduction/component/forcefield/HyperReducedTetrahedronHyperelasticityFEMForceField.h b/src/ModelOrderReduction/component/forcefield/HyperReducedTetrahedronHyperelasticityFEMForceField.h index 4dad9d8d..c419d5b5 100644 --- a/src/ModelOrderReduction/component/forcefield/HyperReducedTetrahedronHyperelasticityFEMForceField.h +++ b/src/ModelOrderReduction/component/forcefield/HyperReducedTetrahedronHyperelasticityFEMForceField.h @@ -118,7 +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; - void buildStiffnessMatrix(core::behavior::StiffnessMatrix* /* matrix */) override; + void doBuildStiffnessMatrix(core::behavior::StiffnessMatrix* /* matrix */) override; void draw(const core::visual::VisualParams* vparams) override; diff --git a/src/ModelOrderReduction/component/forcefield/HyperReducedTetrahedronHyperelasticityFEMForceField.inl b/src/ModelOrderReduction/component/forcefield/HyperReducedTetrahedronHyperelasticityFEMForceField.inl index ff6f9c2e..35d0bd1a 100644 --- a/src/ModelOrderReduction/component/forcefield/HyperReducedTetrahedronHyperelasticityFEMForceField.inl +++ b/src/ModelOrderReduction/component/forcefield/HyperReducedTetrahedronHyperelasticityFEMForceField.inl @@ -491,7 +491,7 @@ void HyperReducedTetrahedronHyperelasticityFEMForceField::addDForce(c template void HyperReducedTetrahedronHyperelasticityFEMForceField:: -buildStiffnessMatrix(core::behavior::StiffnessMatrix* matrix) +doBuildStiffnessMatrix(core::behavior::StiffnessMatrix* matrix) { /// if the matrix needs to be updated if (m_updateMatrix) diff --git a/src/ModelOrderReduction/component/forcefield/HyperReducedTriangleFEMForceField.h b/src/ModelOrderReduction/component/forcefield/HyperReducedTriangleFEMForceField.h index 02515739..1cc22971 100644 --- a/src/ModelOrderReduction/component/forcefield/HyperReducedTriangleFEMForceField.h +++ b/src/ModelOrderReduction/component/forcefield/HyperReducedTriangleFEMForceField.h @@ -140,7 +140,7 @@ protected : void hyperReducedApplyStiffnessLarge( VecCoord& f, Real h, const VecCoord& x, const SReal &kFactor ); //// stiffness matrix assembly - void buildStiffnessMatrix(core::behavior::StiffnessMatrix* matrix) override; + void doBuildStiffnessMatrix(core::behavior::StiffnessMatrix* matrix) override; }; diff --git a/src/ModelOrderReduction/component/forcefield/HyperReducedTriangleFEMForceField.inl b/src/ModelOrderReduction/component/forcefield/HyperReducedTriangleFEMForceField.inl index 9c367e2b..957ab2d5 100644 --- a/src/ModelOrderReduction/component/forcefield/HyperReducedTriangleFEMForceField.inl +++ b/src/ModelOrderReduction/component/forcefield/HyperReducedTriangleFEMForceField.inl @@ -372,7 +372,7 @@ void HyperReducedTriangleFEMForceField::draw(const core::visual::Visu } template -void HyperReducedTriangleFEMForceField::buildStiffnessMatrix(core::behavior::StiffnessMatrix* matrix) +void HyperReducedTriangleFEMForceField::doBuildStiffnessMatrix(core::behavior::StiffnessMatrix* matrix) { StiffnessMatrix JKJt, RJKJtRt; sofa::type::Mat<3, 3, Real> localMatrix(type::NOINIT);