Skip to content
Snippets Groups Projects
Commit 530123c4 authored by Christoph Lehmann's avatar Christoph Lehmann Committed by Dmitri Naumov
Browse files

[PL] Pass volumetric strain to permeability model.

parent 26c6f2af
No related branches found
No related tags found
No related merge requests found
......@@ -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;
......@@ -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));
......
......@@ -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;
};
......
......@@ -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,
......
......@@ -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,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment