From 86dbee6ce82636e0bb24da60dcc83d62d46a1305 Mon Sep 17 00:00:00 2001
From: Wenqing Wang <wenqing.wang@ufz.de>
Date: Fri, 20 Jul 2018 16:55:10 +0200
Subject: [PATCH] [KelvinV] Changed the name of Norm to FrobeniusNorm
---
MaterialLib/SolidModels/CreepBGRa.cpp | 2 +-
MathLib/KelvinVector-impl.h | 2 +-
MathLib/KelvinVector.h | 2 +-
ProcessLib/ThermoMechanics/ThermoMechanicsFEM.h | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/MaterialLib/SolidModels/CreepBGRa.cpp b/MaterialLib/SolidModels/CreepBGRa.cpp
index 2d0356b1daf..8cf369dc4a6 100644
--- a/MaterialLib/SolidModels/CreepBGRa.cpp
+++ b/MaterialLib/SolidModels/CreepBGRa.cpp
@@ -53,7 +53,7 @@ CreepBGRa<DisplacementDim>::integrateStress(
KelvinVector s_n1;
auto const update_jacobian = [&](JacobianMatrix& jacobian) {
s_n1 = deviatoric_matrix * solution;
- double const norm_s_n1 = Invariants::Norm(s_n1);
+ double const norm_s_n1 = Invariants::FrobeniusNorm(s_n1);
pow_norm_s_n1_n_minus_one_2b_G =
2.0 * b * this->_mp.mu(t, x) * std::pow(norm_s_n1, _n - 1);
jacobian =
diff --git a/MathLib/KelvinVector-impl.h b/MathLib/KelvinVector-impl.h
index 2ae0a692bce..5baca5d3eec 100644
--- a/MathLib/KelvinVector-impl.h
+++ b/MathLib/KelvinVector-impl.h
@@ -23,7 +23,7 @@ double Invariants<KelvinVectorSize>::equivalentStress(
}
template <int KelvinVectorSize>
-double Invariants<KelvinVectorSize>::Norm(
+double Invariants<KelvinVectorSize>::FrobeniusNorm(
Eigen::Matrix<double, KelvinVectorSize, 1> const& deviatoric_v)
{
return std::sqrt(deviatoric_v.transpose() * deviatoric_v);
diff --git a/MathLib/KelvinVector.h b/MathLib/KelvinVector.h
index a96eeb2048f..d7f9aded81d 100644
--- a/MathLib/KelvinVector.h
+++ b/MathLib/KelvinVector.h
@@ -88,7 +88,7 @@ struct Invariants final
Eigen::Matrix<double, KelvinVectorSize, 1> const& deviatoric_v);
/// Get the norm of the deviatoric stress.
- static double Norm(
+ static double FrobeniusNorm(
Eigen::Matrix<double, KelvinVectorSize, 1> const& deviatoric_v);
/// Second invariant of deviatoric tensor.
diff --git a/ProcessLib/ThermoMechanics/ThermoMechanicsFEM.h b/ProcessLib/ThermoMechanics/ThermoMechanicsFEM.h
index f12afc8ffcb..5d65fbbc0bc 100644
--- a/ProcessLib/ThermoMechanics/ThermoMechanicsFEM.h
+++ b/ProcessLib/ThermoMechanics/ThermoMechanicsFEM.h
@@ -299,7 +299,7 @@ public:
MaterialLib::Solids::ConstitutiveModel::CreepBGRa)
{
auto const s = Invariants::deviatoric_projection * sigma;
- double const norm_s = Invariants::Norm(s);
+ double const norm_s = Invariants::FrobeniusNorm(s);
const double creep_coefficient =
_process_data.material->getTemperatureRelatedCoefficient(
t, dt, x_position,
--
GitLab