From e35463ac3f4ed2ea19407d62db1f42daf5b93025 Mon Sep 17 00:00:00 2001
From: Ned Coltman <edward.coltman@iws.uni-stuttgart.de>
Date: Wed, 28 Oct 2020 12:30:32 +0100
Subject: [PATCH] [boundarytypes] update derivation of boundarytypes

---
 lecture/efm/1p2c_2p_2p2c/lens1p2cproblem.hh                | 4 ++--
 lecture/efm/1p2c_2p_2p2c/lens2p2cproblem.hh                | 4 ++--
 lecture/efm/1p2c_2p_2p2c/lens2pproblem.hh                  | 4 ++--
 lecture/efm/1p2cvs2p/lens1p2cproblem.hh                    | 5 +++--
 lecture/efm/1p2cvs2p/lens2pproblem.hh                      | 5 +++--
 lecture/efm/2p/lens2pproblem.hh                            | 5 +++--
 lecture/mm/co2plume/co2plumeshapeproblem.hh                | 4 ++--
 lecture/mm/columnxylene/columnxyleneproblem.hh             | 4 ++--
 lecture/mm/convectivemixing/convmixproblem.hh              | 4 ++--
 lecture/mm/fractures/fractureproblem.hh                    | 4 ++--
 lecture/mm/fractures/matrixproblem.hh                      | 4 ++--
 lecture/mm/fuelcell/fuelcellproblem.hh                     | 4 ++--
 lecture/mm/heatpipe/heatpipeproblem.hh                     | 4 ++--
 lecture/mm/heavyoil/sagd/problem.hh                        | 4 ++--
 lecture/mm/heavyoil/sagdcyclic/problem.hh                  | 4 ++--
 lecture/mm/heavyoil/sagdcyclichyst/problem.hh              | 4 ++--
 lecture/mm/henryproblem/henry1p2c/henry1p2cproblem.hh      | 4 ++--
 lecture/mm/henryproblem/henry2p/henry2pproblem.hh          | 4 ++--
 lecture/mm/naplinfiltration/3p/problem.hh                  | 5 ++---
 lecture/mm/naplinfiltration/3p3c/problem.hh                | 3 ++-
 .../mm/remediationscenarios/remediationscenariosproblem.hh | 7 +++----
 21 files changed, 46 insertions(+), 44 deletions(-)

diff --git a/lecture/efm/1p2c_2p_2p2c/lens1p2cproblem.hh b/lecture/efm/1p2c_2p_2p2c/lens1p2cproblem.hh
index ecf451d..60c20ba 100644
--- a/lecture/efm/1p2c_2p_2p2c/lens1p2cproblem.hh
+++ b/lecture/efm/1p2c_2p_2p2c/lens1p2cproblem.hh
@@ -27,9 +27,9 @@
 
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
-
 namespace Dumux {
 
 /*!
@@ -64,7 +64,7 @@ class LensOnePTwoCProblem : public PorousMediumFlowProblem<TypeTag>
     using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
     using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+    using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
     using Element = typename GridView::template Codim<0>::Entity;
     using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
     using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
diff --git a/lecture/efm/1p2c_2p_2p2c/lens2p2cproblem.hh b/lecture/efm/1p2c_2p_2p2c/lens2p2cproblem.hh
index 0c57726..5ce9064 100644
--- a/lecture/efm/1p2c_2p_2p2c/lens2p2cproblem.hh
+++ b/lecture/efm/1p2c_2p_2p2c/lens2p2cproblem.hh
@@ -27,9 +27,9 @@
 
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
-
 namespace Dumux {
 
 
@@ -65,7 +65,7 @@ class LensTwoPTwoCProblem: public PorousMediumFlowProblem<TypeTag>
     using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
     using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+    using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
     using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
     using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
     using SubControlVolume = typename FVElementGeometry::SubControlVolume;
diff --git a/lecture/efm/1p2c_2p_2p2c/lens2pproblem.hh b/lecture/efm/1p2c_2p_2p2c/lens2pproblem.hh
index 2f43f7b..ee095fb 100644
--- a/lecture/efm/1p2c_2p_2p2c/lens2pproblem.hh
+++ b/lecture/efm/1p2c_2p_2p2c/lens2pproblem.hh
@@ -27,9 +27,9 @@
 
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
-
 namespace Dumux{
 
 /*!
@@ -68,7 +68,7 @@ class LensTwoPProblem : public PorousMediumFlowProblem<TypeTag>
     using Element = typename GridView::template Codim<0>::Entity;
     using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+    using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
     using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
 
 public:
diff --git a/lecture/efm/1p2cvs2p/lens1p2cproblem.hh b/lecture/efm/1p2cvs2p/lens1p2cproblem.hh
index 4b4845d..ee0e542 100644
--- a/lecture/efm/1p2cvs2p/lens1p2cproblem.hh
+++ b/lecture/efm/1p2cvs2p/lens1p2cproblem.hh
@@ -28,8 +28,9 @@
 
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
-#include <dumux/porousmediumflow/problem.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/common/timeloop.hh>
+#include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
 
@@ -65,7 +66,7 @@ class LensOnePTwoCProblem : public PorousMediumFlowProblem<TypeTag>
     using Scalar = GetPropType<TypeTag, Properties::Scalar>;
     using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+    using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
     using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
     using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
     using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
diff --git a/lecture/efm/1p2cvs2p/lens2pproblem.hh b/lecture/efm/1p2cvs2p/lens2pproblem.hh
index 1834c99..ad062ba 100644
--- a/lecture/efm/1p2cvs2p/lens2pproblem.hh
+++ b/lecture/efm/1p2cvs2p/lens2pproblem.hh
@@ -28,8 +28,9 @@
 
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
-#include <dumux/porousmediumflow/problem.hh>
 #include <dumux/common/timeloop.hh>
+#include <dumux/common/boundarytypes.hh>
+#include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
 
@@ -77,7 +78,7 @@ class LensTwoPProblem : public PorousMediumFlowProblem<TypeTag>
     using Element = typename GridView::template Codim<0>::Entity;
     using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+    using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
     using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
     using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
     using SubControlVolume = typename FVElementGeometry::SubControlVolume;
diff --git a/lecture/efm/2p/lens2pproblem.hh b/lecture/efm/2p/lens2pproblem.hh
index be2dee0..1ec7e23 100644
--- a/lecture/efm/2p/lens2pproblem.hh
+++ b/lecture/efm/2p/lens2pproblem.hh
@@ -28,8 +28,9 @@
 
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
-#include <dumux/porousmediumflow/problem.hh>
 #include <dumux/common/timeloop.hh>
+#include <dumux/common/boundarytypes.hh>
+#include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
 
@@ -73,7 +74,7 @@ class LensTwoPProblem : public PorousMediumFlowProblem<TypeTag>
     using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
     using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
     using FluidState = GetPropType<TypeTag, Properties::FluidState>;
-    using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+    using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
     using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
     // primary variable indices
diff --git a/lecture/mm/co2plume/co2plumeshapeproblem.hh b/lecture/mm/co2plume/co2plumeshapeproblem.hh
index 4d42db1..7faea94 100644
--- a/lecture/mm/co2plume/co2plumeshapeproblem.hh
+++ b/lecture/mm/co2plume/co2plumeshapeproblem.hh
@@ -25,7 +25,7 @@
 
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
-
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 #include <dumux/material/fluidsystems/brineco2.hh>
@@ -105,7 +105,7 @@ class PlumeShapeProblem : public PorousMediumFlowProblem<TypeTag>
 
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
     using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
-    using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+    using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
     using Element = typename GridView::template Codim<0>::Entity;
     using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
     using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
diff --git a/lecture/mm/columnxylene/columnxyleneproblem.hh b/lecture/mm/columnxylene/columnxyleneproblem.hh
index 74e348b..59cb58f 100644
--- a/lecture/mm/columnxylene/columnxyleneproblem.hh
+++ b/lecture/mm/columnxylene/columnxyleneproblem.hh
@@ -26,7 +26,7 @@
 
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
-
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 #define ISOTHERMAL 0
@@ -88,7 +88,7 @@ class ColumnProblem : public PorousMediumFlowProblem<TypeTag>
 
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
     using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
-    using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+    using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
     using Element = typename GridView::template Codim<0>::Entity;
     using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
     using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
diff --git a/lecture/mm/convectivemixing/convmixproblem.hh b/lecture/mm/convectivemixing/convmixproblem.hh
index 69a0dfb..0000480 100644
--- a/lecture/mm/convectivemixing/convmixproblem.hh
+++ b/lecture/mm/convectivemixing/convmixproblem.hh
@@ -26,7 +26,7 @@
 
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
-
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 #include <dumux/material/fluidsystems/brineco2.hh>
@@ -49,7 +49,7 @@ class ConvmixProblem : public PorousMediumFlowProblem<TypeTag>
     using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
     using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
     using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+    using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
     using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
     using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
diff --git a/lecture/mm/fractures/fractureproblem.hh b/lecture/mm/fractures/fractureproblem.hh
index ab6cc6b..8f19fe2 100644
--- a/lecture/mm/fractures/fractureproblem.hh
+++ b/lecture/mm/fractures/fractureproblem.hh
@@ -25,7 +25,7 @@
 
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
-
+#include <dumux/common/boundarytypes.hh>
 // include the base problem we inherit from
 #include <dumux/porousmediumflow/problem.hh>
 
@@ -39,7 +39,7 @@ class FractureSubProblem : public PorousMediumFlowProblem<TypeTag>
 {
     using ParentType = PorousMediumFlowProblem<TypeTag>;
 
-    using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+    using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
     using CouplingManager = GetPropType<TypeTag, Properties::CouplingManager>;
     using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
     using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
diff --git a/lecture/mm/fractures/matrixproblem.hh b/lecture/mm/fractures/matrixproblem.hh
index 5794bf6..b3986a9 100644
--- a/lecture/mm/fractures/matrixproblem.hh
+++ b/lecture/mm/fractures/matrixproblem.hh
@@ -26,7 +26,7 @@
 // we need this in this test in order to define the domain
 // id of the fracture problem (see function interiorBoundaryTypes())
 #include <dune/common/indices.hh>
-
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 
@@ -43,7 +43,7 @@ class MatrixSubProblem : public PorousMediumFlowProblem<TypeTag>
 {
     using ParentType = PorousMediumFlowProblem<TypeTag>;
 
-    using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+    using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
     using CouplingManager = GetPropType<TypeTag, Properties::CouplingManager>;
     using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
     using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
diff --git a/lecture/mm/fuelcell/fuelcellproblem.hh b/lecture/mm/fuelcell/fuelcellproblem.hh
index c6d7f23..f52a427 100644
--- a/lecture/mm/fuelcell/fuelcellproblem.hh
+++ b/lecture/mm/fuelcell/fuelcellproblem.hh
@@ -26,7 +26,7 @@
 
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
-
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 #if !ISOTHERMAL
@@ -67,7 +67,7 @@ class FuelCellLectureProblem : public PorousMediumFlowProblem<TypeTag>
     static constexpr int conti0EqIdx = Indices::conti0EqIdx;
     using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+    using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
     using Element = typename GridView::template Codim<0>::Entity;
     using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
     using FVElementGeometry = typename FVGridGeometry::LocalView;
diff --git a/lecture/mm/heatpipe/heatpipeproblem.hh b/lecture/mm/heatpipe/heatpipeproblem.hh
index 87c20ba..877e839 100644
--- a/lecture/mm/heatpipe/heatpipeproblem.hh
+++ b/lecture/mm/heatpipe/heatpipeproblem.hh
@@ -21,7 +21,7 @@
 
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
-
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux
@@ -42,7 +42,7 @@ class HeatPipeProblem : public PorousMediumFlowProblem<TypeTag>
 
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
     using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
-    using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+    using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
 
 public:
     HeatPipeProblem(std::shared_ptr<const FVGridGeometry> fVGridGeometry)
diff --git a/lecture/mm/heavyoil/sagd/problem.hh b/lecture/mm/heavyoil/sagd/problem.hh
index 417c64d..eba1af4 100644
--- a/lecture/mm/heavyoil/sagd/problem.hh
+++ b/lecture/mm/heavyoil/sagd/problem.hh
@@ -25,7 +25,7 @@
 
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
-
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
@@ -70,7 +70,7 @@ class SagdProblem : public PorousMediumFlowProblem<TypeTag>
     using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
     using ElementFluxVariablesCache = typename GridVariables::GridFluxVariablesCache::LocalView;
     using ElementVolumeVariables = typename GridVariables::GridVolumeVariables::LocalView;
-    using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+    using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
     using Element = typename GridView::template Codim<0>::Entity;
     using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
     using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
diff --git a/lecture/mm/heavyoil/sagdcyclic/problem.hh b/lecture/mm/heavyoil/sagdcyclic/problem.hh
index 424b61d..30a3607 100644
--- a/lecture/mm/heavyoil/sagdcyclic/problem.hh
+++ b/lecture/mm/heavyoil/sagdcyclic/problem.hh
@@ -25,7 +25,7 @@
 
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
-
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
@@ -72,7 +72,7 @@ class SagdCyclicProblem : public PorousMediumFlowProblem<TypeTag>
     using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
     using ElementFluxVariablesCache = typename GridVariables::GridFluxVariablesCache::LocalView;
     using ElementVolumeVariables = typename GridVariables::GridVolumeVariables::LocalView;
-    using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+    using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
     using Element = typename GridView::template Codim<0>::Entity;
     using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
     using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
diff --git a/lecture/mm/heavyoil/sagdcyclichyst/problem.hh b/lecture/mm/heavyoil/sagdcyclichyst/problem.hh
index 9866c6c..40bd7bf 100644
--- a/lecture/mm/heavyoil/sagdcyclichyst/problem.hh
+++ b/lecture/mm/heavyoil/sagdcyclichyst/problem.hh
@@ -25,7 +25,7 @@
 
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
-
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
@@ -72,7 +72,7 @@ class SagdCyclicHystProblem : public PorousMediumFlowProblem<TypeTag>
     using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
     using ElementFluxVariablesCache = typename GridVariables::GridFluxVariablesCache::LocalView;
     using ElementVolumeVariables = typename GridVariables::GridVolumeVariables::LocalView;
-    using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+    using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
     using Element = typename GridView::template Codim<0>::Entity;
     using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
     using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
diff --git a/lecture/mm/henryproblem/henry1p2c/henry1p2cproblem.hh b/lecture/mm/henryproblem/henry1p2c/henry1p2cproblem.hh
index fd2ee5f..dcbe493 100644
--- a/lecture/mm/henryproblem/henry1p2c/henry1p2cproblem.hh
+++ b/lecture/mm/henryproblem/henry1p2c/henry1p2cproblem.hh
@@ -26,7 +26,7 @@
 
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
-
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
@@ -39,7 +39,7 @@ class Henry1p2cProblem : public PorousMediumFlowProblem<TypeTag>
     using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
     using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+    using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
     using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
     using Element = typename GridView::template Codim<0>::Entity;
     using ElementIterator = typename GridView::template Codim<0>::Iterator;
diff --git a/lecture/mm/henryproblem/henry2p/henry2pproblem.hh b/lecture/mm/henryproblem/henry2p/henry2pproblem.hh
index b2883b7..72a7048 100644
--- a/lecture/mm/henryproblem/henry2p/henry2pproblem.hh
+++ b/lecture/mm/henryproblem/henry2p/henry2pproblem.hh
@@ -28,7 +28,7 @@
 
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
-
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
@@ -52,7 +52,7 @@ class Henry2pProblem : public PorousMediumFlowProblem<TypeTag>
     static constexpr int dim = GridView::dimension;
     static constexpr int dimWorld = GridView::dimensionworld;
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+    using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
     using Element = typename GridView::template Codim<0>::Entity;
     using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
 
diff --git a/lecture/mm/naplinfiltration/3p/problem.hh b/lecture/mm/naplinfiltration/3p/problem.hh
index f2d074c..e102c47 100644
--- a/lecture/mm/naplinfiltration/3p/problem.hh
+++ b/lecture/mm/naplinfiltration/3p/problem.hh
@@ -26,10 +26,9 @@
 
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
-
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
-
 namespace Dumux
 {
 /*!
@@ -80,7 +79,7 @@ class InfiltrationThreePProblem : public PorousMediumFlowProblem<TypeTag>
 
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
     using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
-    using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+    using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
     using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
     using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
 
diff --git a/lecture/mm/naplinfiltration/3p3c/problem.hh b/lecture/mm/naplinfiltration/3p3c/problem.hh
index c1a9dee..f843be7 100644
--- a/lecture/mm/naplinfiltration/3p3c/problem.hh
+++ b/lecture/mm/naplinfiltration/3p3c/problem.hh
@@ -26,6 +26,7 @@
 
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux
@@ -89,7 +90,7 @@ class InfiltrationThreePThreeCProblem : public PorousMediumFlowProblem<TypeTag>
 
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
     using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
-    using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+    using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
     using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
 
     using Element = typename GridView::template Codim<0>::Entity;
diff --git a/lecture/mm/remediationscenarios/remediationscenariosproblem.hh b/lecture/mm/remediationscenarios/remediationscenariosproblem.hh
index da999f9..4735516 100644
--- a/lecture/mm/remediationscenarios/remediationscenariosproblem.hh
+++ b/lecture/mm/remediationscenarios/remediationscenariosproblem.hh
@@ -25,12 +25,11 @@
 #ifndef DUMUX_REMEDIATIONSCENARIOS_PROBLEM_HH
 #define DUMUX_REMEDIATIONSCENARIOS_PROBLEM_HH
 
+#include <dune/common/float_cmp.hh>
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/porousmediumflow/problem.hh>
-#include <dune/common/float_cmp.hh>
-
-
 
 namespace Dumux {
 
@@ -97,7 +96,7 @@ class KuevetteProblem : public PorousMediumFlowProblem<TypeTag>
 
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
     using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
-    using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
+    using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
     using Element = typename GridView::template Codim<0>::Entity;
     using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
     using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
-- 
GitLab