From 229943bce796e40859f9923cdbfcf2d0a4a2e08e Mon Sep 17 00:00:00 2001
From: Wenqing Wang <wenqing.wang@ufz.de>
Date: Wed, 18 Jul 2018 17:27:27 +0200
Subject: [PATCH] [LIE] Added a reference temperature to the processes with LIE
---
.../HydroMechanics/CreateHydroMechanicsProcess.cpp | 8 +++++++-
.../LIE/HydroMechanics/HydroMechanicsProcessData.h | 11 ++++++++---
.../HydroMechanicsLocalAssemblerMatrix-impl.h | 4 ++--
.../CreateSmallDeformationProcess.cpp | 7 ++++++-
.../SmallDeformationLocalAssemblerMatrix-impl.h | 2 +-
...DeformationLocalAssemblerMatrixNearFracture-impl.h | 2 +-
.../SmallDeformation/SmallDeformationProcessData.h | 11 ++++++++---
7 files changed, 33 insertions(+), 12 deletions(-)
diff --git a/ProcessLib/LIE/HydroMechanics/CreateHydroMechanicsProcess.cpp b/ProcessLib/LIE/HydroMechanics/CreateHydroMechanicsProcess.cpp
index 5a8552fb517..5c8ffbddd28 100644
--- a/ProcessLib/LIE/HydroMechanics/CreateHydroMechanicsProcess.cpp
+++ b/ProcessLib/LIE/HydroMechanics/CreateHydroMechanicsProcess.cpp
@@ -302,6 +302,11 @@ std::unique_ptr<Process> createHydroMechanicsProcess(
if (deactivate_matrix_in_flow)
INFO("Deactivate matrix elements in flow calculation.");
+ // Reference temperature
+ const auto& reference_temperature =
+ //! \ogs_file_param{prj__processes__process__HYDRO_MECHANICS_WITH_LIE__reference_temperature}
+ config.getConfigParameterOptional<double>("reference_temperature");
+
HydroMechanicsProcessData<GlobalDim> process_data{
std::move(material),
intrinsic_permeability,
@@ -316,7 +321,8 @@ std::unique_ptr<Process> createHydroMechanicsProcess(
std::move(frac_prop),
initial_effective_stress,
initial_fracture_effective_stress,
- deactivate_matrix_in_flow};
+ deactivate_matrix_in_flow,
+ *reference_temperature};
SecondaryVariableCollection secondary_variables;
diff --git a/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcessData.h b/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcessData.h
index 22dbfa40420..f19c93b24d4 100644
--- a/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcessData.h
+++ b/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcessData.h
@@ -52,7 +52,8 @@ struct HydroMechanicsProcessData
std::unique_ptr<FracturePropertyHM>&& fracture_prop,
Parameter<double> const& initial_effective_stress_,
Parameter<double> const& initial_fracture_effective_stress_,
- bool const deactivate_matrix_in_flow_)
+ bool const deactivate_matrix_in_flow_,
+ double const reference_temperature_)
: material{std::move(material_)},
intrinsic_permeability(intrinsic_permeability_),
specific_storage(specific_storage_),
@@ -66,7 +67,8 @@ struct HydroMechanicsProcessData
fracture_property{std::move(fracture_prop)},
initial_effective_stress(initial_effective_stress_),
initial_fracture_effective_stress(initial_fracture_effective_stress_),
- deactivate_matrix_in_flow(deactivate_matrix_in_flow_)
+ deactivate_matrix_in_flow(deactivate_matrix_in_flow_),
+ reference_temperature(reference_temperature_)
{
}
@@ -89,7 +91,8 @@ struct HydroMechanicsProcessData
p_element_status(std::move(other.p_element_status)),
p0(other.p0),
dt(other.dt),
- t(other.t)
+ t(other.t),
+ reference_temperature(other.reference_temperature)
{
}
@@ -155,6 +158,8 @@ struct HydroMechanicsProcessData
MeshLib::PropertyVector<double>* mesh_prop_nodal_forces_jump = nullptr;
MeshLib::PropertyVector<double>* mesh_prop_hydraulic_flow = nullptr;
+ double const reference_temperature;
+
EIGEN_MAKE_ALIGNED_OPERATOR_NEW;
};
diff --git a/ProcessLib/LIE/HydroMechanics/LocalAssembler/HydroMechanicsLocalAssemblerMatrix-impl.h b/ProcessLib/LIE/HydroMechanics/LocalAssembler/HydroMechanicsLocalAssemblerMatrix-impl.h
index 19eb40dad46..1ff35e41d21 100644
--- a/ProcessLib/LIE/HydroMechanics/LocalAssembler/HydroMechanicsLocalAssemblerMatrix-impl.h
+++ b/ProcessLib/LIE/HydroMechanics/LocalAssembler/HydroMechanicsLocalAssemblerMatrix-impl.h
@@ -236,7 +236,7 @@ void HydroMechanicsLocalAssemblerMatrix<ShapeFunctionDisplacement,
auto&& solution = _ip_data[ip].solid_material.integrateStress(
t, x_position, _process_data.dt, eps_prev, eps, sigma_eff_prev,
- *state, MaterialLib::PhysicalConstant::RoomTemperature);
+ *state, _process_data.reference_temperature);
if (!solution)
OGS_FATAL("Computation of local constitutive relation failed.");
@@ -354,7 +354,7 @@ void HydroMechanicsLocalAssemblerMatrix<ShapeFunctionDisplacement,
auto&& solution = _ip_data[ip].solid_material.integrateStress(
t, x_position, _process_data.dt, eps_prev, eps, sigma_eff_prev,
- *state, MaterialLib::PhysicalConstant::RoomTemperature);
+ *state, _process_data.reference_temperature);
if (!solution)
OGS_FATAL("Computation of local constitutive relation failed.");
diff --git a/ProcessLib/LIE/SmallDeformation/CreateSmallDeformationProcess.cpp b/ProcessLib/LIE/SmallDeformation/CreateSmallDeformationProcess.cpp
index b834695aca4..33513e74088 100644
--- a/ProcessLib/LIE/SmallDeformation/CreateSmallDeformationProcess.cpp
+++ b/ProcessLib/LIE/SmallDeformation/CreateSmallDeformationProcess.cpp
@@ -167,9 +167,14 @@ std::unique_ptr<Process> createSmallDeformationProcess(
"are not consistent");
}
+ // Reference temperature
+ const auto& reference_temperature =
+ //! \ogs_file_param{prj__processes__process__SMALL_DEFORMATION_WITH_LIE__reference_temperature}
+ config.getConfigParameterOptional<double>("reference_temperature");
+
SmallDeformationProcessData<DisplacementDim> process_data(
std::move(material), std::move(fracture_model),
- std::move(vec_fracture_property));
+ std::move(vec_fracture_property), *reference_temperature);
SecondaryVariableCollection secondary_variables;
diff --git a/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrix-impl.h b/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrix-impl.h
index 6e4dfe3206d..ed300a3c6eb 100644
--- a/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrix-impl.h
+++ b/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrix-impl.h
@@ -147,7 +147,7 @@ void SmallDeformationLocalAssemblerMatrix<ShapeFunction, IntegrationMethod,
auto&& solution = _ip_data[ip]._solid_material.integrateStress(
t, x_position, _process_data.dt, eps_prev, eps, sigma_prev, *state,
- MaterialLib::PhysicalConstant::RoomTemperature);
+ _process_data._reference_temperature);
if (!solution)
{
diff --git a/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrixNearFracture-impl.h b/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrixNearFracture-impl.h
index 4fa4931b157..dc3f297917e 100644
--- a/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrixNearFracture-impl.h
+++ b/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrixNearFracture-impl.h
@@ -244,7 +244,7 @@ void SmallDeformationLocalAssemblerMatrixNearFracture<
auto&& solution = _ip_data[ip]._solid_material.integrateStress(
t, x_position, _process_data.dt, eps_prev, eps, sigma_prev, *state,
- MaterialLib::PhysicalConstant::RoomTemperature);
+ _process_data._reference_temperature);
if (!solution)
{
diff --git a/ProcessLib/LIE/SmallDeformation/SmallDeformationProcessData.h b/ProcessLib/LIE/SmallDeformation/SmallDeformationProcessData.h
index c27a622fa65..e6714c84758 100644
--- a/ProcessLib/LIE/SmallDeformation/SmallDeformationProcessData.h
+++ b/ProcessLib/LIE/SmallDeformation/SmallDeformationProcessData.h
@@ -38,17 +38,20 @@ struct SmallDeformationProcessData
std::unique_ptr<
MaterialLib::Fracture::FractureModelBase<DisplacementDim>>&&
fracture_model,
- std::vector<std::unique_ptr<FractureProperty>>&& vec_fracture_prop)
+ std::vector<std::unique_ptr<FractureProperty>>&& vec_fracture_prop,
+ double const reference_temperature)
: _material{std::move(material)},
_fracture_model{std::move(fracture_model)},
- _vec_fracture_property(std::move(vec_fracture_prop))
+ _vec_fracture_property(std::move(vec_fracture_prop)),
+ _reference_temperature(reference_temperature)
{
}
SmallDeformationProcessData(SmallDeformationProcessData&& other)
: _material{std::move(other._material)},
_fracture_model{std::move(other._fracture_model)},
- _vec_fracture_property(std::move(other._vec_fracture_property))
+ _vec_fracture_property(std::move(other._vec_fracture_property)),
+ _reference_temperature(other._reference_temperature)
{
}
@@ -94,6 +97,8 @@ struct SmallDeformationProcessData
// mesh property for fracture aperture
MeshLib::PropertyVector<double>* _mesh_prop_b = nullptr;
+
+ double const _reference_temperature;
};
} // namespace SmallDeformation
--
GitLab