From 4b52d24b9b159ba16aff7b46f03d7b0b6005ffc1 Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <dmitri.naumov@ufz.de>
Date: Thu, 9 Feb 2017 16:52:09 +0100
Subject: [PATCH] [MatL] Solids; Wrap Ehlers material model in ns.
---
MaterialLib/SolidModels/CreateEhlers.h | 6 +++++-
MaterialLib/SolidModels/Ehlers-impl.h | 3 +++
MaterialLib/SolidModels/Ehlers.cpp | 3 +++
MaterialLib/SolidModels/Ehlers.h | 3 +++
.../SmallDeformation/CreateSmallDeformationProcess.cpp | 2 +-
5 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/MaterialLib/SolidModels/CreateEhlers.h b/MaterialLib/SolidModels/CreateEhlers.h
index 1f80ef3eac9..656599de6ab 100644
--- a/MaterialLib/SolidModels/CreateEhlers.h
+++ b/MaterialLib/SolidModels/CreateEhlers.h
@@ -11,14 +11,17 @@
#include <logog/include/logog.hpp>
-#include "MechanicsBase.h"
#include "ProcessLib/Utils/ProcessUtils.h" // required for findParameter
+
#include "Ehlers.h"
+#include "MechanicsBase.h"
namespace MaterialLib
{
namespace Solids
{
+namespace Ehlers
+{
template <int DisplacementDim>
std::unique_ptr<MechanicsBase<DisplacementDim>> createEhlers(
std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters,
@@ -148,5 +151,6 @@ std::unique_ptr<MechanicsBase<DisplacementDim>> createEhlers(
new SolidEhlers<DisplacementDim>{mp}};
}
+} // namespace Ehlers
} // namespace Solids
} // namespace MaterialLib
diff --git a/MaterialLib/SolidModels/Ehlers-impl.h b/MaterialLib/SolidModels/Ehlers-impl.h
index 92b1a81733a..d5415da9d24 100644
--- a/MaterialLib/SolidModels/Ehlers-impl.h
+++ b/MaterialLib/SolidModels/Ehlers-impl.h
@@ -41,6 +41,8 @@ namespace MaterialLib
{
namespace Solids
{
+namespace Ehlers
+{
template <int DisplacementDim>
struct PhysicalStressWithInvariants final
{
@@ -654,5 +656,6 @@ bool SolidEhlers<DisplacementDim>::computeConstitutiveRelation(
return true;
}
+} // namespace Ehlers
} // namespace Solids
} // namespace MaterialLib
diff --git a/MaterialLib/SolidModels/Ehlers.cpp b/MaterialLib/SolidModels/Ehlers.cpp
index fcf2b1e6f9e..af91297bbd6 100644
--- a/MaterialLib/SolidModels/Ehlers.cpp
+++ b/MaterialLib/SolidModels/Ehlers.cpp
@@ -13,8 +13,11 @@ namespace MaterialLib
{
namespace Solids
{
+namespace Ehlers
+{
template class SolidEhlers<2>;
template class SolidEhlers<3>;
+} // namespace Ehlers
} // namespace Solids
} // namespace MaterialLib
diff --git a/MaterialLib/SolidModels/Ehlers.h b/MaterialLib/SolidModels/Ehlers.h
index 0a858a00c26..a9c14cf756f 100644
--- a/MaterialLib/SolidModels/Ehlers.h
+++ b/MaterialLib/SolidModels/Ehlers.h
@@ -36,6 +36,8 @@ namespace MaterialLib
{
namespace Solids
{
+namespace Ehlers
+{
template <int DisplacementDim>
class SolidEhlers final : public MechanicsBase<DisplacementDim>
@@ -207,6 +209,7 @@ private:
MaterialProperties _mp;
};
+} // namespace Ehlers
} // namespace Solids
} // namespace MaterialLib
#include "Ehlers-impl.h"
diff --git a/ProcessLib/SmallDeformation/CreateSmallDeformationProcess.cpp b/ProcessLib/SmallDeformation/CreateSmallDeformationProcess.cpp
index 1c19e13ca99..a00758073b6 100644
--- a/ProcessLib/SmallDeformation/CreateSmallDeformationProcess.cpp
+++ b/ProcessLib/SmallDeformation/CreateSmallDeformationProcess.cpp
@@ -81,7 +81,7 @@ createSmallDeformationProcess(
material = nullptr;
if (type == "Ehlers")
{
- material = MaterialLib::Solids::createEhlers<DisplacementDim>(
+ material = MaterialLib::Solids::Ehlers::createEhlers<DisplacementDim>(
parameters, constitutive_relation_config);
}
else if (type == "LinearElasticIsotropic")
--
GitLab