From 13a23b3a90f900f010e221063a519a23d86680cb Mon Sep 17 00:00:00 2001
From: joergbuchwald <joerg.buchwald@ufz.de>
Date: Mon, 12 Dec 2022 20:27:33 +0100
Subject: [PATCH] rename FormKelvinVectorFromThermalExpansivity ->
FormKelvinVector
---
...hermalExpansivity.cpp => FormKelvinVector.cpp} | 15 +++++----------
...romThermalExpansivity.h => FormKelvinVector.h} | 3 +--
.../ThermoHydroMechanicsFEM-impl.h | 6 +++---
.../ThermoMechanics/ThermoMechanicsFEM-impl.h | 6 +++---
.../ConstitutiveCommon/SolidThermalExpansion.cpp | 4 ++--
.../ThermoRichardsMechanicsFEM-impl.h | 1 -
6 files changed, 14 insertions(+), 21 deletions(-)
rename MaterialLib/MPL/Utils/{FormKelvinVectorFromThermalExpansivity.cpp => FormKelvinVector.cpp} (89%)
rename MaterialLib/MPL/Utils/{FormKelvinVectorFromThermalExpansivity.h => FormKelvinVector.h} (94%)
diff --git a/MaterialLib/MPL/Utils/FormKelvinVectorFromThermalExpansivity.cpp b/MaterialLib/MPL/Utils/FormKelvinVector.cpp
similarity index 89%
rename from MaterialLib/MPL/Utils/FormKelvinVectorFromThermalExpansivity.cpp
rename to MaterialLib/MPL/Utils/FormKelvinVector.cpp
index 9972d97de0b..e1fd045d23f 100644
--- a/MaterialLib/MPL/Utils/FormKelvinVectorFromThermalExpansivity.cpp
+++ b/MaterialLib/MPL/Utils/FormKelvinVector.cpp
@@ -16,7 +16,7 @@
namespace MaterialPropertyLib
{
static constexpr const char error_info[] =
- "The conversion to a Kelvin vector of correct dimensionality is ambigous."
+ "The conversion to a Kelvin vector of correct dimensionality is ambiguous."
"Please use a scalar number for isotropic properties, a three element "
"array or a 3 x 3 matrix for anisotropic properties.";
@@ -78,22 +78,17 @@ struct FormKelvinVector
}
};
-
template <int GlobalDim>
-MathLib::KelvinVector::KelvinVectorType<GlobalDim>
-formKelvinVector(
+MathLib::KelvinVector::KelvinVectorType<GlobalDim> formKelvinVector(
MaterialPropertyLib::PropertyDataType const& values)
{
- return std::visit(FormKelvinVector<GlobalDim>(),
- values);
+ return std::visit(FormKelvinVector<GlobalDim>(), values);
}
-template MathLib::KelvinVector::KelvinVectorType<2>
-formKelvinVector<2>(
+template MathLib::KelvinVector::KelvinVectorType<2> formKelvinVector<2>(
MaterialPropertyLib::PropertyDataType const& values);
-template MathLib::KelvinVector::KelvinVectorType<3>
-formKelvinVector<3>(
+template MathLib::KelvinVector::KelvinVectorType<3> formKelvinVector<3>(
MaterialPropertyLib::PropertyDataType const& values);
} // namespace MaterialPropertyLib
diff --git a/MaterialLib/MPL/Utils/FormKelvinVectorFromThermalExpansivity.h b/MaterialLib/MPL/Utils/FormKelvinVector.h
similarity index 94%
rename from MaterialLib/MPL/Utils/FormKelvinVectorFromThermalExpansivity.h
rename to MaterialLib/MPL/Utils/FormKelvinVector.h
index b11a0ea4c9c..a7db805b7fe 100644
--- a/MaterialLib/MPL/Utils/FormKelvinVectorFromThermalExpansivity.h
+++ b/MaterialLib/MPL/Utils/FormKelvinVector.h
@@ -32,8 +32,7 @@ namespace MaterialPropertyLib
* @return Kelvin vector type property.
*/
template <int GlobalDim>
-MathLib::KelvinVector::KelvinVectorType<GlobalDim>
-formKelvinVector(
+MathLib::KelvinVector::KelvinVectorType<GlobalDim> formKelvinVector(
MaterialPropertyLib::PropertyDataType const& values);
} // namespace MaterialPropertyLib
diff --git a/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsFEM-impl.h b/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsFEM-impl.h
index 910522822eb..c9597713ae7 100644
--- a/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsFEM-impl.h
+++ b/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsFEM-impl.h
@@ -15,7 +15,7 @@
#include "MaterialLib/MPL/Medium.h"
#include "MaterialLib/MPL/Property.h"
#include "MaterialLib/MPL/Utils/FormEigenTensor.h"
-#include "MaterialLib/MPL/Utils/FormKelvinVectorFromThermalExpansivity.h"
+#include "MaterialLib/MPL/Utils/FormKelvinVector.h"
#include "MaterialLib/MPL/Utils/GetLiquidThermalExpansivity.h"
#include "MaterialLib/SolidModels/SelectSolidConstitutiveRelation.h"
#include "MathLib/KelvinVector.h"
@@ -363,7 +363,7 @@ void ThermoHydroMechanicsLocalAssembler<
// Consider also anisotropic thermal expansion.
MathLib::KelvinVector::KelvinVectorType<
DisplacementDim> const solid_linear_thermal_expansion_coefficient =
- MPL::formKelvinVectorFromThermalExpansivity<DisplacementDim>(
+ MPL::formKelvinVector<DisplacementDim>(
solid_phase
.property(
MaterialPropertyLib::PropertyType::thermal_expansivity)
@@ -834,7 +834,7 @@ void ThermoHydroMechanicsLocalAssembler<
// Consider also anisotropic thermal expansion.
MathLib::KelvinVector::KelvinVectorType<
DisplacementDim> const solid_linear_thermal_expansion_coefficient =
- MPL::formKelvinVectorFromThermalExpansivity<DisplacementDim>(
+ MPL::formKelvinVector<DisplacementDim>(
solid_phase
.property(
MaterialPropertyLib::PropertyType::thermal_expansivity)
diff --git a/ProcessLib/ThermoMechanics/ThermoMechanicsFEM-impl.h b/ProcessLib/ThermoMechanics/ThermoMechanicsFEM-impl.h
index a44b9d7b433..01e3a9edfca 100644
--- a/ProcessLib/ThermoMechanics/ThermoMechanicsFEM-impl.h
+++ b/ProcessLib/ThermoMechanics/ThermoMechanicsFEM-impl.h
@@ -15,7 +15,7 @@
#include "MaterialLib/MPL/Medium.h"
#include "MaterialLib/MPL/Property.h"
#include "MaterialLib/MPL/Utils/FormEigenTensor.h"
-#include "MaterialLib/MPL/Utils/FormKelvinVectorFromThermalExpansivity.h"
+#include "MaterialLib/MPL/Utils/FormKelvinVector.h"
#include "ProcessLib/Utils/SetOrGetIntegrationPointData.h"
#include "ProcessLib/Utils/TransposeInPlace.h"
@@ -197,7 +197,7 @@ void ThermoMechanicsLocalAssembler<ShapeFunction, DisplacementDim>::
// Consider also anisotropic thermal expansion.
auto const solid_linear_thermal_expansivity_vector =
- MPL::formKelvinVectorFromThermalExpansivity<DisplacementDim>(
+ MPL::formKelvinVector<DisplacementDim>(
solid_phase
.property(
MaterialPropertyLib::PropertyType::thermal_expansivity)
@@ -429,7 +429,7 @@ void ThermoMechanicsLocalAssembler<ShapeFunction, DisplacementDim>::
// Consider also anisotropic thermal expansion.
auto const solid_linear_thermal_expansivity_vector =
- MPL::formKelvinVectorFromThermalExpansivity<DisplacementDim>(
+ MPL::formKelvinVector<DisplacementDim>(
solid_phase
.property(
MaterialPropertyLib::PropertyType::thermal_expansivity)
diff --git a/ProcessLib/ThermoRichardsMechanics/ConstitutiveCommon/SolidThermalExpansion.cpp b/ProcessLib/ThermoRichardsMechanics/ConstitutiveCommon/SolidThermalExpansion.cpp
index e7cc364a940..70879c94940 100644
--- a/ProcessLib/ThermoRichardsMechanics/ConstitutiveCommon/SolidThermalExpansion.cpp
+++ b/ProcessLib/ThermoRichardsMechanics/ConstitutiveCommon/SolidThermalExpansion.cpp
@@ -10,7 +10,7 @@
#include "SolidThermalExpansion.h"
-#include "MaterialLib/MPL/Utils/FormKelvinVectorFromThermalExpansivity.h"
+#include "MaterialLib/MPL/Utils/FormKelvinVector.h"
namespace ProcessLib::ThermoRichardsMechanics
{
@@ -24,7 +24,7 @@ void SolidThermalExpansionModel<DisplacementDim>::eval(
// Consider also anisotropic thermal expansion.
out.solid_linear_thermal_expansivity_vector =
- MPL::formKelvinVectorFromThermalExpansivity<DisplacementDim>(
+ MPL::formKelvinVector<DisplacementDim>(
media_data.solid.property(MPL::PropertyType::thermal_expansivity)
.value(variables, x_t.x, x_t.t, x_t.dt));
}
diff --git a/ProcessLib/ThermoRichardsMechanics/ThermoRichardsMechanicsFEM-impl.h b/ProcessLib/ThermoRichardsMechanics/ThermoRichardsMechanicsFEM-impl.h
index 19e618a14d4..a2c741b9080 100644
--- a/ProcessLib/ThermoRichardsMechanics/ThermoRichardsMechanicsFEM-impl.h
+++ b/ProcessLib/ThermoRichardsMechanics/ThermoRichardsMechanicsFEM-impl.h
@@ -18,7 +18,6 @@
#include "MaterialLib/MPL/Medium.h"
#include "MaterialLib/MPL/Utils/FormEigenTensor.h"
-#include "MaterialLib/MPL/Utils/FormKelvinVectorFromThermalExpansivity.h"
#include "MaterialLib/MPL/Utils/GetLiquidThermalExpansivity.h"
#include "MaterialLib/PhysicalConstant.h"
#include "MathLib/KelvinVector.h"
--
GitLab