Skip to content

Commit

Permalink
[PL] Pass volumetric strain to permeability model.
Browse files Browse the repository at this point in the history
  • Loading branch information
chleh authored and endJunction committed Sep 15, 2023
1 parent 26c6f2a commit 530123c
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,16 @@ void PermeabilityModel<DisplacementDim>::eval(
LiquidViscosityData const& mu_L_data,
TransportPorosityData const& transport_poro_data,
TotalStressData<DisplacementDim> const& total_stress_data,
StrainData<DisplacementDim> const& eps_data,
EquivalentPlasticStrainData const& equiv_plast_strain_data,
PermeabilityData<DisplacementDim>& out) const
{
namespace MPL = MaterialPropertyLib;

static constexpr int kelvin_vector_size =
MathLib::KelvinVector::kelvin_vector_dimensions(DisplacementDim);
using Invariants = MathLib::KelvinVector::Invariants<kelvin_vector_size>;

auto const& medium = media_data.medium;

MPL::VariableArray variables;
Expand Down Expand Up @@ -57,6 +62,8 @@ void PermeabilityModel<DisplacementDim>::eval(
variables.equivalent_plastic_strain =
equiv_plast_strain_data.equivalent_plastic_strain;

variables.volumetric_strain = Invariants::trace(eps_data.eps);

auto const K_intrinsic = MPL::formEigenTensor<DisplacementDim>(
medium.property(MPL::PropertyType::permeability)
.value(variables, x_t.x, x_t.t, x_t.dt));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ struct PermeabilityModel
LiquidViscosityData const& mu_L_data,
TransportPorosityData const& transport_poro_data,
TotalStressData<DisplacementDim> const& total_stress_data,
StrainData<DisplacementDim> const& eps_data,
EquivalentPlasticStrainData const& equiv_plast_strain_data,
PermeabilityData<DisplacementDim>& out) const;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ void ConstitutiveSetting<DisplacementDim>::eval(
assertEvalArgsUnique(models.perm_model);
models.perm_model.eval(x_t, media_data, S_L_data, p_cap_data, T_data,
mu_L_data, state.transport_poro_data,
state.total_stress_data, tmp.equiv_plast_strain_data,
perm_data);
state.total_stress_data, state.eps_data,
tmp.equiv_plast_strain_data, perm_data);

assertEvalArgsUnique(models.th_osmosis_model);
models.th_osmosis_model.eval(x_t, media_data, T_data, rho_L_data,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,8 @@ void ConstitutiveSetting<DisplacementDim>::eval(
assertEvalArgsUnique(models.perm_model);
models.perm_model.eval(x_t, media_data, S_L_data, p_cap_data, T_data,
mu_L_data, state.transport_poro_data,
cd.total_stress_data, tmp.equiv_plast_strain_data,
perm_data);
cd.total_stress_data, state.eps_data,
tmp.equiv_plast_strain_data, perm_data);

assertEvalArgsUnique(models.th_osmosis_model);
models.th_osmosis_model.eval(x_t, media_data, T_data, rho_L_data,
Expand Down

0 comments on commit 530123c

Please sign in to comment.