[MatL] Solids: Cleanup includes.

MaterialLib/SolidModels/CreateEhlers.h

@@ -9,12 +9,8 @@
 
 #pragma once
 
-#include <logog/include/logog.hpp>
-
 #include "ProcessLib/Utils/ProcessUtils.h"  // required for findParameter
-
 #include "Ehlers.h"
-#include "MechanicsBase.h"
 
 namespace MaterialLib
 {
@@ -67,7 +63,7 @@ inline std::unique_ptr<DamagePropertiesParameters> createDamageProperties(
 }
 
 template <int DisplacementDim>
-std::unique_ptr<MechanicsBase<DisplacementDim>> createEhlers(
+std::unique_ptr<SolidEhlers<DisplacementDim>> createEhlers(
     std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters,
     BaseLib::ConfigTree const& config)
 {
@@ -194,7 +190,7 @@ std::unique_ptr<MechanicsBase<DisplacementDim>> createEhlers(
     auto const nonlinear_solver_parameters =
         createNewtonRaphsonSolverParameters(nonlinear_solver_config);
 
-    return std::unique_ptr<MechanicsBase<DisplacementDim>>{
+    return std::unique_ptr<SolidEhlers<DisplacementDim>>{
         new SolidEhlers<DisplacementDim>{nonlinear_solver_parameters, mp,
                                          std::move(ehlers_damage_properties)}};
 }

MaterialLib/SolidModels/CreateLubby2.h

@@ -9,12 +9,9 @@
 
 #pragma once
 
-#include <logog/include/logog.hpp>
-
 #include "ProcessLib/Utils/ProcessUtils.h"  // required for findParameter
 
 #include "Lubby2.h"
-#include "MechanicsBase.h"
 
 namespace MaterialLib
 {
@@ -42,7 +39,7 @@ createNewtonRaphsonSolverParameters(BaseLib::ConfigTree const& config)
 }
 
 template <int DisplacementDim>
-std::unique_ptr<MechanicsBase<DisplacementDim>> createLubby2(
+std::unique_ptr<Lubby2<DisplacementDim>> createLubby2(
     std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters,
     BaseLib::ConfigTree const& config)
 {
@@ -126,7 +123,7 @@ std::unique_ptr<MechanicsBase<DisplacementDim>> createLubby2(
     auto const nonlinear_solver_parameters =
         createNewtonRaphsonSolverParameters(nonlinear_solver_config);
 
-    return std::unique_ptr<MechanicsBase<DisplacementDim>>{
+    return std::unique_ptr<Lubby2<DisplacementDim>>{
         new Lubby2<DisplacementDim>{nonlinear_solver_parameters, mp}};
 }
 

MaterialLib/SolidModels/Ehlers.h

@@ -19,18 +19,13 @@
 
 #pragma once
 
-#include <cfloat>
-#include <memory>
 #ifndef NDEBUG
 #include <ostream>
 #endif
 
-#include <Eigen/Dense>
-#include <logog/include/logog.hpp>
-#include <utility>
-
 #include "BaseLib/Error.h"
 #include "NumLib/NewtonRaphson.h"
+#include "ProcessLib/Parameter/Parameter.h"
 
 #include "KelvinVector.h"
 #include "MechanicsBase.h"

MaterialLib/SolidModels/LinearElasticIsotropic.h

@@ -9,9 +9,8 @@
 
 #pragma once
 
-#include <utility>
-
 #include "MechanicsBase.h"
+#include "ProcessLib/Parameter/Parameter.h"
 
 namespace MaterialLib
 {

MaterialLib/SolidModels/Lubby2.h

@@ -9,11 +9,8 @@
 
 #pragma once
 
-#include <logog/include/logog.hpp>
-#include <utility>
-
-#include "BaseLib/Error.h"
 #include "NumLib/NewtonRaphson.h"
+#include "ProcessLib/Parameter/Parameter.h"
 
 #include "KelvinVector.h"
 #include "MechanicsBase.h"

MaterialLib/SolidModels/MechanicsBase.h

@@ -13,7 +13,11 @@
 #include <tuple>
 
 #include "ProcessLib/Deformation/BMatrixPolicy.h"
-#include "ProcessLib/Parameter/Parameter.h"
+
+namespace ProcessLib
+{
+class SpatialPosition;
+}
 
 namespace MeshLib
 {