diff --git a/MaterialLib/SolidModels/Ehlers-impl.h b/MaterialLib/SolidModels/Ehlers-impl.h index 55ab5cd5bd896c2080b24e91b8ce7a74dac147d1..6de8c1b2e27112ea558637f2ace488f4783b3486 100644 --- a/MaterialLib/SolidModels/Ehlers-impl.h +++ b/MaterialLib/SolidModels/Ehlers-impl.h @@ -48,7 +48,7 @@ namespace Ehlers /// v is given in \p Kelvin mapping. /// \note Implementation only for 2 and 3 dimensions. template <int DisplacementDim> -ProcessLib::KelvinMatrixType<DisplacementDim> s_odot_s( +ProcessLib::KelvinMatrixType<DisplacementDim> sOdotS( ProcessLib::KelvinVectorType<DisplacementDim> const& v); template <int DisplacementDim> @@ -319,7 +319,7 @@ void calculatePlasticJacobian( one_gt.pow_m_p * (P_dev + s.D * gm_p * M0.transpose()); // second derivative of theta KelvinMatrix const d2theta_dsigma2 = - theta * P_dev * s_odot_s<DisplacementDim>(sigma_D_inverse) * P_dev + + theta * P_dev * sOdotS<DisplacementDim>(sigma_D_inverse) * P_dev + sigma_D_inverse_D * dtheta_dsigma.transpose() - 3. / 2. * theta / s.J_2 * P_dev - 3. / 2. * dtheta_dsigma / s.J_2 * s.D.transpose() + diff --git a/MaterialLib/SolidModels/Ehlers.cpp b/MaterialLib/SolidModels/Ehlers.cpp index 42669ce6ccb27456afd1cfc815d0e7e8ba7673b6..3151990fadbadffe59fec5b215036e3baf029383 100644 --- a/MaterialLib/SolidModels/Ehlers.cpp +++ b/MaterialLib/SolidModels/Ehlers.cpp @@ -19,7 +19,7 @@ template class SolidEhlers<2>; template class SolidEhlers<3>; template <> -ProcessLib::KelvinMatrixType<3> s_odot_s<3>( +ProcessLib::KelvinMatrixType<3> sOdotS<3>( ProcessLib::KelvinVectorType<3> const& v) { ProcessLib::KelvinMatrixType<3> result; @@ -57,7 +57,7 @@ ProcessLib::KelvinMatrixType<3> s_odot_s<3>( } template <> -ProcessLib::KelvinMatrixType<2> s_odot_s<2>( +ProcessLib::KelvinMatrixType<2> sOdotS<2>( ProcessLib::KelvinVectorType<2> const& v) { ProcessLib::KelvinMatrixType<2> result;