From 7ab8ebd5c7079cc7c228ddd2b905898ff3c24636 Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <dmitri.naumov@ufz.de>
Date: Wed, 15 Mar 2017 11:37:06 +0100
Subject: [PATCH] [MatL] Ehlers: Fix function naming. sOdotS() now.
---
MaterialLib/SolidModels/Ehlers-impl.h | 4 ++--
MaterialLib/SolidModels/Ehlers.cpp | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/MaterialLib/SolidModels/Ehlers-impl.h b/MaterialLib/SolidModels/Ehlers-impl.h
index 55ab5cd5bd8..6de8c1b2e27 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 42669ce6ccb..3151990fadb 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;
--
GitLab