Skip to content

[forcefield] TriangularShellForceField: changes inheritance #20

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
EulalieCoevoet wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[forcefield] TriangularShellForceField: changes inheritance #20

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: 2 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ sofa_find_package(Sofa.Component.Controller REQUIRED)
sofa_find_package(Sofa.Component.Topology.Container.Dynamic REQUIRED)
sofa_find_package(Sofa.Component.StateContainer REQUIRED)
sofa_find_package(Sofa.Component.Mapping.Linear REQUIRED)
sofa_find_package(Sofa.Component.SolidMechanics.FEM.Elastic REQUIRED)
sofa_find_package(Sofa.GL REQUIRED)

set(README_FILE README.md)
Expand Down Expand Up @@ -77,6 +78,7 @@ target_link_libraries(${PROJECT_NAME}
Sofa.Component.Topology.Container.Dynamic
Sofa.Component.StateContainer
Sofa.Component.Mapping.Linear
Sofa.Component.SolidMechanics.FEM.Elastic
Sofa.GL
)

Expand Down
19 changes: 10 additions & 9 deletions src/Shell/forcefield/TriangularShellForceField.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#endif


#include <sofa/core/behavior/ForceField.h>
#include <sofa/component/solidmechanics/fem/elastic/BaseLinearElasticityFEMForceField.h>
#include <sofa/core/behavior/MechanicalState.h>
#include <sofa/core/objectmodel/Data.h>
#include <sofa/helper/OptionsGroup.h>
Expand All @@ -57,7 +57,7 @@ namespace forcefield
using namespace sofa::type;
using sofa::type::vector;
using namespace sofa::core::topology;
using namespace sofa::core::behavior;
using namespace sofa::component::solidmechanics::fem::elastic;

/// This class can be overridden if needed for additional storage within template specializations.
template<class DataTypes>
Expand All @@ -68,14 +68,14 @@ class TriangularShellForceFieldInternalData


template<class DataTypes>
class TriangularShellForceField : public core::behavior::ForceField<DataTypes>
class TriangularShellForceField : public BaseLinearElasticityFEMForceField<DataTypes>
{
public:
SOFA_CLASS(SOFA_TEMPLATE(TriangularShellForceField,DataTypes), SOFA_TEMPLATE(core::behavior::ForceField,DataTypes));
SOFA_CLASS(SOFA_TEMPLATE(TriangularShellForceField,DataTypes), SOFA_TEMPLATE(BaseLinearElasticityFEMForceField,DataTypes));

typedef core::behavior::ForceField<DataTypes> Inherited;
typedef typename DataTypes::VecCoord VecCoord;
typedef typename DataTypes::VecDeriv VecDeriv;
typedef BaseLinearElasticityFEMForceField<DataTypes> Inherited;
typedef typename DataTypes::VecCoord VecCoord;
typedef typename DataTypes::VecDeriv VecDeriv;
//typedef typename DataTypes::VecReal VecReal;

typedef typename DataTypes::Coord Coord;
Expand Down Expand Up @@ -206,8 +206,9 @@ class TriangularShellForceField : public core::behavior::ForceField<DataTypes>

sofa::core::topology::BaseMeshTopology* getTopology() {return _topology;}

Data<Real> d_poisson;
Data<Real> d_young;
using BaseLinearElasticityFEMForceField<DataTypes>::d_youngModulus;
using BaseLinearElasticityFEMForceField<DataTypes>::d_poissonRatio;

Data <Real> d_thickness;
Data <sofa::helper::OptionsGroup> d_membraneElement;
Data <sofa::helper::OptionsGroup> d_bendingElement;
Expand Down
13 changes: 6 additions & 7 deletions src/Shell/forcefield/TriangularShellForceField.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,7 @@ void TriangularShellForceField<DataTypes>::TRQSTriangleHandler::applyCreateFunct
// --------------------------------------------------------------------------------------
template <class DataTypes>
TriangularShellForceField<DataTypes>::TriangularShellForceField()
: d_poisson(initData(&d_poisson,(Real)0.45,"poissonRatio","Poisson ratio in Hooke's law"))
, d_young(initData(&d_young,(Real)3000.,"youngModulus","Young modulus in Hooke's law"))
, d_thickness(initData(&d_thickness,(Real)0.1,"thickness","Thickness of the plates"))
: d_thickness(initData(&d_thickness,(Real)0.1,"thickness","Thickness of the plates"))
, d_membraneElement(initData(&d_membraneElement, "membraneElement", "The membrane element to use"))
, d_bendingElement(initData(&d_bendingElement, "bendingElement", "The bending plate element to use"))
, d_corotated(initData(&d_corotated, true, "corotated", "Compute forces in corotational frame"))
Expand Down Expand Up @@ -543,8 +541,8 @@ void TriangularShellForceField<DataTypes>::computeRotation(Transformation& R, co
template <class DataTypes>
void TriangularShellForceField<DataTypes>::computeMaterialStiffness()
{
Real E = d_young.getValue(),
nu = d_poisson.getValue(),
Real E = d_youngModulus.getValue()[0],
nu = d_poissonRatio.getValue()[0],
t = d_thickness.getValue();

materialMatrix[0][0] = 1.0;
Expand Down Expand Up @@ -1157,8 +1155,9 @@ void TriangularShellForceField<DataTypes>::computeStiffnessMatrixLSTRet(Stiffnes
template <class DataTypes>
void TriangularShellForceField<DataTypes>::computeStiffnessMatrixAndesOpt(StiffnessMatrix &K, TriangleInformation &tinfo)
{
Real beta0 = helper::rmax(0.5 - 2.0*d_poisson.getValue()*d_poisson.getValue(), 0.01);
return andesTemplate(K, tinfo, 3.0/2.0, AndesBeta(beta0, 1.0, 2.0, 1.0, 0.0, 1.0, -1.0, -1.0, -1.0, -2.0));
Real poissonRatio = d_poissonRatio.getValue()[0];
Real beta0 = helper::rmax(0.5 - 2.0 * poissonRatio * poissonRatio, 0.01);
return andesTemplate(K, tinfo, 3.0/2.0, AndesBeta{beta0, 1.0, 2.0, 1.0, 0.0, 1.0, -1.0, -1.0, -1.0, -2.0});
}

// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Expand Down
Loading