From b8de4a3a53b6dc507a739f58e0e70a851b48404b Mon Sep 17 00:00:00 2001 From: Dmitri Naumov <dmitri.naumov@ufz.de> Date: Thu, 26 Jan 2017 17:20:49 +0100 Subject: [PATCH] [MatL] Solids: Rename local loadState in setICs. --- MaterialLib/SolidModels/Ehlers-impl.h | 2 +- MaterialLib/SolidModels/Ehlers.h | 2 +- MaterialLib/SolidModels/Lubby2-impl.h | 2 +- MaterialLib/SolidModels/Lubby2.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MaterialLib/SolidModels/Ehlers-impl.h b/MaterialLib/SolidModels/Ehlers-impl.h index 1527e7b6b17..92b1a81733a 100644 --- a/MaterialLib/SolidModels/Ehlers-impl.h +++ b/MaterialLib/SolidModels/Ehlers-impl.h @@ -533,7 +533,7 @@ bool SolidEhlers<DisplacementDim>::computeConstitutiveRelation( nullptr); MaterialStateVariables& _state = static_cast<MaterialStateVariables&>(material_state_variables); - _state.loadState(); + _state.setInitialConditions(); using Invariants = MaterialLib::SolidModels::Invariants<KelvinVectorSize>; C.setZero(); diff --git a/MaterialLib/SolidModels/Ehlers.h b/MaterialLib/SolidModels/Ehlers.h index d50a5ff6a15..0a858a00c26 100644 --- a/MaterialLib/SolidModels/Ehlers.h +++ b/MaterialLib/SolidModels/Ehlers.h @@ -128,7 +128,7 @@ public: { } - void loadState() + void setInitialConditions() { eps_p_D = eps_p_D_prev; eps_p_V = eps_p_V_prev; diff --git a/MaterialLib/SolidModels/Lubby2-impl.h b/MaterialLib/SolidModels/Lubby2-impl.h index e8f7e3eca33..5ec31e4622d 100644 --- a/MaterialLib/SolidModels/Lubby2-impl.h +++ b/MaterialLib/SolidModels/Lubby2-impl.h @@ -34,7 +34,7 @@ bool Lubby2<DisplacementDim>::computeConstitutiveRelation( nullptr); MaterialStateVariables& state = static_cast<MaterialStateVariables&>(material_state_variables); - state.loadState(); + state.setInitialConditions(); auto local_lubby2_properties = detail::LocalLubby2Properties<DisplacementDim>{t, x, _mp}; diff --git a/MaterialLib/SolidModels/Lubby2.h b/MaterialLib/SolidModels/Lubby2.h index 8f753446998..97300083b5e 100644 --- a/MaterialLib/SolidModels/Lubby2.h +++ b/MaterialLib/SolidModels/Lubby2.h @@ -114,7 +114,7 @@ public: eps_M_j.resize(KelvinVectorSize); } - void loadState() + void setInitialConditions() { eps_K_j = eps_K_t; eps_M_j = eps_M_t; -- GitLab