Skip to content
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

[FEM.Elastic] Remove unused methods #4824

Merged
merged 7 commits into from
Jul 24, 2024
Merged

[FEM.Elastic] Remove unused methods #4824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
22f8656
[FEM.Elastic] Start unification of tetra FF and division of tests
alxbilger Jun 18, 2024
92951fd
share common topology link
alxbilger Jun 19, 2024
95f8012
restore warning when topology has no tetras
alxbilger Jun 19, 2024
6cdcc06
Rename because it can also be used for triangle force fields
alxbilger Jun 21, 2024
f6388d0
more fixes
alxbilger Jul 3, 2024
db32cf6
[FEM.Elastic] Remove unused methods
alxbilger Jul 11, 2024
bb73bda
revert wrong change
alxbilger Jul 16, 2024
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: 0 additions & 2 deletions ...nics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TetrahedronFEMForceField.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,8 +359,6 @@ class TetrahedronFEMForceField : public BaseLinearElasticityFEMForceField<DataTy

// Getting the stiffness matrix of index i
void getElementStiffnessMatrix(Real* stiffness, Index nodeIdx);
void getElementStiffnessMatrix(Real* stiffness, Tetrahedron& te);
virtual void computeMaterialStiffness(MaterialStiffness& materialMatrix, Index&a, Index&b, Index&c, Index&d);

protected:
void computeStrainDisplacement( StrainDisplacement &J, Coord a, Coord b, Coord c, Coord d );
Expand Down
88 changes: 0 additions & 88 deletions ...cs/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TetrahedronFEMForceField.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,63 +280,11 @@ inline void TetrahedronFEMForceField<DataTypes>::getElementStiffnessMatrix(Real*
}
}

template <class DataTypes>
inline void TetrahedronFEMForceField<DataTypes>::getElementStiffnessMatrix(Real* stiffness, Tetrahedron& te)
{
if (needUpdateTopology)
{
reinit();
needUpdateTopology = false;
}
const VecCoord X0=this->mstate->read(core::ConstVecCoordId::restPosition())->getValue();
Index a = te[0];
Index b = te[1];
Index c = te[2];
Index d = te[3];

Transformation R_0_1;
computeRotationLarge( R_0_1, (X0), a, b, c);

MaterialStiffness materialMatrix;
StrainDisplacement strainMatrix;
type::fixed_array<Coord,4> rotatedInitialElements;

rotatedInitialElements[0] = R_0_1*(X0)[a];
rotatedInitialElements[1] = R_0_1*(X0)[b];
rotatedInitialElements[2] = R_0_1*(X0)[c];
rotatedInitialElements[3] = R_0_1*(X0)[d];

rotatedInitialElements[1] -= rotatedInitialElements[0];
rotatedInitialElements[2] -= rotatedInitialElements[0];
rotatedInitialElements[3] -= rotatedInitialElements[0];
rotatedInitialElements[0] = Coord(0,0,0);

computeMaterialStiffness(materialMatrix,a,b,c,d);
computeStrainDisplacement(strainMatrix, rotatedInitialElements[0], rotatedInitialElements[1], rotatedInitialElements[2], rotatedInitialElements[3]);

Transformation Rot;
StiffnessMatrix JKJt,tmp;
Rot[0][0]=Rot[1][1]=Rot[2][2]=1;
Rot[0][1]=Rot[0][2]=0;
Rot[1][0]=Rot[1][2]=0;
Rot[2][0]=Rot[2][1]=0;

R_0_1.transpose();
computeStiffnessMatrix(JKJt, tmp, materialMatrix, strainMatrix, R_0_1);
for(int i=0; i<12; i++)
{
for(int j=0; j<12; j++)
stiffness[i*12+j]=tmp(i,j);
}
}


template<class DataTypes>
void TetrahedronFEMForceField<DataTypes>::computeMaterialStiffness(Index i, Index&a, Index&b, Index&c, Index&d)
{
const VecReal& localStiffnessFactor = d_localStiffnessFactor.getValue();
const Real youngModulusElement = this->getYoungModulusInElement(i);

const Real youngModulus = (localStiffnessFactor.empty() ? 1.0f : localStiffnessFactor[i*localStiffnessFactor.size()/_indexedElements->size()])*youngModulusElement;
const Real poissonRatio = this->d_poissonRatio.getValue();

Expand Down Expand Up @@ -376,42 +324,6 @@ void TetrahedronFEMForceField<DataTypes>::computeMaterialStiffness(Index i, Inde
materialsStiffnesses[i] /= (volumes6*6); // 36*Volume in the formula
}

template<class DataTypes>
void TetrahedronFEMForceField<DataTypes>::computeMaterialStiffness(MaterialStiffness& materialMatrix, Index&a, Index&b, Index&c, Index&d)
{
const Real youngModulus = this->d_youngModulus.getValue()[0];
const Real poissonRatio = this->d_poissonRatio.getValue();

materialMatrix[0][0] = materialMatrix[1][1] = materialMatrix[2][2] = 1;
materialMatrix[0][1] = materialMatrix[0][2] = materialMatrix[1][0] = materialMatrix[1][2] = materialMatrix[2][0] = materialMatrix[2][1] = poissonRatio/(1-poissonRatio);
materialMatrix[0][3] = materialMatrix[0][4] = materialMatrix[0][5] = 0;
materialMatrix[1][3] = materialMatrix[1][4] = materialMatrix[1][5] = 0;
materialMatrix[2][3] = materialMatrix[2][4] = materialMatrix[2][5] = 0;
materialMatrix[3][0] = materialMatrix[3][1] = materialMatrix[3][2] = materialMatrix[3][4] = materialMatrix[3][5] = 0;
materialMatrix[4][0] = materialMatrix[4][1] = materialMatrix[4][2] = materialMatrix[4][3] = materialMatrix[4][5] = 0;
materialMatrix[5][0] = materialMatrix[5][1] = materialMatrix[5][2] = materialMatrix[5][3] = materialMatrix[5][4] = 0;
materialMatrix[3][3] = materialMatrix[4][4] = materialMatrix[5][5] = (1-2*poissonRatio)/(2*(1-poissonRatio));
materialMatrix *= (youngModulus*(1-poissonRatio))/((1+poissonRatio)*(1-2*poissonRatio));

// divide by 36 times volumes of the element
const VecCoord X0=this->mstate->read(core::ConstVecCoordId::restPosition())->getValue();

Coord A = (X0)[b] - (X0)[a];
Coord B = (X0)[c] - (X0)[a];
Coord C = (X0)[d] - (X0)[a];
Coord AB = cross(A, B);
Real volumes6 = fabs( dot( AB, C ) );
m_restVolume += volumes6/6;
if (volumes6<0)
{
msg_error() << "Negative volume for tetra"<<a<<','<<b<<','<<c<<','<<d<<"> = "<<volumes6/6 ;
}
materialMatrix /= (volumes6*6);
}




template<class DataTypes>
inline void TetrahedronFEMForceField<DataTypes>::computeForce( Displacement &F, const Displacement &Depl, VoigtTensor &plasticStrain, const MaterialStiffness &K, const StrainDisplacement &J )
{
Expand Down
Loading