From ce4e49f2a29d1de3039452a4d27db2bda4f1993c Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <github@naumov.de>
Date: Sat, 17 Mar 2018 13:29:25 +0100
Subject: [PATCH] [PL] PF; Rename sigma_real into sigma.
There are no other unspecified sigmas.
---
ProcessLib/PhaseField/PhaseFieldFEM-impl.h | 8 ++++----
ProcessLib/PhaseField/PhaseFieldFEM.h | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ProcessLib/PhaseField/PhaseFieldFEM-impl.h b/ProcessLib/PhaseField/PhaseFieldFEM-impl.h
index e44074d184c..a44bf2754aa 100644
--- a/ProcessLib/PhaseField/PhaseFieldFEM-impl.h
+++ b/ProcessLib/PhaseField/PhaseFieldFEM-impl.h
@@ -106,7 +106,7 @@ void PhaseFieldLocalAssembler<ShapeFunction, IntegrationMethod,
auto& history_variable = _ip_data[ip].history_variable;
auto& history_variable_prev = _ip_data[ip].history_variable_prev;
- auto const& sigma_real = _ip_data[ip].sigma_real;
+ auto const& sigma = _ip_data[ip].sigma;
// Kdd_1 defines one term which both used in Kdd and local_rhs for
// phase field
@@ -146,7 +146,7 @@ void PhaseFieldLocalAssembler<ShapeFunction, IntegrationMethod,
auto const& b = _process_data.specific_body_force;
local_rhs.template block<displacement_size, 1>(displacement_index, 0)
.noalias() -=
- (B.transpose() * sigma_real - N_u.transpose() * rho_sr * b) * w;
+ (B.transpose() * sigma - N_u.transpose() * rho_sr * b) * w;
//
// displacement equation, phasefield part
@@ -303,7 +303,7 @@ void PhaseFieldLocalAssembler<ShapeFunction, IntegrationMethod,
_ip_data[ip].updateConstitutiveRelation(t, x_position, dt, u,
degradation);
- auto& sigma_real = _ip_data[ip].sigma_real;
+ auto& sigma = _ip_data[ip].sigma;
auto const& C_tensile = _ip_data[ip].C_tensile;
auto const& C_compressive = _ip_data[ip].C_compressive;
@@ -322,7 +322,7 @@ void PhaseFieldLocalAssembler<ShapeFunction, IntegrationMethod,
auto const& b = _process_data.specific_body_force;
local_rhs.noalias() -=
- (B.transpose() * sigma_real - N_u.transpose() * rho_sr * b -
+ (B.transpose() * sigma - N_u.transpose() * rho_sr * b -
local_pressure * N_u.transpose() * dNdx * d) *
w;
diff --git a/ProcessLib/PhaseField/PhaseFieldFEM.h b/ProcessLib/PhaseField/PhaseFieldFEM.h
index dea80628dcd..d6e2d42791e 100644
--- a/ProcessLib/PhaseField/PhaseFieldFEM.h
+++ b/ProcessLib/PhaseField/PhaseFieldFEM.h
@@ -45,7 +45,7 @@ struct IntegrationPointData final
typename BMatricesType::KelvinVectorType eps, eps_prev;
typename BMatricesType::KelvinVectorType sigma_tensile, sigma_compressive,
- sigma_real;
+ sigma;
double strain_energy_tensile, elastic_energy;
MaterialLib::Solids::MechanicsBase<DisplacementDim>& solid_material;
@@ -79,7 +79,7 @@ struct IntegrationPointData final
solid_material)
.calculateDegradedStress(t, x_position, eps, strain_energy_tensile,
sigma_tensile, sigma_compressive,
- C_tensile, C_compressive, sigma_real,
+ C_tensile, C_compressive, sigma,
degradation, elastic_energy);
}
EIGEN_MAKE_ALIGNED_OPERATOR_NEW;
@@ -158,7 +158,7 @@ public:
_process_data.history_field(0, x_position)[0];
ip_data.history_variable_prev =
_process_data.history_field(0, x_position)[0];
- ip_data.sigma_real.setZero(kelvin_vector_size);
+ ip_data.sigma.setZero(kelvin_vector_size);
ip_data.strain_energy_tensile = 0.0;
ip_data.elastic_energy = 0.0;
@@ -255,7 +255,7 @@ private:
for (unsigned ip = 0; ip < num_intpts; ++ip)
{
- auto const& sigma = _ip_data[ip].sigma_real;
+ auto const& sigma = _ip_data[ip].sigma;
cache_mat.col(ip) =
MathLib::KelvinVector::kelvinVectorToSymmetricTensor(sigma);
}
--
GitLab