Skip to content

Commit

Permalink
Minor changes in Elasticity material.
Browse files Browse the repository at this point in the history
  • Loading branch information
@thiagoquinelato
thiagoquinelato committed Sep 27, 2023
1 parent e0ecef7 commit 8e13c15
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 73 deletions.
104 changes: 44 additions & 60 deletions Material/Elasticity/TPZMixedElasticityND.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ TPZMixedElasticityND::TPZMixedElasticityND() : TBase() {
fMatrixA = 0.;
}

TPZMixedElasticityND::TPZMixedElasticityND(int id) : TBase(id) {
TPZMixedElasticityND::TPZMixedElasticityND(int id, int dimension) : TBase(id), fDimension(dimension) {
fE_const = -1.; // Young modulus
fnu_const = -1.; // Poisson coefficient
fForce[0] = 0.; // X component of the body force
Expand Down Expand Up @@ -137,8 +137,7 @@ void TPZMixedElasticityND::ComputeDivergenceOnDeformed(TPZVec<TPZMaterialDataT<S

void TPZMixedElasticityND::ElasticityModulusTensor(TPZFMatrix<STATE> &MatrixElast, TElasticityAtPoint &elast) {
//Matrix modulus Voigt notation:
int matdim = 4;
if(fDimension == 3) matdim = 9;
int matdim = (fDimension == 3) ? 9 : 4;
MatrixElast.Redim(matdim, matdim);
REAL mu = elast.fmu;
REAL lambda = elast.flambda;
Expand Down Expand Up @@ -202,8 +201,7 @@ void TPZMixedElasticityND::ElasticityModulusTensor(TPZFMatrix<STATE> &MatrixElas
}

void TPZMixedElasticityND::ComputeDeformationVector(TPZVec<STATE> &PhiStress, TPZVec<STATE> &APhiStress, TElasticityAtPoint &elast) {
int matdim = 4;
if(fDimension == 3) matdim = 9;
int matdim = (fDimension == 3) ? 9 : 4;
TPZFNMatrix<81, STATE> MatrixElast(matdim, matdim, 0.);
ElasticityModulusTensor(MatrixElast, elast);
for (int iq = 0; iq < matdim; iq++) {
Expand Down Expand Up @@ -254,36 +252,34 @@ void TPZMixedElasticityND::Print(std::ostream &out) const {
}

/// Transform a tensor to a Voigt notation
void TPZMixedElasticityND::ToVoigt(TPZFMatrix<STATE> &S, TPZVec<STATE> &Svoigt) {
{
Svoigt[Exx] = S(0, 0);
Svoigt[Exy] = S(0, 1);
Svoigt[Eyx] = S(1, 0);
Svoigt[Eyy] = S(1, 1);
}
if(fDimension > 2)
{
Svoigt[Exz] = S(0,2);
Svoigt[Eyz] = S(1,2);
Svoigt[Ezx] = S(2,0);
Svoigt[Ezy] = S(2,1);
Svoigt[Ezz] = S(2,2);

void TPZMixedElasticityND::ToVoigt(const TPZFMatrix<STATE> &S, TPZVec<STATE> &Svoigt) const {
Svoigt[Exx] = S(0, 0);
Svoigt[Exy] = S(0, 1);
Svoigt[Eyx] = S(1, 0);
Svoigt[Eyy] = S(1, 1);
if (fDimension > 2) {
Svoigt[Exz] = S(0, 2);
Svoigt[Eyz] = S(1, 2);
Svoigt[Ezx] = S(2, 0);
Svoigt[Ezy] = S(2, 1);
Svoigt[Ezz] = S(2, 2);
}
}

/// Transform a Voigt notation to a tensor
void TPZMixedElasticityND::FromVoigt(TPZVec<STATE> &Svoigt, TPZFMatrix<STATE> &S) {

void TPZMixedElasticityND::FromVoigt(const TPZVec<STATE> &Svoigt, TPZFMatrix<STATE> &S) const {
S(0, 0) = Svoigt[Exx];
S(0, 1) = Svoigt[Exy];
S(1, 0) = Svoigt[Eyx];
S(1, 1) = Svoigt[Eyy];
if(fDimension > 2)
{
S(0,2) = Svoigt[Exz];
S(1,2) = Svoigt[Eyz];
S(2,0) = Svoigt[Ezx];
S(2,1) = Svoigt[Ezy];
S(2,2) = Svoigt[Ezz];
if (fDimension > 2) {
S(0, 2) = Svoigt[Exz];
S(1, 2) = Svoigt[Eyz];
S(2, 0) = Svoigt[Ezx];
S(2, 1) = Svoigt[Ezy];
S(2, 2) = Svoigt[Ezz];
}
}

Expand All @@ -296,22 +292,18 @@ void TPZMixedElasticityND::Contribute_3spaces(const TPZVec<TPZMaterialDataT<STAT
TPZFMatrix<REAL> &dphiS = datavec[0].dphix;
// U
TPZFMatrix<REAL> &phiU = datavec[1].phi;
TPZFMatrix<REAL> &dphiU = datavec[1].dphix;
// TPZFMatrix<REAL> &dphiU = datavec[1].dphix;
// P
TPZFMatrix<REAL> &phiP = datavec[2].phi;


TElasticityAtPoint elast(fE_const,fnu_const);
if(fElasticity)
{
//TPZManVector<REAL,3> result(2);
TPZManVector<STATE, 3> result(2);
TPZFNMatrix<4,STATE> Dres(0,0);
TElasticityAtPoint elast(fE_const, fnu_const);
if (fElasticity) {
TPZManVector<STATE, 3> result(2);
TPZFNMatrix<4, STATE> Dres(0, 0);
fElasticity(datavec[0].x, result, Dres);
REAL E = result[0];
REAL nu = result[1];
TElasticityAtPoint modify(E,nu);
elast = modify;
elast = TElasticityAtPoint(E, nu);
}
//
// TPZFNMatrix<220, REAL> dphiSx(fDimension, dphiS.Cols());
Expand All @@ -329,11 +321,10 @@ void TPZMixedElasticityND::Contribute_3spaces(const TPZVec<TPZMaterialDataT<STAT
nshapeP = datavec[2].phi.Rows();
const int firstequation_S = 0;
const int firstequation_U = firstequation_S + nshapeS*fDimension;
const int firstequation_P = firstequation_U + nshapeU*fDimension;
//const int firstequation_P = firstequation_U + nshapeU*fDimension;

// number of asymetric tensors for each shape function
int nrotations = 1;
if(fDimension == 3) nrotations = 3;
int nrotations = (fDimension == 3) ? 3 : 1;

TPZManVector<STATE, 3> force(fDimension, 0.);

Expand Down Expand Up @@ -375,15 +366,12 @@ void TPZMixedElasticityND::Contribute_3spaces(const TPZVec<TPZMaterialDataT<STAT
for (int i = 0; i < nshapeS; i++) {
int iphi = datavec[0].fVecShapeIndex[i].second;
int ivec = datavec[0].fVecShapeIndex[i].first;
TPZFNMatrix<4> GradSi(fDimension, fDimension);

REAL divSi = 0.;

for (int e = 0; e < 3; e++) {

ivecS(e, 0) = datavec[0].fDeformedDirections(e, ivec);
phiSi(e, 0) = phiS(iphi, 0) * ivecS(e, 0);

}
// TPZFNMatrix<3, REAL> axesvec(fDimension, 1, 0.);
// datavec[0].axes.Multiply(ivecS, axesvec);
Expand All @@ -397,19 +385,16 @@ void TPZMixedElasticityND::Contribute_3spaces(const TPZVec<TPZMaterialDataT<STAT
TPZFNMatrix<9, STATE> phiTensx(fDimension, fDimension, 0.), phiTensy(fDimension, fDimension, 0.),
phiTensz(fDimension,fDimension,0.);

for(int d = 0; d< fDimension; d++)
{
phiTensx(0,d) = phiSi(d,0);
phiTensy(1,d) = phiSi(d,0);
if(fDimension == 3)
{
phiTensz(2,d) = phiSi(d,0);
for (int d = 0; d < fDimension; d++) {
phiTensx(0, d) = phiSi(d, 0);
phiTensy(1, d) = phiSi(d, 0);
if (fDimension == 3) {
phiTensz(2, d) = phiSi(d, 0);
}
}
ToVoigt(phiTensx, phiSi1x);
ToVoigt(phiTensy, phiSi1y);
if(fDimension == 3)
{
if (fDimension == 3) {
ToVoigt(phiTensz, phiSi1z);
}

Expand Down Expand Up @@ -449,11 +434,11 @@ void TPZMixedElasticityND::Contribute_3spaces(const TPZVec<TPZMaterialDataT<STAT
//Multiply by Lamé parameters
TPZManVector<STATE, 9> AphiSi1x(voigtdim, 0.0), AphiSi1y(voigtdim, 0.0), AphiSi1z(voigtdim, 0.0);

ComputeDeformationVector(phiSi1x, AphiSi1x,elast);
ComputeDeformationVector(phiSi1y, AphiSi1y,elast);
ComputeDeformationVector(phiSi1x, AphiSi1x, elast);
ComputeDeformationVector(phiSi1y, AphiSi1y, elast);
if(fDimension == 3)
{
ComputeDeformationVector(phiSi1z, AphiSi1z,elast);
ComputeDeformationVector(phiSi1z, AphiSi1z, elast);
}

STATE valxx = InnerVec(AphiSi1x, phiSj1x);
Expand Down Expand Up @@ -1051,16 +1036,16 @@ int TPZMixedElasticityND::NSolutionVariables(int var) const {
case 24:
case 25:
case 26:
case 27:
return 3;
case 27: // Rotation
return Dimension() == 3 ? 3 : 1;
case 28:
case 29:
case 30:
case 31:
return 1;
case 33:
case 34:
return 3;
return nstate;
case 100:
return 1;
default:
Expand Down Expand Up @@ -1348,8 +1333,6 @@ TVar TPZMixedElasticityND::InnerVec(const TPZVec<TVar> &S, const TPZVec<TVar> &T

////////////////////////////////////////////////////////////////////
STATE TPZMixedElasticityND::Tr(TPZFMatrix<REAL> &GradU) {

int grr = GradU.Rows();
#ifdef DEBUG
if (GradU.Rows() != GradU.Cols()) {
DebugStop();
Expand All @@ -1358,6 +1341,7 @@ STATE TPZMixedElasticityND::Tr(TPZFMatrix<REAL> &GradU) {

STATE Val = 0.;

int grr = GradU.Rows();
for (int i = 0; i < grr; i++) {
Val += GradU(i, i);
}
Expand Down
19 changes: 9 additions & 10 deletions Material/Elasticity/TPZMixedElasticityND.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ TPZMatErrorCombinedSpaces<STATE>> {
using TBase = TPZMatBase<STATE, TPZMatCombinedSpacesT<STATE>,
TPZMatErrorCombinedSpaces<STATE> >;


public:

struct TElasticityAtPoint
Expand Down Expand Up @@ -71,9 +70,7 @@ using TBase = TPZMatBase<STATE, TPZMatCombinedSpacesT<STATE>,
*/
TPZMixedElasticityND(int id, REAL E, REAL nu, REAL fx, REAL fy, int planestress = 1, int Dimension = 1);

/// dimension of the material

TPZMixedElasticityND(int id);
TPZMixedElasticityND(int id, int dimension = 2);

/** @brief Copies the data of one TPZMixedElasticityND object to another */
TPZMixedElasticityND(const TPZMixedElasticityND &copy);
Expand Down Expand Up @@ -204,9 +201,12 @@ using TBase = TPZMatBase<STATE, TPZMatCombinedSpacesT<STATE>,
virtual std::string Name() const override {
return "TPZMixedElasticityND";
}




REAL GetMaxCoalescenceEigenvalue(TPZVec<REAL> &x) const {
DebugStop();
return 0;
}

/** @name Contribute methods */
/** @{ */

Expand Down Expand Up @@ -257,10 +257,10 @@ using TBase = TPZMatBase<STATE, TPZMatCombinedSpacesT<STATE>,
STATE Inner(TPZFMatrix<STATE> &S, TPZFMatrix<STATE> &T);

/// Transform a tensor to a Voigt notation
void ToVoigt(TPZFMatrix<STATE> &S, TPZVec<STATE> &Svoigt);
void ToVoigt(const TPZFMatrix<STATE> &S, TPZVec<STATE> &Svoigt) const;

/// Transform a Voigt notation to a tensor
void FromVoigt(TPZVec<STATE> &Svoigt, TPZFMatrix<STATE> &S);
void FromVoigt(const TPZVec<STATE> &Svoigt, TPZFMatrix<STATE> &S) const;

/** inner product of two vectors. See Gurtin (2003), p. 5. */
template<class TVar>
Expand Down Expand Up @@ -335,7 +335,6 @@ using TBase = TPZMatBase<STATE, TPZMatCombinedSpacesT<STATE>,
/** @brief Second Lame Parameter */
REAL fmu_const;


// Matrix A
TPZFMatrix<STATE> fMatrixA;

Expand Down
4 changes: 1 addition & 3 deletions Pre/TPZHDivApproxCreator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,9 +227,7 @@ TPZCompMesh * TPZHDivApproxCreator::CreateHDivSpace(){
fGeoMesh->ResetReference();
int dim = fGeoMesh->Dimension();
TPZCompMesh *cmesh = new TPZCompMesh(fGeoMesh);
if (fProbType == ProblemType::EDarcy) {
cmesh->SetDefaultOrder(fDefaultPOrder);
}else if (fProbType == ProblemType::EElastic){
if (fProbType == ProblemType::EDarcy || fProbType == ProblemType::EElastic){
cmesh->SetDefaultOrder(fDefaultPOrder);
} else {
DebugStop();
Expand Down

0 comments on commit 8e13c15

Please sign in to comment.