From ee4b553ed16e64cf4809a8f8695e725ba5b8cbd5 Mon Sep 17 00:00:00 2001
From: hanchuan <>
Date: Sat, 15 May 2021 23:36:57 +0200
Subject: [PATCH] [cleanup] Deprecate old NumeqVector Property

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

diff --git a/lecture/efm/1p2c_2p_2p2c/lens1p2cproblem.hh b/lecture/efm/1p2c_2p_2p2c/lens1p2cproblem.hh
index 60c20ba..aeb2e3b 100644
--- a/lecture/efm/1p2c_2p_2p2c/lens1p2cproblem.hh
+++ b/lecture/efm/1p2c_2p_2p2c/lens1p2cproblem.hh
@@ -28,6 +28,7 @@
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
@@ -71,7 +72,7 @@ class LensOnePTwoCProblem : public PorousMediumFlowProblem<TypeTag>
     using SubControlVolume = typename FVElementGeometry::SubControlVolume;
     using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
     using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
     using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
     enum {
         H2OIdx = FluidSystem::compIdx(FluidSystem::MultiPhaseFluidSystem::H2OIdx),
diff --git a/lecture/efm/1p2c_2p_2p2c/lens2p2cproblem.hh b/lecture/efm/1p2c_2p_2p2c/lens2p2cproblem.hh
index 5ce9064..c471820 100644
--- a/lecture/efm/1p2c_2p_2p2c/lens2p2cproblem.hh
+++ b/lecture/efm/1p2c_2p_2p2c/lens2p2cproblem.hh
@@ -28,6 +28,7 @@
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
@@ -71,7 +72,7 @@ class LensTwoPTwoCProblem: public PorousMediumFlowProblem<TypeTag>
     using SubControlVolume = typename FVElementGeometry::SubControlVolume;
     using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
     using Element = typename GridView::template Codim<0>::Entity;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
     using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
     static constexpr int dim = GridView::dimension;
     static constexpr int dimWorld = GridView::dimensionworld;
diff --git a/lecture/efm/1p2c_2p_2p2c/lens2pproblem.hh b/lecture/efm/1p2c_2p_2p2c/lens2pproblem.hh
index ee095fb..b070bea 100644
--- a/lecture/efm/1p2c_2p_2p2c/lens2pproblem.hh
+++ b/lecture/efm/1p2c_2p_2p2c/lens2pproblem.hh
@@ -28,6 +28,7 @@
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux{
@@ -69,7 +70,7 @@ class LensTwoPProblem : public PorousMediumFlowProblem<TypeTag>
     using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
     using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
 
 public:
     /*!
diff --git a/lecture/efm/1p2cvs2p/lens1p2cproblem.hh b/lecture/efm/1p2cvs2p/lens1p2cproblem.hh
index ee0e542..601b44a 100644
--- a/lecture/efm/1p2cvs2p/lens1p2cproblem.hh
+++ b/lecture/efm/1p2cvs2p/lens1p2cproblem.hh
@@ -30,6 +30,7 @@
 #include <dumux/common/parameters.hh>
 #include <dumux/common/boundarytypes.hh>
 #include <dumux/common/timeloop.hh>
+#include <dumux/common/numeqvector.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
@@ -71,7 +72,7 @@ class LensOnePTwoCProblem : public PorousMediumFlowProblem<TypeTag>
     using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
     using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
     using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
     using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
     using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
     static constexpr int dim = GridView::dimension;
diff --git a/lecture/efm/1p2cvs2p/lens2pproblem.hh b/lecture/efm/1p2cvs2p/lens2pproblem.hh
index ad062ba..63158c7 100644
--- a/lecture/efm/1p2cvs2p/lens2pproblem.hh
+++ b/lecture/efm/1p2cvs2p/lens2pproblem.hh
@@ -30,6 +30,7 @@
 #include <dumux/common/parameters.hh>
 #include <dumux/common/timeloop.hh>
 #include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
@@ -83,7 +84,7 @@ class LensTwoPProblem : public PorousMediumFlowProblem<TypeTag>
     using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
     using SubControlVolume = typename FVElementGeometry::SubControlVolume;
     using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
     using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
     // primary variable indices
     static constexpr int pressureIdx = Indices::pressureIdx;
diff --git a/lecture/efm/2p/lens2pproblem.hh b/lecture/efm/2p/lens2pproblem.hh
index 1ec7e23..c2761f1 100644
--- a/lecture/efm/2p/lens2pproblem.hh
+++ b/lecture/efm/2p/lens2pproblem.hh
@@ -30,6 +30,7 @@
 #include <dumux/common/parameters.hh>
 #include <dumux/common/timeloop.hh>
 #include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
@@ -75,8 +76,8 @@ class LensTwoPProblem : public PorousMediumFlowProblem<TypeTag>
     using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
     using FluidState = GetPropType<TypeTag, Properties::FluidState>;
     using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
     // primary variable indices
     static constexpr int pressureIdx = Indices::pressureIdx;
     static constexpr int saturationIdx = Indices::saturationIdx;
diff --git a/lecture/mm/co2plume/co2plumeshapeproblem.hh b/lecture/mm/co2plume/co2plumeshapeproblem.hh
index 7faea94..0d71c76 100644
--- a/lecture/mm/co2plume/co2plumeshapeproblem.hh
+++ b/lecture/mm/co2plume/co2plumeshapeproblem.hh
@@ -26,6 +26,7 @@
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 #include <dumux/material/fluidsystems/brineco2.hh>
@@ -104,7 +105,7 @@ class PlumeShapeProblem : public PorousMediumFlowProblem<TypeTag>
 #endif
 
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
     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/columnxylene/columnxyleneproblem.hh b/lecture/mm/columnxylene/columnxyleneproblem.hh
index 59cb58f..a251d3f 100644
--- a/lecture/mm/columnxylene/columnxyleneproblem.hh
+++ b/lecture/mm/columnxylene/columnxyleneproblem.hh
@@ -27,6 +27,7 @@
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 #define ISOTHERMAL 0
@@ -87,7 +88,7 @@ class ColumnProblem : public PorousMediumFlowProblem<TypeTag>
     };
 
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
     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/convectivemixing/convmixproblem.hh b/lecture/mm/convectivemixing/convmixproblem.hh
index 0000480..07c72d8 100644
--- a/lecture/mm/convectivemixing/convmixproblem.hh
+++ b/lecture/mm/convectivemixing/convmixproblem.hh
@@ -27,6 +27,7 @@
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 #include <dumux/material/fluidsystems/brineco2.hh>
@@ -53,7 +54,7 @@ class ConvmixProblem : public PorousMediumFlowProblem<TypeTag>
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
     using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
     using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
     using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
     using ElementFluxVariablesCache = typename GridVariables::GridFluxVariablesCache::LocalView;
     using ElementVolumeVariables = typename GridVariables::GridVolumeVariables::LocalView;
diff --git a/lecture/mm/fractures/fractureproblem.hh b/lecture/mm/fractures/fractureproblem.hh
index 8f19fe2..7f32eac 100644
--- a/lecture/mm/fractures/fractureproblem.hh
+++ b/lecture/mm/fractures/fractureproblem.hh
@@ -26,6 +26,7 @@
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
 // include the base problem we inherit from
 #include <dumux/porousmediumflow/problem.hh>
 
@@ -41,10 +42,10 @@ class FractureSubProblem : public PorousMediumFlowProblem<TypeTag>
 
     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>;
-    using ElementVolumeVariables = typename GridVariables::GridVolumeVariables::LocalView;
     using PrimaryVariables = typename GridVariables::PrimaryVariables;
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
+    using ElementVolumeVariables = typename GridVariables::GridVolumeVariables::LocalView;
     using Scalar = typename GridVariables::Scalar;
 
     using FVGridGeometry = typename GridVariables::GridGeometry;
diff --git a/lecture/mm/fractures/matrixproblem.hh b/lecture/mm/fractures/matrixproblem.hh
index b3986a9..bb556bf 100644
--- a/lecture/mm/fractures/matrixproblem.hh
+++ b/lecture/mm/fractures/matrixproblem.hh
@@ -29,6 +29,7 @@
 #include <dumux/common/boundarytypes.hh>
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
+#include <dumux/common/numeqvector.hh>
 
 // include the base problem we inherit from
 #include <dumux/porousmediumflow/problem.hh>
@@ -45,9 +46,9 @@ class MatrixSubProblem : public PorousMediumFlowProblem<TypeTag>
 
     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>;
     using PrimaryVariables = typename GridVariables::PrimaryVariables;
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
     using Scalar = typename GridVariables::Scalar;
 
     using FVGridGeometry = typename GridVariables::GridGeometry;
diff --git a/lecture/mm/fuelcell/fuelcellproblem.hh b/lecture/mm/fuelcell/fuelcellproblem.hh
index f52a427..2c3e82a 100644
--- a/lecture/mm/fuelcell/fuelcellproblem.hh
+++ b/lecture/mm/fuelcell/fuelcellproblem.hh
@@ -27,6 +27,7 @@
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 #if !ISOTHERMAL
@@ -53,7 +54,8 @@ class FuelCellLectureProblem : public PorousMediumFlowProblem<TypeTag>
     using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
     using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
     using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
     static constexpr int dim = GridView::dimension;
     static constexpr int numComponents = GetPropType<TypeTag, Properties::ModelTraits>::numFluidComponents();
 #if !ISOTHERMAL
@@ -66,7 +68,6 @@ class FuelCellLectureProblem : public PorousMediumFlowProblem<TypeTag>
 #endif
     static constexpr int conti0EqIdx = Indices::conti0EqIdx;
     using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
-    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
     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/heatpipe/heatpipeproblem.hh b/lecture/mm/heatpipe/heatpipeproblem.hh
index 877e839..5748ef2 100644
--- a/lecture/mm/heatpipe/heatpipeproblem.hh
+++ b/lecture/mm/heatpipe/heatpipeproblem.hh
@@ -22,6 +22,7 @@
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux
@@ -41,7 +42,7 @@ class HeatPipeProblem : public PorousMediumFlowProblem<TypeTag>
     using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
 
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
     using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
 
 public:
diff --git a/lecture/mm/heavyoil/sagd/problem.hh b/lecture/mm/heavyoil/sagd/problem.hh
index eba1af4..781517e 100644
--- a/lecture/mm/heavyoil/sagd/problem.hh
+++ b/lecture/mm/heavyoil/sagd/problem.hh
@@ -26,6 +26,7 @@
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
@@ -66,7 +67,7 @@ class SagdProblem : public PorousMediumFlowProblem<TypeTag>
     };
 
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
     using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
     using ElementFluxVariablesCache = typename GridVariables::GridFluxVariablesCache::LocalView;
     using ElementVolumeVariables = typename GridVariables::GridVolumeVariables::LocalView;
diff --git a/lecture/mm/heavyoil/sagdcyclic/problem.hh b/lecture/mm/heavyoil/sagdcyclic/problem.hh
index 30a3607..c006c05 100644
--- a/lecture/mm/heavyoil/sagdcyclic/problem.hh
+++ b/lecture/mm/heavyoil/sagdcyclic/problem.hh
@@ -26,6 +26,7 @@
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
@@ -66,7 +67,7 @@ class SagdCyclicProblem : public PorousMediumFlowProblem<TypeTag>
     };
 
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
     using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
     using Problem = GetPropType<TypeTag, Properties::Problem>;
     using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
diff --git a/lecture/mm/heavyoil/sagdcyclichyst/problem.hh b/lecture/mm/heavyoil/sagdcyclichyst/problem.hh
index 40bd7bf..a7c6b00 100644
--- a/lecture/mm/heavyoil/sagdcyclichyst/problem.hh
+++ b/lecture/mm/heavyoil/sagdcyclichyst/problem.hh
@@ -26,6 +26,7 @@
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
@@ -66,7 +67,7 @@ class SagdCyclicHystProblem : public PorousMediumFlowProblem<TypeTag>
     };
 
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
     using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
     using Problem = GetPropType<TypeTag, Properties::Problem>;
     using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
diff --git a/lecture/mm/henryproblem/henry1p2c/henry1p2cproblem.hh b/lecture/mm/henryproblem/henry1p2c/henry1p2cproblem.hh
index dcbe493..2c0a22b 100644
--- a/lecture/mm/henryproblem/henry1p2c/henry1p2cproblem.hh
+++ b/lecture/mm/henryproblem/henry1p2c/henry1p2cproblem.hh
@@ -27,6 +27,7 @@
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
@@ -43,7 +44,7 @@ class Henry1p2cProblem : public PorousMediumFlowProblem<TypeTag>
     using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
     using Element = typename GridView::template Codim<0>::Entity;
     using ElementIterator = typename GridView::template Codim<0>::Iterator;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
     using ParentType = PorousMediumFlowProblem<TypeTag>;
     using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
     using ElementFluxVariablesCache = typename GridVariables::GridFluxVariablesCache::LocalView;
diff --git a/lecture/mm/henryproblem/henry2p/henry2pproblem.hh b/lecture/mm/henryproblem/henry2p/henry2pproblem.hh
index 72a7048..ecaebba 100644
--- a/lecture/mm/henryproblem/henry2p/henry2pproblem.hh
+++ b/lecture/mm/henryproblem/henry2p/henry2pproblem.hh
@@ -29,6 +29,7 @@
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
@@ -41,7 +42,8 @@ class Henry2pProblem : public PorousMediumFlowProblem<TypeTag>
     using Scalar = GetPropType<TypeTag, Properties::Scalar>;
     using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
     using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
     using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
     // primary variable indices
     static constexpr int pressureIdx = Indices::pressureIdx;
@@ -51,7 +53,6 @@ class Henry2pProblem : public PorousMediumFlowProblem<TypeTag>
     // Grid and world dimension
     static constexpr int dim = GridView::dimension;
     static constexpr int dimWorld = GridView::dimensionworld;
-    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
     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 bb3fd9d..6bc6273 100644
--- a/lecture/mm/naplinfiltration/3p/problem.hh
+++ b/lecture/mm/naplinfiltration/3p/problem.hh
@@ -27,6 +27,7 @@
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux
@@ -78,7 +79,7 @@ class InfiltrationThreePProblem : public PorousMediumFlowProblem<TypeTag>
     };
 
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
     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 a5c1291..3139c39 100644
--- a/lecture/mm/naplinfiltration/3p3c/problem.hh
+++ b/lecture/mm/naplinfiltration/3p3c/problem.hh
@@ -27,6 +27,7 @@
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.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 NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
     using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
     using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
 
diff --git a/lecture/mm/remediationscenarios/remediationscenariosproblem.hh b/lecture/mm/remediationscenarios/remediationscenariosproblem.hh
index 4735516..b14e88c 100644
--- a/lecture/mm/remediationscenarios/remediationscenariosproblem.hh
+++ b/lecture/mm/remediationscenarios/remediationscenariosproblem.hh
@@ -29,6 +29,7 @@
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
@@ -95,7 +96,7 @@ class KuevetteProblem : public PorousMediumFlowProblem<TypeTag>
     };
 
     using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+    using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
     using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
     using Element = typename GridView::template Codim<0>::Entity;
     using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
-- 
GitLab