[PL/RM] Extracted some constitutive setting evaluations

... from assembleWithJacobian() into a separate method.
I added some constitutive data structs and reused some from TRM.

ProcessLib/RichardsMechanics/ConstitutiveRelations/Base.h

@@ -10,6 +10,7 @@
 
 #pragma once
 
+#include "BaseLib/StrongType.h"
 #include "MaterialLib/MPL/Medium.h"
 #include "MathLib/KelvinVector.h"
 #include "ParameterLib/SpatialPosition.h"
@@ -63,13 +64,7 @@ struct MediaData
     MaterialPropertyLib::Phase const& solid;
 };
 
-template <int DisplacementDim>
-struct TemperatureData
-{
-    double T;
-    double T_prev;
-    Eigen::Vector<double, DisplacementDim> grad_T;
-};
+using TemperatureData = BaseLib::StrongType<double, struct TemperatureDataTag>;
 
 template <int DisplacementDim>
 struct CapillaryPressureData

ProcessLib/RichardsMechanics/ConstitutiveRelations/ConstitutiveData.h

@@ -10,7 +10,17 @@
 
 #pragma once
 
+#include "Density.h"
+#include "LiquidDensity.h"
 #include "ProcessLib/ConstitutiveRelations/Base.h"
+#include "ProcessLib/ThermoRichardsMechanics/ConstitutiveCommon/Biot.h"
+#include "ProcessLib/ThermoRichardsMechanics/ConstitutiveCommon/LiquidViscosity.h"
+#include "ProcessLib/ThermoRichardsMechanics/ConstitutiveCommon/PermeabilityData.h"
+#include "ProcessLib/ThermoRichardsMechanics/ConstitutiveCommon/Porosity.h"
+#include "ProcessLib/ThermoRichardsMechanics/ConstitutiveCommon/Saturation.h"
+#include "ProcessLib/ThermoRichardsMechanics/ConstitutiveCommon/SolidCompressibilityData.h"
+#include "SaturationSecantDerivative.h"
+#include "StiffnessTensor.h"
 
 namespace ProcessLib::RichardsMechanics
 {
@@ -29,7 +39,18 @@ using OutputData = std::tuple<>;
 
 /// Data that is needed for the equation system assembly.
 template <int DisplacementDim>
-using ConstitutiveData = std::tuple<>;
+using ConstitutiveData = std::tuple<
+    // TODO (CL) check if all that data should stay here
+    StiffnessTensor<DisplacementDim>,
+    ProcessLib::ThermoRichardsMechanics::PorosityData, Density, LiquidDensity,
+    ProcessLib::ThermoRichardsMechanics::BiotData,
+    ProcessLib::ThermoRichardsMechanics::SaturationDataDeriv,
+    ProcessLib::ThermoRichardsMechanics::LiquidViscosityData,
+    ProcessLib::ThermoRichardsMechanics::SolidCompressibilityData,
+    ProcessLib::ThermoRichardsMechanics::BishopsData,
+    PrevState<ProcessLib::ThermoRichardsMechanics::BishopsData>,
+    ProcessLib::ThermoRichardsMechanics::PermeabilityData<DisplacementDim>,
+    SaturationSecantDerivative>;
 
 /// Data that stores intermediate values, which are not needed outside the
 /// constitutive setting.

ProcessLib/RichardsMechanics/ConstitutiveRelations/ConstitutiveSetting.cpp

@@ -14,19 +14,19 @@ namespace ProcessLib::RichardsMechanics
 {
 template <int DisplacementDim>
 void ConstitutiveSetting<DisplacementDim>::eval(
-    ConstitutiveModels<DisplacementDim>& models, double const t,
-    double const dt, ParameterLib::SpatialPosition const& x_position,
-    MaterialPropertyLib::Medium const& medium,
-    TemperatureData<DisplacementDim> const& T_data,
-    CapillaryPressureData<DisplacementDim> const& p_cap_data,
-    KelvinVector<DisplacementDim> const& eps_arg,
-    StatefulData<DisplacementDim>& state,
-    StatefulDataPrev<DisplacementDim> const& prev_state,
+    ConstitutiveModels<DisplacementDim>& /*models*/, double const /*t*/,
+    double const /*dt*/, ParameterLib::SpatialPosition const& /*x_position*/,
+    MaterialPropertyLib::Medium const& /*medium*/,
+    TemperatureData const /*T_data*/,
+    CapillaryPressureData<DisplacementDim> const& /*p_cap_data*/,
+    KelvinVector<DisplacementDim> const& /*eps_arg*/,
+    StatefulData<DisplacementDim>& /*state*/,
+    StatefulDataPrev<DisplacementDim> const& /*prev_state*/,
     ProcessLib::ThermoRichardsMechanics::MaterialStateData<DisplacementDim>&
-        mat_state,
-    ConstitutiveTempData<DisplacementDim>& tmp,
-    OutputData<DisplacementDim>& out,
-    ConstitutiveData<DisplacementDim>& cd) const
+    /*mat_state*/,
+    ConstitutiveTempData<DisplacementDim>& /*tmp*/,
+    OutputData<DisplacementDim>& /*out*/,
+    ConstitutiveData<DisplacementDim>& /*cd*/) const
 {
 }
 

ProcessLib/RichardsMechanics/ConstitutiveRelations/ConstitutiveSetting.h

@@ -24,8 +24,7 @@ struct ConstitutiveSetting
     void eval(
         ConstitutiveModels<DisplacementDim>& models, double const t,
         double const dt, ParameterLib::SpatialPosition const& x_position,
-        MaterialPropertyLib::Medium const& medium,
-        TemperatureData<DisplacementDim> const& T_data,
+        MaterialPropertyLib::Medium const& medium, TemperatureData const T_data,
         CapillaryPressureData<DisplacementDim> const& p_cap_data,
         KelvinVector<DisplacementDim> const& eps_arg,
         StatefulData<DisplacementDim>& state,

ProcessLib/RichardsMechanics/ConstitutiveRelations/Density.h

+/**
+ * \file
+ * \copyright
+ * Copyright (c) 2012-2024, OpenGeoSys Community (http://www.opengeosys.org)
+ *            Distributed under a Modified BSD License.
+ *              See accompanying file LICENSE.txt or
+ *              http://www.opengeosys.org/project/license
+ *
+ */
+
+#pragma once
+
+#include "BaseLib/StrongType.h"
+
+namespace ProcessLib::RichardsMechanics
+{
+// effective density of both the solid and fluid phases
+using Density = BaseLib::StrongType<double, struct DensityTag>;
+}  // namespace ProcessLib::RichardsMechanics

ProcessLib/RichardsMechanics/ConstitutiveRelations/EffectivePorePressure.h

+/**
+ * \file
+ * \copyright
+ * Copyright (c) 2012-2024, OpenGeoSys Community (http://www.opengeosys.org)
+ *            Distributed under a Modified BSD License.
+ *              See accompanying file LICENSE.txt or
+ *              http://www.opengeosys.org/project/license
+ *
+ */
+
+#pragma once
+
+#include "BaseLib/StrongType.h"
+
+namespace ProcessLib::RichardsMechanics
+{
+using EffectivePorePressure =
+    BaseLib::StrongType<double, struct EffectivePorePressureTag>;
+}  // namespace ProcessLib::RichardsMechanics

ProcessLib/RichardsMechanics/ConstitutiveRelations/LiquidDensity.h

+/**
+ * \file
+ * \copyright
+ * Copyright (c) 2012-2024, OpenGeoSys Community (http://www.opengeosys.org)
+ *            Distributed under a Modified BSD License.
+ *              See accompanying file LICENSE.txt or
+ *              http://www.opengeosys.org/project/license
+ *
+ */
+
+#pragma once
+
+#include "BaseLib/StrongType.h"
+
+namespace ProcessLib::RichardsMechanics
+{
+using LiquidDensity = BaseLib::StrongType<double, struct LiquidDensityTag>;
+}  // namespace ProcessLib::RichardsMechanics

ProcessLib/RichardsMechanics/ConstitutiveRelations/SaturationSecantDerivative.h

+/**
+ * \file
+ * \copyright
+ * Copyright (c) 2012-2024, OpenGeoSys Community (http://www.opengeosys.org)
+ *            Distributed under a Modified BSD License.
+ *              See accompanying file LICENSE.txt or
+ *              http://www.opengeosys.org/project/license
+ *
+ */
+
+#pragma once
+
+#include "Base.h"
+
+namespace ProcessLib::RichardsMechanics
+{
+struct SaturationSecantDerivative
+{
+    double DeltaS_L_Deltap_cap = nan;
+};
+}  // namespace ProcessLib::RichardsMechanics

ProcessLib/RichardsMechanics/ConstitutiveRelations/StiffnessTensor.h

+/**
+ * \file
+ * \copyright
+ * Copyright (c) 2012-2024, OpenGeoSys Community (http://www.opengeosys.org)
+ *            Distributed under a Modified BSD License.
+ *              See accompanying file LICENSE.txt or
+ *              http://www.opengeosys.org/project/license
+ *
+ */
+
+#pragma once
+
+#include "Base.h"
+
+namespace ProcessLib::RichardsMechanics
+{
+template <int DisplacementDim>
+using StiffnessTensor = BaseLib::StrongType<KelvinMatrix<DisplacementDim>,
+                                            struct StiffnessTensorTag>;
+}  // namespace ProcessLib::RichardsMechanics

ProcessLib/RichardsMechanics/RichardsMechanicsFEM.h

@@ -13,6 +13,8 @@
 #include <memory>
 #include <vector>
 
+#include "ConstitutiveRelations/Base.h"
+#include "ConstitutiveRelations/ConstitutiveData.h"
 #include "IntegrationPointData.h"
 #include "LocalAssemblerInterface.h"
 #include "MaterialLib/MPL/VariableType.h"
@@ -328,6 +330,14 @@ private:
     getMaterialStateVariablesAt(unsigned integration_point) const override;
 
 private:
+    void assembleWithJacobianEvalConstitutiveSetting(
+        double const t, double const dt,
+        ParameterLib::SpatialPosition const& x_position, IpData& ip_data,
+        MPL::VariableArray& variables, MPL::VariableArray& variables_prev,
+        MPL::Medium const* const medium, TemperatureData const T_data,
+        CapillaryPressureData<DisplacementDim> const& p_cap_data,
+        ConstitutiveData<DisplacementDim>& CD);
+
     RichardsMechanicsProcessData<DisplacementDim>& _process_data;
 
     std::vector<IpData, Eigen::aligned_allocator<IpData>> _ip_data;