Skip to content

Commit 4e1d6d2

Browse files
WPK4FEMWPK4FEM
committed
Renamed IgnoreUndrained variables.
1 parent 6e3dffa commit 4e1d6d2

7 files changed

Lines changed: 34 additions & 31 deletions

‎applications/GeoMechanicsApplication/custom_elements/U_Pw_interface_element.cpp‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Geo::ProcessInfoGetter CreateProcessInfoGetter(const ProcessInfo& rProcessInfo)
8888
return [&rProcessInfo]() -> const ProcessInfo& { return rProcessInfo; };
8989
}
9090

91-
bool GetIgnoreUndrained(const Properties& rProperties)
91+
bool GetIsConstantWaterPressure(const Properties& rProperties)
9292
{
9393
if (rProperties.Has(GEO_DRAINAGE_TYPE))
9494
return ConstitutiveLawUtilities::StringToDrainageType(rProperties[GEO_DRAINAGE_TYPE]) ==
@@ -161,9 +161,9 @@ void UPwInterfaceElement::EquationIdVector(EquationIdVectorType& rResult, const
161161

162162
void UPwInterfaceElement::CalculateLeftHandSide(MatrixType& rLeftHandSideMatrix, const ProcessInfo& rProcessInfo)
163163
{
164-
const auto number_of_dofs = GetDofs().size();
165-
const auto ignore_undrained = GetIgnoreUndrained(GetProperties());
166-
rLeftHandSideMatrix = ZeroMatrix{number_of_dofs, number_of_dofs};
164+
const auto number_of_dofs = GetDofs().size();
165+
const auto is_constant_pw_field = GetIsConstantWaterPressure(GetProperties());
166+
rLeftHandSideMatrix = ZeroMatrix{number_of_dofs, number_of_dofs};
167167

168168
for (auto contribution : mContributions) {
169169
switch (contribution) {
@@ -175,10 +175,10 @@ void UPwInterfaceElement::CalculateLeftHandSide(MatrixType& rLeftHandSideMatrix,
175175
CalculateAndAssignUPCouplingMatrix(rLeftHandSideMatrix);
176176
break;
177177
case PUCoupling:
178-
if (!ignore_undrained) CalculateAndAssignPUCouplingMatrix(rLeftHandSideMatrix);
178+
if (!is_constant_pw_field) CalculateAndAssignPUCouplingMatrix(rLeftHandSideMatrix);
179179
break;
180180
case Permeability:
181-
if (!ignore_undrained) CalculateAndAssignPermeabilityMatrix(rLeftHandSideMatrix);
181+
if (!is_constant_pw_field) CalculateAndAssignPermeabilityMatrix(rLeftHandSideMatrix);
182182
break;
183183
case FluidBodyFlow:
184184
break;
@@ -270,8 +270,8 @@ void UPwInterfaceElement::CalculateAndAssignPermeabilityMatrix(Element::MatrixTy
270270
void UPwInterfaceElement::CalculateRightHandSide(Element::VectorType& rRightHandSideVector,
271271
const ProcessInfo& rProcessInfo)
272272
{
273-
const auto ignore_undrained = GetIgnoreUndrained(GetProperties());
274-
rRightHandSideVector = ZeroVector{GetDofs().size()};
273+
const auto is_constant_pw_field = GetIsConstantWaterPressure(GetProperties());
274+
rRightHandSideVector = ZeroVector{GetDofs().size()};
275275

276276
for (auto contribution : mContributions) {
277277
switch (contribution) {
@@ -283,13 +283,16 @@ void UPwInterfaceElement::CalculateRightHandSide(Element::VectorType& rRightHand
283283
CalculateAndAssembleUPCouplingForceVector(rRightHandSideVector);
284284
break;
285285
case PUCoupling:
286-
if (!ignore_undrained) CalculateAndAssemblePUCouplingForceVector(rRightHandSideVector);
286+
if (!is_constant_pw_field)
287+
CalculateAndAssemblePUCouplingForceVector(rRightHandSideVector);
287288
break;
288289
case Permeability:
289-
if (!ignore_undrained) CalculateAndAssemblePermeabilityFlowVector(rRightHandSideVector);
290+
if (!is_constant_pw_field)
291+
CalculateAndAssemblePermeabilityFlowVector(rRightHandSideVector);
290292
break;
291293
case FluidBodyFlow:
292-
if (!ignore_undrained) CalculateAndAssembleFluidBodyFlowVector(rRightHandSideVector);
294+
if (!is_constant_pw_field)
295+
CalculateAndAssembleFluidBodyFlowVector(rRightHandSideVector);
293296
break;
294297
default:
295298
KRATOS_ERROR << "This contribution is not supported \n";

‎applications/GeoMechanicsApplication/custom_elements/U_Pw_small_strain_element.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -969,7 +969,7 @@ void UPwSmallStrainElement<TDim, TNumNodes>::CalculateAndAddLHS(MatrixType& rLef
969969

970970
this->CalculateAndAddCouplingMatrix(rLeftHandSideMatrix, rVariables);
971971

972-
if (!rVariables.IgnoreUndrained) {
972+
if (!rVariables.IsConstantWaterPressure) {
973973
const auto permeability_matrix =
974974
GeoTransportEquationUtilities::CalculatePermeabilityMatrix<TDim, TNumNodes>(
975975
rVariables.GradNpT, rVariables.DynamicViscosityInverse, rVariables.PermeabilityMatrix,
@@ -1007,7 +1007,7 @@ void UPwSmallStrainElement<TDim, TNumNodes>::CalculateAndAddCouplingMatrix(Matri
10071007
rVariables.BiotCoefficient, rVariables.BishopCoefficient, rVariables.IntegrationCoefficient);
10081008
GeoElementUtilities::AssembleUPBlockMatrix(rLeftHandSideMatrix, coupling_matrix);
10091009

1010-
if (!rVariables.IgnoreUndrained) {
1010+
if (!rVariables.IsConstantWaterPressure) {
10111011
const auto p_coupling_matrix = GeoTransportEquationUtilities::CalculateCouplingMatrix<TDim, TNumNodes>(
10121012
rVariables.B, GetStressStatePolicy().GetVoigtVector(), rVariables.Np,
10131013
rVariables.BiotCoefficient, rVariables.DegreeOfSaturation, rVariables.IntegrationCoefficient);
@@ -1048,7 +1048,7 @@ void UPwSmallStrainElement<TDim, TNumNodes>::CalculateAndAddRHS(VectorType& rRig
10481048

10491049
this->CalculateAndAddCouplingTerms(rRightHandSideVector, rVariables);
10501050

1051-
if (!rVariables.IgnoreUndrained) {
1051+
if (!rVariables.IsConstantWaterPressure) {
10521052
this->CalculateAndAddCompressibilityFlow(rRightHandSideVector, rVariables);
10531053

10541054
this->CalculateAndAddPermeabilityFlow(rRightHandSideVector, rVariables);
@@ -1114,7 +1114,7 @@ void UPwSmallStrainElement<TDim, TNumNodes>::CalculateAndAddCouplingTerms(Vector
11141114
const array_1d<double, TNumNodes * TDim> coupling_force = prod(coupling_matrix, rVariables.PressureVector);
11151115
GeoElementUtilities::AssembleUBlockVector(rRightHandSideVector, (-1.0) * coupling_force);
11161116

1117-
if (!rVariables.IgnoreUndrained) {
1117+
if (!rVariables.IsConstantWaterPressure) {
11181118
const auto p_coupling_matrix = GeoTransportEquationUtilities::CalculateCouplingMatrix<TDim, TNumNodes>(
11191119
rVariables.B, GetStressStatePolicy().GetVoigtVector(), rVariables.Np,
11201120
rVariables.BiotCoefficient, rVariables.DegreeOfSaturation, rVariables.IntegrationCoefficient);
@@ -1318,7 +1318,7 @@ void UPwSmallStrainElement<TDim, TNumNodes>::InitializeProperties(ElementVariabl
13181318

13191319
const auto& r_properties = this->GetProperties();
13201320

1321-
rVariables.IgnoreUndrained =
1321+
rVariables.IsConstantWaterPressure =
13221322
r_properties.Has(GEO_DRAINAGE_TYPE)
13231323
? ConstitutiveLawUtilities::StringToDrainageType(r_properties[GEO_DRAINAGE_TYPE]) ==
13241324
DrainageType::CONSTANT_WATER_PRESSURE

‎applications/GeoMechanicsApplication/custom_elements/U_Pw_small_strain_element.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ class KRATOS_API(GEO_MECHANICS_APPLICATION) UPwSmallStrainElement : public UPwBa
119119
protected:
120120
struct ElementVariables {
121121
/// Properties variables
122-
bool IgnoreUndrained;
122+
bool IsConstantWaterPressure;
123123
bool UseHenckyStrain;
124124
bool ConsiderGeometricStiffness;
125125
double DynamicViscosityInverse;

‎applications/GeoMechanicsApplication/custom_elements/U_Pw_small_strain_interface_element.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1191,7 +1191,7 @@ void UPwSmallStrainInterfaceElement<TDim, TNumNodes>::InitializeElementVariables
11911191
KRATOS_TRY
11921192

11931193
// Properties variables
1194-
rVariables.IgnoreUndrained =
1194+
rVariables.IsConstantWaterPressure =
11951195
rProperties.Has(GEO_DRAINAGE_TYPE)
11961196
? ConstitutiveLawUtilities::StringToDrainageType(rProperties[GEO_DRAINAGE_TYPE]) ==
11971197
DrainageType::CONSTANT_WATER_PRESSURE
@@ -1625,7 +1625,7 @@ void UPwSmallStrainInterfaceElement<TDim, TNumNodes>::CalculateAndAddLHS(MatrixT
16251625

16261626
this->CalculateAndAddStiffnessMatrix(rLeftHandSideMatrix, rVariables);
16271627

1628-
if (!rVariables.IgnoreUndrained) {
1628+
if (!rVariables.IsConstantWaterPressure) {
16291629
this->CalculateAndAddCouplingMatrix(rLeftHandSideMatrix, rVariables);
16301630

16311631
this->CalculateAndAddCompressibilityMatrix(rLeftHandSideMatrix, rVariables);
@@ -1669,7 +1669,7 @@ void UPwSmallStrainInterfaceElement<TDim, TNumNodes>::CalculateAndAddCouplingMat
16691669

16701670
GeoElementUtilities::AssembleUPBlockMatrix(rLeftHandSideMatrix, coupling_matrix);
16711671

1672-
if (!rVariables.IgnoreUndrained) {
1672+
if (!rVariables.IsConstantWaterPressure) {
16731673
const double SaturationCoefficient = rVariables.DegreeOfSaturation / rVariables.BishopCoefficient;
16741674
const BoundedMatrix<double, TNumNodes, TNumNodes * TDim> transposed_coupling_matrix =
16751675
PORE_PRESSURE_SIGN_FACTOR * SaturationCoefficient * rVariables.VelocityCoefficient *
@@ -1724,7 +1724,7 @@ void UPwSmallStrainInterfaceElement<TDim, TNumNodes>::CalculateAndAddRHS(VectorT
17241724

17251725
this->CalculateAndAddCouplingTerms(rRightHandSideVector, rVariables);
17261726

1727-
if (!rVariables.IgnoreUndrained) {
1727+
if (!rVariables.IsConstantWaterPressure) {
17281728
this->CalculateAndAddCompressibilityFlow(rRightHandSideVector, rVariables);
17291729

17301730
this->CalculateAndAddPermeabilityFlow(rRightHandSideVector, rVariables);
@@ -1799,7 +1799,7 @@ void UPwSmallStrainInterfaceElement<TDim, TNumNodes>::CalculateAndAddCouplingTer
17991799

18001800
GeoElementUtilities::AssembleUBlockVector(rRightHandSideVector, u_vector);
18011801

1802-
if (!rVariables.IgnoreUndrained) {
1802+
if (!rVariables.IsConstantWaterPressure) {
18031803
const double SaturationCoefficient = rVariables.DegreeOfSaturation / rVariables.BishopCoefficient;
18041804
const array_1d<double, TNumNodes> coupling_flow_vector =
18051805
PORE_PRESSURE_SIGN_FACTOR * SaturationCoefficient *

‎applications/GeoMechanicsApplication/custom_elements/U_Pw_small_strain_interface_element.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ class KRATOS_API(GEO_MECHANICS_APPLICATION) UPwSmallStrainInterfaceElement : pub
108108

109109
struct InterfaceElementVariables {
110110
/// Properties variables
111-
bool IgnoreUndrained;
111+
bool IsConstantWaterPressure;
112112
double DynamicViscosityInverse;
113113
double BiotCoefficient;
114114
double BiotModulusInverse;

‎applications/GeoMechanicsApplication/custom_elements/small_strain_U_Pw_diff_order_element.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ void SmallStrainUPwDiffOrderElement::FinalizeSolutionStep(const ProcessInfo& rCu
191191
}
192192

193193
// Assign pressure values to the intermediate nodes for post-processing
194-
if (!Variables.IgnoreUndrained) AssignPressureToIntermediateNodes();
194+
if (!Variables.IsConstantWaterPressure) AssignPressureToIntermediateNodes();
195195

196196
KRATOS_CATCH("")
197197
}
@@ -883,7 +883,7 @@ Vector SmallStrainUPwDiffOrderElement::CalculateInternalForces(ElementVariables&
883883

884884
this->CalculateAndAddCouplingTerms(result, rVariables);
885885
}
886-
if (!rVariables.IgnoreUndrained) {
886+
if (!rVariables.IsConstantWaterPressure) {
887887
for (unsigned int integration_point = 0;
888888
integration_point < rIntegrationCoefficients.size(); ++integration_point) {
889889
noalias(rVariables.Np) = row(rVariables.NpContainer, integration_point);
@@ -921,7 +921,7 @@ Vector SmallStrainUPwDiffOrderElement::CalculateExternalForces(
921921
rIntegrationCoefficientsOnInitialConfiguration[integration_point];
922922
this->CalculateAndAddMixBodyForce(result, rVariables);
923923
}
924-
if (!rVariables.IgnoreUndrained) {
924+
if (!rVariables.IsConstantWaterPressure) {
925925
for (unsigned int integration_point = 0;
926926
integration_point < rIntegrationCoefficients.size(); ++integration_point) {
927927
noalias(rVariables.Nu) = row(rVariables.NuContainer, integration_point);
@@ -1257,7 +1257,7 @@ void SmallStrainUPwDiffOrderElement::InitializeProperties(ElementVariables& rVar
12571257

12581258
const auto& r_properties = this->GetProperties();
12591259

1260-
rVariables.IgnoreUndrained =
1260+
rVariables.IsConstantWaterPressure =
12611261
r_properties.Has(GEO_DRAINAGE_TYPE)
12621262
? ConstitutiveLawUtilities::StringToDrainageType(r_properties[GEO_DRAINAGE_TYPE]) ==
12631263
DrainageType::CONSTANT_WATER_PRESSURE
@@ -1317,7 +1317,7 @@ void SmallStrainUPwDiffOrderElement::CalculateAndAddLHS(MatrixType&
13171317

13181318
this->CalculateAndAddCouplingMatrix(rLeftHandSideMatrix, rVariables);
13191319

1320-
if (!rVariables.IgnoreUndrained) {
1320+
if (!rVariables.IsConstantWaterPressure) {
13211321
const auto permeability_matrix = GeoTransportEquationUtilities::CalculatePermeabilityMatrix(
13221322
rVariables.DNp_DX, rVariables.DynamicViscosityInverse, rVariables.IntrinsicPermeability,
13231323
rVariables.RelativePermeability, rVariables.IntegrationCoefficient);
@@ -1357,7 +1357,7 @@ void SmallStrainUPwDiffOrderElement::CalculateAndAddCouplingMatrix(MatrixType& r
13571357
rVariables.BiotCoefficient, rVariables.BishopCoefficient, rVariables.IntegrationCoefficient);
13581358
GeoElementUtilities::AssembleUPBlockMatrix(rLeftHandSideMatrix, coupling_matrix);
13591359

1360-
if (!rVariables.IgnoreUndrained) {
1360+
if (!rVariables.IsConstantWaterPressure) {
13611361
GeoTransportEquationUtilities::CalculateCouplingMatrix(
13621362
coupling_matrix, rVariables.B, GetStressStatePolicy().GetVoigtVector(), rVariables.Np,
13631363
rVariables.BiotCoefficient, rVariables.DegreeOfSaturation, rVariables.IntegrationCoefficient);
@@ -1440,7 +1440,7 @@ void SmallStrainUPwDiffOrderElement::CalculateAndAddCouplingTerms(VectorType& rR
14401440
const Vector coupling_force = prod(coupling_matrix, rVariables.PressureVector);
14411441
GeoElementUtilities::AssembleUBlockVector(rRightHandSideVector, coupling_force);
14421442

1443-
if (!rVariables.IgnoreUndrained) {
1443+
if (!rVariables.IsConstantWaterPressure) {
14441444
GeoTransportEquationUtilities::CalculateCouplingMatrix(
14451445
coupling_matrix, rVariables.B, GetStressStatePolicy().GetVoigtVector(), rVariables.Np,
14461446
rVariables.BiotCoefficient, rVariables.DegreeOfSaturation, rVariables.IntegrationCoefficient);

‎applications/GeoMechanicsApplication/custom_elements/small_strain_U_Pw_diff_order_element.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ class KRATOS_API(GEO_MECHANICS_APPLICATION) SmallStrainUPwDiffOrderElement : pub
143143
double BishopCoefficient;
144144

145145
// Properties and processinfo variables
146-
bool IgnoreUndrained;
146+
bool IsConstantWaterPressure;
147147
bool UseHenckyStrain;
148148
bool ConsiderGeometricStiffness;
149149

0 commit comments

Comments
 (0)