From 86e4d4882c73f462f3b188b41e51f871a6dd8203 Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <dmitri.naumov@ufz.de>
Date: Thu, 19 Oct 2017 18:09:29 +0200
Subject: [PATCH] [MatL] KelvinVector: Use vector norm in assertion.
The trace of deviatoric tensor must be zero but is
linearly scaling with the tensor's norm.
---
MaterialLib/SolidModels/KelvinVector-impl.h | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/MaterialLib/SolidModels/KelvinVector-impl.h b/MaterialLib/SolidModels/KelvinVector-impl.h
index eafe29cdf5f..182533b27d9 100644
--- a/MaterialLib/SolidModels/KelvinVector-impl.h
+++ b/MaterialLib/SolidModels/KelvinVector-impl.h
@@ -15,8 +15,8 @@ template <int KelvinVectorSize>
double Invariants<KelvinVectorSize>::equivalentStress(
Eigen::Matrix<double, KelvinVectorSize, 1> const& deviatoric_v)
{
- assert(std::abs(trace(deviatoric_v)) <
- std::numeric_limits<double>::epsilon() * 100);
+ assert(std::abs(trace(deviatoric_v)) <=
+ 1e-16 * std::abs(deviatoric_v.squaredNorm()));
return std::sqrt(3 * J2(deviatoric_v));
}
@@ -24,8 +24,8 @@ template <int KelvinVectorSize>
double Invariants<KelvinVectorSize>::J2(
Eigen::Matrix<double, KelvinVectorSize, 1> const& deviatoric_v)
{
- assert(std::abs(trace(deviatoric_v)) <
- std::numeric_limits<double>::epsilon() * 100);
+ assert(std::abs(trace(deviatoric_v)) <=
+ 1e-16 * std::abs(deviatoric_v.squaredNorm()));
return 0.5 * deviatoric_v.transpose() * deviatoric_v;
}
@@ -35,8 +35,8 @@ template <int KelvinVectorSize>
double Invariants<KelvinVectorSize>::J3(
Eigen::Matrix<double, KelvinVectorSize, 1> const& deviatoric_v)
{
- assert(std::abs(trace(deviatoric_v)) <
- std::numeric_limits<double>::epsilon() * 100);
+ assert(std::abs(trace(deviatoric_v)) <=
+ 1e-16 * std::abs(deviatoric_v.squaredNorm()));
return determinant(deviatoric_v);
}
--
GitLab