Commit 2890cf40 authored by Antoine Jacquey's avatar Antoine Jacquey

Corrected LynxADPorosityAux

parent 324de43f
...@@ -28,8 +28,8 @@ protected: ...@@ -28,8 +28,8 @@ protected:
bool _coupled_pf; bool _coupled_pf;
const VariableValue & _pf_dot; const VariableValue & _pf_dot;
const ADMaterialProperty<Real> & _biot; const MaterialProperty<Real> & _biot;
const ADMaterialProperty<Real> & _C_d; const MaterialProperty<Real> & _C_d;
const ADMaterialProperty<RankTwoTensor> & _strain_increment; const ADMaterialProperty<RankTwoTensor> & _strain_increment;
const bool _has_viscous; const bool _has_viscous;
const ADMaterialProperty<RankTwoTensor> * _viscous_strain_incr; const ADMaterialProperty<RankTwoTensor> * _viscous_strain_incr;
......
...@@ -28,12 +28,14 @@ LynxADPorosityAux::validParams() ...@@ -28,12 +28,14 @@ LynxADPorosityAux::validParams()
LynxADPorosityAux::LynxADPorosityAux(const InputParameters & parameters) LynxADPorosityAux::LynxADPorosityAux(const InputParameters & parameters)
: AuxKernel(parameters), : AuxKernel(parameters),
_pf_dot(coupledDot("fluid_pressure")), _pf_dot(coupledDot("fluid_pressure")),
_biot(getADMaterialProperty<Real>("biot_coefficient")), _biot(getMaterialProperty<Real>("biot_coefficient")),
_C_d(getADMaterialProperty<Real>("bulk_compressibility")), _C_d(getMaterialProperty<Real>("bulk_compressibility")),
_strain_increment(getADMaterialProperty<RankTwoTensor>("strain_increment")), _strain_increment(getADMaterialProperty<RankTwoTensor>("strain_increment")),
// TO CORRECT with hasADMaterialProperty
_has_viscous(hasMaterialProperty<RankTwoTensor>("viscous_strain_increment")), _has_viscous(hasMaterialProperty<RankTwoTensor>("viscous_strain_increment")),
_viscous_strain_incr( _viscous_strain_incr(
_has_viscous ? &getADMaterialProperty<RankTwoTensor>("viscous_strain_increment") : nullptr), _has_viscous ? &getADMaterialProperty<RankTwoTensor>("viscous_strain_increment") : nullptr),
// TO CORRECT with hasADMaterialProperty
_has_plastic(hasMaterialProperty<RankTwoTensor>("plastic_strain_increment")), _has_plastic(hasMaterialProperty<RankTwoTensor>("plastic_strain_increment")),
_plastic_strain_incr( _plastic_strain_incr(
_has_viscous ? &getADMaterialProperty<RankTwoTensor>("plastic_strain_increment") : nullptr) _has_viscous ? &getADMaterialProperty<RankTwoTensor>("plastic_strain_increment") : nullptr)
...@@ -47,12 +49,12 @@ LynxADPorosityAux::computeValue() ...@@ -47,12 +49,12 @@ LynxADPorosityAux::computeValue()
Real ev_in_dot = computeEvInDot(); Real ev_in_dot = computeEvInDot();
return _u_old[_qp] + return _u_old[_qp] +
(MetaPhysicL::raw_value(_biot[_qp]) - _u[_qp]) * (_biot[_qp] - _u[_qp]) *
(MetaPhysicL::raw_value(_C_d[_qp]) * (1.0 - MetaPhysicL::raw_value(_biot[_qp])) * (_C_d[_qp] * (1.0 - _biot[_qp]) *
_pf_dot[_qp] + _pf_dot[_qp] +
ev_dot) * ev_dot) *
_dt + _dt +
(1.0 - MetaPhysicL::raw_value(_biot[_qp])) * ev_in_dot * _dt; (1.0 - _biot[_qp]) * ev_in_dot * _dt;
} }
Real Real
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment