md changes due to rebase mistakes.

ufz · Jun 5, 2019 · 2b5e6e4 · 2b5e6e4
1 parent d1fea93
commit 2b5e6e4
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/MaterialLib/PorousMedium/Permeability/DupuitPermeability.h b/MaterialLib/PorousMedium/Permeability/DupuitPermeability.h
@@ -13,7 +13,7 @@
 
 #include "BaseLib/Error.h"
 #include "MaterialLib/PorousMedium/Permeability/Permeability.h"
-#include "ProcessLib/Parameter/Parameter.h"
+#include "ParameterLib/Parameter.h"
 
 namespace MaterialLib
 {
@@ -26,7 +26,7 @@ class DupuitPermeability final : public Permeability
 {
 public:
     explicit DupuitPermeability(
-        ProcessLib::Parameter<double> const& permeability_parameter,
+        ParameterLib::Parameter<double> const& permeability_parameter,
         int const dimension)
         : Permeability(permeability_parameter, dimension)
     {
@@ -43,7 +43,7 @@ class DupuitPermeability final : public Permeability
      */
     Eigen::MatrixXd const& getValue(
         const double t,
-        ProcessLib::SpatialPosition const& pos,
+        ParameterLib::SpatialPosition const& pos,
         const double variable,
         const double temperature) const override
     {

diff --git a/MaterialLib/PorousMedium/Permeability/createPermeabilityModel.cpp b/MaterialLib/PorousMedium/Permeability/createPermeabilityModel.cpp
@@ -59,7 +59,8 @@ std::unique_ptr<Permeability> createPermeabilityModel(
 
     if (type == "Dupuit")
     {
-        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/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler-impl.h b/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler-impl.h
@@ -74,7 +74,7 @@ void LiquidFlowLocalAssembler<ShapeFunction, IntegrationMethod, GlobalDim>::
     unsigned const n_integration_points =
         _integration_method.getNumberOfPoints();
 
-    SpatialPosition pos;
+    ParameterLib::SpatialPosition pos;
     pos.setElementID(_element.getID());
 
     // TODO: The following two variables should be calculated inside the
@@ -164,7 +164,7 @@ void LiquidFlowLocalAssembler<ShapeFunction, IntegrationMethod, GlobalDim>::
         const int material_id,
         const double t,
         std::vector<double> const& local_x,
-        SpatialPosition const& pos,
+        ParameterLib::SpatialPosition const& pos,
         MatrixOfVelocityAtIntegrationPoints& darcy_velocity_at_ips) const
 {
     auto const local_matrix_size = local_x.size();

diff --git a/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler.h b/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler.h
@@ -211,7 +211,7 @@ class LiquidFlowLocalAssembler : public LiquidFlowLocalAssemblerInterface
         const int material_id,
         const double t,
         std::vector<double> const& local_x,
-        SpatialPosition const& pos,
+        ParameterLib::SpatialPosition const& pos,
         MatrixOfVelocityAtIntegrationPoints& darcy_velocity_at_ips) const;
 
     const int _gravitational_axis_id;

diff --git a/ProcessLib/LiquidFlow/LiquidFlowMaterialProperties.cpp b/ProcessLib/LiquidFlow/LiquidFlowMaterialProperties.cpp
@@ -96,8 +96,9 @@ double LiquidFlowMaterialProperties::getMassCoefficient(
 }
 
 Eigen::MatrixXd const& LiquidFlowMaterialProperties::getPermeability(
-    const int material_id, const double t, const SpatialPosition& pos,
-    const int /*dim*/, double const p, double const T) const
+    const int material_id, const double t,
+    const ParameterLib::SpatialPosition& pos, const int /*dim*/, double const p,
+    double const T) const
 {
     return _intrinsic_permeability_models[material_id]->getValue(t, pos, p, T);
 }