From de0d17bdfe6ea0f2c4dc2a09b42b8813c95f5876 Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <dmitri.naumov@ufz.de>
Date: Wed, 23 Aug 2023 11:58:26 +0200
Subject: [PATCH] [PL/TRM] Use Forces/Grads product in MFrontGeneric
---
.../ElasticTangentStiffnessModel.h | 9 +++++----
.../SolidMechanics.h | 10 ++++++----
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/ProcessLib/ThermoRichardsMechanics/ConstitutiveStressSaturation_StrainPressureTemperature/ElasticTangentStiffnessModel.h b/ProcessLib/ThermoRichardsMechanics/ConstitutiveStressSaturation_StrainPressureTemperature/ElasticTangentStiffnessModel.h
index 008b4eea01d..a320213f4a4 100644
--- a/ProcessLib/ThermoRichardsMechanics/ConstitutiveStressSaturation_StrainPressureTemperature/ElasticTangentStiffnessModel.h
+++ b/ProcessLib/ThermoRichardsMechanics/ConstitutiveStressSaturation_StrainPressureTemperature/ElasticTangentStiffnessModel.h
@@ -25,7 +25,7 @@ struct ElasticTangentStiffnessModel
SolidConstitutiveRelation<DisplacementDim> const& solid_material)
: solid_material_(solid_material),
tangent_operator_blocks_view_{
- solid_material.createTangentOperatorBlocksView()}
+ solid_material.template createTangentOperatorBlocksView()}
{
}
@@ -38,9 +38,10 @@ private:
MSM::OGSMFrontTangentOperatorBlocksView<
DisplacementDim,
- boost::mp11::mp_list<MSM::Strain, MSM::LiquidPressure>,
- boost::mp11::mp_list<MSM::Stress, MSM::Saturation>,
- boost::mp11::mp_list<MSM::Temperature>>
+ MSM::ForcesGradsCombinations<
+ boost::mp11::mp_list<MSM::Strain, MSM::LiquidPressure>,
+ boost::mp11::mp_list<MSM::Stress, MSM::Saturation>,
+ boost::mp11::mp_list<MSM::Temperature>>::type>
tangent_operator_blocks_view_;
};
diff --git a/ProcessLib/ThermoRichardsMechanics/ConstitutiveStressSaturation_StrainPressureTemperature/SolidMechanics.h b/ProcessLib/ThermoRichardsMechanics/ConstitutiveStressSaturation_StrainPressureTemperature/SolidMechanics.h
index d481779ad13..ad994b18c63 100644
--- a/ProcessLib/ThermoRichardsMechanics/ConstitutiveStressSaturation_StrainPressureTemperature/SolidMechanics.h
+++ b/ProcessLib/ThermoRichardsMechanics/ConstitutiveStressSaturation_StrainPressureTemperature/SolidMechanics.h
@@ -42,7 +42,7 @@ struct SolidMechanicsModel
SolidConstitutiveRelation<DisplacementDim> const& solid_material)
: solid_material_(solid_material),
tangent_operator_blocks_view_{
- solid_material.createTangentOperatorBlocksView()}
+ solid_material.template createTangentOperatorBlocksView()}
{
}
@@ -68,9 +68,11 @@ private:
SolidConstitutiveRelation<DisplacementDim> const& solid_material_;
MSM::OGSMFrontTangentOperatorBlocksView<
- DisplacementDim, boost::mp11::mp_list<MSM::Strain, MSM::LiquidPressure>,
- boost::mp11::mp_list<MSM::Stress, MSM::Saturation>,
- boost::mp11::mp_list<MSM::Temperature>>
+ DisplacementDim,
+ MSM::ForcesGradsCombinations<
+ boost::mp11::mp_list<MSM::Strain, MSM::LiquidPressure>,
+ boost::mp11::mp_list<MSM::Stress, MSM::Saturation>,
+ boost::mp11::mp_list<MSM::Temperature>>::type>
tangent_operator_blocks_view_;
};
--
GitLab