diff --git a/MaterialLib/SolidModels/Ehlers-impl.h b/MaterialLib/SolidModels/Ehlers-impl.h index 2e932e8172a6e870b2b035e0d68e366863728aab..f09a41164fe305dbb31ac8a0d11bcafbd8a8f90e 100644 --- a/MaterialLib/SolidModels/Ehlers-impl.h +++ b/MaterialLib/SolidModels/Ehlers-impl.h @@ -739,13 +739,13 @@ SolidEhlers<DisplacementDim>::integrateStress( if (_damage_properties) sigma_final *= 1 - state.damage.value(); - return { - {sigma_final, - std::unique_ptr< - typename MechanicsBase<DisplacementDim>::MaterialStateVariables>{ - new StateVariables<DisplacementDim>{ - static_cast<StateVariables<DisplacementDim> const&>(state)}}, - tangentStiffness}}; + return {std::make_tuple( + sigma_final, + std::unique_ptr< + typename MechanicsBase<DisplacementDim>::MaterialStateVariables>{ + new StateVariables<DisplacementDim>{ + static_cast<StateVariables<DisplacementDim> const&>(state)}}, + tangentStiffness)}; } } // namespace Ehlers diff --git a/MaterialLib/SolidModels/LinearElasticIsotropic.h b/MaterialLib/SolidModels/LinearElasticIsotropic.h index 828230456bf1d20b9c81c8c5b07b2b8e7a7f2956..ec3814459f94c6455e55a4e206e54bb5f2ea753d 100644 --- a/MaterialLib/SolidModels/LinearElasticIsotropic.h +++ b/MaterialLib/SolidModels/LinearElasticIsotropic.h @@ -108,13 +108,14 @@ public: KelvinVector sigma = sigma_prev + C * (eps - eps_prev); - return {{sigma, - std::unique_ptr<typename MechanicsBase< - DisplacementDim>::MaterialStateVariables>{ - new MaterialStateVariables{ - static_cast<MaterialStateVariables const&>( - material_state_variables)}}, - C}}; + return { + std::make_tuple(sigma, + std::unique_ptr<typename MechanicsBase< + DisplacementDim>::MaterialStateVariables>{ + new MaterialStateVariables{ + static_cast<MaterialStateVariables const&>( + material_state_variables)}}, + C)}; } private: diff --git a/MaterialLib/SolidModels/Lubby2-impl.h b/MaterialLib/SolidModels/Lubby2-impl.h index f7ab7f1b32a86146b9f3f5d575845f8c0593a3f5..8ece8e1dd01c3a3d0138e0f1b16fc3d5fe0474d3 100644 --- a/MaterialLib/SolidModels/Lubby2-impl.h +++ b/MaterialLib/SolidModels/Lubby2-impl.h @@ -180,13 +180,15 @@ Lubby2<DisplacementDim>::integrateStress( // Hydrostatic part for the stress and the tangent. double const eps_i_trace = Invariants::trace(eps); - return { - {local_lubby2_properties.GM0 * sigd_j + - local_lubby2_properties.KM0 * eps_i_trace * Invariants::identity2, - std::unique_ptr< - typename MechanicsBase<DisplacementDim>::MaterialStateVariables>{ - new MaterialStateVariables{state}}, - C}}; + KelvinVector const sigma = + local_lubby2_properties.GM0 * sigd_j + + local_lubby2_properties.KM0 * eps_i_trace * Invariants::identity2; + return {std::make_tuple( + sigma, + std::unique_ptr< + typename MechanicsBase<DisplacementDim>::MaterialStateVariables>{ + new MaterialStateVariables{state}}, + C)}; } template <int DisplacementDim>