From 44c3a4d28d66e535cabd5fa106efe28ff455e956 Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <dmitri.naumov@ufz.de>
Date: Wed, 7 Jun 2023 18:32:25 +0200
Subject: [PATCH] [PL] Call internal state variables initialization
---
ProcessLib/HydroMechanics/HydroMechanicsFEM.h | 18 +++++++++++-------
.../RichardsMechanics/RichardsMechanicsFEM.h | 18 +++++++++++-------
.../SmallDeformation/SmallDeformationFEM.h | 18 +++++++++++-------
ProcessLib/TH2M/TH2MFEM.h | 18 +++++++++++-------
.../ThermoHydroMechanicsFEM.h | 18 +++++++++++-------
.../ThermoMechanics/ThermoMechanicsFEM.h | 18 +++++++++++-------
.../ThermoRichardsMechanicsFEM.h | 5 +++++
7 files changed, 71 insertions(+), 42 deletions(-)
diff --git a/ProcessLib/HydroMechanics/HydroMechanicsFEM.h b/ProcessLib/HydroMechanics/HydroMechanicsFEM.h
index 7c902c4ca2a..c3b73149f8f 100644
--- a/ProcessLib/HydroMechanics/HydroMechanicsFEM.h
+++ b/ProcessLib/HydroMechanics/HydroMechanicsFEM.h
@@ -233,16 +233,16 @@ public:
{
auto& ip_data = _ip_data[ip];
+ ParameterLib::SpatialPosition const x_position{
+ std::nullopt, _element.getID(), ip,
+ MathLib::Point3d(
+ NumLib::interpolateCoordinates<ShapeFunctionPressure,
+ ShapeMatricesTypePressure>(
+ _element, ip_data.N_p))};
+
/// Set initial stress from parameter.
if (_process_data.initial_stress != nullptr)
{
- ParameterLib::SpatialPosition const x_position{
- std::nullopt, _element.getID(), ip,
- MathLib::Point3d(NumLib::interpolateCoordinates<
- ShapeFunctionDisplacement,
- ShapeMatricesTypeDisplacement>(
- _element, ip_data.N_u))};
-
ip_data.sigma_eff =
MathLib::KelvinVector::symmetricTensorToKelvinVector<
DisplacementDim>((*_process_data.initial_stress)(
@@ -251,6 +251,10 @@ public:
x_position));
}
+ double const t = 0; // TODO (naumov) pass t from top
+ ip_data.solid_material.initializeInternalStateVariables(
+ t, x_position, *ip_data.material_state_variables);
+
ip_data.pushBackState();
}
}
diff --git a/ProcessLib/RichardsMechanics/RichardsMechanicsFEM.h b/ProcessLib/RichardsMechanics/RichardsMechanicsFEM.h
index 2dd4c79ca7b..5a13430d4a2 100644
--- a/ProcessLib/RichardsMechanics/RichardsMechanicsFEM.h
+++ b/ProcessLib/RichardsMechanics/RichardsMechanicsFEM.h
@@ -130,16 +130,16 @@ public:
{
auto& ip_data = _ip_data[ip];
+ ParameterLib::SpatialPosition const x_position{
+ std::nullopt, _element.getID(), ip,
+ MathLib::Point3d(
+ NumLib::interpolateCoordinates<
+ ShapeFunctionDisplacement,
+ ShapeMatricesTypeDisplacement>(_element, ip_data.N_u))};
+
/// Set initial stress from parameter.
if (_process_data.initial_stress != nullptr)
{
- ParameterLib::SpatialPosition const x_position{
- std::nullopt, _element.getID(), ip,
- MathLib::Point3d(NumLib::interpolateCoordinates<
- ShapeFunctionDisplacement,
- ShapeMatricesTypeDisplacement>(
- _element, ip_data.N_u))};
-
ip_data.sigma_eff =
MathLib::KelvinVector::symmetricTensorToKelvinVector<
DisplacementDim>((*_process_data.initial_stress)(
@@ -148,6 +148,10 @@ public:
x_position));
}
+ double const t = 0; // TODO (naumov) pass t from top
+ ip_data.solid_material.initializeInternalStateVariables(
+ t, x_position, *ip_data.material_state_variables);
+
ip_data.pushBackState();
}
}
diff --git a/ProcessLib/SmallDeformation/SmallDeformationFEM.h b/ProcessLib/SmallDeformation/SmallDeformationFEM.h
index 5ad1661a0a0..532ebd77e00 100644
--- a/ProcessLib/SmallDeformation/SmallDeformationFEM.h
+++ b/ProcessLib/SmallDeformation/SmallDeformationFEM.h
@@ -236,16 +236,16 @@ public:
{
auto& ip_data = _ip_data[ip];
+ ParameterLib::SpatialPosition const x_position{
+ std::nullopt, _element.getID(), ip,
+ MathLib::Point3d(
+ NumLib::interpolateCoordinates<ShapeFunction,
+ ShapeMatricesType>(
+ _element, ip_data.N))};
+
/// Set initial stress from parameter.
if (_process_data.initial_stress != nullptr)
{
- ParameterLib::SpatialPosition const x_position{
- std::nullopt, _element.getID(), ip,
- MathLib::Point3d(
- NumLib::interpolateCoordinates<ShapeFunction,
- ShapeMatricesType>(
- _element, ip_data.N))};
-
ip_data.sigma =
MathLib::KelvinVector::symmetricTensorToKelvinVector<
DisplacementDim>((*_process_data.initial_stress)(
@@ -254,6 +254,10 @@ public:
x_position));
}
+ double const t = 0; // TODO (naumov) pass t from top
+ ip_data.solid_material.initializeInternalStateVariables(
+ t, x_position, *ip_data.material_state_variables);
+
ip_data.pushBackState();
}
}
diff --git a/ProcessLib/TH2M/TH2MFEM.h b/ProcessLib/TH2M/TH2MFEM.h
index 88653ff7188..27bedcd7da1 100644
--- a/ProcessLib/TH2M/TH2MFEM.h
+++ b/ProcessLib/TH2M/TH2MFEM.h
@@ -126,16 +126,16 @@ private:
{
auto& ip_data = _ip_data[ip];
+ ParameterLib::SpatialPosition const x_position{
+ std::nullopt, _element.getID(), ip,
+ MathLib::Point3d(
+ NumLib::interpolateCoordinates<
+ ShapeFunctionDisplacement,
+ ShapeMatricesTypeDisplacement>(_element, ip_data.N_u))};
+
/// Set initial stress from parameter.
if (_process_data.initial_stress != nullptr)
{
- ParameterLib::SpatialPosition const x_position{
- std::nullopt, _element.getID(), ip,
- MathLib::Point3d(NumLib::interpolateCoordinates<
- ShapeFunctionDisplacement,
- ShapeMatricesTypeDisplacement>(
- _element, ip_data.N_u))};
-
ip_data.sigma_eff =
MathLib::KelvinVector::symmetricTensorToKelvinVector<
DisplacementDim>((*_process_data.initial_stress)(
@@ -144,6 +144,10 @@ private:
x_position));
}
+ double const t = 0; // TODO (naumov) pass t from top
+ ip_data.solid_material.initializeInternalStateVariables(
+ t, x_position, *ip_data.material_state_variables);
+
ip_data.pushBackState();
}
}
diff --git a/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsFEM.h b/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsFEM.h
index 94a53bc808c..e59aaa2aa3e 100644
--- a/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsFEM.h
+++ b/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsFEM.h
@@ -122,16 +122,16 @@ public:
{
auto& ip_data = _ip_data[ip];
+ ParameterLib::SpatialPosition const x_position{
+ std::nullopt, _element.getID(), ip,
+ MathLib::Point3d(
+ NumLib::interpolateCoordinates<
+ ShapeFunctionDisplacement,
+ ShapeMatricesTypeDisplacement>(_element, ip_data.N_u))};
+
/// Set initial stress from parameter.
if (_process_data.initial_stress != nullptr)
{
- ParameterLib::SpatialPosition const x_position{
- std::nullopt, _element.getID(), ip,
- MathLib::Point3d(NumLib::interpolateCoordinates<
- ShapeFunctionDisplacement,
- ShapeMatricesTypeDisplacement>(
- _element, ip_data.N_u))};
-
ip_data.sigma_eff =
MathLib::KelvinVector::symmetricTensorToKelvinVector<
DisplacementDim>((*_process_data.initial_stress)(
@@ -142,6 +142,10 @@ public:
x_position));
}
+ double const t = 0; // TODO (naumov) pass t from top
+ ip_data.solid_material.initializeInternalStateVariables(
+ t, x_position, *ip_data.material_state_variables);
+
ip_data.pushBackState();
}
}
diff --git a/ProcessLib/ThermoMechanics/ThermoMechanicsFEM.h b/ProcessLib/ThermoMechanics/ThermoMechanicsFEM.h
index 72a3660828d..374c7e51c80 100644
--- a/ProcessLib/ThermoMechanics/ThermoMechanicsFEM.h
+++ b/ProcessLib/ThermoMechanics/ThermoMechanicsFEM.h
@@ -202,16 +202,16 @@ public:
{
auto& ip_data = _ip_data[ip];
+ ParameterLib::SpatialPosition const x_position{
+ std::nullopt, _element.getID(), ip,
+ MathLib::Point3d(
+ NumLib::interpolateCoordinates<ShapeFunction,
+ ShapeMatricesType>(
+ _element, ip_data.N))};
+
/// Set initial stress from parameter.
if (_process_data.initial_stress != nullptr)
{
- ParameterLib::SpatialPosition const x_position{
- std::nullopt, _element.getID(), ip,
- MathLib::Point3d(
- NumLib::interpolateCoordinates<ShapeFunction,
- ShapeMatricesType>(
- _element, ip_data.N))};
-
ip_data.sigma =
MathLib::KelvinVector::symmetricTensorToKelvinVector<
DisplacementDim>((*_process_data.initial_stress)(
@@ -220,6 +220,10 @@ public:
x_position));
}
+ double const t = 0; // TODO (naumov) pass t from top
+ ip_data.solid_material.initializeInternalStateVariables(
+ t, x_position, *ip_data.material_state_variables);
+
ip_data.pushBackState();
}
}
diff --git a/ProcessLib/ThermoRichardsMechanics/ThermoRichardsMechanicsFEM.h b/ProcessLib/ThermoRichardsMechanics/ThermoRichardsMechanicsFEM.h
index 949b966f522..3d01685f427 100644
--- a/ProcessLib/ThermoRichardsMechanics/ThermoRichardsMechanicsFEM.h
+++ b/ProcessLib/ThermoRichardsMechanics/ThermoRichardsMechanicsFEM.h
@@ -317,6 +317,11 @@ public:
current_state.transport_poro_data.phi =
current_state.poro_data.phi;
}
+
+ double const t = 0; // TODO (naumov) pass t from top
+ this->solid_material_.initializeInternalStateVariables(
+ t, x_position,
+ *this->material_states_[ip].material_state_variables);
}
for (unsigned ip = 0; ip < n_integration_points; ip++)
--
GitLab