Skip to content
Snippets Groups Projects
Commit 86dbee6c authored by wenqing's avatar wenqing
Browse files

[KelvinV] Changed the name of Norm to FrobeniusNorm

parent e6e057ab
No related branches found
No related tags found
No related merge requests found
...@@ -53,7 +53,7 @@ CreepBGRa<DisplacementDim>::integrateStress( ...@@ -53,7 +53,7 @@ CreepBGRa<DisplacementDim>::integrateStress(
KelvinVector s_n1; KelvinVector s_n1;
auto const update_jacobian = [&](JacobianMatrix& jacobian) { auto const update_jacobian = [&](JacobianMatrix& jacobian) {
s_n1 = deviatoric_matrix * solution; 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 = pow_norm_s_n1_n_minus_one_2b_G =
2.0 * b * this->_mp.mu(t, x) * std::pow(norm_s_n1, _n - 1); 2.0 * b * this->_mp.mu(t, x) * std::pow(norm_s_n1, _n - 1);
jacobian = jacobian =
......
...@@ -23,7 +23,7 @@ double Invariants<KelvinVectorSize>::equivalentStress( ...@@ -23,7 +23,7 @@ double Invariants<KelvinVectorSize>::equivalentStress(
} }
template <int KelvinVectorSize> template <int KelvinVectorSize>
double Invariants<KelvinVectorSize>::Norm( double Invariants<KelvinVectorSize>::FrobeniusNorm(
Eigen::Matrix<double, KelvinVectorSize, 1> const& deviatoric_v) Eigen::Matrix<double, KelvinVectorSize, 1> const& deviatoric_v)
{ {
return std::sqrt(deviatoric_v.transpose() * deviatoric_v); return std::sqrt(deviatoric_v.transpose() * deviatoric_v);
......
...@@ -88,7 +88,7 @@ struct Invariants final ...@@ -88,7 +88,7 @@ struct Invariants final
Eigen::Matrix<double, KelvinVectorSize, 1> const& deviatoric_v); Eigen::Matrix<double, KelvinVectorSize, 1> const& deviatoric_v);
/// Get the norm of the deviatoric stress. /// Get the norm of the deviatoric stress.
static double Norm( static double FrobeniusNorm(
Eigen::Matrix<double, KelvinVectorSize, 1> const& deviatoric_v); Eigen::Matrix<double, KelvinVectorSize, 1> const& deviatoric_v);
/// Second invariant of deviatoric tensor. /// Second invariant of deviatoric tensor.
......
...@@ -299,7 +299,7 @@ public: ...@@ -299,7 +299,7 @@ public:
MaterialLib::Solids::ConstitutiveModel::CreepBGRa) MaterialLib::Solids::ConstitutiveModel::CreepBGRa)
{ {
auto const s = Invariants::deviatoric_projection * sigma; 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 = const double creep_coefficient =
_process_data.material->getTemperatureRelatedCoefficient( _process_data.material->getTemperatureRelatedCoefficient(
t, dt, x_position, t, dt, x_position,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment