From b8db0a9e1294eb561b7aa8557010839d542be302 Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <github@naumov.de>
Date: Sat, 9 Mar 2019 19:09:42 +0100
Subject: [PATCH] [MatL] Update for moved Parameter.
---
.../FractureModels/CohesiveZoneModeI.cpp | 4 +-
.../FractureModels/CohesiveZoneModeI.h | 12 +-
.../CreateCohesiveZoneModeI.cpp | 17 +--
.../FractureModels/CreateCohesiveZoneModeI.h | 2 +-
.../CreateLinearElasticIsotropic.cpp | 23 ++--
.../CreateLinearElasticIsotropic.h | 3 +-
.../FractureModels/CreateMohrCoulomb.cpp | 32 +++---
.../FractureModels/CreateMohrCoulomb.h | 6 +-
.../FractureModels/FractureModelBase.h | 4 +-
.../FractureModels/LinearElasticIsotropic.cpp | 2 +-
.../FractureModels/LinearElasticIsotropic.h | 8 +-
MaterialLib/FractureModels/MohrCoulomb.cpp | 9 +-
MaterialLib/FractureModels/MohrCoulomb.h | 8 +-
.../CreatePorousMediaProperties.cpp | 2 +-
.../CreatePorousMediaProperties.h | 7 +-
.../PorousMedium/Permeability/Permeability.h | 15 ++-
.../Permeability/createPermeabilityModel.cpp | 11 +-
.../Permeability/createPermeabilityModel.h | 3 +-
MaterialLib/PorousMedium/Porosity/Porosity.h | 9 +-
.../Porosity/createPorosityModel.cpp | 12 +-
.../Porosity/createPorosityModel.h | 5 +-
.../PorousMedium/PorousMediaProperties.cpp | 8 +-
.../PorousMedium/PorousMediaProperties.h | 11 +-
.../CreateConstitutiveRelation.cpp | 10 +-
.../SolidModels/CreateConstitutiveRelation.h | 8 +-
MaterialLib/SolidModels/CreateCreepBGRa.cpp | 18 +--
MaterialLib/SolidModels/CreateCreepBGRa.h | 8 +-
MaterialLib/SolidModels/CreateEhlers.h | 47 ++++----
.../CreateLinearElasticIsotropic.h | 9 +-
MaterialLib/SolidModels/CreateLubby2.h | 20 ++--
MaterialLib/SolidModels/CreepBGRa.cpp | 4 +-
MaterialLib/SolidModels/CreepBGRa.h | 8 +-
MaterialLib/SolidModels/Ehlers.cpp | 4 +-
MaterialLib/SolidModels/Ehlers.h | 18 +--
.../SolidModels/LinearElasticIsotropic.cpp | 4 +-
.../SolidModels/LinearElasticIsotropic.h | 12 +-
MaterialLib/SolidModels/Lubby2.cpp | 4 +-
MaterialLib/SolidModels/Lubby2.h | 12 +-
.../SolidModels/MFront/CreateMFront.cpp | 17 ++-
MaterialLib/SolidModels/MFront/CreateMFront.h | 8 +-
MaterialLib/SolidModels/MFront/MFront.cpp | 6 +-
MaterialLib/SolidModels/MFront/MFront.h | 10 +-
MaterialLib/SolidModels/MechanicsBase.h | 10 +-
.../CreateTwoPhaseFlowMaterialProperties.cpp | 6 +-
.../CreateTwoPhaseFlowMaterialProperties.h | 3 +-
.../TwoPhaseFlowWithPPMaterialProperties.cpp | 18 +--
.../TwoPhaseFlowWithPPMaterialProperties.h | 21 ++--
Tests/MaterialLib/TestFractureModels.cpp | 104 +++++++++---------
48 files changed, 297 insertions(+), 305 deletions(-)
diff --git a/MaterialLib/FractureModels/CohesiveZoneModeI.cpp b/MaterialLib/FractureModels/CohesiveZoneModeI.cpp
index 928b642b17d..4e1d9b823b0 100644
--- a/MaterialLib/FractureModels/CohesiveZoneModeI.cpp
+++ b/MaterialLib/FractureModels/CohesiveZoneModeI.cpp
@@ -38,10 +38,10 @@ double computeDamage(double const damage_prev,
template <int DisplacementDim>
void CohesiveZoneModeI<DisplacementDim>::computeConstitutiveRelation(
double const t,
- ProcessLib::SpatialPosition const& x,
+ ParameterLib::SpatialPosition const& x,
double const aperture0,
Eigen::Ref<Eigen::VectorXd const>
- /*sigma0*/,
+ /*sigma0*/,
Eigen::Ref<Eigen::VectorXd const>
/*w_prev*/,
Eigen::Ref<Eigen::VectorXd const>
diff --git a/MaterialLib/FractureModels/CohesiveZoneModeI.h b/MaterialLib/FractureModels/CohesiveZoneModeI.h
index 1b62cde9fbb..b68aeb5f748 100644
--- a/MaterialLib/FractureModels/CohesiveZoneModeI.h
+++ b/MaterialLib/FractureModels/CohesiveZoneModeI.h
@@ -12,7 +12,7 @@
#include <Eigen/Eigen>
#include <utility>
-#include "ProcessLib/Parameter/Parameter.h"
+#include "ParameterLib/Parameter.h"
#include "FractureModelBase.h"
@@ -25,8 +25,8 @@ namespace CohesiveZoneModeI
/// Variables specific to the material model
struct MaterialPropertiesParameters
{
- using P = ProcessLib::Parameter<double>;
- using X = ProcessLib::SpatialPosition;
+ using P = ParameterLib::Parameter<double>;
+ using X = ParameterLib::SpatialPosition;
MaterialPropertiesParameters(P const& normal_stiffness_,
P const& shear_stiffness_,
@@ -84,7 +84,7 @@ struct MaterialPropertiesParameters
/// details.
struct MaterialProperties final
{
- MaterialProperties(double const t, ProcessLib::SpatialPosition const& x,
+ MaterialProperties(double const t, ParameterLib::SpatialPosition const& x,
MaterialPropertiesParameters const& mp)
: Kn(mp.normal_stiffness(t, x)[0]),
Ks(mp.shear_stiffness(t, x)[0]),
@@ -161,7 +161,7 @@ public:
*/
void computeConstitutiveRelation(
double const t,
- ProcessLib::SpatialPosition const& x,
+ ParameterLib::SpatialPosition const& x,
double const aperture0,
Eigen::Ref<Eigen::VectorXd const>
sigma0,
@@ -179,7 +179,7 @@ public:
material_state_variables) override;
MaterialProperties evaluatedMaterialProperties(
- double const t, ProcessLib::SpatialPosition const& x) const
+ double const t, ParameterLib::SpatialPosition const& x) const
{
return MaterialProperties(t, x, _mp);
}
diff --git a/MaterialLib/FractureModels/CreateCohesiveZoneModeI.cpp b/MaterialLib/FractureModels/CreateCohesiveZoneModeI.cpp
index fdbc4a408f9..125a9ef9a65 100644
--- a/MaterialLib/FractureModels/CreateCohesiveZoneModeI.cpp
+++ b/MaterialLib/FractureModels/CreateCohesiveZoneModeI.cpp
@@ -9,8 +9,9 @@
#include "CreateCohesiveZoneModeI.h"
+#include "ParameterLib/Utils.h"
+
#include "CohesiveZoneModeI.h"
-#include "ProcessLib/Utils/ProcessUtils.h" // required for findParameter
namespace MaterialLib
{
@@ -20,26 +21,26 @@ namespace CohesiveZoneModeI
{
template <int DisplacementDim>
std::unique_ptr<FractureModelBase<DisplacementDim>> createCohesiveZoneModeI(
- std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters,
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters,
BaseLib::ConfigTree const& config)
{
//! \ogs_file_param{material__fracture_model__type}
config.checkConfigParameter("type", "CohesiveZoneModeI");
DBUG("Create CohesiveZoneModeI material");
- auto& Kn = ProcessLib::findParameter<double>(
+ auto& Kn = ParameterLib::findParameter<double>(
//! \ogs_file_param_special{material__fracture_model__CohesiveZoneModeI__normal_stiffness}
config, "normal_stiffness", parameters, 1);
- auto& Ks = ProcessLib::findParameter<double>(
+ auto& Ks = ParameterLib::findParameter<double>(
//! \ogs_file_param_special{material__fracture_model__CohesiveZoneModeI__shear_stiffness}
config, "shear_stiffness", parameters, 1);
- auto& Gc = ProcessLib::findParameter<double>(
+ auto& Gc = ParameterLib::findParameter<double>(
//! \ogs_file_param_special{material__fracture_model__CohesiveZoneModeI__fracture_toughness}
config, "fracture_toughness", parameters, 1);
- auto& t_np = ProcessLib::findParameter<double>(
+ auto& t_np = ParameterLib::findParameter<double>(
//! \ogs_file_param_special{material__fracture_model__CohesiveZoneModeI__peak_normal_traction}
config, "peak_normal_traction", parameters, 1);
@@ -58,11 +59,11 @@ std::unique_ptr<FractureModelBase<DisplacementDim>> createCohesiveZoneModeI(
}
template std::unique_ptr<FractureModelBase<2>> createCohesiveZoneModeI(
- std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters,
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters,
BaseLib::ConfigTree const& config);
template std::unique_ptr<FractureModelBase<3>> createCohesiveZoneModeI(
- std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters,
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters,
BaseLib::ConfigTree const& config);
} // namespace CohesiveZoneModeI
diff --git a/MaterialLib/FractureModels/CreateCohesiveZoneModeI.h b/MaterialLib/FractureModels/CreateCohesiveZoneModeI.h
index 10a7d8128f1..7e2967a0cc1 100644
--- a/MaterialLib/FractureModels/CreateCohesiveZoneModeI.h
+++ b/MaterialLib/FractureModels/CreateCohesiveZoneModeI.h
@@ -19,7 +19,7 @@ namespace CohesiveZoneModeI
{
template <int DisplacementDim>
std::unique_ptr<FractureModelBase<DisplacementDim>> createCohesiveZoneModeI(
- std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters,
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters,
BaseLib::ConfigTree const& config);
} // namespace CohesiveZoneModeI
diff --git a/MaterialLib/FractureModels/CreateLinearElasticIsotropic.cpp b/MaterialLib/FractureModels/CreateLinearElasticIsotropic.cpp
index e7929a988f0..83631fc2354 100644
--- a/MaterialLib/FractureModels/CreateLinearElasticIsotropic.cpp
+++ b/MaterialLib/FractureModels/CreateLinearElasticIsotropic.cpp
@@ -9,29 +9,29 @@
#include "CreateLinearElasticIsotropic.h"
-#include "ProcessLib/Utils/ProcessUtils.h" // required for findParameter
+#include "ParameterLib/Utils.h"
+
#include "LinearElasticIsotropic.h"
namespace MaterialLib
{
namespace Fracture
{
-
template <int DisplacementDim>
std::unique_ptr<FractureModelBase<DisplacementDim>>
createLinearElasticIsotropic(
- std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters,
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters,
BaseLib::ConfigTree const& config)
{
//! \ogs_file_param{material__fracture_model__type}
config.checkConfigParameter("type", "LinearElasticIsotropic");
DBUG("Create LinearElasticIsotropic material");
- auto& Kn = ProcessLib::findParameter<double>(
+ auto& Kn = ParameterLib::findParameter<double>(
//! \ogs_file_param_special{material__fracture_model__LinearElasticIsotropic__normal_stiffness}
config, "normal_stiffness", parameters, 1);
- auto& Ks = ProcessLib::findParameter<double>(
+ auto& Ks = ParameterLib::findParameter<double>(
//! \ogs_file_param_special{material__fracture_model__LinearElasticIsotropic__shear_stiffness}
config, "shear_stiffness", parameters, 1);
@@ -50,17 +50,12 @@ createLinearElasticIsotropic(
penalty_aperture_cutoff, tension_cutoff, mp);
}
-
-template
-std::unique_ptr<FractureModelBase<2>>
-createLinearElasticIsotropic(
- std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters,
+template std::unique_ptr<FractureModelBase<2>> createLinearElasticIsotropic(
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters,
BaseLib::ConfigTree const& config);
-template
-std::unique_ptr<FractureModelBase<3>>
-createLinearElasticIsotropic(
- std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters,
+template std::unique_ptr<FractureModelBase<3>> createLinearElasticIsotropic(
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters,
BaseLib::ConfigTree const& config);
} // namespace Fracture
diff --git a/MaterialLib/FractureModels/CreateLinearElasticIsotropic.h b/MaterialLib/FractureModels/CreateLinearElasticIsotropic.h
index b34e087109c..330f21ee575 100644
--- a/MaterialLib/FractureModels/CreateLinearElasticIsotropic.h
+++ b/MaterialLib/FractureModels/CreateLinearElasticIsotropic.h
@@ -15,11 +15,10 @@ namespace MaterialLib
{
namespace Fracture
{
-
template <int DisplacementDim>
std::unique_ptr<FractureModelBase<DisplacementDim>>
createLinearElasticIsotropic(
- std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters,
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters,
BaseLib::ConfigTree const& config);
} // namespace Fracture
diff --git a/MaterialLib/FractureModels/CreateMohrCoulomb.cpp b/MaterialLib/FractureModels/CreateMohrCoulomb.cpp
index 830522a54f0..cde42940c05 100644
--- a/MaterialLib/FractureModels/CreateMohrCoulomb.cpp
+++ b/MaterialLib/FractureModels/CreateMohrCoulomb.cpp
@@ -9,41 +9,40 @@
#include "CreateMohrCoulomb.h"
-#include "ProcessLib/Utils/ProcessUtils.h" // required for findParameter
+#include "ParameterLib/Utils.h"
+
#include "MohrCoulomb.h"
namespace MaterialLib
{
namespace Fracture
{
-
template <int DisplacementDim>
-std::unique_ptr<FractureModelBase<DisplacementDim>>
-createMohrCoulomb(
- std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters,
+std::unique_ptr<FractureModelBase<DisplacementDim>> createMohrCoulomb(
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters,
BaseLib::ConfigTree const& config)
{
//! \ogs_file_param{material__fracture_model__type}
config.checkConfigParameter("type", "MohrCoulomb");
DBUG("Create MohrCoulomb material");
- auto& Kn = ProcessLib::findParameter<double>(
+ auto& Kn = ParameterLib::findParameter<double>(
//! \ogs_file_param_special{material__fracture_model__MohrCoulomb__normal_stiffness}
config, "normal_stiffness", parameters, 1);
- auto& Ks = ProcessLib::findParameter<double>(
+ auto& Ks = ParameterLib::findParameter<double>(
//! \ogs_file_param_special{material__fracture_model__MohrCoulomb__shear_stiffness}
config, "shear_stiffness", parameters, 1);
- auto& friction_angle = ProcessLib::findParameter<double>(
+ auto& friction_angle = ParameterLib::findParameter<double>(
//! \ogs_file_param_special{material__fracture_model__MohrCoulomb__friction_angle}
config, "friction_angle", parameters, 1);
- auto& dilatancy_angle = ProcessLib::findParameter<double>(
+ auto& dilatancy_angle = ParameterLib::findParameter<double>(
//! \ogs_file_param_special{material__fracture_model__MohrCoulomb__dilatancy_angle}
config, "dilatancy_angle", parameters, 1);
- auto& cohesion = ProcessLib::findParameter<double>(
+ auto& cohesion = ParameterLib::findParameter<double>(
//! \ogs_file_param_special{material__fracture_model__MohrCoulomb__cohesion}
config, "cohesion", parameters, 1);
@@ -62,17 +61,12 @@ createMohrCoulomb(
penalty_aperture_cutoff, tension_cutoff, mp);
}
-
-template
-std::unique_ptr<FractureModelBase<2>>
-createMohrCoulomb(
- std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters,
+template std::unique_ptr<FractureModelBase<2>> createMohrCoulomb(
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters,
BaseLib::ConfigTree const& config);
-template
-std::unique_ptr<FractureModelBase<3>>
-createMohrCoulomb(
- std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters,
+template std::unique_ptr<FractureModelBase<3>> createMohrCoulomb(
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters,
BaseLib::ConfigTree const& config);
} // namespace Fracture
diff --git a/MaterialLib/FractureModels/CreateMohrCoulomb.h b/MaterialLib/FractureModels/CreateMohrCoulomb.h
index 18b5797f548..e73781781ea 100644
--- a/MaterialLib/FractureModels/CreateMohrCoulomb.h
+++ b/MaterialLib/FractureModels/CreateMohrCoulomb.h
@@ -15,11 +15,9 @@ namespace MaterialLib
{
namespace Fracture
{
-
template <int DisplacementDim>
-std::unique_ptr<FractureModelBase<DisplacementDim>>
-createMohrCoulomb(
- std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters,
+std::unique_ptr<FractureModelBase<DisplacementDim>> createMohrCoulomb(
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters,
BaseLib::ConfigTree const& config);
} // namespace Fracture
diff --git a/MaterialLib/FractureModels/FractureModelBase.h b/MaterialLib/FractureModels/FractureModelBase.h
index 7cad143685b..dc6cd9e135b 100644
--- a/MaterialLib/FractureModels/FractureModelBase.h
+++ b/MaterialLib/FractureModels/FractureModelBase.h
@@ -11,7 +11,7 @@
#include <Eigen/Eigen>
-#include "ProcessLib/Parameter/Parameter.h"
+#include "ParameterLib/Parameter.h"
namespace MaterialLib
{
@@ -77,7 +77,7 @@ public:
*/
virtual void computeConstitutiveRelation(
double const t,
- ProcessLib::SpatialPosition const& x,
+ ParameterLib::SpatialPosition const& x,
double const aperture0,
Eigen::Ref<Eigen::VectorXd const>
sigma0,
diff --git a/MaterialLib/FractureModels/LinearElasticIsotropic.cpp b/MaterialLib/FractureModels/LinearElasticIsotropic.cpp
index dbc3b433990..74730170d73 100644
--- a/MaterialLib/FractureModels/LinearElasticIsotropic.cpp
+++ b/MaterialLib/FractureModels/LinearElasticIsotropic.cpp
@@ -18,7 +18,7 @@ namespace Fracture
template <int DisplacementDim>
void LinearElasticIsotropic<DisplacementDim>::computeConstitutiveRelation(
double const t,
- ProcessLib::SpatialPosition const& x,
+ ParameterLib::SpatialPosition const& x,
double const aperture0,
Eigen::Ref<Eigen::VectorXd const>
sigma0,
diff --git a/MaterialLib/FractureModels/LinearElasticIsotropic.h b/MaterialLib/FractureModels/LinearElasticIsotropic.h
index 962a6e434ac..25d586ac6f9 100644
--- a/MaterialLib/FractureModels/LinearElasticIsotropic.h
+++ b/MaterialLib/FractureModels/LinearElasticIsotropic.h
@@ -12,7 +12,7 @@
#include <Eigen/Eigen>
#include <utility>
-#include "ProcessLib/Parameter/Parameter.h"
+#include "ParameterLib/Parameter.h"
#include "FractureModelBase.h"
@@ -28,8 +28,8 @@ public:
/// Variables specific to the material model
struct MaterialProperties
{
- using P = ProcessLib::Parameter<double>;
- using X = ProcessLib::SpatialPosition;
+ using P = ParameterLib::Parameter<double>;
+ using X = ParameterLib::SpatialPosition;
MaterialProperties(P const& normal_stiffness_, P const& shear_stiffness_)
: normal_stiffness(normal_stiffness_), shear_stiffness(shear_stiffness_)
@@ -83,7 +83,7 @@ public:
*/
void computeConstitutiveRelation(
double const t,
- ProcessLib::SpatialPosition const& x,
+ ParameterLib::SpatialPosition const& x,
double const aperture0,
Eigen::Ref<Eigen::VectorXd const>
sigma0,
diff --git a/MaterialLib/FractureModels/MohrCoulomb.cpp b/MaterialLib/FractureModels/MohrCoulomb.cpp
index 1e86063670c..80c8622829a 100644
--- a/MaterialLib/FractureModels/MohrCoulomb.cpp
+++ b/MaterialLib/FractureModels/MohrCoulomb.cpp
@@ -30,10 +30,9 @@ struct MaterialPropertyValues
double c = 0.0;
template <typename MaterialProperties>
- MaterialPropertyValues(
- MaterialProperties const& mp,
- double const t,
- ProcessLib::SpatialPosition const& x)
+ MaterialPropertyValues(MaterialProperties const& mp,
+ double const t,
+ ParameterLib::SpatialPosition const& x)
{
Kn = mp.normal_stiffness(t,x)[0];
Ks = mp.shear_stiffness(t,x)[0];
@@ -48,7 +47,7 @@ struct MaterialPropertyValues
template <int DisplacementDim>
void MohrCoulomb<DisplacementDim>::computeConstitutiveRelation(
double const t,
- ProcessLib::SpatialPosition const& x,
+ ParameterLib::SpatialPosition const& x,
double const aperture0,
Eigen::Ref<Eigen::VectorXd const>
sigma0,
diff --git a/MaterialLib/FractureModels/MohrCoulomb.h b/MaterialLib/FractureModels/MohrCoulomb.h
index 2e47a1ad454..eb6cd5db4a1 100644
--- a/MaterialLib/FractureModels/MohrCoulomb.h
+++ b/MaterialLib/FractureModels/MohrCoulomb.h
@@ -12,7 +12,7 @@
#include <Eigen/Eigen>
#include <utility>
-#include "ProcessLib/Parameter/Parameter.h"
+#include "ParameterLib/Parameter.h"
#include "FractureModelBase.h"
@@ -28,8 +28,8 @@ public:
/// Variables specific to the material model
struct MaterialProperties
{
- using P = ProcessLib::Parameter<double>;
- using X = ProcessLib::SpatialPosition;
+ using P = ParameterLib::Parameter<double>;
+ using X = ParameterLib::SpatialPosition;
MaterialProperties(
P const& normal_stiffness_, P const& shear_stiffness_,
@@ -98,7 +98,7 @@ public:
*/
void computeConstitutiveRelation(
double const t,
- ProcessLib::SpatialPosition const& x,
+ ParameterLib::SpatialPosition const& x,
double const aperture0,
Eigen::Ref<Eigen::VectorXd const>
sigma0,
diff --git a/MaterialLib/PorousMedium/CreatePorousMediaProperties.cpp b/MaterialLib/PorousMedium/CreatePorousMediaProperties.cpp
index 27651ac3692..2697d2cc9f8 100644
--- a/MaterialLib/PorousMedium/CreatePorousMediaProperties.cpp
+++ b/MaterialLib/PorousMedium/CreatePorousMediaProperties.cpp
@@ -24,7 +24,7 @@ namespace PorousMedium
{
PorousMediaProperties createPorousMediaProperties(
MeshLib::Mesh& mesh, BaseLib::ConfigTree const& configs,
- std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters)
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters)
{
DBUG("Create PorousMediaProperties.");
diff --git a/MaterialLib/PorousMedium/CreatePorousMediaProperties.h b/MaterialLib/PorousMedium/CreatePorousMediaProperties.h
index c91cf122a3e..c8181beab4b 100644
--- a/MaterialLib/PorousMedium/CreatePorousMediaProperties.h
+++ b/MaterialLib/PorousMedium/CreatePorousMediaProperties.h
@@ -11,9 +11,9 @@
#pragma once
-#include "PorousMediaProperties.h"
#include "BaseLib/ConfigTree.h"
-#include "ProcessLib/Parameter/Parameter.h"
+#include "ParameterLib/Parameter.h"
+#include "PorousMediaProperties.h"
namespace MeshLib
{
@@ -26,6 +26,7 @@ namespace PorousMedium
{
PorousMediaProperties createPorousMediaProperties(
MeshLib::Mesh& mesh, BaseLib::ConfigTree const& porous_media_config,
- std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters);
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const&
+ parameters);
}
}
diff --git a/MaterialLib/PorousMedium/Permeability/Permeability.h b/MaterialLib/PorousMedium/Permeability/Permeability.h
index 4716f0135d2..fa00cd304c1 100644
--- a/MaterialLib/PorousMedium/Permeability/Permeability.h
+++ b/MaterialLib/PorousMedium/Permeability/Permeability.h
@@ -14,7 +14,7 @@
#include <Eigen/Dense>
#include "BaseLib/Error.h"
-#include "ProcessLib/Parameter/Parameter.h"
+#include "ParameterLib/Parameter.h"
namespace MaterialLib
{
@@ -27,7 +27,7 @@ class Permeability
{
public:
explicit Permeability(
- ProcessLib::Parameter<double> const& permeability_parameter,
+ ParameterLib::Parameter<double> const& permeability_parameter,
int const dimension)
: _permeability_parameter(permeability_parameter), _dimension(dimension)
{
@@ -52,11 +52,10 @@ public:
* @param variable A variable with any double type value.
* @param temperature Temperature with any double type value.
*/
- Eigen::MatrixXd const& getValue(
- const double t,
- ProcessLib::SpatialPosition const& pos,
- const double variable,
- const double temperature) const
+ Eigen::MatrixXd const& getValue(const double t,
+ ParameterLib::SpatialPosition const& pos,
+ const double variable,
+ const double temperature) const
{
(void)variable;
(void)temperature;
@@ -72,7 +71,7 @@ public:
}
private:
- ProcessLib::Parameter<double> const& _permeability_parameter;
+ ParameterLib::Parameter<double> const& _permeability_parameter;
int const _dimension;
mutable Eigen::MatrixXd _intrinsic_permeability_tensor;
};
diff --git a/MaterialLib/PorousMedium/Permeability/createPermeabilityModel.cpp b/MaterialLib/PorousMedium/Permeability/createPermeabilityModel.cpp
index a8a510efa8b..c2f541d4e51 100644
--- a/MaterialLib/PorousMedium/Permeability/createPermeabilityModel.cpp
+++ b/MaterialLib/PorousMedium/Permeability/createPermeabilityModel.cpp
@@ -18,9 +18,9 @@
#include "BaseLib/Error.h"
#include "MathLib/LinAlg/Eigen/EigenMapTools.h"
-#include "ProcessLib/Parameter/ConstantParameter.h"
-#include "ProcessLib/Parameter/SpatialPosition.h"
-#include "ProcessLib/Utils/ProcessUtils.h"
+#include "ParameterLib/ConstantParameter.h"
+#include "ParameterLib/SpatialPosition.h"
+#include "ParameterLib/Utils.h"
namespace MaterialLib
{
@@ -28,14 +28,15 @@ namespace PorousMedium
{
std::unique_ptr<Permeability> createPermeabilityModel(
BaseLib::ConfigTree const& config,
- std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters)
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters)
{
//! \ogs_file_param{material__porous_medium__permeability__type}
auto const type = config.getConfigParameter<std::string>("type");
if (type == "Constant")
{
- auto const& permeability_parameter = ProcessLib::findParameter<double>(
+ auto const& permeability_parameter = ParameterLib::findParameter<
+ double>(
config,
//! \ogs_file_param_special{material__porous_medium__permeability__permeability_tensor_entries}
"permeability_tensor_entries", parameters, 0);
diff --git a/MaterialLib/PorousMedium/Permeability/createPermeabilityModel.h b/MaterialLib/PorousMedium/Permeability/createPermeabilityModel.h
index 0237ebea93b..727029b051b 100644
--- a/MaterialLib/PorousMedium/Permeability/createPermeabilityModel.h
+++ b/MaterialLib/PorousMedium/Permeability/createPermeabilityModel.h
@@ -33,7 +33,8 @@ namespace PorousMedium
*/
std::unique_ptr<Permeability> createPermeabilityModel(
BaseLib::ConfigTree const& config,
- std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters);
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const&
+ parameters);
} // namespace PorousMedium
} // namespace MaterialLib
diff --git a/MaterialLib/PorousMedium/Porosity/Porosity.h b/MaterialLib/PorousMedium/Porosity/Porosity.h
index a4cca87dc1f..e836f3b8031 100644
--- a/MaterialLib/PorousMedium/Porosity/Porosity.h
+++ b/MaterialLib/PorousMedium/Porosity/Porosity.h
@@ -14,7 +14,7 @@
#include <string>
-#include "ProcessLib/Parameter/Parameter.h"
+#include "ParameterLib/Parameter.h"
namespace MaterialLib
{
@@ -23,8 +23,7 @@ namespace PorousMedium
class Porosity
{
public:
- explicit Porosity(
- ProcessLib::Parameter<double> const& parameter)
+ explicit Porosity(ParameterLib::Parameter<double> const& parameter)
: _parameter(parameter)
{
}
@@ -38,7 +37,7 @@ public:
* @param temperature Temperature with any double type value.
*/
virtual double getValue(const double t,
- ProcessLib::SpatialPosition const& pos,
+ ParameterLib::SpatialPosition const& pos,
const double variable,
const double temperature) const
{
@@ -48,7 +47,7 @@ public:
}
private:
- ProcessLib::Parameter<double> const& _parameter;
+ ParameterLib::Parameter<double> const& _parameter;
};
} // namespace PorousMedium
diff --git a/MaterialLib/PorousMedium/Porosity/createPorosityModel.cpp b/MaterialLib/PorousMedium/Porosity/createPorosityModel.cpp
index de4cd5b11e8..97817932bbe 100644
--- a/MaterialLib/PorousMedium/Porosity/createPorosityModel.cpp
+++ b/MaterialLib/PorousMedium/Porosity/createPorosityModel.cpp
@@ -12,10 +12,9 @@
#include "createPorosityModel.h"
-#include "BaseLib/Error.h"
#include "BaseLib/ConfigTree.h"
-
-#include "ProcessLib/Utils/ProcessUtils.h"
+#include "BaseLib/Error.h"
+#include "ParameterLib/Utils.h"
#include "Porosity.h"
@@ -23,15 +22,16 @@ namespace MaterialLib
{
namespace PorousMedium
{
-std::unique_ptr<Porosity> createPorosityModel(BaseLib::ConfigTree const& config,
- std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters)
+std::unique_ptr<Porosity> createPorosityModel(
+ BaseLib::ConfigTree const& config,
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters)
{
//! \ogs_file_param{material__porous_medium__porosity__type}
auto const type = config.getConfigParameter<std::string>("type");
if (type == "Constant")
{
- auto const& constant_porosity = ProcessLib::findParameter<double>(
+ auto const& constant_porosity = ParameterLib::findParameter<double>(
config,
//! \ogs_file_param_special{material__porous_medium__porosity__porosity_parameter}
"porosity_parameter", parameters, 1);
diff --git a/MaterialLib/PorousMedium/Porosity/createPorosityModel.h b/MaterialLib/PorousMedium/Porosity/createPorosityModel.h
index bdfb5602239..fc0bfbbfe0b 100644
--- a/MaterialLib/PorousMedium/Porosity/createPorosityModel.h
+++ b/MaterialLib/PorousMedium/Porosity/createPorosityModel.h
@@ -13,7 +13,7 @@
#pragma once
#include <memory>
-#include "ProcessLib/Parameter/Parameter.h"
+#include "ParameterLib/Parameter.h"
namespace BaseLib
{
@@ -33,7 +33,8 @@ class Porosity;
*/
std::unique_ptr<Porosity> createPorosityModel(
BaseLib::ConfigTree const& config,
- std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters);
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const&
+ parameters);
} // namespace PorousMedium
} // namespace MaterialLib
diff --git a/MaterialLib/PorousMedium/PorousMediaProperties.cpp b/MaterialLib/PorousMedium/PorousMediaProperties.cpp
index 6c05d86e96b..e264f867990 100644
--- a/MaterialLib/PorousMedium/PorousMediaProperties.cpp
+++ b/MaterialLib/PorousMedium/PorousMediaProperties.cpp
@@ -16,27 +16,27 @@ namespace MaterialLib
namespace PorousMedium
{
int PorousMediaProperties::getMaterialID(
- ProcessLib::SpatialPosition const& pos) const
+ ParameterLib::SpatialPosition const& pos) const
{
return _material_ids ? (*_material_ids)[pos.getElementID().get()] : 0;
}
MaterialLib::PorousMedium::Porosity const& PorousMediaProperties::getPorosity(
- double /*t*/, ProcessLib::SpatialPosition const& pos) const
+ double /*t*/, ParameterLib::SpatialPosition const& pos) const
{
return *_porosity_models[getMaterialID(pos)];
}
MaterialLib::PorousMedium::Permeability const&
PorousMediaProperties::getIntrinsicPermeability(
- double /*t*/, ProcessLib::SpatialPosition const& pos) const
+ double /*t*/, ParameterLib::SpatialPosition const& pos) const
{
return *_intrinsic_permeability_models[getMaterialID(pos)];
}
MaterialLib::PorousMedium::Storage const&
PorousMediaProperties::getSpecificStorage(
- double /*t*/, ProcessLib::SpatialPosition const& pos) const
+ double /*t*/, ParameterLib::SpatialPosition const& pos) const
{
return *_specific_storage_models[getMaterialID(pos)];
}
diff --git a/MaterialLib/PorousMedium/PorousMediaProperties.h b/MaterialLib/PorousMedium/PorousMediaProperties.h
index cc5965c6e8b..dfd3c8c75ba 100644
--- a/MaterialLib/PorousMedium/PorousMediaProperties.h
+++ b/MaterialLib/PorousMedium/PorousMediaProperties.h
@@ -19,7 +19,7 @@
#include "Porosity/Porosity.h"
#include "Storage/Storage.h"
-#include "ProcessLib/Parameter/SpatialPosition.h"
+#include "ParameterLib/SpatialPosition.h"
namespace MaterialLib
{
@@ -48,16 +48,17 @@ public:
PorousMediaProperties(PorousMediaProperties&& other) = default;
MaterialLib::PorousMedium::Porosity const& getPorosity(
- double t, ProcessLib::SpatialPosition const& pos) const;
+ double t, ParameterLib::SpatialPosition const& pos) const;
MaterialLib::PorousMedium::Permeability const& getIntrinsicPermeability(
- double t, ProcessLib::SpatialPosition const& pos) const;
+ double t, ParameterLib::SpatialPosition const& pos) const;
MaterialLib::PorousMedium::Storage const& getSpecificStorage(
- double t, ProcessLib::SpatialPosition const& pos) const;
+ double t, ParameterLib::SpatialPosition const& pos) const;
private:
- int getMaterialID(ProcessLib::SpatialPosition const& pos) const;
+ int getMaterialID(ParameterLib::SpatialPosition const& pos) const;
+
private:
std::vector<std::unique_ptr<MaterialLib::PorousMedium::Porosity>>
_porosity_models;
diff --git a/MaterialLib/SolidModels/CreateConstitutiveRelation.cpp b/MaterialLib/SolidModels/CreateConstitutiveRelation.cpp
index 5eed2b314b2..b2a5edf2d74 100644
--- a/MaterialLib/SolidModels/CreateConstitutiveRelation.cpp
+++ b/MaterialLib/SolidModels/CreateConstitutiveRelation.cpp
@@ -22,7 +22,7 @@
#include "BaseLib/ConfigTree.h"
#include "BaseLib/Error.h"
-#include "ProcessLib/Parameter/Parameter.h"
+#include "ParameterLib/Parameter.h"
namespace MaterialLib
{
@@ -31,7 +31,7 @@ namespace Solids
template <int DisplacementDim>
std::unique_ptr<MaterialLib::Solids::MechanicsBase<DisplacementDim>>
createConstitutiveRelation(
- std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters,
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters,
BaseLib::ConfigTree const& config)
{
auto const type =
@@ -72,7 +72,7 @@ template <int DisplacementDim>
std::map<int,
std::unique_ptr<MaterialLib::Solids::MechanicsBase<DisplacementDim>>>
createConstitutiveRelations(
- std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters,
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters,
BaseLib::ConfigTree const& config)
{
auto const constitutive_relation_configs =
@@ -112,12 +112,12 @@ createConstitutiveRelations(
template std::map<int, std::unique_ptr<MaterialLib::Solids::MechanicsBase<2>>>
createConstitutiveRelations<2>(
- std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters,
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters,
BaseLib::ConfigTree const& config);
template std::map<int, std::unique_ptr<MaterialLib::Solids::MechanicsBase<3>>>
createConstitutiveRelations<3>(
- std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters,
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters,
BaseLib::ConfigTree const& config);
} // namespace Solids
} // namespace MaterialLib
diff --git a/MaterialLib/SolidModels/CreateConstitutiveRelation.h b/MaterialLib/SolidModels/CreateConstitutiveRelation.h
index 9136a944b84..9c1d0bde62f 100644
--- a/MaterialLib/SolidModels/CreateConstitutiveRelation.h
+++ b/MaterialLib/SolidModels/CreateConstitutiveRelation.h
@@ -20,7 +20,7 @@ namespace BaseLib
class ConfigTree;
}
-namespace ProcessLib
+namespace ParameterLib
{
struct ParameterBase;
}
@@ -36,19 +36,19 @@ template <int DisplacementDim>
std::map<int,
std::unique_ptr<MaterialLib::Solids::MechanicsBase<DisplacementDim>>>
createConstitutiveRelations(
- std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters,
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters,
BaseLib::ConfigTree const& config);
extern template std::map<int,
std::unique_ptr<MaterialLib::Solids::MechanicsBase<2>>>
createConstitutiveRelations<2>(
- std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters,
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters,
BaseLib::ConfigTree const& config);
extern template std::map<int,
std::unique_ptr<MaterialLib::Solids::MechanicsBase<3>>>
createConstitutiveRelations<3>(
- std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters,
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters,
BaseLib::ConfigTree const& config);
} // namespace Solids
} // namespace MaterialLib
diff --git a/MaterialLib/SolidModels/CreateCreepBGRa.cpp b/MaterialLib/SolidModels/CreateCreepBGRa.cpp
index b8d08921856..9889c110bae 100644
--- a/MaterialLib/SolidModels/CreateCreepBGRa.cpp
+++ b/MaterialLib/SolidModels/CreateCreepBGRa.cpp
@@ -21,8 +21,8 @@
#include "BaseLib/ConfigTree.h"
#include "BaseLib/Error.h"
-#include "ProcessLib/Parameter/Parameter.h"
-#include "ProcessLib/Utils/ProcessUtils.h" // required for findParameter
+#include "ParameterLib/Parameter.h"
+#include "ParameterLib/Utils.h"
namespace MaterialLib
{
@@ -33,7 +33,7 @@ namespace Creep
template <int DisplacementDim>
std::unique_ptr<MaterialLib::Solids::MechanicsBase<DisplacementDim>>
createCreepBGRa(
- std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters,
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters,
BaseLib::ConfigTree const& config)
{
//! \ogs_file_param{material__solid__constitutive_relation__type}
@@ -46,19 +46,19 @@ createCreepBGRa(
MaterialLib::Solids::createLinearElasticIsotropic<DisplacementDim>(
parameters, config, skip_type_checking);
- auto& A = ProcessLib::findParameter<double>(
+ auto& A = ParameterLib::findParameter<double>(
//! \ogs_file_param_special{material__solid__constitutive_relation__CreepBGRa__a}
config, "a", parameters, 1);
- auto& n = ProcessLib::findParameter<double>(
+ auto& n = ParameterLib::findParameter<double>(
//! \ogs_file_param_special{material__solid__constitutive_relation__CreepBGRa__n}
config, "n", parameters, 1);
- auto& sigma0 = ProcessLib::findParameter<double>(
+ auto& sigma0 = ParameterLib::findParameter<double>(
//! \ogs_file_param_special{material__solid__constitutive_relation__CreepBGRa__sigma0}
config, "sigma0", parameters, 1);
- auto& Q = ProcessLib::findParameter<double>(
+ auto& Q = ParameterLib::findParameter<double>(
//! \ogs_file_param_special{material__solid__constitutive_relation__CreepBGRa__q}
config, "q", parameters, 1);
@@ -73,12 +73,12 @@ createCreepBGRa(
template std::unique_ptr<MaterialLib::Solids::MechanicsBase<2>>
createCreepBGRa<2>(
- std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters,
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters,
BaseLib::ConfigTree const& config);
template std::unique_ptr<MaterialLib::Solids::MechanicsBase<3>>
createCreepBGRa<3>(
- std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters,
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters,
BaseLib::ConfigTree const& config);
} // namespace Creep
} // namespace Solids
diff --git a/MaterialLib/SolidModels/CreateCreepBGRa.h b/MaterialLib/SolidModels/CreateCreepBGRa.h
index 23b4c770c82..aa7f77d00a1 100644
--- a/MaterialLib/SolidModels/CreateCreepBGRa.h
+++ b/MaterialLib/SolidModels/CreateCreepBGRa.h
@@ -19,7 +19,7 @@ namespace BaseLib
class ConfigTree;
}
-namespace ProcessLib
+namespace ParameterLib
{
struct ParameterBase;
}
@@ -36,17 +36,17 @@ namespace Creep
template <int DisplacementDim>
std::unique_ptr<MaterialLib::Solids::MechanicsBase<DisplacementDim>>
createCreepBGRa(
- std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters,
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters,
BaseLib::ConfigTree const& config);
extern template std::unique_ptr<MaterialLib::Solids::MechanicsBase<2>>
createCreepBGRa<2>(
- std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters,
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters,
BaseLib::ConfigTree const& config);
extern template std::unique_ptr<MaterialLib::Solids::MechanicsBase<3>>
createCreepBGRa<3>(
- std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters,
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters,
BaseLib::ConfigTree const& config);
} // namespace Creep
} // namespace Solids
diff --git a/MaterialLib/SolidModels/CreateEhlers.h b/MaterialLib/SolidModels/CreateEhlers.h
index 0d4884449d6..7b0002feedb 100644
--- a/MaterialLib/SolidModels/CreateEhlers.h
+++ b/MaterialLib/SolidModels/CreateEhlers.h
@@ -10,7 +10,8 @@
#pragma once
#include "CreateNewtonRaphsonSolverParameters.h"
-#include "ProcessLib/Utils/ProcessUtils.h" // required for findParameter
+#include "ParameterLib/Utils.h"
+
#include "Ehlers.h"
namespace MaterialLib
@@ -20,23 +21,24 @@ namespace Solids
namespace Ehlers
{
inline std::unique_ptr<DamagePropertiesParameters> createDamageProperties(
- std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters,
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters,
BaseLib::ConfigTree const& config)
{
//! \ogs_file_param_special{material__solid__constitutive_relation__Ehlers__damage_properties__alpha_d}
auto& alpha_d =
- ProcessLib::findParameter<double>(config, "alpha_d", parameters, 1);
+ ParameterLib::findParameter<double>(config, "alpha_d", parameters, 1);
DBUG("Use '%s' as alpha_d.", alpha_d.name.c_str());
//! \ogs_file_param_special{material__solid__constitutive_relation__Ehlers__damage_properties__beta_d}
auto& beta_d =
- ProcessLib::findParameter<double>(config, "beta_d", parameters, 1);
+ ParameterLib::findParameter<double>(config, "beta_d", parameters, 1);
DBUG("Use '%s' as beta_d.", beta_d.name.c_str());
//! \ogs_file_param_special{material__solid__constitutive_relation__Ehlers__damage_properties__h_d}
- auto& h_d = ProcessLib::findParameter<double>(config, "h_d", parameters, 1);
+ auto& h_d =
+ ParameterLib::findParameter<double>(config, "h_d", parameters, 1);
DBUG("Use '%s' as h_d.", h_d.name.c_str());
@@ -46,7 +48,7 @@ inline std::unique_ptr<DamagePropertiesParameters> createDamageProperties(
template <int DisplacementDim>
std::unique_ptr<SolidEhlers<DisplacementDim>> createEhlers(
- std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters,
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters,
BaseLib::ConfigTree const& config)
{
//! \ogs_file_param{material__solid__constitutive_relation__type}
@@ -54,37 +56,37 @@ std::unique_ptr<SolidEhlers<DisplacementDim>> createEhlers(
DBUG("Create Ehlers material");
//! \ogs_file_param_special{material__solid__constitutive_relation__Ehlers__shear_modulus}
- auto& shear_modulus = ProcessLib::findParameter<double>(
+ auto& shear_modulus = ParameterLib::findParameter<double>(
config, "shear_modulus", parameters, 1);
DBUG("Use '%s' as shear modulus parameter.", shear_modulus.name.c_str());
//! \ogs_file_param_special{material__solid__constitutive_relation__Ehlers__bulk_modulus}
- auto& bulk_modulus = ProcessLib::findParameter<double>(
+ auto& bulk_modulus = ParameterLib::findParameter<double>(
config, "bulk_modulus", parameters, 1);
DBUG("Use '%s' as bulk modulus parameter.", bulk_modulus.name.c_str());
//! \ogs_file_param_special{material__solid__constitutive_relation__Ehlers__kappa}
auto& kappa =
- ProcessLib::findParameter<double>(config, "kappa", parameters, 1);
+ ParameterLib::findParameter<double>(config, "kappa", parameters, 1);
DBUG("Use '%s' as kappa.", kappa.name.c_str());
//! \ogs_file_param_special{material__solid__constitutive_relation__Ehlers__beta}
auto& beta =
- ProcessLib::findParameter<double>(config, "beta", parameters, 1);
+ ParameterLib::findParameter<double>(config, "beta", parameters, 1);
DBUG("Use '%s' as beta.", beta.name.c_str());
//! \ogs_file_param_special{material__solid__constitutive_relation__Ehlers__gamma}
auto& gamma =
- ProcessLib::findParameter<double>(config, "gamma", parameters, 1);
+ ParameterLib::findParameter<double>(config, "gamma", parameters, 1);
DBUG("Use '%s' as gamma.", gamma.name.c_str());
//! \ogs_file_param_special{material__solid__constitutive_relation__Ehlers__hardening_modulus}
- auto& hardening_modulus = ProcessLib::findParameter<double>(
+ auto& hardening_modulus = ParameterLib::findParameter<double>(
config, "hardening_modulus", parameters, 1);
DBUG("Use '%s' as hardening modulus parameter.",
@@ -92,59 +94,60 @@ std::unique_ptr<SolidEhlers<DisplacementDim>> createEhlers(
//! \ogs_file_param_special{material__solid__constitutive_relation__Ehlers__alpha}
auto& alpha =
- ProcessLib::findParameter<double>(config, "alpha", parameters, 1);
+ ParameterLib::findParameter<double>(config, "alpha", parameters, 1);
DBUG("Use '%s' as alpha.", alpha.name.c_str());
//! \ogs_file_param_special{material__solid__constitutive_relation__Ehlers__delta}
auto& delta =
- ProcessLib::findParameter<double>(config, "delta", parameters, 1);
+ ParameterLib::findParameter<double>(config, "delta", parameters, 1);
DBUG("Use '%s' as delta.", delta.name.c_str());
//! \ogs_file_param_special{material__solid__constitutive_relation__Ehlers__eps}
- auto& eps = ProcessLib::findParameter<double>(config, "eps", parameters, 1);
+ auto& eps =
+ ParameterLib::findParameter<double>(config, "eps", parameters, 1);
DBUG("Use '%s' as eps.", eps.name.c_str());
//! \ogs_file_param_special{material__solid__constitutive_relation__Ehlers__m}
- auto& m = ProcessLib::findParameter<double>(config, "m", parameters, 1);
+ auto& m = ParameterLib::findParameter<double>(config, "m", parameters, 1);
DBUG("Use '%s' as m.", m.name.c_str());
//! \ogs_file_param_special{material__solid__constitutive_relation__Ehlers__alphap}
auto& alphap =
- ProcessLib::findParameter<double>(config, "alphap", parameters, 1);
+ ParameterLib::findParameter<double>(config, "alphap", parameters, 1);
DBUG("Use '%s' as alphap.", alphap.name.c_str());
//! \ogs_file_param_special{material__solid__constitutive_relation__Ehlers__deltap}
auto& deltap =
- ProcessLib::findParameter<double>(config, "deltap", parameters, 1);
+ ParameterLib::findParameter<double>(config, "deltap", parameters, 1);
DBUG("Use '%s' as deltap.", deltap.name.c_str());
//! \ogs_file_param_special{material__solid__constitutive_relation__Ehlers__epsp}
auto& epsp =
- ProcessLib::findParameter<double>(config, "epsp", parameters, 1);
+ ParameterLib::findParameter<double>(config, "epsp", parameters, 1);
DBUG("Use '%s' as epsp.", epsp.name.c_str());
//! \ogs_file_param_special{material__solid__constitutive_relation__Ehlers__mp}
auto& paremeter_mp =
- ProcessLib::findParameter<double>(config, "mp", parameters, 1);
+ ParameterLib::findParameter<double>(config, "mp", parameters, 1);
DBUG("Use '%s' as mp.", paremeter_mp.name.c_str());
//! \ogs_file_param_special{material__solid__constitutive_relation__Ehlers__betap}
auto& betap =
- ProcessLib::findParameter<double>(config, "betap", parameters, 1);
+ ParameterLib::findParameter<double>(config, "betap", parameters, 1);
DBUG("Use '%s' as betap.", betap.name.c_str());
//! \ogs_file_param_special{material__solid__constitutive_relation__Ehlers__gammap}
auto& gammap =
- ProcessLib::findParameter<double>(config, "gammap", parameters, 1);
+ ParameterLib::findParameter<double>(config, "gammap", parameters, 1);
DBUG("Use '%s' as gammap.", gammap.name.c_str());
diff --git a/MaterialLib/SolidModels/CreateLinearElasticIsotropic.h b/MaterialLib/SolidModels/CreateLinearElasticIsotropic.h
index cdf7826cdeb..ead3d10296c 100644
--- a/MaterialLib/SolidModels/CreateLinearElasticIsotropic.h
+++ b/MaterialLib/SolidModels/CreateLinearElasticIsotropic.h
@@ -9,7 +9,8 @@
#pragma once
-#include "ProcessLib/Utils/ProcessUtils.h" // required for findParameter
+#include "ParameterLib/Utils.h"
+
#include "LinearElasticIsotropic.h"
namespace MaterialLib
@@ -19,7 +20,7 @@ namespace Solids
template <int DisplacementDim>
std::unique_ptr<LinearElasticIsotropic<DisplacementDim>>
createLinearElasticIsotropic(
- std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters,
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters,
BaseLib::ConfigTree const& config, const bool skip_type_checking)
{
if (!skip_type_checking)
@@ -30,14 +31,14 @@ createLinearElasticIsotropic(
}
// Youngs modulus
- auto& youngs_modulus = ProcessLib::findParameter<double>(
+ auto& youngs_modulus = ParameterLib::findParameter<double>(
//! \ogs_file_param_special{material__solid__constitutive_relation__LinearElasticIsotropic__youngs_modulus}
config, "youngs_modulus", parameters, 1);
DBUG("Use '%s' as youngs_modulus parameter.", youngs_modulus.name.c_str());
// Poissons ratio
- auto& poissons_ratio = ProcessLib::findParameter<double>(
+ auto& poissons_ratio = ParameterLib::findParameter<double>(
//! \ogs_file_param_special{material__solid__constitutive_relation__LinearElasticIsotropic__poissons_ratio}
config, "poissons_ratio", parameters, 1);
diff --git a/MaterialLib/SolidModels/CreateLubby2.h b/MaterialLib/SolidModels/CreateLubby2.h
index 7b2427a228c..8ea24ea44f2 100644
--- a/MaterialLib/SolidModels/CreateLubby2.h
+++ b/MaterialLib/SolidModels/CreateLubby2.h
@@ -10,7 +10,7 @@
#pragma once
#include "CreateNewtonRaphsonSolverParameters.h"
-#include "ProcessLib/Utils/ProcessUtils.h" // required for findParameter
+#include "ParameterLib/Utils.h"
#include "Lubby2.h"
@@ -22,7 +22,7 @@ namespace Lubby2
{
template <int DisplacementDim>
std::unique_ptr<Lubby2<DisplacementDim>> createLubby2(
- std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters,
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters,
BaseLib::ConfigTree const& config)
{
//! \ogs_file_param{material__solid__constitutive_relation__type}
@@ -30,7 +30,7 @@ std::unique_ptr<Lubby2<DisplacementDim>> createLubby2(
DBUG("Create Lubby2 material");
// Kelvin shear modulus.
- auto& kelvin_shear_modulus = ProcessLib::findParameter<double>(
+ auto& kelvin_shear_modulus = ParameterLib::findParameter<double>(
//! \ogs_file_param_special{material__solid__constitutive_relation__Lubby2__kelvin_shear_modulus}
config, "kelvin_shear_modulus", parameters, 1);
@@ -38,7 +38,7 @@ std::unique_ptr<Lubby2<DisplacementDim>> createLubby2(
kelvin_shear_modulus.name.c_str());
// Kelvin viscosity.
- auto& kelvin_viscosity = ProcessLib::findParameter<double>(
+ auto& kelvin_viscosity = ParameterLib::findParameter<double>(
//! \ogs_file_param_special{material__solid__constitutive_relation__Lubby2__kelvin_viscosity}
config, "kelvin_viscosity", parameters, 1);
@@ -46,7 +46,7 @@ std::unique_ptr<Lubby2<DisplacementDim>> createLubby2(
kelvin_viscosity.name.c_str());
// Maxwell shear modulus.
- auto& maxwell_shear_modulus = ProcessLib::findParameter<double>(
+ auto& maxwell_shear_modulus = ParameterLib::findParameter<double>(
//! \ogs_file_param_special{material__solid__constitutive_relation__Lubby2__maxwell_shear_modulus}
config, "maxwell_shear_modulus", parameters, 1);
@@ -54,7 +54,7 @@ std::unique_ptr<Lubby2<DisplacementDim>> createLubby2(
maxwell_shear_modulus.name.c_str());
// Maxwell bulk modulus.
- auto& maxwell_bulk_modulus = ProcessLib::findParameter<double>(
+ auto& maxwell_bulk_modulus = ParameterLib::findParameter<double>(
//! \ogs_file_param_special{material__solid__constitutive_relation__Lubby2__maxwell_bulk_modulus}
config, "maxwell_bulk_modulus", parameters, 1);
@@ -62,7 +62,7 @@ std::unique_ptr<Lubby2<DisplacementDim>> createLubby2(
maxwell_bulk_modulus.name.c_str());
// Maxwell viscosity.
- auto& maxwell_viscosity = ProcessLib::findParameter<double>(
+ auto& maxwell_viscosity = ParameterLib::findParameter<double>(
//! \ogs_file_param_special{material__solid__constitutive_relation__Lubby2__maxwell_viscosity}
config, "maxwell_viscosity", parameters, 1);
@@ -70,7 +70,7 @@ std::unique_ptr<Lubby2<DisplacementDim>> createLubby2(
maxwell_viscosity.name.c_str());
// Dependency parameter for mK.
- auto& dependency_parameter_mK = ProcessLib::findParameter<double>(
+ auto& dependency_parameter_mK = ParameterLib::findParameter<double>(
//! \ogs_file_param_special{material__solid__constitutive_relation__Lubby2__dependency_parameter_mk}
config, "dependency_parameter_mk", parameters, 1);
@@ -78,7 +78,7 @@ std::unique_ptr<Lubby2<DisplacementDim>> createLubby2(
dependency_parameter_mK.name.c_str());
// Dependency parameter for mvK.
- auto& dependency_parameter_mvK = ProcessLib::findParameter<double>(
+ auto& dependency_parameter_mvK = ParameterLib::findParameter<double>(
//! \ogs_file_param_special{material__solid__constitutive_relation__Lubby2__dependency_parameter_mvk}
config, "dependency_parameter_mvk", parameters, 1);
@@ -86,7 +86,7 @@ std::unique_ptr<Lubby2<DisplacementDim>> createLubby2(
dependency_parameter_mvK.name.c_str());
// Dependency parameter for mvM.
- auto& dependency_parameter_mvM = ProcessLib::findParameter<double>(
+ auto& dependency_parameter_mvM = ParameterLib::findParameter<double>(
//! \ogs_file_param_special{material__solid__constitutive_relation__Lubby2__dependency_parameter_mvm}
config, "dependency_parameter_mvm", parameters, 1);
diff --git a/MaterialLib/SolidModels/CreepBGRa.cpp b/MaterialLib/SolidModels/CreepBGRa.cpp
index 0c58a8469f5..9671153de1e 100644
--- a/MaterialLib/SolidModels/CreepBGRa.cpp
+++ b/MaterialLib/SolidModels/CreepBGRa.cpp
@@ -34,7 +34,7 @@ boost::optional<std::tuple<typename CreepBGRa<DisplacementDim>::KelvinVector,
DisplacementDim>::MaterialStateVariables>,
typename CreepBGRa<DisplacementDim>::KelvinMatrix>>
CreepBGRa<DisplacementDim>::integrateStress(
- double const t, ProcessLib::SpatialPosition const& x, double const dt,
+ double const t, ParameterLib::SpatialPosition const& x, double const dt,
KelvinVector const& eps_prev, KelvinVector const& eps,
KelvinVector const& sigma_prev,
typename MechanicsBase<DisplacementDim>::MaterialStateVariables const&
@@ -134,7 +134,7 @@ CreepBGRa<DisplacementDim>::integrateStress(
template <int DisplacementDim>
double CreepBGRa<DisplacementDim>::getTemperatureRelatedCoefficient(
- double const t, double const dt, ProcessLib::SpatialPosition const& x,
+ double const t, double const dt, ParameterLib::SpatialPosition const& x,
double const T, double const deviatoric_stress_norm) const
{
const double A = _a(t, x)[0];
diff --git a/MaterialLib/SolidModels/CreepBGRa.h b/MaterialLib/SolidModels/CreepBGRa.h
index 31b8d912615..d8c02d0f5ef 100644
--- a/MaterialLib/SolidModels/CreepBGRa.h
+++ b/MaterialLib/SolidModels/CreepBGRa.h
@@ -18,7 +18,7 @@
#include "LinearElasticIsotropic.h"
#include "MathLib/KelvinVector.h"
#include "NumLib/NewtonRaphson.h"
-#include "ProcessLib/Parameter/Parameter.h"
+#include "ParameterLib/Parameter.h"
namespace MaterialLib
{
@@ -50,7 +50,7 @@ public:
using KelvinMatrix =
MathLib::KelvinVector::KelvinMatrixType<DisplacementDim>;
- using Parameter = ProcessLib::Parameter<double>;
+ using Parameter = ParameterLib::Parameter<double>;
std::unique_ptr<
typename MechanicsBase<DisplacementDim>::MaterialStateVariables>
@@ -79,7 +79,7 @@ public:
DisplacementDim>::MaterialStateVariables>,
KelvinMatrix>>
integrateStress(
- double const t, ProcessLib::SpatialPosition const& x, double const dt,
+ double const t, ParameterLib::SpatialPosition const& x, double const dt,
KelvinVector const& eps_prev, KelvinVector const& eps,
KelvinVector const& sigma_prev,
typename MechanicsBase<DisplacementDim>::MaterialStateVariables const&
@@ -92,7 +92,7 @@ public:
}
double getTemperatureRelatedCoefficient(
- double const t, double const dt, ProcessLib::SpatialPosition const& x,
+ double const t, double const dt, ParameterLib::SpatialPosition const& x,
double const T, double const deviatoric_stress_norm) const override;
private:
diff --git a/MaterialLib/SolidModels/Ehlers.cpp b/MaterialLib/SolidModels/Ehlers.cpp
index efece2a3756..d9be5cbe16d 100644
--- a/MaterialLib/SolidModels/Ehlers.cpp
+++ b/MaterialLib/SolidModels/Ehlers.cpp
@@ -484,7 +484,7 @@ SolidEhlers<DisplacementDim>::SolidEhlers(
template <int DisplacementDim>
double SolidEhlers<DisplacementDim>::computeFreeEnergyDensity(
double const /*t*/,
- ProcessLib::SpatialPosition const& /*x*/,
+ ParameterLib::SpatialPosition const& /*x*/,
double const /*dt*/,
KelvinVector const& eps,
KelvinVector const& sigma,
@@ -508,7 +508,7 @@ boost::optional<std::tuple<typename SolidEhlers<DisplacementDim>::KelvinVector,
DisplacementDim>::MaterialStateVariables>,
typename SolidEhlers<DisplacementDim>::KelvinMatrix>>
SolidEhlers<DisplacementDim>::integrateStress(
- double const t, ProcessLib::SpatialPosition const& x, double const dt,
+ double const t, ParameterLib::SpatialPosition const& x, double const dt,
KelvinVector const& eps_prev, KelvinVector const& eps,
KelvinVector const& sigma_prev,
typename MechanicsBase<DisplacementDim>::MaterialStateVariables const&
diff --git a/MaterialLib/SolidModels/Ehlers.h b/MaterialLib/SolidModels/Ehlers.h
index 3734d0fb283..9b892428a64 100644
--- a/MaterialLib/SolidModels/Ehlers.h
+++ b/MaterialLib/SolidModels/Ehlers.h
@@ -25,7 +25,7 @@
#include "BaseLib/Error.h"
#include "MathLib/KelvinVector.h"
#include "NumLib/NewtonRaphson.h"
-#include "ProcessLib/Parameter/Parameter.h"
+#include "ParameterLib/Parameter.h"
#include "MechanicsBase.h"
@@ -64,7 +64,7 @@ inline TangentType makeTangentType(std::string const& s)
/// \cite Ehlers1995.
struct MaterialPropertiesParameters
{
- using P = ProcessLib::Parameter<double>;
+ using P = ParameterLib::Parameter<double>;
MaterialPropertiesParameters(P const& G_, P const& K_, P const& alpha_,
P const& beta_, P const& gamma_,
@@ -117,7 +117,7 @@ struct MaterialPropertiesParameters
struct DamagePropertiesParameters
{
- using P = ProcessLib::Parameter<double>;
+ using P = ParameterLib::Parameter<double>;
P const& alpha_d;
P const& beta_d;
P const& h_d;
@@ -127,7 +127,7 @@ struct DamagePropertiesParameters
/// details.
struct MaterialProperties final
{
- MaterialProperties(double const t, ProcessLib::SpatialPosition const& x,
+ MaterialProperties(double const t, ParameterLib::SpatialPosition const& x,
MaterialPropertiesParameters const& mp)
: G(mp.G(t, x)[0]),
K(mp.K(t, x)[0]),
@@ -173,7 +173,7 @@ struct MaterialProperties final
struct DamageProperties
{
DamageProperties(double const t,
- ProcessLib::SpatialPosition const& x,
+ ParameterLib::SpatialPosition const& x,
DamagePropertiesParameters const& dp)
: alpha_d(dp.alpha_d(t, x)[0]),
beta_d(dp.beta_d(t, x)[0]),
@@ -311,7 +311,7 @@ public:
double computeFreeEnergyDensity(
double const /*t*/,
- ProcessLib::SpatialPosition const& /*x*/,
+ ParameterLib::SpatialPosition const& /*x*/,
double const /*dt*/,
KelvinVector const& eps,
KelvinVector const& sigma,
@@ -323,7 +323,7 @@ public:
DisplacementDim>::MaterialStateVariables>,
KelvinMatrix>>
integrateStress(
- double const t, ProcessLib::SpatialPosition const& x, double const dt,
+ double const t, ParameterLib::SpatialPosition const& x, double const dt,
KelvinVector const& eps_prev, KelvinVector const& eps,
KelvinVector const& sigma_prev,
typename MechanicsBase<DisplacementDim>::MaterialStateVariables const&
@@ -334,13 +334,13 @@ public:
getInternalVariables() const override;
MaterialProperties evaluatedMaterialProperties(
- double const t, ProcessLib::SpatialPosition const& x) const
+ double const t, ParameterLib::SpatialPosition const& x) const
{
return MaterialProperties(t, x, _mp);
}
DamageProperties evaluatedDamageProperties(
- double const t, ProcessLib::SpatialPosition const& x) const
+ double const t, ParameterLib::SpatialPosition const& x) const
{
return DamageProperties(t, x, *_damage_properties);
}
diff --git a/MaterialLib/SolidModels/LinearElasticIsotropic.cpp b/MaterialLib/SolidModels/LinearElasticIsotropic.cpp
index 866f28751a4..03c08c56f16 100644
--- a/MaterialLib/SolidModels/LinearElasticIsotropic.cpp
+++ b/MaterialLib/SolidModels/LinearElasticIsotropic.cpp
@@ -20,7 +20,7 @@ boost::optional<
DisplacementDim>::MaterialStateVariables>,
typename LinearElasticIsotropic<DisplacementDim>::KelvinMatrix>>
LinearElasticIsotropic<DisplacementDim>::integrateStress(
- double const t, ProcessLib::SpatialPosition const& x, double const /*dt*/,
+ double const t, ParameterLib::SpatialPosition const& x, double const /*dt*/,
KelvinVector const& eps_prev, KelvinVector const& eps,
KelvinVector const& sigma_prev,
typename MechanicsBase<DisplacementDim>::MaterialStateVariables const&
@@ -44,7 +44,7 @@ LinearElasticIsotropic<DisplacementDim>::integrateStress(
template <int DisplacementDim>
typename LinearElasticIsotropic<DisplacementDim>::KelvinMatrix
LinearElasticIsotropic<DisplacementDim>::getElasticTensor(
- double const t, ProcessLib::SpatialPosition const& x,
+ double const t, ParameterLib::SpatialPosition const& x,
double const /*T*/) const
{
return elasticTangentStiffness<DisplacementDim>(_mp.lambda(t, x),
diff --git a/MaterialLib/SolidModels/LinearElasticIsotropic.h b/MaterialLib/SolidModels/LinearElasticIsotropic.h
index c6e91526e8e..27aed3ee693 100644
--- a/MaterialLib/SolidModels/LinearElasticIsotropic.h
+++ b/MaterialLib/SolidModels/LinearElasticIsotropic.h
@@ -10,7 +10,7 @@
#pragma once
#include "MechanicsBase.h"
-#include "ProcessLib/Parameter/Parameter.h"
+#include "ParameterLib/Parameter.h"
namespace MaterialLib
{
@@ -23,8 +23,8 @@ public:
/// Variables specific to the material model
class MaterialProperties
{
- using P = ProcessLib::Parameter<double>;
- using X = ProcessLib::SpatialPosition;
+ using P = ParameterLib::Parameter<double>;
+ using X = ParameterLib::SpatialPosition;
public:
MaterialProperties(P const& youngs_modulus, P const& poissons_ratio)
@@ -97,7 +97,7 @@ public:
double computeFreeEnergyDensity(
double const /*t*/,
- ProcessLib::SpatialPosition const& /*x*/,
+ ParameterLib::SpatialPosition const& /*x*/,
double const /*dt*/,
KelvinVector const& eps,
KelvinVector const& sigma,
@@ -113,7 +113,7 @@ public:
DisplacementDim>::MaterialStateVariables>,
KelvinMatrix>>
integrateStress(
- double const t, ProcessLib::SpatialPosition const& x,
+ double const t, ParameterLib::SpatialPosition const& x,
double const /*dt*/, KelvinVector const& eps_prev,
KelvinVector const& eps, KelvinVector const& sigma_prev,
typename MechanicsBase<DisplacementDim>::MaterialStateVariables const&
@@ -121,7 +121,7 @@ public:
double const T) const override;
KelvinMatrix getElasticTensor(double const t,
- ProcessLib::SpatialPosition const& x,
+ ParameterLib::SpatialPosition const& x,
double const T) const;
MaterialProperties getMaterialProperties() const { return _mp; }
diff --git a/MaterialLib/SolidModels/Lubby2.cpp b/MaterialLib/SolidModels/Lubby2.cpp
index f804c9d8da1..bb735a625bb 100644
--- a/MaterialLib/SolidModels/Lubby2.cpp
+++ b/MaterialLib/SolidModels/Lubby2.cpp
@@ -73,7 +73,7 @@ boost::optional<std::tuple<typename Lubby2<DisplacementDim>::KelvinVector,
DisplacementDim>::MaterialStateVariables>,
typename Lubby2<DisplacementDim>::KelvinMatrix>>
Lubby2<DisplacementDim>::integrateStress(
- double const t, ProcessLib::SpatialPosition const& x, double const dt,
+ double const t, ParameterLib::SpatialPosition const& x, double const dt,
KelvinVector const& /*eps_prev*/, KelvinVector const& eps,
KelvinVector const& /*sigma_prev*/,
typename MechanicsBase<DisplacementDim>::MaterialStateVariables const&
@@ -227,7 +227,7 @@ void Lubby2<DisplacementDim>::calculateResidualBurgers(
template <int DisplacementDim>
void Lubby2<DisplacementDim>::calculateJacobianBurgers(
double const t,
- ProcessLib::SpatialPosition const& x,
+ ParameterLib::SpatialPosition const& x,
const double dt,
JacobianMatrix& Jac,
double s_eff,
diff --git a/MaterialLib/SolidModels/Lubby2.h b/MaterialLib/SolidModels/Lubby2.h
index 58a0ebe5832..cae32b14471 100644
--- a/MaterialLib/SolidModels/Lubby2.h
+++ b/MaterialLib/SolidModels/Lubby2.h
@@ -11,7 +11,7 @@
#include "MathLib/KelvinVector.h"
#include "NumLib/NewtonRaphson.h"
-#include "ProcessLib/Parameter/Parameter.h"
+#include "ParameterLib/Parameter.h"
#include "MechanicsBase.h"
@@ -26,7 +26,7 @@ namespace Lubby2
//
struct Lubby2MaterialProperties
{
- using P = ProcessLib::Parameter<double>;
+ using P = ParameterLib::Parameter<double>;
Lubby2MaterialProperties(P const& GK0_,
P const& GM0_,
P const& KM0_,
@@ -63,7 +63,7 @@ template <int DisplacementDim>
struct LocalLubby2Properties
{
LocalLubby2Properties(double const t,
- ProcessLib::SpatialPosition const& x,
+ ParameterLib::SpatialPosition const& x,
Lubby2MaterialProperties const& mp)
: GM0(mp.GM0(t, x)[0]),
KM0(mp.KM0(t, x)[0]),
@@ -192,7 +192,7 @@ public:
double computeFreeEnergyDensity(
double const t,
- ProcessLib::SpatialPosition const& x,
+ ParameterLib::SpatialPosition const& x,
double const dt,
KelvinVector const& eps,
KelvinVector const& sigma,
@@ -224,7 +224,7 @@ public:
DisplacementDim>::MaterialStateVariables>,
KelvinMatrix>>
integrateStress(
- double const t, ProcessLib::SpatialPosition const& x, double const dt,
+ double const t, ParameterLib::SpatialPosition const& x, double const dt,
KelvinVector const& eps_prev, KelvinVector const& eps,
KelvinVector const& sigma_prev,
typename MechanicsBase<DisplacementDim>::MaterialStateVariables const&
@@ -247,7 +247,7 @@ private:
/// Calculates the 18x18 Jacobian.
void calculateJacobianBurgers(
double const t,
- ProcessLib::SpatialPosition const& x,
+ ParameterLib::SpatialPosition const& x,
double const dt,
JacobianMatrix& Jac,
double s_eff,
diff --git a/MaterialLib/SolidModels/MFront/CreateMFront.cpp b/MaterialLib/SolidModels/MFront/CreateMFront.cpp
index 3d32185f92d..97446167c46 100644
--- a/MaterialLib/SolidModels/MFront/CreateMFront.cpp
+++ b/MaterialLib/SolidModels/MFront/CreateMFront.cpp
@@ -11,11 +11,10 @@
#ifdef OGS_USE_MFRONT
-#include "MFront.h"
-
#include "BaseLib/FileTools.h"
-#include "ProcessLib/Utils/ProcessUtils.h"
+#include "ParameterLib/Utils.h"
+#include "MFront.h"
namespace
{
/// Prints info about MFront variables.
@@ -46,7 +45,7 @@ namespace MFront
{
template <int DisplacementDim>
std::unique_ptr<MechanicsBase<DisplacementDim>> createMFront(
- std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters,
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters,
BaseLib::ConfigTree const& config)
{
INFO("### MFRONT ########################################################");
@@ -102,7 +101,7 @@ std::unique_ptr<MechanicsBase<DisplacementDim>> createMFront(
// MGIS library.
varInfo("Parameters", behaviour.parameters, hypothesis);
- std::vector<ProcessLib::Parameter<double> const*> material_properties;
+ std::vector<ParameterLib::Parameter<double> const*> material_properties;
if (!behaviour.mps.empty())
{
@@ -137,7 +136,7 @@ std::unique_ptr<MechanicsBase<DisplacementDim>> createMFront(
auto const param_name = it->second;
auto const num_comp =
mgis::behaviour::getVariableSize(mp, hypothesis);
- auto const* param = &ProcessLib::findParameter<double>(
+ auto const* param = &ParameterLib::findParameter<double>(
param_name, parameters, num_comp);
INFO("Using OGS parameter `%s' for material property `%s'.",
@@ -194,7 +193,7 @@ namespace MFront
template <int DisplacementDim>
std::unique_ptr<MechanicsBase<DisplacementDim>> createMFront(
std::vector<
- std::unique_ptr<ProcessLib::ParameterBase>> const& /*parameters*/,
+ std::unique_ptr<ParameterLib::ParameterBase>> const& /*parameters*/,
BaseLib::ConfigTree const& /*config*/)
{
OGS_FATAL("OpenGeoSys has not been build with MFront support.");
@@ -212,10 +211,10 @@ namespace Solids
namespace MFront
{
template std::unique_ptr<MechanicsBase<2>> createMFront<2>(
- std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters,
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters,
BaseLib::ConfigTree const& config);
template std::unique_ptr<MechanicsBase<3>> createMFront<3>(
- std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters,
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters,
BaseLib::ConfigTree const& config);
} // namespace MFront
} // namespace Solids
diff --git a/MaterialLib/SolidModels/MFront/CreateMFront.h b/MaterialLib/SolidModels/MFront/CreateMFront.h
index 26997aefae1..638ca136a47 100644
--- a/MaterialLib/SolidModels/MFront/CreateMFront.h
+++ b/MaterialLib/SolidModels/MFront/CreateMFront.h
@@ -14,7 +14,7 @@
#include "BaseLib/ConfigTree.h"
#include "MaterialLib/SolidModels/MechanicsBase.h"
-#include "ProcessLib/Parameter/Parameter.h"
+#include "ParameterLib/Parameter.h"
namespace MaterialLib
{
@@ -24,14 +24,14 @@ namespace MFront
{
template <int DisplacementDim>
std::unique_ptr<MechanicsBase<DisplacementDim>> createMFront(
- std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters,
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters,
BaseLib::ConfigTree const& config);
extern template std::unique_ptr<MechanicsBase<2>> createMFront<2>(
- std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters,
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters,
BaseLib::ConfigTree const& config);
extern template std::unique_ptr<MechanicsBase<3>> createMFront<3>(
- std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters,
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters,
BaseLib::ConfigTree const& config);
} // namespace MFront
} // namespace Solids
diff --git a/MaterialLib/SolidModels/MFront/MFront.cpp b/MaterialLib/SolidModels/MFront/MFront.cpp
index 081f760d00d..95e076e543a 100644
--- a/MaterialLib/SolidModels/MFront/MFront.cpp
+++ b/MaterialLib/SolidModels/MFront/MFront.cpp
@@ -157,7 +157,7 @@ const char* varTypeToString(int v)
template <int DisplacementDim>
MFront<DisplacementDim>::MFront(
mgis::behaviour::Behaviour&& behaviour,
- std::vector<ProcessLib::Parameter<double> const*>&& material_properties)
+ std::vector<ParameterLib::Parameter<double> const*>&& material_properties)
: _behaviour(std::move(behaviour)),
_material_properties(std::move(material_properties))
{
@@ -238,7 +238,7 @@ boost::optional<std::tuple<typename MFront<DisplacementDim>::KelvinVector,
typename MFront<DisplacementDim>::KelvinMatrix>>
MFront<DisplacementDim>::integrateStress(
double const t,
- ProcessLib::SpatialPosition const& x,
+ ParameterLib::SpatialPosition const& x,
double const dt,
KelvinVector const& /*eps_prev*/,
KelvinVector const& eps,
@@ -317,7 +317,7 @@ MFront<DisplacementDim>::integrateStress(
template <int DisplacementDim>
double MFront<DisplacementDim>::computeFreeEnergyDensity(
double const /*t*/,
- ProcessLib::SpatialPosition const& /*x*/,
+ ParameterLib::SpatialPosition const& /*x*/,
double const /*dt*/,
KelvinVector const& /*eps*/,
KelvinVector const& /*sigma*/,
diff --git a/MaterialLib/SolidModels/MFront/MFront.h b/MaterialLib/SolidModels/MFront/MFront.h
index d59c742a86b..5f886b22d69 100644
--- a/MaterialLib/SolidModels/MFront/MFront.h
+++ b/MaterialLib/SolidModels/MFront/MFront.h
@@ -14,7 +14,7 @@
#include <MGIS/Behaviour/Behaviour.hxx>
#include <MGIS/Behaviour/BehaviourData.hxx>
-#include "ProcessLib/Parameter/Parameter.h"
+#include "ParameterLib/Parameter.h"
namespace MaterialLib
{
@@ -72,7 +72,7 @@ public:
MathLib::KelvinVector::KelvinMatrixType<DisplacementDim>;
MFront(mgis::behaviour::Behaviour&& behaviour,
- std::vector<ProcessLib::Parameter<double> const*>&&
+ std::vector<ParameterLib::Parameter<double> const*>&&
material_properties);
std::unique_ptr<
@@ -85,7 +85,7 @@ public:
KelvinMatrix>>
integrateStress(
double const t,
- ProcessLib::SpatialPosition const& x,
+ ParameterLib::SpatialPosition const& x,
double const dt,
KelvinVector const& eps_prev,
KelvinVector const& eps,
@@ -96,7 +96,7 @@ public:
double computeFreeEnergyDensity(
double const t,
- ProcessLib::SpatialPosition const& x,
+ ParameterLib::SpatialPosition const& x,
double const dt,
KelvinVector const& eps,
KelvinVector const& sigma,
@@ -105,7 +105,7 @@ public:
private:
mgis::behaviour::Behaviour _behaviour;
- std::vector<ProcessLib::Parameter<double> const*> _material_properties;
+ std::vector<ParameterLib::Parameter<double> const*> _material_properties;
};
extern template class MFront<2>;
diff --git a/MaterialLib/SolidModels/MechanicsBase.h b/MaterialLib/SolidModels/MechanicsBase.h
index 5082bb27ffd..019c5850daf 100644
--- a/MaterialLib/SolidModels/MechanicsBase.h
+++ b/MaterialLib/SolidModels/MechanicsBase.h
@@ -18,7 +18,7 @@
#include "BaseLib/Error.h"
#include "ProcessLib/Deformation/BMatrixPolicy.h"
-namespace ProcessLib
+namespace ParameterLib
{
class SpatialPosition;
}
@@ -80,7 +80,7 @@ struct MechanicsBase
boost::optional<std::tuple<
KelvinVector, std::unique_ptr<MaterialStateVariables>, KelvinMatrix>>
integrateStress(double const t,
- ProcessLib::SpatialPosition const& x,
+ ParameterLib::SpatialPosition const& x,
double const dt,
Eigen::Matrix<double, Eigen::Dynamic, 1> const& eps_prev,
Eigen::Matrix<double, Eigen::Dynamic, 1> const& eps,
@@ -111,7 +111,7 @@ struct MechanicsBase
virtual boost::optional<std::tuple<
KelvinVector, std::unique_ptr<MaterialStateVariables>, KelvinMatrix>>
integrateStress(double const t,
- ProcessLib::SpatialPosition const& x,
+ ParameterLib::SpatialPosition const& x,
double const dt,
KelvinVector const& eps_prev,
KelvinVector const& eps,
@@ -152,7 +152,7 @@ struct MechanicsBase
/// one.
virtual double getTemperatureRelatedCoefficient(
double const /*t*/, double const /*dt*/,
- ProcessLib::SpatialPosition const& /*x*/, double const /*T*/,
+ ParameterLib::SpatialPosition const& /*x*/, double const /*T*/,
double const /*deviatoric_stress_norm*/) const
{
return 0.0;
@@ -160,7 +160,7 @@ struct MechanicsBase
virtual double computeFreeEnergyDensity(
double const t,
- ProcessLib::SpatialPosition const& x,
+ ParameterLib::SpatialPosition const& x,
double const dt,
KelvinVector const& eps,
KelvinVector const& sigma,
diff --git a/MaterialLib/TwoPhaseModels/CreateTwoPhaseFlowMaterialProperties.cpp b/MaterialLib/TwoPhaseModels/CreateTwoPhaseFlowMaterialProperties.cpp
index 891ff1653dd..6fb4325312c 100644
--- a/MaterialLib/TwoPhaseModels/CreateTwoPhaseFlowMaterialProperties.cpp
+++ b/MaterialLib/TwoPhaseModels/CreateTwoPhaseFlowMaterialProperties.cpp
@@ -20,8 +20,8 @@
#include "MathLib/InterpolationAlgorithms/PiecewiseLinearInterpolation.h"
#include "MeshLib/Mesh.h"
#include "MeshLib/PropertyVector.h"
-#include "ProcessLib/Parameter/Parameter.h"
-#include "ProcessLib/Parameter/SpatialPosition.h"
+#include "ParameterLib/Parameter.h"
+#include "ParameterLib/SpatialPosition.h"
#include "TwoPhaseFlowWithPPMaterialProperties.h"
@@ -34,7 +34,7 @@ std::tuple<std::unique_ptr<TwoPhaseFlowWithPPMaterialProperties>,
createTwoPhaseFlowMaterialProperties(
BaseLib::ConfigTree const& config,
MeshLib::PropertyVector<int> const& material_ids,
- std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters)
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters)
{
DBUG("Reading material properties of two-phase flow process.");
diff --git a/MaterialLib/TwoPhaseModels/CreateTwoPhaseFlowMaterialProperties.h b/MaterialLib/TwoPhaseModels/CreateTwoPhaseFlowMaterialProperties.h
index 021ac92e594..6f1d3bc69d4 100644
--- a/MaterialLib/TwoPhaseModels/CreateTwoPhaseFlowMaterialProperties.h
+++ b/MaterialLib/TwoPhaseModels/CreateTwoPhaseFlowMaterialProperties.h
@@ -32,7 +32,8 @@ std::tuple<std::unique_ptr<TwoPhaseFlowWithPPMaterialProperties>,
createTwoPhaseFlowMaterialProperties(
BaseLib::ConfigTree const& config,
MeshLib::PropertyVector<int> const& material_ids,
- std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters);
+ std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const&
+ parameters);
} // end namespace
} // namespace MaterialLib
diff --git a/MaterialLib/TwoPhaseModels/TwoPhaseFlowWithPPMaterialProperties.cpp b/MaterialLib/TwoPhaseModels/TwoPhaseFlowWithPPMaterialProperties.cpp
index b7a71d19229..5a50c0fd37d 100644
--- a/MaterialLib/TwoPhaseModels/TwoPhaseFlowWithPPMaterialProperties.cpp
+++ b/MaterialLib/TwoPhaseModels/TwoPhaseFlowWithPPMaterialProperties.cpp
@@ -21,8 +21,8 @@
#include "MathLib/InterpolationAlgorithms/PiecewiseLinearInterpolation.h"
#include "MeshLib/Mesh.h"
#include "MeshLib/PropertyVector.h"
-#include "ProcessLib/Parameter/Parameter.h"
-#include "ProcessLib/Parameter/SpatialPosition.h"
+#include "ParameterLib/Parameter.h"
+#include "ParameterLib/SpatialPosition.h"
namespace MaterialLib
{
@@ -120,14 +120,14 @@ double TwoPhaseFlowWithPPMaterialProperties::getGasViscosity(
Eigen::MatrixXd const& TwoPhaseFlowWithPPMaterialProperties::getPermeability(
const int material_id, const double t,
- const ProcessLib::SpatialPosition& pos, const int /*dim*/) const
+ const ParameterLib::SpatialPosition& pos, const int /*dim*/) const
{
return _intrinsic_permeability_models[material_id]->getValue(t, pos, 0, 0);
}
double TwoPhaseFlowWithPPMaterialProperties::getPorosity(
const int material_id, const double t,
- const ProcessLib::SpatialPosition& pos, const double /*p*/,
+ const ParameterLib::SpatialPosition& pos, const double /*p*/,
const double T, const double porosity_variable) const
{
return _porosity_models[material_id]->getValue(t, pos, porosity_variable,
@@ -136,7 +136,7 @@ double TwoPhaseFlowWithPPMaterialProperties::getPorosity(
double TwoPhaseFlowWithPPMaterialProperties::getSaturation(
const int material_id, const double /*t*/,
- const ProcessLib::SpatialPosition& /*pos*/, const double /*p*/,
+ const ParameterLib::SpatialPosition& /*pos*/, const double /*p*/,
const double /*T*/, const double pc) const
{
return _capillary_pressure_models[material_id]->getSaturation(pc);
@@ -144,7 +144,7 @@ double TwoPhaseFlowWithPPMaterialProperties::getSaturation(
double TwoPhaseFlowWithPPMaterialProperties::getCapillaryPressure(
const int material_id, const double /*t*/,
- const ProcessLib::SpatialPosition& /*pos*/, const double /*p*/,
+ const ParameterLib::SpatialPosition& /*pos*/, const double /*p*/,
const double /*T*/, const double saturation) const
{
return _capillary_pressure_models[material_id]->getCapillaryPressure(
@@ -153,7 +153,7 @@ double TwoPhaseFlowWithPPMaterialProperties::getCapillaryPressure(
double TwoPhaseFlowWithPPMaterialProperties::getSaturationDerivative(
const int material_id, const double /*t*/,
- const ProcessLib::SpatialPosition& /*pos*/, const double /*p*/,
+ const ParameterLib::SpatialPosition& /*pos*/, const double /*p*/,
const double /*T*/, const double saturation) const
{
const double dpcdsw =
@@ -162,7 +162,7 @@ double TwoPhaseFlowWithPPMaterialProperties::getSaturationDerivative(
}
double TwoPhaseFlowWithPPMaterialProperties::getNonwetRelativePermeability(
- const double /*t*/, const ProcessLib::SpatialPosition& /*pos*/,
+ const double /*t*/, const ParameterLib::SpatialPosition& /*pos*/,
const double /*p*/, const double /*T*/, const double saturation) const
{
if (saturation < 0.)
@@ -177,7 +177,7 @@ double TwoPhaseFlowWithPPMaterialProperties::getNonwetRelativePermeability(
}
double TwoPhaseFlowWithPPMaterialProperties::getWetRelativePermeability(
- const double /*t*/, const ProcessLib::SpatialPosition& /*pos*/,
+ const double /*t*/, const ParameterLib::SpatialPosition& /*pos*/,
const double /*p*/, const double /*T*/, const double saturation) const
{
if (saturation < 0)
diff --git a/MaterialLib/TwoPhaseModels/TwoPhaseFlowWithPPMaterialProperties.h b/MaterialLib/TwoPhaseModels/TwoPhaseFlowWithPPMaterialProperties.h
index 4adb66bad51..b6f2811a399 100644
--- a/MaterialLib/TwoPhaseModels/TwoPhaseFlowWithPPMaterialProperties.h
+++ b/MaterialLib/TwoPhaseModels/TwoPhaseFlowWithPPMaterialProperties.h
@@ -82,21 +82,21 @@ public:
Eigen::MatrixXd const& getPermeability(
const int material_id,
const double t,
- const ProcessLib::SpatialPosition& pos,
+ const ParameterLib::SpatialPosition& pos,
const int dim) const;
double getPorosity(const int material_id, const double t,
- const ProcessLib::SpatialPosition& pos, const double p,
+ const ParameterLib::SpatialPosition& pos, const double p,
const double T, const double porosity_variable) const;
double getSaturation(const int material_id, const double t,
- const ProcessLib::SpatialPosition& pos, const double p,
- const double T, const double pc) const;
+ const ParameterLib::SpatialPosition& pos,
+ const double p, const double T, const double pc) const;
double getCapillaryPressure(const int material_id, const double t,
- const ProcessLib::SpatialPosition& pos,
+ const ParameterLib::SpatialPosition& pos,
const double p, const double T,
const double saturation) const;
double getSaturationDerivative(const int material_id, const double t,
- const ProcessLib::SpatialPosition& pos,
+ const ParameterLib::SpatialPosition& pos,
const double p, const double T,
const double saturation) const;
double getLiquidDensity(const double p, const double T) const;
@@ -104,12 +104,11 @@ public:
double getGasViscosity(const double p, const double T) const;
double getLiquidViscosity(const double p, const double T) const;
double getGasDensityDerivative(double const p, double const T) const;
- double getNonwetRelativePermeability(const double t,
- const ProcessLib::SpatialPosition& pos,
- const double p, const double T,
- const double saturation) const;
+ double getNonwetRelativePermeability(
+ const double t, const ParameterLib::SpatialPosition& pos,
+ const double p, const double T, const double saturation) const;
double getWetRelativePermeability(const double t,
- const ProcessLib::SpatialPosition& pos,
+ const ParameterLib::SpatialPosition& pos,
const double p, const double T,
const double saturation) const;
diff --git a/Tests/MaterialLib/TestFractureModels.cpp b/Tests/MaterialLib/TestFractureModels.cpp
index 4c8c815642c..a33206d8f1d 100644
--- a/Tests/MaterialLib/TestFractureModels.cpp
+++ b/Tests/MaterialLib/TestFractureModels.cpp
@@ -17,7 +17,7 @@
#include "MaterialLib/FractureModels/LinearElasticIsotropic.h"
#include "MaterialLib/FractureModels/MohrCoulomb.h"
-#include "ProcessLib/Parameter/ConstantParameter.h"
+#include "ParameterLib/ConstantParameter.h"
using namespace MaterialLib::Fracture;
@@ -26,8 +26,8 @@ static const double eps_C = 1e10*1e-5;
TEST(MaterialLib_Fracture, LinearElasticIsotropic)
{
- ProcessLib::ConstantParameter<double> const kn("", 1e11);
- ProcessLib::ConstantParameter<double> const ks("", 1e9);
+ ParameterLib::ConstantParameter<double> const kn("", 1e11);
+ ParameterLib::ConstantParameter<double> const ks("", 1e9);
LinearElasticIsotropic<2>::MaterialProperties const mp{kn, ks};
double const aperture0 = 1e-5;
@@ -47,7 +47,7 @@ TEST(MaterialLib_Fracture, LinearElasticIsotropic)
Eigen::Vector2d sigma;
Eigen::Matrix2d C;
- ProcessLib::SpatialPosition x;
+ ParameterLib::SpatialPosition x;
fractureModel.computeConstitutiveRelation(0, x, aperture0, sigma0, w_prev,
w, sigma_prev, sigma, C, *state);
@@ -73,11 +73,11 @@ TEST(MaterialLib_Fracture, LinearElasticIsotropic)
TEST(MaterialLib_Fracture, MohrCoulomb2D_elastic)
{
- ProcessLib::ConstantParameter<double> const kn("", 1e11);
- ProcessLib::ConstantParameter<double> const ks("", 1e9);
- ProcessLib::ConstantParameter<double> const phi("", 15);
- ProcessLib::ConstantParameter<double> const psi("", 5);
- ProcessLib::ConstantParameter<double> const c("", 3e16);
+ ParameterLib::ConstantParameter<double> const kn("", 1e11);
+ ParameterLib::ConstantParameter<double> const ks("", 1e9);
+ ParameterLib::ConstantParameter<double> const phi("", 15);
+ ParameterLib::ConstantParameter<double> const psi("", 5);
+ ParameterLib::ConstantParameter<double> const c("", 3e16);
MohrCoulomb<2>::MaterialProperties const mp{kn, ks, phi, psi, c};
double const aperture0 = 1;
@@ -96,7 +96,7 @@ TEST(MaterialLib_Fracture, MohrCoulomb2D_elastic)
Eigen::Vector2d sigma;
Eigen::Matrix2d C;
- ProcessLib::SpatialPosition x;
+ ParameterLib::SpatialPosition x;
fractureModel.computeConstitutiveRelation(0, x, aperture0, sigma0, w_prev,
w, sigma_prev, sigma, C, *state);
@@ -121,11 +121,11 @@ TEST(MaterialLib_Fracture, MohrCoulomb2D_elastic)
TEST(MaterialLib_Fracture, MohrCoulomb2D_negative_t)
{
- ProcessLib::ConstantParameter<double> const kn("", 50e9);
- ProcessLib::ConstantParameter<double> const ks("", 20e9);
- ProcessLib::ConstantParameter<double> const phi("", 15);
- ProcessLib::ConstantParameter<double> const psi("", 5);
- ProcessLib::ConstantParameter<double> const c("", 3e6);
+ ParameterLib::ConstantParameter<double> const kn("", 50e9);
+ ParameterLib::ConstantParameter<double> const ks("", 20e9);
+ ParameterLib::ConstantParameter<double> const phi("", 15);
+ ParameterLib::ConstantParameter<double> const psi("", 5);
+ ParameterLib::ConstantParameter<double> const c("", 3e6);
MohrCoulomb<2>::MaterialProperties const mp{kn, ks, phi, psi, c};
double const aperture0 = 1e-5;
@@ -144,7 +144,7 @@ TEST(MaterialLib_Fracture, MohrCoulomb2D_negative_t)
Eigen::Vector2d sigma;
Eigen::Matrix2d C;
- ProcessLib::SpatialPosition x;
+ ParameterLib::SpatialPosition x;
fractureModel.computeConstitutiveRelation(0, x, aperture0, sigma0, w_prev,
w, sigma_prev, sigma, C, *state);
@@ -160,11 +160,11 @@ TEST(MaterialLib_Fracture, MohrCoulomb2D_negative_t)
TEST(MaterialLib_Fracture, MohrCoulomb2D_positive_t)
{
- ProcessLib::ConstantParameter<double> const kn("", 50e9);
- ProcessLib::ConstantParameter<double> const ks("", 20e9);
- ProcessLib::ConstantParameter<double> const phi("", 15);
- ProcessLib::ConstantParameter<double> const psi("", 5);
- ProcessLib::ConstantParameter<double> const c("", 3e6);
+ ParameterLib::ConstantParameter<double> const kn("", 50e9);
+ ParameterLib::ConstantParameter<double> const ks("", 20e9);
+ ParameterLib::ConstantParameter<double> const phi("", 15);
+ ParameterLib::ConstantParameter<double> const psi("", 5);
+ ParameterLib::ConstantParameter<double> const c("", 3e6);
MohrCoulomb<2>::MaterialProperties const mp{kn, ks, phi, psi, c};
double const aperture0 = 1e-5;
@@ -183,7 +183,7 @@ TEST(MaterialLib_Fracture, MohrCoulomb2D_positive_t)
Eigen::Vector2d sigma;
Eigen::Matrix2d C;
- ProcessLib::SpatialPosition x;
+ ParameterLib::SpatialPosition x;
fractureModel.computeConstitutiveRelation(0, x, aperture0, sigma0, w_prev,
w, sigma_prev, sigma, C, *state);
@@ -198,11 +198,11 @@ TEST(MaterialLib_Fracture, MohrCoulomb2D_positive_t)
TEST(MaterialLib_Fracture, MohrCoulomb3D_negative_t1)
{
- ProcessLib::ConstantParameter<double> const kn("", 50e9);
- ProcessLib::ConstantParameter<double> const ks("", 20e9);
- ProcessLib::ConstantParameter<double> const phi("", 15);
- ProcessLib::ConstantParameter<double> const psi("", 5);
- ProcessLib::ConstantParameter<double> const c("", 3e6);
+ ParameterLib::ConstantParameter<double> const kn("", 50e9);
+ ParameterLib::ConstantParameter<double> const ks("", 20e9);
+ ParameterLib::ConstantParameter<double> const phi("", 15);
+ ParameterLib::ConstantParameter<double> const psi("", 5);
+ ParameterLib::ConstantParameter<double> const c("", 3e6);
MohrCoulomb<3>::MaterialProperties const mp{kn, ks, phi, psi, c};
double const aperture0 = 1e-5;
@@ -221,7 +221,7 @@ TEST(MaterialLib_Fracture, MohrCoulomb3D_negative_t1)
Eigen::Vector3d sigma;
Eigen::Matrix3d C;
- ProcessLib::SpatialPosition x;
+ ParameterLib::SpatialPosition x;
fractureModel.computeConstitutiveRelation(0, x, aperture0, sigma0, w_prev,
w, sigma_prev, sigma, C, *state);
@@ -242,11 +242,11 @@ TEST(MaterialLib_Fracture, MohrCoulomb3D_negative_t1)
TEST(MaterialLib_Fracture, MohrCoulomb3D_positive_t1)
{
- ProcessLib::ConstantParameter<double> const kn("", 50e9);
- ProcessLib::ConstantParameter<double> const ks("", 20e9);
- ProcessLib::ConstantParameter<double> const phi("", 15);
- ProcessLib::ConstantParameter<double> const psi("", 5);
- ProcessLib::ConstantParameter<double> const c("", 3e6);
+ ParameterLib::ConstantParameter<double> const kn("", 50e9);
+ ParameterLib::ConstantParameter<double> const ks("", 20e9);
+ ParameterLib::ConstantParameter<double> const phi("", 15);
+ ParameterLib::ConstantParameter<double> const psi("", 5);
+ ParameterLib::ConstantParameter<double> const c("", 3e6);
MohrCoulomb<3>::MaterialProperties const mp{kn, ks, phi, psi, c};
double const aperture0 = 1e-5;
@@ -265,7 +265,7 @@ TEST(MaterialLib_Fracture, MohrCoulomb3D_positive_t1)
Eigen::Vector3d sigma;
Eigen::Matrix3d C;
- ProcessLib::SpatialPosition x;
+ ParameterLib::SpatialPosition x;
fractureModel.computeConstitutiveRelation(0, x, aperture0, sigma0, w_prev,
w, sigma_prev, sigma, C, *state);
@@ -287,11 +287,11 @@ TEST(MaterialLib_Fracture, MohrCoulomb3D_positive_t1)
TEST(MaterialLib_Fracture, MohrCoulomb3D_positive_t2)
{
- ProcessLib::ConstantParameter<double> const kn("", 50e9);
- ProcessLib::ConstantParameter<double> const ks("", 20e9);
- ProcessLib::ConstantParameter<double> const phi("", 15);
- ProcessLib::ConstantParameter<double> const psi("", 5);
- ProcessLib::ConstantParameter<double> const c("", 3e6);
+ ParameterLib::ConstantParameter<double> const kn("", 50e9);
+ ParameterLib::ConstantParameter<double> const ks("", 20e9);
+ ParameterLib::ConstantParameter<double> const phi("", 15);
+ ParameterLib::ConstantParameter<double> const psi("", 5);
+ ParameterLib::ConstantParameter<double> const c("", 3e6);
MohrCoulomb<3>::MaterialProperties const mp{kn, ks, phi, psi, c};
double const aperture0 = 1e-5;
@@ -310,7 +310,7 @@ TEST(MaterialLib_Fracture, MohrCoulomb3D_positive_t2)
Eigen::Vector3d sigma;
Eigen::Matrix3d C;
- ProcessLib::SpatialPosition x;
+ ParameterLib::SpatialPosition x;
fractureModel.computeConstitutiveRelation(0, x, aperture0, sigma0, w_prev,
w, sigma_prev, sigma, C, *state);
@@ -332,11 +332,11 @@ TEST(MaterialLib_Fracture, MohrCoulomb3D_positive_t2)
TEST(MaterialLib_Fracture, MohrCoulomb3D_negative_t1t2)
{
- ProcessLib::ConstantParameter<double> const kn("", 50e9);
- ProcessLib::ConstantParameter<double> const ks("", 20e9);
- ProcessLib::ConstantParameter<double> const phi("", 15);
- ProcessLib::ConstantParameter<double> const psi("", 5);
- ProcessLib::ConstantParameter<double> const c("", 3e6);
+ ParameterLib::ConstantParameter<double> const kn("", 50e9);
+ ParameterLib::ConstantParameter<double> const ks("", 20e9);
+ ParameterLib::ConstantParameter<double> const phi("", 15);
+ ParameterLib::ConstantParameter<double> const psi("", 5);
+ ParameterLib::ConstantParameter<double> const c("", 3e6);
MohrCoulomb<3>::MaterialProperties const mp{kn, ks, phi, psi, c};
double const aperture0 = 1e-5;
@@ -356,7 +356,7 @@ TEST(MaterialLib_Fracture, MohrCoulomb3D_negative_t1t2)
Eigen::Vector3d sigma;
Eigen::Matrix3d C;
- ProcessLib::SpatialPosition x;
+ ParameterLib::SpatialPosition x;
fractureModel.computeConstitutiveRelation(0, x, aperture0, sigma0, w_prev,
w, sigma_prev, sigma, C, *state);
@@ -378,11 +378,11 @@ TEST(MaterialLib_Fracture, MohrCoulomb3D_negative_t1t2)
TEST(MaterialLib_Fracture, MohrCoulomb3D_negative_t1_positive_t2)
{
- ProcessLib::ConstantParameter<double> const kn("", 50e9);
- ProcessLib::ConstantParameter<double> const ks("", 20e9);
- ProcessLib::ConstantParameter<double> const phi("", 15);
- ProcessLib::ConstantParameter<double> const psi("", 5);
- ProcessLib::ConstantParameter<double> const c("", 3e6);
+ ParameterLib::ConstantParameter<double> const kn("", 50e9);
+ ParameterLib::ConstantParameter<double> const ks("", 20e9);
+ ParameterLib::ConstantParameter<double> const phi("", 15);
+ ParameterLib::ConstantParameter<double> const psi("", 5);
+ ParameterLib::ConstantParameter<double> const c("", 3e6);
MohrCoulomb<3>::MaterialProperties const mp{kn, ks, phi, psi, c};
double const aperture0 = 1e-5;
@@ -402,7 +402,7 @@ TEST(MaterialLib_Fracture, MohrCoulomb3D_negative_t1_positive_t2)
Eigen::Vector3d sigma;
Eigen::Matrix3d C;
- ProcessLib::SpatialPosition x;
+ ParameterLib::SpatialPosition x;
fractureModel.computeConstitutiveRelation(0, x, aperture0, sigma0, w_prev,
w, sigma_prev, sigma, C, *state);
--
GitLab