diff --git a/include/materials/ComputeMultipleInelasticDamageStress.h b/include/materials/ComputeMultipleInelasticDamageStress.h index 2682ca54..00e2e88e 100644 --- a/include/materials/ComputeMultipleInelasticDamageStress.h +++ b/include/materials/ComputeMultipleInelasticDamageStress.h @@ -29,7 +29,7 @@ class ComputeMultipleInelasticDamageStress : public ComputeMultipleInelasticStre /// damage parameter for DamagePlasticityStressUpdate model const MaterialProperty & _D; const MaterialProperty & _D_old; - const MaterialProperty & _D_older; + virtual void computeQpJacobianMult() override; diff --git a/include/materials/DamagePlasticityStressUpdate.h b/include/materials/DamagePlasticityStressUpdate.h index 51b958a9..e10639be 100644 --- a/include/materials/DamagePlasticityStressUpdate.h +++ b/include/materials/DamagePlasticityStressUpdate.h @@ -69,8 +69,7 @@ class DamagePlasticityStressUpdate : public MultiParameterPlasticityStressUpdate /// Eigenvectors of the trial stress as a RankTwoTensor, in order to rotate the returned stress back to stress space RankTwoTensor _eigvecs; - MaterialProperty & _max_principal; - MaterialProperty & _min_principal; + MaterialProperty & _intnl0; MaterialProperty & _intnl1; MaterialProperty & _ele_len; diff --git a/src/materials/ComputeMultipleInelasticDamageStress.C b/src/materials/ComputeMultipleInelasticDamageStress.C index 4bfaf7e3..8168763b 100644 --- a/src/materials/ComputeMultipleInelasticDamageStress.C +++ b/src/materials/ComputeMultipleInelasticDamageStress.C @@ -22,7 +22,8 @@ ComputeMultipleInelasticDamageStress::validParams() { InputParameters params = ComputeMultipleInelasticStress::validParams(); params.addClassDescription("This ComputeMultipleInelasticStress is to be used with " - "DamagePlasticityStressUpdate") return params; + "DamagePlasticityStressUpdate"); + return params; } ComputeMultipleInelasticDamageStress::ComputeMultipleInelasticDamageStress( @@ -63,7 +64,7 @@ ComputeMultipleInelasticDamageStress::computeAdmissibleState( inelastic_strain_increment, _rotation_increment[_qp], _stress[_qp], - _stress_old[_qp] / (1.0 - _D_older[_qp]), + _stress_old[_qp] / (1.0 - _D_old[_qp]), // _stress_old[_qp] / (1.0 - _D[_qp]), _elasticity_tensor[_qp], _elastic_strain_old[_qp], diff --git a/src/materials/DamagePlasticityStressUpdate.C b/src/materials/DamagePlasticityStressUpdate.C index efa24983..a4797fd0 100644 --- a/src/materials/DamagePlasticityStressUpdate.C +++ b/src/materials/DamagePlasticityStressUpdate.C @@ -107,7 +107,8 @@ DamagePlasticityStressUpdate::DamagePlasticityStressUpdate(const InputParameters _ft0(0.5 * _ft / ((1. - _Dt) * std::pow((_zt - _sqrtPhit_max / _at), (1. - _dt_bt)) * _sqrtPhit_max)), _fc0(_fc / ((1. - _Dc) * std::pow((_zc - _sqrtPhic_max / _ac), (1. - _dc_bc)) * _sqrtPhic_max)), - _small_smoother2(Utility::pow(getParam("tip_smoother"), 2)), + _small_smoother2(Utility::pow<2>(getParam("tip_smoother"))), + _sqrt3(std::sqrt(3.)), _perfect_guess(getParam("perfect_guess")),