Skip to content

Apply template method on BaseForceField #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hugtalbot wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Apply template method on BaseForceField #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ModelOrderReduction/component/forcefield/HyperReducedHexahedronFEMForceField.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/ModelOrderReduction/component/forcefield/HyperReducedHexahedronFEMForceField.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ template<class DataTypes>


template <class DataTypes>
void HyperReducedHexahedronFEMForceField<DataTypes>::buildStiffnessMatrix(
void HyperReducedHexahedronFEMForceField<DataTypes>::doBuildStiffnessMatrix(
core::behavior::StiffnessMatrix* matrix)
{
sofa::Index e { 0 }; //index of the element in the topology
Expand Down
2 changes: 1 addition & 1 deletion src/ModelOrderReduction/component/forcefield/HyperReducedRestShapeSpringsForceField.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/ModelOrderReduction/component/forcefield/HyperReducedRestShapeSpringsForceField.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ void HyperReducedRestShapeSpringsForceField<DataTypes>::draw(const VisualParams
}

template <class DataTypes>
void HyperReducedRestShapeSpringsForceField<DataTypes>::buildStiffnessMatrix(
void HyperReducedRestShapeSpringsForceField<DataTypes>::doBuildStiffnessMatrix(
core::behavior::StiffnessMatrix* matrix)
{
const VecReal& k = d_stiffness.getValue();
Expand Down
2 changes: 1 addition & 1 deletion ...delOrderReduction/component/forcefield/HyperReducedTetrahedralCorotationalFEMForceField.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...lOrderReduction/component/forcefield/HyperReducedTetrahedralCorotationalFEMForceField.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,7 +678,7 @@ void HyperReducedTetrahedralCorotationalFEMForceField<DataTypes>::draw(const cor

template <class DataTypes>
void HyperReducedTetrahedralCorotationalFEMForceField<DataTypes>::
buildStiffnessMatrix(core::behavior::StiffnessMatrix* matrix)
doBuildStiffnessMatrix(core::behavior::StiffnessMatrix* matrix)
{
StiffnessMatrix JKJt, RJKJtRt;
sofa::type::Mat<3, 3, Real> localMatrix(type::NOINIT);
Expand Down
2 changes: 1 addition & 1 deletion src/ModelOrderReduction/component/forcefield/HyperReducedTetrahedronFEMForceField.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ class HyperReducedTetrahedronFEMForceField : public virtual TetrahedronFEMForceF
// Make other overloaded version of getPotentialEnergy() to show up in subclass.
using TetrahedronFEMForceField<DataTypes>::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:
Expand Down
2 changes: 1 addition & 1 deletion src/ModelOrderReduction/component/forcefield/HyperReducedTetrahedronFEMForceField.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,7 @@ void HyperReducedTetrahedronFEMForceField<DataTypes>::draw(const core::visual::V
}

template <class DataTypes>
void HyperReducedTetrahedronFEMForceField<DataTypes>::buildStiffnessMatrix(core::behavior::StiffnessMatrix* matrix)
void HyperReducedTetrahedronFEMForceField<DataTypes>::doBuildStiffnessMatrix(core::behavior::StiffnessMatrix* matrix)
{
StiffnessMatrix JKJt, RJKJtRt;
sofa::type::Mat<3, 3, Real> localMatrix(type::NOINIT);
Expand Down
2 changes: 1 addition & 1 deletion ...OrderReduction/component/forcefield/HyperReducedTetrahedronHyperelasticityFEMForceField.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...derReduction/component/forcefield/HyperReducedTetrahedronHyperelasticityFEMForceField.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ void HyperReducedTetrahedronHyperelasticityFEMForceField<DataTypes>::addDForce(c

template <class DataTypes>
void HyperReducedTetrahedronHyperelasticityFEMForceField<DataTypes>::
buildStiffnessMatrix(core::behavior::StiffnessMatrix* matrix)
doBuildStiffnessMatrix(core::behavior::StiffnessMatrix* matrix)
{
/// if the matrix needs to be updated
if (m_updateMatrix)
Expand Down
2 changes: 1 addition & 1 deletion src/ModelOrderReduction/component/forcefield/HyperReducedTriangleFEMForceField.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

};

Expand Down
2 changes: 1 addition & 1 deletion src/ModelOrderReduction/component/forcefield/HyperReducedTriangleFEMForceField.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ void HyperReducedTriangleFEMForceField<DataTypes>::draw(const core::visual::Visu
}

template <class DataTypes>
void HyperReducedTriangleFEMForceField<DataTypes>::buildStiffnessMatrix(core::behavior::StiffnessMatrix* matrix)
void HyperReducedTriangleFEMForceField<DataTypes>::doBuildStiffnessMatrix(core::behavior::StiffnessMatrix* matrix)
{
StiffnessMatrix JKJt, RJKJtRt;
sofa::type::Mat<3, 3, Real> localMatrix(type::NOINIT);
Expand Down
Loading