diff --git a/dumux/assembly/boxlocalresidual.hh b/dumux/assembly/boxlocalresidual.hh
index 5be788e52929caadf54040f7e7c7b39de3020edc..5b8853c4c75cd01101537354948cffaf63828de7 100644
--- a/dumux/assembly/boxlocalresidual.hh
+++ b/dumux/assembly/boxlocalresidual.hh
@@ -29,6 +29,7 @@
#include <dune/istl/matrix.hh>
#include <dumux/common/properties.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/assembly/fvlocalresidual.hh>
#include <dumux/discretization/extrusion.hh>
@@ -55,7 +56,7 @@ class BoxLocalResidual : public FVLocalResidual<TypeTag>
using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
using ElementFluxVariablesCache = typename GetPropType<TypeTag, Properties::GridFluxVariablesCache>::LocalView;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<GetPropType<TypeTag, Properties::PrimaryVariables>>;
public:
using ElementResidualVector = typename ParentType::ElementResidualVector;
diff --git a/dumux/assembly/cclocalassembler.hh b/dumux/assembly/cclocalassembler.hh
index a539283a120d08d81fb0b0f80fa9a75a52c71d6e..408fd9b7ec1470cb9c1e5a51ce11e71c2d2aa04d 100644
--- a/dumux/assembly/cclocalassembler.hh
+++ b/dumux/assembly/cclocalassembler.hh
@@ -33,6 +33,7 @@
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
#include <dumux/common/numericdifferentiation.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/assembly/numericepsilon.hh>
#include <dumux/assembly/diffmethod.hh>
#include <dumux/assembly/fvlocalassemblerbase.hh>
@@ -61,7 +62,7 @@ class CCLocalAssemblerBase : public FVLocalAssemblerBase<TypeTag, Assembler, Imp
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<GetPropType<TypeTag, Properties::PrimaryVariables>>;
public:
@@ -133,7 +134,7 @@ class CCLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, /*implicit=*/tru
using ThisType = CCLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, true>;
using ParentType = CCLocalAssemblerBase<TypeTag, Assembler, ThisType, true>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<GetPropType<TypeTag, Properties::PrimaryVariables>>;
using Element = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView::template Codim<0>::Entity;
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using FVElementGeometry = typename GridGeometry::LocalView;
@@ -359,7 +360,7 @@ class CCLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, /*implicit=*/fal
using ThisType = CCLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, false>;
using ParentType = CCLocalAssemblerBase<TypeTag, Assembler, ThisType, false>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<GetPropType<TypeTag, Properties::PrimaryVariables>>;
using Element = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView::template Codim<0>::Entity;
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
using JacobianMatrix = GetPropType<TypeTag, Properties::JacobianMatrix>;
@@ -491,7 +492,7 @@ class CCLocalAssembler<TypeTag, Assembler, DiffMethod::analytic, /*implicit=*/tr
{
using ThisType = CCLocalAssembler<TypeTag, Assembler, DiffMethod::analytic, true>;
using ParentType = CCLocalAssemblerBase<TypeTag, Assembler, ThisType, true>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<GetPropType<TypeTag, Properties::PrimaryVariables>>;
using JacobianMatrix = GetPropType<TypeTag, Properties::JacobianMatrix>;
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
using Problem = typename GridVariables::GridVolumeVariables::Problem;
@@ -608,7 +609,7 @@ class CCLocalAssembler<TypeTag, Assembler, DiffMethod::analytic, /*implicit=*/fa
{
using ThisType = CCLocalAssembler<TypeTag, Assembler, DiffMethod::analytic, false>;
using ParentType = CCLocalAssemblerBase<TypeTag, Assembler, ThisType, false>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<GetPropType<TypeTag, Properties::PrimaryVariables>>;
using JacobianMatrix = GetPropType<TypeTag, Properties::JacobianMatrix>;
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
using Problem = typename GridVariables::GridVolumeVariables::Problem;
diff --git a/dumux/assembly/cclocalresidual.hh b/dumux/assembly/cclocalresidual.hh
index 3c2759a4211c5af53b84ea122f2bf51bcec24f29..e69b73f760260a2c45b1e3fade473e45c59c03ae 100644
--- a/dumux/assembly/cclocalresidual.hh
+++ b/dumux/assembly/cclocalresidual.hh
@@ -27,6 +27,7 @@
#include <dumux/common/reservedblockvector.hh>
#include <dumux/common/properties.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/assembly/fvlocalresidual.hh>
#include <dumux/discretization/extrusion.hh>
@@ -43,7 +44,7 @@ class CCLocalResidual : public FVLocalResidual<TypeTag>
using ParentType = FVLocalResidual<TypeTag>;
using Problem = GetPropType<TypeTag, Properties::Problem>;
using Element = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView::template Codim<0>::Entity;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<GetPropType<TypeTag, Properties::PrimaryVariables>>;
using ElementBoundaryTypes = GetPropType<TypeTag, Properties::ElementBoundaryTypes>;
using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
using ElementFluxVariablesCache = typename GetPropType<TypeTag, Properties::GridFluxVariablesCache>::LocalView;
diff --git a/dumux/assembly/fvlocalresidual.hh b/dumux/assembly/fvlocalresidual.hh
index 3bbe70d4df80fe875ed7dfd782b829a8b16b4846..01713a4ee693540c8ea55919067810b5983671ac 100644
--- a/dumux/assembly/fvlocalresidual.hh
+++ b/dumux/assembly/fvlocalresidual.hh
@@ -30,6 +30,7 @@
#include <dumux/common/properties.hh>
#include <dumux/common/timeloop.hh>
#include <dumux/common/reservedblockvector.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/discretization/method.hh>
#include <dumux/discretization/extrusion.hh>
@@ -55,7 +56,7 @@ class FVLocalResidual
using SubControlVolume = typename GridGeometry::SubControlVolume;
using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace;
using Extrusion = Extrusion_t<GridGeometry>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<GetPropType<TypeTag, Properties::PrimaryVariables>>;
using ElementBoundaryTypes = GetPropType<TypeTag, Properties::ElementBoundaryTypes>;
using ElementFluxVariablesCache = typename GetPropType<TypeTag, Properties::GridFluxVariablesCache>::LocalView;
using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
diff --git a/dumux/common/fvproblem.hh b/dumux/common/fvproblem.hh
index f3063569475d9ea073ead553445ac21c90927da7..7d12ea3f21718e224fca446fdd37811bfb9a751f 100644
--- a/dumux/common/fvproblem.hh
+++ b/dumux/common/fvproblem.hh
@@ -33,6 +33,7 @@
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
#include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/discretization/method.hh>
#include <dumux/discretization/extrusion.hh>
@@ -75,7 +76,7 @@ class FVProblem
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<GetPropType<TypeTag, Properties::PrimaryVariables>>;
using BoundaryTypes = Dumux::BoundaryTypes<PrimaryVariables::size()>;
public:
diff --git a/dumux/common/pointsource.hh b/dumux/common/pointsource.hh
index ff83a403057f3dc80461d45155143df0a7bbeb86..c5df970e139f884919103bfc5b06d25bbd149314 100644
--- a/dumux/common/pointsource.hh
+++ b/dumux/common/pointsource.hh
@@ -31,6 +31,7 @@
#include <dune/common/reservedvector.hh>
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/geometry/boundingboxtree.hh>
#include <dumux/geometry/intersectspointgeometry.hh>
#include <dumux/geometry/intersectingentities.hh>
@@ -210,10 +211,10 @@ private:
template<class TypeTag>
class SolDependentPointSource : public PointSource<Dune::FieldVector<typename GetPropType<TypeTag, Properties::GridGeometry>::GridView::ctype,
GetPropType<TypeTag, Properties::GridGeometry>::GridView::dimensionworld>,
- GetPropType<TypeTag, Properties::NumEqVector>>
+ Dumux::NumEqVector<GetPropType<TypeTag, Properties::PrimaryVariables>>>
{
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
- using SourceValues = GetPropType<TypeTag, Properties::NumEqVector>;
+ using SourceValues = Dumux::NumEqVector<GetPropType<TypeTag, Properties::PrimaryVariables>>;
using Problem = GetPropType<TypeTag, Properties::Problem>;
using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
diff --git a/dumux/common/properties/grid.hh b/dumux/common/properties/grid.hh
index 1adddcea0207ecc3548da9c3958a1ae33e3f6c19..e13bd74f4185edf4250385aebb84bbfa30b96106 100644
--- a/dumux/common/properties/grid.hh
+++ b/dumux/common/properties/grid.hh
@@ -28,6 +28,7 @@
#include <dumux/common/properties.hh>
#include <dumux/common/pointsource.hh>
+#include <dumux/common/numeqvector.hh>
namespace Dumux {
namespace Properties {
@@ -42,7 +43,7 @@ template<class TypeTag>
struct PointSource<TypeTag, TTag::GridProperties>
{
private:
- using SourceValues = GetPropType<TypeTag, Properties::NumEqVector>;
+ using SourceValues = Dumux::NumEqVector<GetPropType<TypeTag, Properties::PrimaryVariables>>;
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using GlobalPosition = typename Dune::FieldVector<typename GridView::ctype, GridView::dimensionworld>;
public:
diff --git a/dumux/common/staggeredfvproblem.hh b/dumux/common/staggeredfvproblem.hh
index c74db38cfa03121be5c8a1a4966721fa97ae036b..c328243660dd37e3cffe9d61d4ec41570deef5b2 100644
--- a/dumux/common/staggeredfvproblem.hh
+++ b/dumux/common/staggeredfvproblem.hh
@@ -29,6 +29,7 @@
#include <dumux/common/properties.hh>
#include <dumux/common/fvproblem.hh>
+#include <dumux/common/numeqvector.hh>
namespace Dumux {
@@ -61,7 +62,7 @@ class StaggeredFVProblem : public FVProblem<TypeTag>
using FVElementGeometry = typename GridGeometry::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<GetPropType<TypeTag, Properties::PrimaryVariables>>;
using CoordScalar = typename GridView::ctype;
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
diff --git a/dumux/freeflow/shallowwater/fluxvariables.hh b/dumux/freeflow/shallowwater/fluxvariables.hh
index 1b70f8f767cf011fc24ca85766c1d70a1990dd02..22660557e2ca99155c4b9fcb629a6be1626e90e0 100644
--- a/dumux/freeflow/shallowwater/fluxvariables.hh
+++ b/dumux/freeflow/shallowwater/fluxvariables.hh
@@ -25,6 +25,7 @@
#define DUMUX_FREEFLOW_SHALLOW_WATER_FLUXVARIABLES_HH
#include <dumux/common/properties.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/flux/fluxvariablesbase.hh>
namespace Dumux {
@@ -43,7 +44,7 @@ class ShallowWaterFluxVariables
{
using Problem = GetPropType<TypeTag, Properties::Problem>;
using ModelTraits = GetPropType<TypeTag, Properties::ModelTraits>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<GetPropType<TypeTag, Properties::PrimaryVariables>>;
using AdvectionType = GetPropType<TypeTag, Properties::AdvectionType>;
using ViscousFluxType = GetPropType<TypeTag, Properties::ViscousFluxType>;
diff --git a/dumux/freeflow/shallowwater/localresidual.hh b/dumux/freeflow/shallowwater/localresidual.hh
index 1c00928c848d297dca2be331f147368074ef71b7..225794f22bab18478f58492c298cfef30c376936 100644
--- a/dumux/freeflow/shallowwater/localresidual.hh
+++ b/dumux/freeflow/shallowwater/localresidual.hh
@@ -26,6 +26,7 @@
#include <dumux/common/parameters.hh>
#include <dumux/common/properties.hh>
+#include <dumux/common/numeqvector.hh>
namespace Dumux{
@@ -40,7 +41,7 @@ class ShallowWaterResidual
using ParentType = GetPropType<TypeTag, Properties::BaseLocalResidual>;
using Problem = GetPropType<TypeTag, Properties::Problem>;
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<GetPropType<TypeTag, Properties::PrimaryVariables>>;
using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
using ElementFluxVariablesCache = typename GetPropType<TypeTag, Properties::GridFluxVariablesCache>::LocalView;
diff --git a/dumux/freeflow/shallowwater/model.hh b/dumux/freeflow/shallowwater/model.hh
index bf2a9d745656ef3d89c75f8237cfa9c6748bc601..4932bc4c94928b9e14222574ab16a0182565e9cd 100644
--- a/dumux/freeflow/shallowwater/model.hh
+++ b/dumux/freeflow/shallowwater/model.hh
@@ -64,6 +64,7 @@
#include <dumux/common/properties.hh>
#include <dumux/common/properties/model.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/flux/shallowwaterflux.hh>
#include <dumux/flux/shallowwaterviscousflux.hh>
@@ -156,11 +157,11 @@ struct IOFields<TypeTag, TTag::ShallowWater>
template<class TypeTag>
struct AdvectionType<TypeTag, TTag::ShallowWater>
-{ using type = ShallowWaterFlux< GetPropType<TypeTag, Properties::NumEqVector> >; };
+{ using type = ShallowWaterFlux< Dumux::NumEqVector<GetPropType<TypeTag, Properties::PrimaryVariables>> >; };
template<class TypeTag>
struct ViscousFluxType<TypeTag, TTag::ShallowWater>
-{ using type = ShallowWaterViscousFlux< GetPropType<TypeTag, Properties::PrimaryVariables>, GetPropType<TypeTag, Properties::NumEqVector> >; };
+{ using type = ShallowWaterViscousFlux< GetPropType<TypeTag, Properties::PrimaryVariables>, Dumux::NumEqVector<GetPropType<TypeTag, Properties::PrimaryVariables>> >; };
} // end properties
} // end namespace Dumux
diff --git a/dumux/geomechanics/elastic/localresidual.hh b/dumux/geomechanics/elastic/localresidual.hh
index cf4bc3972c810ac88bb682d6b34aae1dfce835aa..c0f2e1bbfe5386f2a181d19c9ef42cfab3b858ae 100644
--- a/dumux/geomechanics/elastic/localresidual.hh
+++ b/dumux/geomechanics/elastic/localresidual.hh
@@ -28,6 +28,7 @@
#include <dumux/common/parameters.hh>
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
+#include <dumux/common/numeqvector.hh>
namespace Dumux {
@@ -49,7 +50,7 @@ class ElasticLocalResidual : public GetPropType<TypeTag, Properties::BaseLocalRe
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<GetPropType<TypeTag, Properties::PrimaryVariables>>;
using ElementFluxVariablesCache = typename GetPropType<TypeTag, Properties::GridFluxVariablesCache>::LocalView;
using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
using VolumeVariables = typename ElementVolumeVariables::VolumeVariables;
diff --git a/dumux/geomechanics/poroelastic/localresidual.hh b/dumux/geomechanics/poroelastic/localresidual.hh
index 9ee1188a70d8135bec27d4a4076d879c6e4071ef..ad65f0d81cbc9e9cda8a9c304a464aed383e3c5f 100644
--- a/dumux/geomechanics/poroelastic/localresidual.hh
+++ b/dumux/geomechanics/poroelastic/localresidual.hh
@@ -26,6 +26,7 @@
#define DUMUX_PRORELASTIC_LOCAL_RESIDUAL_HH
#include <dumux/common/properties.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/geomechanics/elastic/localresidual.hh>
namespace Dumux {
@@ -48,7 +49,7 @@ class PoroElasticLocalResidual: public ElasticLocalResidual<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<GetPropType<TypeTag, Properties::PrimaryVariables>>;
using ElementFluxVariablesCache = typename GetPropType<TypeTag, Properties::GridFluxVariablesCache>::LocalView;
using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
using VolumeVariables = typename ElementVolumeVariables::VolumeVariables;
diff --git a/dumux/multidomain/boundary/darcydarcy/couplingmanager.hh b/dumux/multidomain/boundary/darcydarcy/couplingmanager.hh
index 35323f130bde721cd357e0898642e598996d91d3..61fc26db77179234a9746b017f21ee4057b54bc2 100644
--- a/dumux/multidomain/boundary/darcydarcy/couplingmanager.hh
+++ b/dumux/multidomain/boundary/darcydarcy/couplingmanager.hh
@@ -33,6 +33,7 @@
#include <dumux/common/properties.hh>
#include <dumux/common/math.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/discretization/elementsolution.hh>
#include <dumux/discretization/method.hh>
#include <dumux/discretization/cellcentered/tpfa/computetransmissibility.hh>
@@ -57,7 +58,7 @@ class DarcyDarcyBoundaryCouplingManager
template<std::size_t i> using SubDomainTypeTag = typename MDTraits::template SubDomain<i>::TypeTag;
template<std::size_t i> using Problem = GetPropType<SubDomainTypeTag<i>, Properties::Problem>;
template<std::size_t i> using PrimaryVariables = GetPropType<SubDomainTypeTag<i>, Properties::PrimaryVariables>;
- template<std::size_t i> using NumEqVector = GetPropType<SubDomainTypeTag<i>, Properties::NumEqVector>;
+ template<std::size_t i> using NumEqVector = Dumux::NumEqVector<PrimaryVariables<i>>;
template<std::size_t i> using ElementVolumeVariables = typename GetPropType<SubDomainTypeTag<i>, Properties::GridVolumeVariables>::LocalView;
template<std::size_t i> using VolumeVariables = typename GetPropType<SubDomainTypeTag<i>, Properties::GridVolumeVariables>::VolumeVariables;
template<std::size_t i> using GridGeometry = typename MDTraits::template SubDomain<i>::GridGeometry;
diff --git a/dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh b/dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh
index 29fbb1e21712ecca16bca03b847b5b0bf3c2aec3..e7884f18e598caf3bc8b63d5ef54ad23d14adfb0 100644
--- a/dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh
+++ b/dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh
@@ -31,6 +31,7 @@
#include <dune/common/float_cmp.hh>
#include <dune/common/exceptions.hh>
#include <dumux/common/properties.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/multidomain/staggeredcouplingmanager.hh>
#include <dumux/discretization/staggered/elementsolution.hh>
@@ -75,7 +76,8 @@ private:
template<std::size_t id> using GridView = typename GetPropType<SubDomainTypeTag<id>, Properties::GridGeometry>::GridView;
template<std::size_t id> using Problem = GetPropType<SubDomainTypeTag<id>, Properties::Problem>;
- template<std::size_t id> using NumEqVector = GetPropType<SubDomainTypeTag<id>, Properties::NumEqVector>;
+ template<std::size_t id> using PrimaryVariables = typename MDTraits::template SubDomain<id>::PrimaryVariables;
+ template<std::size_t id> using NumEqVector = Dumux::NumEqVector<PrimaryVariables<id>>;
template<std::size_t id> using ElementVolumeVariables = typename GetPropType<SubDomainTypeTag<id>, Properties::GridVolumeVariables>::LocalView;
template<std::size_t id> using GridVolumeVariables = GetPropType<SubDomainTypeTag<id>, Properties::GridVolumeVariables>;
template<std::size_t id> using VolumeVariables = typename GetPropType<SubDomainTypeTag<id>, Properties::GridVolumeVariables>::VolumeVariables;
@@ -85,7 +87,6 @@ private:
template<std::size_t id> using ElementFluxVariablesCache = typename GetPropType<SubDomainTypeTag<id>, Properties::GridFluxVariablesCache>::LocalView;
template<std::size_t id> using GridVariables = GetPropType<SubDomainTypeTag<id>, Properties::GridVariables>;
template<std::size_t id> using Element = typename GridView<id>::template Codim<0>::Entity;
- template<std::size_t id> using PrimaryVariables = typename MDTraits::template SubDomain<id>::PrimaryVariables;
template<std::size_t id> using SubControlVolumeFace = typename FVElementGeometry<id>::SubControlVolumeFace;
using CellCenterSolutionVector = GetPropType<StokesTypeTag, Properties::CellCenterSolutionVector>;
diff --git a/dumux/multidomain/embedded/circleaveragepointsourcetraits.hh b/dumux/multidomain/embedded/circleaveragepointsourcetraits.hh
index e2e5df8963a4633fb22d69bfc3d12250d8dee186..b95651cb34074658ab5b03deded8d2a4f97a406b 100644
--- a/dumux/multidomain/embedded/circleaveragepointsourcetraits.hh
+++ b/dumux/multidomain/embedded/circleaveragepointsourcetraits.hh
@@ -26,6 +26,7 @@
#define DUMUX_MULTIDOMAIN_EMBEDDED_CIRCLE_AVERAGE_POINT_SOURCE_TRAITS_HH
#include <dumux/common/properties.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/multidomain/embedded/pointsourcedata.hh>
#include <dumux/multidomain/embedded/integrationpointsource.hh>
@@ -38,7 +39,7 @@ struct CircleAveragePointSourceTraits
private:
template<std::size_t i> using SubDomainTypeTag = typename MDTraits::template SubDomain<i>::TypeTag;
template<std::size_t i> using GridGeometry = GetPropType<SubDomainTypeTag<i>, Properties::GridGeometry>;
- template<std::size_t i> using NumEqVector = GetPropType<SubDomainTypeTag<i>, Properties::NumEqVector>;
+ template<std::size_t i> using NumEqVector = Dumux::NumEqVector<GetPropType<SubDomainTypeTag<i>, Properties::PrimaryVariables>>;
public:
//! export the point source type for domain i
template<std::size_t i>
diff --git a/dumux/multidomain/embedded/couplingmanagerbase.hh b/dumux/multidomain/embedded/couplingmanagerbase.hh
index 11928c42bb6f1016286950ce4b297b5a959c02e0..943f246fb97759d9a70faa9d2f7936f5c229e181 100644
--- a/dumux/multidomain/embedded/couplingmanagerbase.hh
+++ b/dumux/multidomain/embedded/couplingmanagerbase.hh
@@ -36,6 +36,7 @@
#include <dune/geometry/quadraturerules.hh>
#include <dumux/common/properties.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/geometry/distance.hh>
#include <dumux/geometry/intersectingentities.hh>
#include <dumux/discretization/method.hh>
@@ -53,7 +54,7 @@ struct DefaultPointSourceTraits
private:
template<std::size_t i> using SubDomainTypeTag = typename MDTraits::template SubDomain<i>::TypeTag;
template<std::size_t i> using GridGeometry = GetPropType<SubDomainTypeTag<i>, Properties::GridGeometry>;
- template<std::size_t i> using NumEqVector = GetPropType<SubDomainTypeTag<i>, Properties::NumEqVector>;
+ template<std::size_t i> using NumEqVector = Dumux::NumEqVector<GetPropType<SubDomainTypeTag<i>, Properties::PrimaryVariables>>;
public:
//! export the point source type for domain i
template<std::size_t i>
diff --git a/dumux/multidomain/facet/box/couplingmanager.hh b/dumux/multidomain/facet/box/couplingmanager.hh
index 732705b5b77f5b8f5407c685d4b49c44a16d9dd3..3c8a0f5d7d3d27f959374ebc3757dbacedfbf1fe 100644
--- a/dumux/multidomain/facet/box/couplingmanager.hh
+++ b/dumux/multidomain/facet/box/couplingmanager.hh
@@ -28,6 +28,7 @@
#include <cassert>
#include <dumux/common/properties.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/discretization/method.hh>
#include <dumux/discretization/elementsolution.hh>
#include <dumux/multidomain/couplingmanager.hh>
@@ -64,7 +65,7 @@ class FacetCouplingManager<MDTraits, CouplingMapper, bulkDomainId, lowDimDomainI
// further types specific to the sub-problems
template<std::size_t id> using PrimaryVariables = GetPropType<SubDomainTypeTag<id>, Properties::PrimaryVariables>;
template<std::size_t id> using Problem = GetPropType<SubDomainTypeTag<id>, Properties::Problem>;
- template<std::size_t id> using NumEqVector = GetPropType<SubDomainTypeTag<id>, Properties::NumEqVector>;
+ template<std::size_t id> using NumEqVector = Dumux::NumEqVector<PrimaryVariables<id>>;
template<std::size_t id> using ElementBoundaryTypes = GetPropType<SubDomainTypeTag<id>, Properties::ElementBoundaryTypes>;
template<std::size_t id> using LocalResidual = GetPropType<SubDomainTypeTag<id>, Properties::LocalResidual>;
diff --git a/dumux/multidomain/facet/box/localresidual.hh b/dumux/multidomain/facet/box/localresidual.hh
index 15649e07b313e739290944f2a2d9f6967e4c480b..aff125fe8a87a9bfa2dcc208b4efa411ef1e34f4 100644
--- a/dumux/multidomain/facet/box/localresidual.hh
+++ b/dumux/multidomain/facet/box/localresidual.hh
@@ -28,6 +28,7 @@
#include <dune/geometry/type.hh>
#include <dumux/common/properties.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/assembly/fvlocalresidual.hh>
#include <dumux/discretization/extrusion.hh>
@@ -53,7 +54,7 @@ class BoxFacetCouplingLocalResidual : public FVLocalResidual<TypeTag>
using ElementBoundaryTypes = GetPropType<TypeTag, Properties::ElementBoundaryTypes>;
using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
using ElementFluxVariablesCache = typename GetPropType<TypeTag, Properties::GridFluxVariablesCache>::LocalView;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<GetPropType<TypeTag, Properties::PrimaryVariables>>;
public:
using ElementResidualVector = typename ParentType::ElementResidualVector;
diff --git a/dumux/multidomain/facet/cellcentered/localresidual.hh b/dumux/multidomain/facet/cellcentered/localresidual.hh
index 77819a5918fbe23c97643c724bed83c2a65e52d1..4d70b14a21266bd35b45a009e9d24fd272d75c8b 100644
--- a/dumux/multidomain/facet/cellcentered/localresidual.hh
+++ b/dumux/multidomain/facet/cellcentered/localresidual.hh
@@ -28,6 +28,7 @@
#define DUMUX_FACETCOUPLING_CC_LOCAL_RESIDUAL_HH
#include <dumux/common/properties.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/assembly/cclocalresidual.hh>
namespace Dumux {
@@ -53,7 +54,7 @@ class CCFacetCouplingLocalResidual : public CCLocalResidual<TypeTag>
using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace;
using Element = typename GridGeometry::GridView::template Codim<0>::Entity;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<GetPropType<TypeTag, Properties::PrimaryVariables>>;
public:
//! pull up the parent's constructor
diff --git a/dumux/multidomain/facet/cellcentered/mpfa/couplingmanager.hh b/dumux/multidomain/facet/cellcentered/mpfa/couplingmanager.hh
index ed364cf7040267ea57b247930750de12bf5f5454..d38f2b6311885ce657712b930fc95829dd58cfae 100644
--- a/dumux/multidomain/facet/cellcentered/mpfa/couplingmanager.hh
+++ b/dumux/multidomain/facet/cellcentered/mpfa/couplingmanager.hh
@@ -30,6 +30,7 @@
#include <dumux/common/properties.hh>
#include <dumux/common/indextraits.hh>
#include <dumux/common/numericdifferentiation.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/assembly/numericepsilon.hh>
#include <dumux/discretization/method.hh>
@@ -68,7 +69,7 @@ class FacetCouplingManager<MDTraits, CouplingMapper, bulkDomainId, lowDimDomainI
// further types specific to the sub-problems
template<std::size_t id> using Scalar = GetPropType<SubDomainTypeTag<id>, Properties::Scalar>;
template<std::size_t id> using Problem = GetPropType<SubDomainTypeTag<id>, Properties::Problem>;
- template<std::size_t id> using NumEqVector = GetPropType<SubDomainTypeTag<id>, Properties::NumEqVector>;
+ template<std::size_t id> using NumEqVector = Dumux::NumEqVector<GetPropType<SubDomainTypeTag<id>, Properties::PrimaryVariables>>;
template<std::size_t id> using GridGeometry = GetPropType<SubDomainTypeTag<id>, Properties::GridGeometry>;
template<std::size_t id> using FVElementGeometry = typename GridGeometry<id>::LocalView;
template<std::size_t id> using SubControlVolume = typename GridGeometry<id>::SubControlVolume;
diff --git a/dumux/multidomain/facet/cellcentered/tpfa/couplingmanager.hh b/dumux/multidomain/facet/cellcentered/tpfa/couplingmanager.hh
index 19fca678a62f42656425f09dd2e7f29f1b994be1..08556c0c4a8a48a7a7d74f913f3e9d4832b2bc05 100644
--- a/dumux/multidomain/facet/cellcentered/tpfa/couplingmanager.hh
+++ b/dumux/multidomain/facet/cellcentered/tpfa/couplingmanager.hh
@@ -29,6 +29,7 @@
#include <dumux/common/properties.hh>
#include <dumux/common/indextraits.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/discretization/method.hh>
#include <dumux/discretization/elementsolution.hh>
#include <dumux/multidomain/couplingmanager.hh>
@@ -65,7 +66,7 @@ class FacetCouplingManager<MDTraits, CouplingMapper, bulkDomainId, lowDimDomainI
// further types specific to the sub-problems
template<std::size_t id> using PrimaryVariables = GetPropType<SubDomainTypeTag<id>, Properties::PrimaryVariables>;
template<std::size_t id> using Problem = GetPropType<SubDomainTypeTag<id>, Properties::Problem>;
- template<std::size_t id> using NumEqVector = GetPropType<SubDomainTypeTag<id>, Properties::NumEqVector>;
+ template<std::size_t id> using NumEqVector = Dumux::NumEqVector<PrimaryVariables<id>>;
template<std::size_t id> using LocalResidual = GetPropType<SubDomainTypeTag<id>, Properties::LocalResidual>;
template<std::size_t id> using GridGeometry = GetPropType<SubDomainTypeTag<id>, Properties::GridGeometry>;
diff --git a/dumux/multidomain/subdomainboxlocalassembler.hh b/dumux/multidomain/subdomainboxlocalassembler.hh
index 2cab40adc1046a2f88d0f06d62e911f69e179c00..f81dfaca33335c5eddd24f0a7e4e059d8b0907dc 100644
--- a/dumux/multidomain/subdomainboxlocalassembler.hh
+++ b/dumux/multidomain/subdomainboxlocalassembler.hh
@@ -36,6 +36,7 @@
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
#include <dumux/common/numericdifferentiation.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/assembly/numericepsilon.hh>
#include <dumux/assembly/diffmethod.hh>
#include <dumux/assembly/fvlocalassemblerbase.hh>
@@ -60,7 +61,7 @@ class SubDomainBoxLocalAssemblerBase : public FVLocalAssemblerBase<TypeTag, Asse
using ParentType = FVLocalAssemblerBase<TypeTag, Assembler,Implementation, implicit>;
using Problem = GetPropType<TypeTag, Properties::Problem>;
- using LocalResidualValues = GetPropType<TypeTag, Properties::NumEqVector>;
+ using LocalResidualValues = Dumux::NumEqVector<GetPropType<TypeTag, Properties::PrimaryVariables>>;
using ElementResidualVector = typename ParentType::LocalResidual::ElementResidualVector;
using JacobianMatrix = GetPropType<TypeTag, Properties::JacobianMatrix>;
using SolutionVector = typename Assembler::SolutionVector;
diff --git a/dumux/multidomain/subdomaincclocalassembler.hh b/dumux/multidomain/subdomaincclocalassembler.hh
index 1af0ca57bd29c8fced3f31a51567df6cc04a1b26..2d9d86574480bc28dbba187e70837ce30976b417 100644
--- a/dumux/multidomain/subdomaincclocalassembler.hh
+++ b/dumux/multidomain/subdomaincclocalassembler.hh
@@ -36,6 +36,7 @@
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
#include <dumux/common/numericdifferentiation.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/discretization/elementsolution.hh>
#include <dumux/discretization/extrusion.hh>
#include <dumux/assembly/numericepsilon.hh>
@@ -61,7 +62,7 @@ class SubDomainCCLocalAssemblerBase : public FVLocalAssemblerBase<TypeTag, Assem
using ParentType = FVLocalAssemblerBase<TypeTag, Assembler,Implementation, implicit>;
using Problem = GetPropType<TypeTag, Properties::Problem>;
- using LocalResidualValues = GetPropType<TypeTag, Properties::NumEqVector>;
+ using LocalResidualValues = Dumux::NumEqVector<GetPropType<TypeTag, Properties::PrimaryVariables>>;
using JacobianMatrix = GetPropType<TypeTag, Properties::JacobianMatrix>;
using SolutionVector = typename Assembler::SolutionVector;
using SubSolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
@@ -283,7 +284,7 @@ class SubDomainCCLocalAssembler<id, TypeTag, Assembler, DiffMethod::numeric, /*i
using Problem = GetPropType<TypeTag, Properties::Problem>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
- using LocalResidualValues = GetPropType<TypeTag, Properties::NumEqVector>;
+ using LocalResidualValues = Dumux::NumEqVector<GetPropType<TypeTag, Properties::PrimaryVariables>>;
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using FVElementGeometry = typename GridGeometry::LocalView;
@@ -635,7 +636,7 @@ class SubDomainCCLocalAssembler<id, TypeTag, Assembler, DiffMethod::numeric, /*i
using ParentType = SubDomainCCLocalAssemblerBase<id, TypeTag, Assembler, ThisType, /*implicit=*/false>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
- using LocalResidualValues = GetPropType<TypeTag, Properties::NumEqVector>;
+ using LocalResidualValues = Dumux::NumEqVector<GetPropType<TypeTag, Properties::PrimaryVariables>>;
using Problem = GetPropType<TypeTag, Properties::Problem>;
static constexpr int numEq = GetPropType<TypeTag, Properties::ModelTraits>::numEq();
@@ -781,7 +782,7 @@ class SubDomainCCLocalAssembler<id, TypeTag, Assembler, DiffMethod::analytic, /*
using ThisType = SubDomainCCLocalAssembler<id, TypeTag, Assembler, DiffMethod::analytic, /*implicit=*/true>;
using ParentType = SubDomainCCLocalAssemblerBase<id, TypeTag, Assembler, ThisType, /*implicit=*/true>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
- using LocalResidualValues = GetPropType<TypeTag, Properties::NumEqVector>;
+ using LocalResidualValues = Dumux::NumEqVector<GetPropType<TypeTag, Properties::PrimaryVariables>>;
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using Element = typename GridView::template Codim<0>::Entity;
using Problem = GetPropType<TypeTag, Properties::Problem>;
diff --git a/dumux/porousmediumflow/2p1c/localresidual.hh b/dumux/porousmediumflow/2p1c/localresidual.hh
index c835cedd55f6eba91ad96dfdaf17f317bf4f9b19..d6c211efdd74dc64da89548620b0e3354771e454 100644
--- a/dumux/porousmediumflow/2p1c/localresidual.hh
+++ b/dumux/porousmediumflow/2p1c/localresidual.hh
@@ -26,6 +26,7 @@
#ifndef DUMUX_2P1C_LOCAL_RESIDUAL_HH
#define DUMUX_2P1C_LOCAL_RESIDUAL_HH
+#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/immiscible/localresidual.hh>
namespace Dumux {
@@ -38,7 +39,7 @@ class TwoPOneCLocalResidual : public ImmiscibleLocalResidual<TypeTag>
{
using ParentType = ImmiscibleLocalResidual<TypeTag>;
using Problem = GetPropType<TypeTag, Properties::Problem>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<GetPropType<TypeTag, Properties::PrimaryVariables>>;
using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
using FluxVariables = GetPropType<TypeTag, Properties::FluxVariables>;
diff --git a/dumux/porousmediumflow/3p3c/localresidual.hh b/dumux/porousmediumflow/3p3c/localresidual.hh
index 1c8a6f94514215489260bba5fc0c59d6af2c9505..046b2647eefd55d8b5cbcd3ab113f30d3458f51c 100644
--- a/dumux/porousmediumflow/3p3c/localresidual.hh
+++ b/dumux/porousmediumflow/3p3c/localresidual.hh
@@ -27,6 +27,7 @@
#define DUMUX_3P3C_LOCAL_RESIDUAL_HH
#include <dumux/common/properties.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/flux/referencesystemformulation.hh>
namespace Dumux
@@ -45,7 +46,7 @@ class ThreePThreeCLocalResidual : public GetPropType<TypeTag, Properties::BaseLo
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<GetPropType<TypeTag, Properties::PrimaryVariables>>;
using FluxVariables = GetPropType<TypeTag, Properties::FluxVariables>;
using ElementFluxVariablesCache = typename GetPropType<TypeTag, Properties::GridFluxVariablesCache>::LocalView;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
diff --git a/dumux/porousmediumflow/3pwateroil/localresidual.hh b/dumux/porousmediumflow/3pwateroil/localresidual.hh
index 51e82a556a6fe30b32e3135d7ce83b0389bb5d44..275c7688977c74c4a4c67f6a85fd4882d5f848bc 100644
--- a/dumux/porousmediumflow/3pwateroil/localresidual.hh
+++ b/dumux/porousmediumflow/3pwateroil/localresidual.hh
@@ -27,6 +27,7 @@
#define DUMUX_3P2CNI_LOCAL_RESIDUAL_HH
#include <dumux/common/properties.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/flux/referencesystemformulation.hh>
namespace Dumux {
@@ -45,7 +46,7 @@ protected:
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<GetPropType<TypeTag, Properties::PrimaryVariables>>;
using FluxVariables = GetPropType<TypeTag, Properties::FluxVariables>;
using ElementFluxVariablesCache = typename GetPropType<TypeTag, Properties::GridFluxVariablesCache>::LocalView;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
diff --git a/dumux/porousmediumflow/compositional/localresidual.hh b/dumux/porousmediumflow/compositional/localresidual.hh
index 7aefc7e34d0d1a57a68f436a49fb4c376547b557..f5cb7a2c20a2817cfa12bf7ae33625bd9189e92e 100644
--- a/dumux/porousmediumflow/compositional/localresidual.hh
+++ b/dumux/porousmediumflow/compositional/localresidual.hh
@@ -29,6 +29,7 @@
#include <vector>
#include <dune/common/exceptions.hh>
#include <dumux/common/properties.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/flux/referencesystemformulation.hh>
namespace Dumux {
@@ -48,7 +49,7 @@ class CompositionalLocalResidual: public GetPropType<TypeTag, Properties::BaseLo
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<GetPropType<TypeTag, Properties::PrimaryVariables>>;
using FluxVariables = GetPropType<TypeTag, Properties::FluxVariables>;
using ElementFluxVariablesCache = typename GetPropType<TypeTag, Properties::GridFluxVariablesCache>::LocalView;
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
diff --git a/dumux/porousmediumflow/immiscible/localresidual.hh b/dumux/porousmediumflow/immiscible/localresidual.hh
index b6abc1d5a0b918a584159944e31ccdd331bad21a..311ff5552e0660967f0c5021a735c09d03e774ac 100644
--- a/dumux/porousmediumflow/immiscible/localresidual.hh
+++ b/dumux/porousmediumflow/immiscible/localresidual.hh
@@ -26,6 +26,7 @@
#define DUMUX_IMMISCIBLE_LOCAL_RESIDUAL_HH
#include <dumux/common/properties.hh>
+#include <dumux/common/numeqvector.hh>
namespace Dumux {
@@ -40,7 +41,7 @@ class ImmiscibleLocalResidual : public GetPropType<TypeTag, Properties::BaseLoca
using ParentType = GetPropType<TypeTag, Properties::BaseLocalResidual>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using Problem = GetPropType<TypeTag, Properties::Problem>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<GetPropType<TypeTag, Properties::PrimaryVariables>>;
using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
using FluxVariables = GetPropType<TypeTag, Properties::FluxVariables>;
diff --git a/dumux/porousmediumflow/mineralization/localresidual.hh b/dumux/porousmediumflow/mineralization/localresidual.hh
index b1de59aab2a42f53d51cca068f8ce533964b9c9d..243f5f5f3b3003dea4cf3ab13f78d03510cc8e0b 100644
--- a/dumux/porousmediumflow/mineralization/localresidual.hh
+++ b/dumux/porousmediumflow/mineralization/localresidual.hh
@@ -26,6 +26,7 @@
#ifndef DUMUX_COMPOSITIONAL_MINERALIZATION_LOCAL_RESIDUAL_HH
#define DUMUX_COMPOSITIONAL_MINERALIZATION_LOCAL_RESIDUAL_HH
+#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/compositional/localresidual.hh>
namespace Dumux
@@ -39,7 +40,7 @@ template<class TypeTag>
class MineralizationLocalResidual: public CompositionalLocalResidual<TypeTag>
{
using ParentType = CompositionalLocalResidual<TypeTag>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<GetPropType<TypeTag, Properties::PrimaryVariables>>;
using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
diff --git a/dumux/porousmediumflow/nonequilibrium/localresidual.hh b/dumux/porousmediumflow/nonequilibrium/localresidual.hh
index 65070c65ccff1141e8ac488401b758d1585fd68c..6029dbe392fbe5e35b8a4bf831aed789139f0302 100644
--- a/dumux/porousmediumflow/nonequilibrium/localresidual.hh
+++ b/dumux/porousmediumflow/nonequilibrium/localresidual.hh
@@ -28,6 +28,7 @@
#include <cmath>
#include <dumux/common/properties.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/nonequilibrium/thermal/localresidual.hh>
namespace Dumux {
@@ -49,7 +50,7 @@ class NonEquilibriumLocalResidualImplementation<TypeTag, false>: public GetPropT
{
using ParentType = GetPropType<TypeTag, Properties::EquilibriumLocalResidual>;
using Problem = GetPropType<TypeTag, Properties::Problem>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<GetPropType<TypeTag, Properties::PrimaryVariables>>;
using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
@@ -113,7 +114,7 @@ class NonEquilibriumLocalResidualImplementation<TypeTag, true>: public GetPropTy
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<GetPropType<TypeTag, Properties::PrimaryVariables>>;
using FluxVariables = GetPropType<TypeTag, Properties::FluxVariables>;
using ElementFluxVariablesCache = typename GetPropType<TypeTag, Properties::GridFluxVariablesCache>::LocalView;
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
diff --git a/dumux/porousmediumflow/nonequilibrium/thermal/localresidual.hh b/dumux/porousmediumflow/nonequilibrium/thermal/localresidual.hh
index 09212057280abc27596f52273146b4dc27cfbb63..63180863a97cba6bc1eadaf01c686aaa0883ccd9 100644
--- a/dumux/porousmediumflow/nonequilibrium/thermal/localresidual.hh
+++ b/dumux/porousmediumflow/nonequilibrium/thermal/localresidual.hh
@@ -29,6 +29,7 @@
#include <dumux/common/spline.hh>
#include <dumux/common/exceptions.hh>
#include <dumux/common/properties.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/flux/referencesystemformulation.hh>
namespace Dumux {
@@ -46,7 +47,7 @@ template<class TypeTag>
class EnergyLocalResidualNonEquilibrium<TypeTag, 1/*numEnergyEqFluid*/>
{
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<GetPropType<TypeTag, Properties::PrimaryVariables>>;
using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
@@ -209,7 +210,7 @@ class EnergyLocalResidualNonEquilibrium<TypeTag, 2/*numEnergyEqFluid*/>
: public EnergyLocalResidualNonEquilibrium<TypeTag, 1/*numEnergyEqFluid*/>
{
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<GetPropType<TypeTag, Properties::PrimaryVariables>>;
using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
diff --git a/dumux/porousmediumflow/nonisothermal/localresidual.hh b/dumux/porousmediumflow/nonisothermal/localresidual.hh
index 42ad8803882dae0ec90c4be5ae0c33baf9392b6f..e0490095824b3992e222d22d9950fed5d98e2201 100644
--- a/dumux/porousmediumflow/nonisothermal/localresidual.hh
+++ b/dumux/porousmediumflow/nonisothermal/localresidual.hh
@@ -27,6 +27,7 @@
#define DUMUX_ENERGY_LOCAL_RESIDUAL_HH
#include <dumux/common/properties.hh>
+#include <dumux/common/numeqvector.hh>
namespace Dumux {
@@ -45,7 +46,7 @@ template<class TypeTag>
class EnergyLocalResidualImplementation<TypeTag, false>
{
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<GetPropType<TypeTag, Properties::PrimaryVariables>>;
using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
@@ -109,7 +110,7 @@ template<class TypeTag>
class EnergyLocalResidualImplementation<TypeTag, true>
{
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<GetPropType<TypeTag, Properties::PrimaryVariables>>;
using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
diff --git a/dumux/porousmediumflow/richards/localresidual.hh b/dumux/porousmediumflow/richards/localresidual.hh
index 705d08d41a1502c3e50eca8c0c8ee8f597bf1435..dac5b3d933bef0fd1091c3f281feaa8135064d3d 100644
--- a/dumux/porousmediumflow/richards/localresidual.hh
+++ b/dumux/porousmediumflow/richards/localresidual.hh
@@ -29,6 +29,7 @@
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
#include <dumux/common/typetraits/typetraits.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/discretization/method.hh>
#include <dumux/discretization/extrusion.hh>
#include <dumux/flux/referencesystemformulation.hh>
@@ -48,7 +49,7 @@ class RichardsLocalResidual : public GetPropType<TypeTag, Properties::BaseLocalR
using ParentType = GetPropType<TypeTag, Properties::BaseLocalResidual>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using Problem = GetPropType<TypeTag, Properties::Problem>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<GetPropType<TypeTag, Properties::PrimaryVariables>>;
using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
using FluxVariables = GetPropType<TypeTag, Properties::FluxVariables>;
diff --git a/dumux/porousmediumflow/solidenergy/localresidual.hh b/dumux/porousmediumflow/solidenergy/localresidual.hh
index 8f88c3fa9f1d617751946dae0385f1b43ae6552a..2ec74f6573070bff1f170749373fddcfc3d88a66 100644
--- a/dumux/porousmediumflow/solidenergy/localresidual.hh
+++ b/dumux/porousmediumflow/solidenergy/localresidual.hh
@@ -25,6 +25,7 @@
#define DUMUX_SOLID_ENERGY_LOCAL_RESIDUAL_HH
#include <dumux/common/properties.hh>
+#include <dumux/common/numeqvector.hh>
namespace Dumux {
@@ -38,7 +39,7 @@ class SolidEnergyLocalResidual : public GetPropType<TypeTag, Properties::BaseLoc
using ParentType = GetPropType<TypeTag, Properties::BaseLocalResidual>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using Problem = GetPropType<TypeTag, Properties::Problem>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<GetPropType<TypeTag, Properties::PrimaryVariables>>;
using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
using FluxVariables = GetPropType<TypeTag, Properties::FluxVariables>;
diff --git a/dumux/porousmediumflow/tracer/localresidual.hh b/dumux/porousmediumflow/tracer/localresidual.hh
index 702ff39e990eaca7d947cbba46f90957aa684811..717401ec70ed2f19bcb24d53b3b37fd151ff732e 100644
--- a/dumux/porousmediumflow/tracer/localresidual.hh
+++ b/dumux/porousmediumflow/tracer/localresidual.hh
@@ -30,6 +30,7 @@
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/discretization/method.hh>
#include <dumux/discretization/extrusion.hh>
#include <dumux/flux/referencesystemformulation.hh>
@@ -52,7 +53,7 @@ class TracerLocalResidual: public GetPropType<TypeTag, Properties::BaseLocalResi
using SubControlVolume = typename GridGeometry::SubControlVolume;
using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace;
using Extrusion = Extrusion_t<GridGeometry>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<GetPropType<TypeTag, Properties::PrimaryVariables>>;
using FluxVariables = GetPropType<TypeTag, Properties::FluxVariables>;
using ElementFluxVariablesCache = typename GetPropType<TypeTag, Properties::GridFluxVariablesCache>::LocalView;
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
diff --git a/examples/1ptracer/problem_tracer.hh b/examples/1ptracer/problem_tracer.hh
index f7dd53a3041c8c6612a556e1108af01ce7f1a5e0..3ba0b7c80e05cb0f28d5bc498c1b47dc18ffda35 100644
--- a/examples/1ptracer/problem_tracer.hh
+++ b/examples/1ptracer/problem_tracer.hh
@@ -33,6 +33,7 @@
#include <dumux/porousmediumflow/problem.hh>
// Include the `BoundaryTypes` class which specifies the boundary types set in this problem.
#include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
// ### The problem class
//
@@ -57,7 +58,7 @@ class TracerTestProblem : public PorousMediumFlowProblem<TypeTag>
using SpatialParams = GetPropType<TypeTag, Properties::SpatialParams>;
using Element = typename GridGeometry::GridView::template Codim<0>::Entity;
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
using ElementVolumeVariables = typename GridVariables::GridVolumeVariables::LocalView;
using ElementFluxVariablesCache = typename GridVariables::GridFluxVariablesCache::LocalView;
diff --git a/examples/2pinfiltration/problem.hh b/examples/2pinfiltration/problem.hh
index 4a7d9d290558595a31e2f6258c88771aff8013fd..9cbc03f3f34f85a56df7c9b5ebcd7d7125b58e2d 100644
--- a/examples/2pinfiltration/problem.hh
+++ b/examples/2pinfiltration/problem.hh
@@ -30,6 +30,7 @@
#include <dumux/io/container.hh>
#include <dumux/common/boundarytypes.hh>
#include <dumux/common/properties.hh>
+#include <dumux/common/numeqvector.hh>
// ### Problem class
// The problem class `PointSourceProblem` implements boundary and initial conditions.
@@ -52,7 +53,7 @@ class PointSourceProblem : public PorousMediumFlowProblem<TypeTag>
using PointSource = GetPropType<TypeTag, Properties::PointSource>;
using BoundaryTypes = Dumux::BoundaryTypes<PrimaryVariables::size()>;
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
enum {
diff --git a/examples/biomineralization/problem.hh b/examples/biomineralization/problem.hh
index 6c6530ae84afc554ab78970d29869a4448d158ec..594507890b9caab65c49bbfa65f23fd2aba25503 100644
--- a/examples/biomineralization/problem.hh
+++ b/examples/biomineralization/problem.hh
@@ -32,6 +32,7 @@
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/common/boundarytypes.hh> // for `BoundaryTypes`
#include <dumux/common/properties.hh> // GetPropType
+#include <dumux/common/numeqvector.hh>
#include <dumux/material/components/ammonia.hh>
#include <dumux/discretization/evalgradients.hh>
#include <dumux/io/container.hh>
@@ -93,7 +94,7 @@ class MICPColumnProblemSimpleChemistry : public PorousMediumFlowProblem<TypeTag>
};
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using BoundaryTypes = Dumux::BoundaryTypes<PrimaryVariables::size()>;
using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
diff --git a/examples/liddrivencavity/problem.hh b/examples/liddrivencavity/problem.hh
index 8967dfc47ac0285c8a7cda8bde3594c086a6312e..fcfeda0976760f0399346f81ec80d2954e6ba691 100644
--- a/examples/liddrivencavity/problem.hh
+++ b/examples/liddrivencavity/problem.hh
@@ -31,6 +31,7 @@
//
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
+#include <dumux/common/numeqvector.hh>
// Include the `NavierStokesProblem` class, the base
// class from which we will derive.
@@ -54,8 +55,8 @@ class LidDrivenCavityExampleProblem : public NavierStokesProblem<TypeTag>
using FVElementGeometry = typename GridGeometry::LocalView;
using SubControlVolume = typename GridGeometry::SubControlVolume;
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 Scalar = GetPropType<TypeTag, Properties::Scalar>;
using Element = typename GridGeometry::GridView::template Codim<0>::Entity;
diff --git a/examples/shallowwaterfriction/problem.hh b/examples/shallowwaterfriction/problem.hh
index 5bba55d30c7cc2c32f8af79d52cac2f075f4960d..7e7e605675f320c26b9ddde1dc327421d6ccf8a1 100644
--- a/examples/shallowwaterfriction/problem.hh
+++ b/examples/shallowwaterfriction/problem.hh
@@ -38,6 +38,7 @@
#include <dumux/freeflow/shallowwater/boundaryfluxes.hh>
// Include the `BoundaryTypes` class which specifies the boundary types set in this problem.
#include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
// ### The problem class
// We enter the problem class where all necessary boundary conditions and initial conditions are set for our simulation.
@@ -56,7 +57,6 @@ class RoughChannelProblem : public ShallowWaterProblem<TypeTag>
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- using NeumannFluxes = GetPropType<TypeTag, Properties::NumEqVector>;
using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
using ElementFluxVariablesCache = typename GridVariables::GridFluxVariablesCache::LocalView;
@@ -65,7 +65,8 @@ class RoughChannelProblem : public ShallowWaterProblem<TypeTag>
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using Element = typename GridView::template Codim<0>::Entity;
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
+ using NeumannFluxes = NumEqVector;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
public:
diff --git a/test/freeflow/navierstokes/angeli/problem.hh b/test/freeflow/navierstokes/angeli/problem.hh
index 7e2066c377caea6f29707b10aa5112ea177874ab..c793ab1e1205e63d81babf3e21be6804d9219497 100644
--- a/test/freeflow/navierstokes/angeli/problem.hh
+++ b/test/freeflow/navierstokes/angeli/problem.hh
@@ -28,6 +28,7 @@
#include <dumux/common/parameters.hh>
#include <dumux/common/properties.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/freeflow/navierstokes/boundarytypes.hh>
#include <dumux/freeflow/navierstokes/problem.hh>
@@ -53,8 +54,8 @@ class AngeliTestProblem : public NavierStokesProblem<TypeTag>
using BoundaryTypes = Dumux::NavierStokesBoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using ModelTraits = GetPropType<TypeTag, Properties::ModelTraits>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
diff --git a/test/freeflow/navierstokes/channel/1d/problem.hh b/test/freeflow/navierstokes/channel/1d/problem.hh
index fb44365730e409b1c7e7ff99f54ddccfe2debb53..e9f92c8566418220df2745e54b48b288bec960b1 100644
--- a/test/freeflow/navierstokes/channel/1d/problem.hh
+++ b/test/freeflow/navierstokes/channel/1d/problem.hh
@@ -30,6 +30,7 @@
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/freeflow/navierstokes/boundarytypes.hh>
#include <dumux/freeflow/navierstokes/problem.hh>
@@ -53,9 +54,9 @@ class NavierStokesAnalyticProblem : public NavierStokesProblem<TypeTag>
using BoundaryTypes = Dumux::NavierStokesBoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
- using ModelTraits = GetPropType<TypeTag, Properties::ModelTraits>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
+ using ModelTraits = GetPropType<TypeTag, Properties::ModelTraits>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
diff --git a/test/freeflow/navierstokes/channel/2d/problem.hh b/test/freeflow/navierstokes/channel/2d/problem.hh
index 90037005ae8af6a69440cc2c76d2e04ed4a58132..977b7c5284a3ae53458809e2966dadeeb8a3bb1b 100644
--- a/test/freeflow/navierstokes/channel/2d/problem.hh
+++ b/test/freeflow/navierstokes/channel/2d/problem.hh
@@ -28,6 +28,7 @@
#include <dumux/common/parameters.hh>
#include <dumux/common/properties.hh>
#include <dumux/common/timeloop.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/freeflow/navierstokes/boundarytypes.hh>
#include <dumux/freeflow/navierstokes/problem.hh>
@@ -57,8 +58,8 @@ class ChannelTestProblem : public NavierStokesProblem<TypeTag>
using FVElementGeometry = typename GridGeometry::LocalView;
using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace;
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 Scalar = GetPropType<TypeTag, Properties::Scalar>;
using ModelTraits = GetPropType<TypeTag, Properties::ModelTraits>;
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
diff --git a/test/freeflow/navierstokes/channel/3d/problem.hh b/test/freeflow/navierstokes/channel/3d/problem.hh
index 94197e365f7e1b510f6227dbcb3def0199cdd89a..c64755be9ea1dabf014c4f5241f5c801aa1f537a 100644
--- a/test/freeflow/navierstokes/channel/3d/problem.hh
+++ b/test/freeflow/navierstokes/channel/3d/problem.hh
@@ -32,6 +32,7 @@
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/freeflow/navierstokes/boundarytypes.hh>
#include <dumux/freeflow/navierstokes/problem.hh>
@@ -78,7 +79,7 @@ class ThreeDChannelTestProblem : public NavierStokesProblem<TypeTag>
using FacePrimaryVariables = GetPropType<TypeTag, Properties::FacePrimaryVariables>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
static constexpr bool enablePseudoThreeDWallFriction = !(GRID_DIM == 3);
diff --git a/test/freeflow/navierstokes/donea/problem.hh b/test/freeflow/navierstokes/donea/problem.hh
index 5aeb0dba29939c606ed47d95138586e9c0c8520f..c438717362a682c27dc4425038938eb4a82d16ea 100644
--- a/test/freeflow/navierstokes/donea/problem.hh
+++ b/test/freeflow/navierstokes/donea/problem.hh
@@ -26,6 +26,7 @@
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/freeflow/navierstokes/boundarytypes.hh>
#include <dumux/freeflow/navierstokes/problem.hh>
@@ -50,9 +51,9 @@ class DoneaTestProblem : public NavierStokesProblem<TypeTag>
using BoundaryTypes = Dumux::NavierStokesBoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
- using ModelTraits = GetPropType<TypeTag, Properties::ModelTraits>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
+ using ModelTraits = GetPropType<TypeTag, Properties::ModelTraits>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
diff --git a/test/freeflow/navierstokes/kovasznay/problem.hh b/test/freeflow/navierstokes/kovasznay/problem.hh
index 05f34ba24dee6c7fd410c437cad63d776d4a99fa..407704ec707f13da8dcbb615de694e1f454c63f9 100644
--- a/test/freeflow/navierstokes/kovasznay/problem.hh
+++ b/test/freeflow/navierstokes/kovasznay/problem.hh
@@ -27,6 +27,7 @@
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/freeflow/navierstokes/boundarytypes.hh>
#include <dumux/freeflow/navierstokes/problem.hh>
@@ -54,8 +55,8 @@ class KovasznayTestProblem : public NavierStokesProblem<TypeTag>
using SubControlVolume = typename GridGeometry::SubControlVolume;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
using ModelTraits = GetPropType<TypeTag, Properties::ModelTraits>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
diff --git a/test/freeflow/navierstokes/sincos/problem.hh b/test/freeflow/navierstokes/sincos/problem.hh
index 35544f55042d2356841e360fe2f4c9fceb9d0d93..d197933e7d236dcfe0edbac131906bdd099b4133 100644
--- a/test/freeflow/navierstokes/sincos/problem.hh
+++ b/test/freeflow/navierstokes/sincos/problem.hh
@@ -26,6 +26,7 @@
#include <dumux/common/parameters.hh>
#include <dumux/common/properties.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/freeflow/navierstokes/boundarytypes.hh>
#include <dumux/freeflow/navierstokes/problem.hh>
@@ -50,8 +51,8 @@ class SincosTestProblem : public NavierStokesProblem<TypeTag>
using BoundaryTypes = Dumux::NavierStokesBoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
using SubControlVolume = typename GridGeometry::SubControlVolume;
diff --git a/test/freeflow/navierstokesnc/channel/problem.hh b/test/freeflow/navierstokesnc/channel/problem.hh
index 0ab231674034b22609c268a396f17f4cfa40029c..4ef16c651817dd74f60a50fbc1771585582fb9b8 100644
--- a/test/freeflow/navierstokesnc/channel/problem.hh
+++ b/test/freeflow/navierstokesnc/channel/problem.hh
@@ -28,6 +28,7 @@
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
#include <dumux/common/timeloop.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/freeflow/navierstokes/boundarytypes.hh>
#include <dumux/freeflow/navierstokes/problem.hh>
@@ -52,8 +53,8 @@ class ChannelNCTestProblem : public NavierStokesProblem<TypeTag>
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using GridGeometry = 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 Scalar = GetPropType<TypeTag, Properties::Scalar>;
static constexpr auto dimWorld = GridGeometry::GridView::dimensionworld;
diff --git a/test/freeflow/navierstokesnc/densitydrivenflow/problem.hh b/test/freeflow/navierstokesnc/densitydrivenflow/problem.hh
index c164124af1410040d5805b232f1506000e89be10..d825632a4dcf8becc7f8790c01204a57a142df2d 100644
--- a/test/freeflow/navierstokesnc/densitydrivenflow/problem.hh
+++ b/test/freeflow/navierstokesnc/densitydrivenflow/problem.hh
@@ -27,6 +27,7 @@
#include <dumux/common/parameters.hh>
#include <dumux/common/properties.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/freeflow/navierstokes/boundarytypes.hh>
#include <dumux/freeflow/navierstokes/problem.hh>
@@ -53,8 +54,8 @@ class DensityDrivenFlowProblem : public NavierStokesProblem<TypeTag>
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using GridGeometry = 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 Scalar = GetPropType<TypeTag, Properties::Scalar>;
using Element = typename GridGeometry::GridView::template Codim<0>::Entity;
diff --git a/test/freeflow/navierstokesnc/maxwellstefan/problem.hh b/test/freeflow/navierstokesnc/maxwellstefan/problem.hh
index d1579df240d710743315edf1885282fe4813295a..48de92a6adb4e5f530457ae94d1ae8804c1fda85 100644
--- a/test/freeflow/navierstokesnc/maxwellstefan/problem.hh
+++ b/test/freeflow/navierstokesnc/maxwellstefan/problem.hh
@@ -27,6 +27,7 @@
#include <dumux/common/parameters.hh>
#include <dumux/common/properties.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/freeflow/navierstokes/boundarytypes.hh>
#include <dumux/freeflow/navierstokes/problem.hh>
@@ -48,8 +49,8 @@ class MaxwellStefanNCTestProblem : public NavierStokesProblem<TypeTag>
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using GridGeometry = 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 Scalar = GetPropType<TypeTag, Properties::Scalar>;
using Element = typename GridGeometry::GridView::template Codim<0>::Entity;
diff --git a/test/freeflow/rans/problem.hh b/test/freeflow/rans/problem.hh
index 43e2c0504a30b2056a9ed35955b2acbcace5f347..9a419eec20c3488033f6b0184f8daa7e47a4ae46 100644
--- a/test/freeflow/rans/problem.hh
+++ b/test/freeflow/rans/problem.hh
@@ -30,6 +30,7 @@
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
#include <dumux/common/timeloop.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/freeflow/navierstokes/boundarytypes.hh>
#include <dumux/freeflow/rans/problem.hh>
@@ -55,8 +56,8 @@ class PipeLauferProblem : public RANSProblem<TypeTag>
using FluidState = GetPropType<TypeTag, Properties::FluidState>;
using GridGeometry = 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 Scalar = GetPropType<TypeTag, Properties::Scalar>;
using ModelTraits = GetPropType<TypeTag, Properties::ModelTraits>;
diff --git a/test/freeflow/ransnc/problem.hh b/test/freeflow/ransnc/problem.hh
index 65988823be183bd228d9175811c367ced9672cbd..10facf02990de049ab1e780b36222310a723895a 100644
--- a/test/freeflow/ransnc/problem.hh
+++ b/test/freeflow/ransnc/problem.hh
@@ -27,6 +27,7 @@
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
#include <dumux/common/timeloop.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/freeflow/navierstokes/boundarytypes.hh>
#include <dumux/freeflow/turbulenceproperties.hh>
@@ -57,8 +58,8 @@ class FlatPlateNCTestProblem : public RANSProblem<TypeTag>
using FluidState = GetPropType<TypeTag, Properties::FluidState>;
using GridGeometry = 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 Scalar = GetPropType<TypeTag, Properties::Scalar>;
using ModelTraits = GetPropType<TypeTag, Properties::ModelTraits>;
diff --git a/test/freeflow/shallowwater/bowl/problem.hh b/test/freeflow/shallowwater/bowl/problem.hh
index f9ca2b3450a11b40b6fab07c720201e51a8514a8..fa01c60cd18365dbb59a126e1a276bc3093ab742 100644
--- a/test/freeflow/shallowwater/bowl/problem.hh
+++ b/test/freeflow/shallowwater/bowl/problem.hh
@@ -27,6 +27,7 @@
#include <dumux/common/boundarytypes.hh>
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/freeflow/shallowwater/problem.hh>
#include <dumux/freeflow/shallowwater/boundaryfluxes.hh>
@@ -72,10 +73,10 @@ class BowlProblem : public ShallowWaterProblem<TypeTag>
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
- using NeumannFluxes = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NeumannFluxes = NumEqVector;
using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
diff --git a/test/freeflow/shallowwater/dambreak/problem.hh b/test/freeflow/shallowwater/dambreak/problem.hh
index b2410f315a740e1204cd32346033e8b047c68a25..7b596fdc42ba89cc449bf5948fc15b9a77d8ee94 100644
--- a/test/freeflow/shallowwater/dambreak/problem.hh
+++ b/test/freeflow/shallowwater/dambreak/problem.hh
@@ -27,6 +27,7 @@
#include <dumux/common/boundarytypes.hh>
#include <dumux/common/parameters.hh>
#include <dumux/common/properties.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/freeflow/shallowwater/problem.hh>
#include <dumux/flux/shallowwater/riemannproblem.hh>
@@ -66,7 +67,7 @@ class DamBreakProblem : public ShallowWaterProblem<TypeTag>
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- using NeumannFluxes = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NeumannFluxes = Dumux::NumEqVector<PrimaryVariables>;
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
using ElementVolumeVariables = typename GridVariables::GridVolumeVariables::LocalView;
diff --git a/test/freeflow/shallowwater/poiseuilleflow/problem.hh b/test/freeflow/shallowwater/poiseuilleflow/problem.hh
index 55f3d4aead52e71b239b210cf7926d29cd2c8752..9324dd4ab434750eab37657563092c224bf1341e 100644
--- a/test/freeflow/shallowwater/poiseuilleflow/problem.hh
+++ b/test/freeflow/shallowwater/poiseuilleflow/problem.hh
@@ -25,6 +25,7 @@
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/freeflow/shallowwater/problem.hh>
#include <dumux/freeflow/shallowwater/boundaryfluxes.hh>
@@ -98,7 +99,6 @@ class PoiseuilleFlowProblem
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- using NeumannFluxes = GetPropType<TypeTag, Properties::NumEqVector>;
using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
using ElementFluxVariablesCache = typename GridVariables::GridFluxVariablesCache::LocalView;
@@ -108,7 +108,8 @@ class PoiseuilleFlowProblem
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using Element = typename GridView::template Codim<0>::Entity;
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
+ using NeumannFluxes = NumEqVector;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
public:
diff --git a/test/freeflow/shallowwater/roughchannel/problem.hh b/test/freeflow/shallowwater/roughchannel/problem.hh
index b4d4f6e4e2641340043916645be2ab1f78a3766b..a2048d0ac4a66d3655453d3ed33e4a00b533e3b5 100644
--- a/test/freeflow/shallowwater/roughchannel/problem.hh
+++ b/test/freeflow/shallowwater/roughchannel/problem.hh
@@ -27,6 +27,7 @@
#include <dumux/common/boundarytypes.hh>
#include <dumux/common/parameters.hh>
#include <dumux/common/properties.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/freeflow/shallowwater/problem.hh>
#include <dumux/freeflow/shallowwater/boundaryfluxes.hh>
@@ -73,7 +74,6 @@ class RoughChannelProblem : public ShallowWaterProblem<TypeTag>
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- using NeumannFluxes = GetPropType<TypeTag, Properties::NumEqVector>;
using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
using ElementFluxVariablesCache = typename GridVariables::GridFluxVariablesCache::LocalView;
@@ -83,7 +83,8 @@ class RoughChannelProblem : public ShallowWaterProblem<TypeTag>
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using Element = typename GridView::template Codim<0>::Entity;
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
+ using NeumannFluxes = NumEqVector;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
public:
diff --git a/test/geomechanics/elastic/problem.hh b/test/geomechanics/elastic/problem.hh
index f5b4236cbb73e84b951b664c4b5d36119f07b111..c63b16e97af6142006004d57c79e305a1e406f02 100644
--- a/test/geomechanics/elastic/problem.hh
+++ b/test/geomechanics/elastic/problem.hh
@@ -30,6 +30,7 @@
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
#include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/geomechanics/fvproblem.hh>
@@ -48,7 +49,7 @@ class ElasticProblem : public GeomechanicsFVProblem<TypeTag>
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
using ElementVolumeVariables = typename GridVariables::GridVolumeVariables::LocalView;
diff --git a/test/geomechanics/poroelastic/problem.hh b/test/geomechanics/poroelastic/problem.hh
index 372c8315c97a767deee6b874da03f27d5ee1362e..ecece0cc51e684a8671386e6bdd7258b9a93cb2e 100644
--- a/test/geomechanics/poroelastic/problem.hh
+++ b/test/geomechanics/poroelastic/problem.hh
@@ -26,6 +26,7 @@
#include <dune/common/fmatrix.hh>
#include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/geomechanics/fvproblem.hh>
namespace Dumux {
@@ -43,7 +44,7 @@ class PoroElasticProblem : public GeomechanicsFVProblem<TypeTag>
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
diff --git a/test/multidomain/boundary/darcydarcy/1p_1p/problem.hh b/test/multidomain/boundary/darcydarcy/1p_1p/problem.hh
index 83c1ea779565dfcb5db330fe1b7d040b70abacfa..3f2438fc0483c03188d39eddbb280059fbf4c48f 100644
--- a/test/multidomain/boundary/darcydarcy/1p_1p/problem.hh
+++ b/test/multidomain/boundary/darcydarcy/1p_1p/problem.hh
@@ -30,6 +30,7 @@
#include <dumux/common/boundarytypes.hh>
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh>
@@ -56,7 +57,7 @@ class OnePTestProblem
using Element = typename GridView::template Codim<0>::Entity;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
static constexpr int dimWorld = GridView::dimensionworld;
diff --git a/test/multidomain/boundary/darcydarcy/1p_2p/problem.hh b/test/multidomain/boundary/darcydarcy/1p_2p/problem.hh
index a67c6fcf83b9ea9c4e762b782eeab9ea80dd2a06..06dae84332e4d00c5d5663b31ba462fa609ea4ca 100644
--- a/test/multidomain/boundary/darcydarcy/1p_2p/problem.hh
+++ b/test/multidomain/boundary/darcydarcy/1p_2p/problem.hh
@@ -30,6 +30,7 @@
#include <dumux/common/boundarytypes.hh>
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh>
@@ -57,7 +58,7 @@ class OnePTestProblem
using Element = typename GridView::template Codim<0>::Entity;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_darcy.hh
index 9fb563c6cd276b9336c5cd7d5b3ceb32a5d3a09c..4029df89cb56f9fdfd9d6d9db0dccd7a68f63b57 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_darcy.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_darcy.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>
@@ -42,7 +43,7 @@ class DarcySubProblem : public PorousMediumFlowProblem<TypeTag>
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_stokes.hh
index 112e9ea62c4ce3b9b0eb3051ae0f7bc44bac3583..907cb04956ea335261dc35c21944020c81913b86 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_stokes.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_stokes.hh
@@ -32,6 +32,7 @@
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/freeflow/navierstokes/boundarytypes.hh>
#include <dumux/freeflow/navierstokes/problem.hh>
@@ -60,7 +61,7 @@ class StokesSubProblem : public NavierStokesProblem<TypeTag>
using FVElementGeometry = typename GridGeometry::LocalView;
using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using Element = typename GridView::template Codim<0>::Entity;
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_darcy.hh
index f738274d64a8da8cf9c158ff2cb5b088de2171e4..37caacc18d5a36fcdb21a73aec8a0dbe8560cad2 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_darcy.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_darcy.hh
@@ -28,6 +28,7 @@
#include <dumux/common/boundarytypes.hh>
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh>
@@ -41,7 +42,7 @@ class DarcySubProblem : public PorousMediumFlowProblem<TypeTag>
using GridView = typename GridGeometry::GridView;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
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 FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_stokes.hh
index 8820809c4f2566133db8e68b16fabdaf24b5e36c..f84ce0b4e25aa8774620ad544680120d07e922ac 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_stokes.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_stokes.hh
@@ -27,6 +27,7 @@
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/freeflow/navierstokes/boundarytypes.hh>
#include <dumux/freeflow/navierstokes/problem.hh>
@@ -51,7 +52,7 @@ class StokesSubProblem : public NavierStokesProblem<TypeTag>
using FVElementGeometry = typename GridGeometry::LocalView;
using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using Element = typename GridView::template Codim<0>::Entity;
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_darcy.hh
index 17ab7c32319104181521251542e00c966cebbb5e..fe634c5b390b37f49e2e86f753888be23e18b489 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_darcy.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_darcy.hh
@@ -26,6 +26,7 @@
#define DUMUX_DARCY2P2C_SUBPROBLEM_HH
#include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/multidomain/boundary/stokesdarcy/couplingdata.hh>
#include <dumux/porousmediumflow/problem.hh>
#include "spatialparams.hh"
@@ -41,7 +42,7 @@ class DarcySubProblem : public PorousMediumFlowProblem<TypeTag>
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
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 VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_stokes.hh
index 2c15f8aca2c530ae20b153d863e6df75398a634f..999f12ca5c1d7c9e7ecef2655d9356b3606b50a1 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_stokes.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_stokes.hh
@@ -28,6 +28,7 @@
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
#include <dumux/common/timeloop.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/freeflow/navierstokes/boundarytypes.hh>
#include <dumux/freeflow/navierstokes/problem.hh>
@@ -64,7 +65,7 @@ class StokesSubProblem : public NavierStokesProblem<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 CouplingManager = GetPropType<TypeTag, Properties::CouplingManager>;
using TimeLoopPtr = std::shared_ptr<TimeLoop<Scalar>>;
diff --git a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_darcy.hh
index 44da76e95713bdbadcf78936b4475d0261bcde3b..5ec83fd1a27699ebafa8ae755e830d5d07ffa492 100644
--- a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_darcy.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_darcy.hh
@@ -26,6 +26,7 @@
#define DUMUX_DARCY_SUBPROBLEM_ONEPTHREEC_HH
#include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/multidomain/boundary/stokesdarcy/couplingdata.hh>
#include <dumux/flux/maxwellstefanslaw.hh>
@@ -48,7 +49,7 @@ class DarcySubProblem : public PorousMediumFlowProblem<TypeTag>
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
diff --git a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_stokes.hh
index 166652efca153cd17a776414e8ea6d9fc0046679..2be8cc82894a13610aa137494846a4ac93442fe6 100644
--- a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_stokes.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_stokes.hh
@@ -25,6 +25,7 @@
#ifndef DUMUX_STOKES_SUBPROBLEM_ONEPTHREEC_HH
#define DUMUX_STOKES_SUBPROBLEM_ONEPTHREEC_HH
+#include <dumux/common/numeqvector.hh>
#include <dumux/freeflow/navierstokes/boundarytypes.hh>
#include <dumux/freeflow/navierstokes/problem.hh>
@@ -57,7 +58,7 @@ class StokesSubProblem : public NavierStokesProblem<TypeTag>
using FVElementGeometry = typename GridGeometry::LocalView;
using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using DiffusionCoefficientAveragingType = typename StokesDarcyCouplingOptions::DiffusionCoefficientAveragingType;
using Element = typename GridView::template Codim<0>::Entity;
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/problem_darcy.hh
index fdc9d63989c32883a5f855d74435d336255c70a9..8d73c6e0c9855b3e235a1a6ccbccba320efc4f0e 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/problem_darcy.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/problem_darcy.hh
@@ -31,6 +31,7 @@
#include <dumux/discretization/cctpfa.hh>
#include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/material/components/constant.hh>
#include <dumux/material/fluidsystems/1pliquid.hh>
@@ -56,7 +57,7 @@ class DarcySubProblem : public PorousMediumFlowProblem<TypeTag>
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
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 VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/problem_stokes.hh
index 657a0ece08c81dd86e36f12f7a7d08f3bc137abd..42e954634e6c8a3e392e80efc86f1af8ce4c97ab 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/problem_stokes.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/problem_stokes.hh
@@ -26,6 +26,7 @@
#define DUMUX_FREEFLOW_SUBPROBLEM_HH
#include <dune/common/fvector.hh>
+#include <dumux/common/numeqvector.hh>
#include <dune/grid/yaspgrid.hh>
#include <dumux/discretization/staggered/freeflow/properties.hh>
@@ -60,7 +61,7 @@ class FreeFlowSubProblem : public NavierStokesProblem<TypeTag>
using Element = typename GridView::template Codim<0>::Entity;
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using ModelTraits = GetPropType<TypeTag, Properties::ModelTraits>;
using CouplingManager = GetPropType<TypeTag, Properties::CouplingManager>;
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p_1p/problem_darcy.hh
index ea2e21c3ddaf14bb3fa0797405b0b3886d7d45cb..c7e7905724c63927df9d6d18d23f9963a0302750 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/problem_darcy.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/problem_darcy.hh
@@ -28,6 +28,7 @@
#include <dumux/common/boundarytypes.hh>
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh>
@@ -40,7 +41,7 @@ class DarcySubProblem : public PorousMediumFlowProblem<TypeTag>
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
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 VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p_1p/problem_stokes.hh
index ff20909ae9846972c723fb92cc25dfbbfd0bb9bd..76e20b1c4097cccd00e32ab9608b400cae00fc6c 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/problem_stokes.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/problem_stokes.hh
@@ -26,7 +26,7 @@
#define DUMUX_STOKES_SUBPROBLEM_HH
#include <dune/grid/yaspgrid.hh>
-
+#include <dumux/common/numeqvector.hh>
#include <dumux/discretization/staggered/freeflow/properties.hh>
#include <dumux/freeflow/navierstokes/boundarytypes.hh>
@@ -64,7 +64,7 @@ class StokesSubProblem : public NavierStokesProblem<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 CouplingManager = GetPropType<TypeTag, Properties::CouplingManager>;
diff --git a/test/multidomain/boundary/stokesdarcy/1p_2p/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p_2p/problem_darcy.hh
index f5e9400fe48ef7ef9d8c0b936799581ac1602fc3..3d64558f74ce0b6e7ef4f161379074f0b8e50de4 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_2p/problem_darcy.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_2p/problem_darcy.hh
@@ -28,6 +28,7 @@
#include <dumux/common/boundarytypes.hh>
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh>
@@ -40,7 +41,7 @@ class DarcySubProblem : public PorousMediumFlowProblem<TypeTag>
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
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 GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
using ElementVolumeVariables = typename GridVariables::GridVolumeVariables::LocalView;
diff --git a/test/multidomain/boundary/stokesdarcy/1p_2p/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p_2p/problem_stokes.hh
index 00e459412d641b14256c60b5dd8aec39f8327ab3..20e80d731599367509f1408ca6a9edb65702160a 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_2p/problem_stokes.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_2p/problem_stokes.hh
@@ -27,6 +27,7 @@
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/freeflow/navierstokes/boundarytypes.hh>
#include <dumux/freeflow/navierstokes/problem.hh>
@@ -63,7 +64,7 @@ class StokesSubProblem : public NavierStokesProblem<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 CouplingManager = GetPropType<TypeTag, Properties::CouplingManager>;
diff --git a/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_root.hh b/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_root.hh
index 168fc148dfe74f7a7b737fd26457c0a5fa79d6b3..2101b4bfa0bc2bca0d93ba492d225244d85b3d96 100644
--- a/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_root.hh
+++ b/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_root.hh
@@ -29,6 +29,7 @@
#include <dumux/common/boundarytypes.hh>
#include <dumux/common/parameters.hh>
#include <dumux/common/properties.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh>
@@ -45,8 +46,8 @@ class RootProblem : public PorousMediumFlowProblem<TypeTag>
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using PointSource = GetPropType<TypeTag, Properties::PointSource>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
- using NeumannFluxes = GetPropType<TypeTag, Properties::NumEqVector>;
- using SourceValues = GetPropType<TypeTag, Properties::NumEqVector>;
+ using SourceValues = Dumux::NumEqVector<PrimaryVariables>;
+ using NeumannFluxes = SourceValues;
using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using GridView = typename GridGeometry::GridView;
diff --git a/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_soil.hh b/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_soil.hh
index b9ae188dcdd7554fc2923cb4a23b26af780fbfd3..1fdc034e4c8790fb4aed59f2fd5452d63fe9ee8c 100644
--- a/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_soil.hh
+++ b/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_soil.hh
@@ -33,6 +33,7 @@
#include <dumux/common/math.hh>
#include <dumux/common/parameters.hh>
#include <dumux/common/properties.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh>
@@ -54,7 +55,7 @@ class SoilProblem : public PorousMediumFlowProblem<TypeTag>
using GridView = typename GridGeometry::GridView;
using GlobalPosition = typename GridGeometry::GlobalCoordinate;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
diff --git a/test/multidomain/embedded/1d3d/1p_1p/problem_tissue.hh b/test/multidomain/embedded/1d3d/1p_1p/problem_tissue.hh
index 1a28a4956143bbdb377e3b1c350e91ebdf098efd..f18afe8ca2ec804a20970d9f37509a5ada6b1765 100644
--- a/test/multidomain/embedded/1d3d/1p_1p/problem_tissue.hh
+++ b/test/multidomain/embedded/1d3d/1p_1p/problem_tissue.hh
@@ -33,6 +33,7 @@
#include <dumux/common/math.hh>
#include <dumux/common/parameters.hh>
#include <dumux/common/properties.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh>
@@ -56,7 +57,7 @@ class TissueProblem : public PorousMediumFlowProblem<TypeTag>
using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace;
using GridView = typename GridGeometry::GridView;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
diff --git a/test/multidomain/embedded/1d3d/1p_richards/problem_root.hh b/test/multidomain/embedded/1d3d/1p_richards/problem_root.hh
index acac794eb65390aab293018880115430180673a3..6027fa0896c6ea73b525510bca5aab85c23d7a38 100644
--- a/test/multidomain/embedded/1d3d/1p_richards/problem_root.hh
+++ b/test/multidomain/embedded/1d3d/1p_richards/problem_root.hh
@@ -29,6 +29,7 @@
#include <dumux/common/boundarytypes.hh>
#include <dumux/common/parameters.hh>
#include <dumux/common/properties.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh>
@@ -46,7 +47,7 @@ class RootProblem : public PorousMediumFlowProblem<TypeTag>
using PointSource = GetPropType<TypeTag, Properties::PointSource>;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
- using NeumannFluxes = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NeumannFluxes = Dumux::NumEqVector<PrimaryVariables>;
using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using GridView = typename GridGeometry::GridView;
diff --git a/test/multidomain/embedded/2d3d/1p_1p/problem_fracture.hh b/test/multidomain/embedded/2d3d/1p_1p/problem_fracture.hh
index 51fdd6855be714e9ea84bb2c8160c1995437d674..8ab5a82083be9586c6272bf81da26ee598fc2bcd 100644
--- a/test/multidomain/embedded/2d3d/1p_1p/problem_fracture.hh
+++ b/test/multidomain/embedded/2d3d/1p_1p/problem_fracture.hh
@@ -28,6 +28,7 @@
#include <dumux/common/boundarytypes.hh>
#include <dumux/common/parameters.hh>
#include <dumux/common/properties.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/porousmediumflow/1p/incompressiblelocalresidual.hh>
@@ -46,7 +47,7 @@ class FractureProblem : public PorousMediumFlowProblem<TypeTag>
using PointSource = GetPropType<TypeTag, Properties::PointSource>;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
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 GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using GridView = typename GridGeometry::GridView;
diff --git a/test/multidomain/embedded/2d3d/1p_1p/problem_matrix.hh b/test/multidomain/embedded/2d3d/1p_1p/problem_matrix.hh
index 5e2c53831c74c978b52d101201af3b90f581ff1a..a0480b76db191c99d66dc81482309abd6346fd47 100644
--- a/test/multidomain/embedded/2d3d/1p_1p/problem_matrix.hh
+++ b/test/multidomain/embedded/2d3d/1p_1p/problem_matrix.hh
@@ -32,6 +32,7 @@
#include <dumux/common/boundarytypes.hh>
#include <dumux/common/math.hh>
#include <dumux/common/parameters.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/porousmediumflow/1p/incompressiblelocalresidual.hh>
@@ -52,7 +53,7 @@ class MatrixProblem : public PorousMediumFlowProblem<TypeTag>
using FVElementGeometry = typename GridGeometry::LocalView;
using SubControlVolume = typename GridGeometry::SubControlVolume;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
diff --git a/test/multidomain/facet/1p_1p/analytical/problem_bulk.hh b/test/multidomain/facet/1p_1p/analytical/problem_bulk.hh
index 345f5f4d014ad5df78862b63880f7e84d9666dce..d9c432ab5134322caf25ec4b244ee884f3a390f7 100644
--- a/test/multidomain/facet/1p_1p/analytical/problem_bulk.hh
+++ b/test/multidomain/facet/1p_1p/analytical/problem_bulk.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>
@@ -57,7 +58,7 @@ class OnePBulkProblem : 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 NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
public:
OnePBulkProblem(std::shared_ptr<const GridGeometry> gridGeometry,
diff --git a/test/multidomain/facet/1p_1p/analytical/problem_lowdim.hh b/test/multidomain/facet/1p_1p/analytical/problem_lowdim.hh
index d49be8dd30a3573f2ec724b113862648e3cfec97..dce49c0be75ee01a7fb6e1e24b77334ec01b5b8e 100644
--- a/test/multidomain/facet/1p_1p/analytical/problem_lowdim.hh
+++ b/test/multidomain/facet/1p_1p/analytical/problem_lowdim.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>
@@ -57,7 +58,7 @@ class OnePLowDimProblem : 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 NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
public:
OnePLowDimProblem(std::shared_ptr<const GridGeometry> gridGeometry,
diff --git a/test/multidomain/facet/1p_1p/gravity/problem_bulk.hh b/test/multidomain/facet/1p_1p/gravity/problem_bulk.hh
index 2fe06c34fefde6813e56d6319373befc5a2266de..f85dd262cd0744afe633f0d9a0099d3746d8844e 100644
--- a/test/multidomain/facet/1p_1p/gravity/problem_bulk.hh
+++ b/test/multidomain/facet/1p_1p/gravity/problem_bulk.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>
@@ -56,7 +57,7 @@ class OnePBulkProblem : 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 NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
static constexpr int dimWorld = GridView::dimensionworld;
diff --git a/test/multidomain/facet/1p_1p/gravity/problem_lowdim.hh b/test/multidomain/facet/1p_1p/gravity/problem_lowdim.hh
index d9f6a8b5ab415e746925b3f42ba8117c1baba0f9..e6cebf86c1b114ee261fa9a545d007620e060d0e 100644
--- a/test/multidomain/facet/1p_1p/gravity/problem_lowdim.hh
+++ b/test/multidomain/facet/1p_1p/gravity/problem_lowdim.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>
@@ -56,7 +57,7 @@ class OnePLowDimProblem : 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 NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
static constexpr int dimWorld = GridView::dimensionworld;
diff --git a/test/multidomain/facet/1p_1p/linearprofile/problem_bulk.hh b/test/multidomain/facet/1p_1p/linearprofile/problem_bulk.hh
index 1af4ede20aa44834badc578e92d2bcbb79ec226f..525b399ee67849be939ec7827ded5af511998481 100644
--- a/test/multidomain/facet/1p_1p/linearprofile/problem_bulk.hh
+++ b/test/multidomain/facet/1p_1p/linearprofile/problem_bulk.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>
@@ -56,7 +57,7 @@ class OnePBulkProblem : 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 NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
public:
OnePBulkProblem(std::shared_ptr<const GridGeometry> gridGeometry,
diff --git a/test/multidomain/facet/1p_1p/linearprofile/problem_lowdim.hh b/test/multidomain/facet/1p_1p/linearprofile/problem_lowdim.hh
index 2152893e7042db79050996aeb4a4971b60be54b6..95810a87fc5ff3f10cdf66e59ead125f513bc077 100644
--- a/test/multidomain/facet/1p_1p/linearprofile/problem_lowdim.hh
+++ b/test/multidomain/facet/1p_1p/linearprofile/problem_lowdim.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>
@@ -56,7 +57,7 @@ class OnePLowDimProblem : 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 NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
public:
OnePLowDimProblem(std::shared_ptr<const GridGeometry> gridGeometry,
diff --git a/test/multidomain/facet/1p_1p/threedomain/problem_bulk.hh b/test/multidomain/facet/1p_1p/threedomain/problem_bulk.hh
index 61040a0987f23007c40ee3e12b6e8f51c08af6e5..9e1fd2898402a8c9d34d57b4dcd00de6adf67791 100644
--- a/test/multidomain/facet/1p_1p/threedomain/problem_bulk.hh
+++ b/test/multidomain/facet/1p_1p/threedomain/problem_bulk.hh
@@ -26,6 +26,7 @@
#define DUMUX_TEST_FACETCOUPLING_THREEDOMAIN_ONEP_BULKPROBLEM_HH
#include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh>
@@ -40,10 +41,9 @@ template<class TypeTag>
class OnePBulkProblem : public PorousMediumFlowProblem<TypeTag>
{
using ParentType = PorousMediumFlowProblem<TypeTag>;
-
- 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 GridGeometry = typename GridVariables::GridGeometry;
diff --git a/test/multidomain/facet/1p_1p/threedomain/problem_edge.hh b/test/multidomain/facet/1p_1p/threedomain/problem_edge.hh
index b049117de1b848c9ac1259596587a425843d0dd7..3556fd23633602aa79b24d8296923872abfd3631 100644
--- a/test/multidomain/facet/1p_1p/threedomain/problem_edge.hh
+++ b/test/multidomain/facet/1p_1p/threedomain/problem_edge.hh
@@ -27,6 +27,7 @@
#define DUMUX_TEST_FACETCOUPLING_THREEDOMAIN_ONEP_EDGEPROBLEM_HH
#include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh>
@@ -41,11 +42,10 @@ template<class TypeTag>
class OnePEdgeProblem : public PorousMediumFlowProblem<TypeTag>
{
using ParentType = PorousMediumFlowProblem<TypeTag>;
-
- 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 GridGeometry = typename GridVariables::GridGeometry;
diff --git a/test/multidomain/facet/1p_1p/threedomain/problem_facet.hh b/test/multidomain/facet/1p_1p/threedomain/problem_facet.hh
index 2786d1715949bc77f0c9a3b61e84b206ab768b1d..160ff516a403c6326c9f323bf892c181fa423add 100644
--- a/test/multidomain/facet/1p_1p/threedomain/problem_facet.hh
+++ b/test/multidomain/facet/1p_1p/threedomain/problem_facet.hh
@@ -27,6 +27,7 @@
#define DUMUX_TEST_FACETCOUPLING_THREEDOMAIN_ONEP_FACETPROBLEM_HH
#include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh>
@@ -41,11 +42,10 @@ template<class TypeTag>
class OnePFacetProblem : public PorousMediumFlowProblem<TypeTag>
{
using ParentType = PorousMediumFlowProblem<TypeTag>;
-
- 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 GridGeometry = typename GridVariables::GridGeometry;
diff --git a/test/multidomain/facet/1pnc_1pnc/problem_bulk.hh b/test/multidomain/facet/1pnc_1pnc/problem_bulk.hh
index 04e0c985e72476c8d0b8ffca300db7019bdf006e..52cf0121cd6812bdfa37ea25738ea3932294dd24 100644
--- a/test/multidomain/facet/1pnc_1pnc/problem_bulk.hh
+++ b/test/multidomain/facet/1pnc_1pnc/problem_bulk.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>
@@ -61,7 +62,7 @@ class OnePNCBulkProblem : 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 NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
diff --git a/test/multidomain/facet/1pnc_1pnc/problem_facet.hh b/test/multidomain/facet/1pnc_1pnc/problem_facet.hh
index 6a4d8ef3464980d91d173f613ecf1371c92f8035..93f783f9eb1ccb17eb8814d857be0069cdec9b0a 100644
--- a/test/multidomain/facet/1pnc_1pnc/problem_facet.hh
+++ b/test/multidomain/facet/1pnc_1pnc/problem_facet.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>
@@ -56,7 +57,7 @@ class OnePNCLowDimProblem : 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 NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
diff --git a/test/multidomain/facet/tracer_tracer/problem_1p_bulk.hh b/test/multidomain/facet/tracer_tracer/problem_1p_bulk.hh
index 475119d6f6f97b0f35f22137545ad614971319ce..b8a840a6d330158db6edf9acc810f73f382236d1 100644
--- a/test/multidomain/facet/tracer_tracer/problem_1p_bulk.hh
+++ b/test/multidomain/facet/tracer_tracer/problem_1p_bulk.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 <dumux/porousmediumflow/problem.hh>
@@ -58,7 +59,7 @@ class OnePBulkProblem : 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 NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
public:
diff --git a/test/multidomain/facet/tracer_tracer/problem_1p_lowdim.hh b/test/multidomain/facet/tracer_tracer/problem_1p_lowdim.hh
index b03a50b93c6310b37441b2b1a9a990c3b51820d7..73c66ea399da0a59eaef7f02ac578e4a176d2b64 100644
--- a/test/multidomain/facet/tracer_tracer/problem_1p_lowdim.hh
+++ b/test/multidomain/facet/tracer_tracer/problem_1p_lowdim.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 <dumux/porousmediumflow/problem.hh>
@@ -58,7 +59,7 @@ class OnePLowDimProblem : 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 NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
public:
diff --git a/test/multidomain/facet/tracer_tracer/problem_tracer_bulk.hh b/test/multidomain/facet/tracer_tracer/problem_tracer_bulk.hh
index 673dfb27426411a6b3b2c77cdfd4461764aa24d5..9bc7a0c84dbb7bd21c441013424b3a798fa78551 100644
--- a/test/multidomain/facet/tracer_tracer/problem_tracer_bulk.hh
+++ b/test/multidomain/facet/tracer_tracer/problem_tracer_bulk.hh
@@ -28,6 +28,7 @@
#include <dumux/common/boundarytypes.hh>
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh>
@@ -50,7 +51,7 @@ class TracerBulkProblem : public PorousMediumFlowProblem<TypeTag>
using FVElementGeometry = typename GridGeometry::LocalView;
using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using CouplingManager = GetPropType<TypeTag, Properties::CouplingManager>;
diff --git a/test/multidomain/facet/tracer_tracer/problem_tracer_lowdim.hh b/test/multidomain/facet/tracer_tracer/problem_tracer_lowdim.hh
index d44ed955594ffd1d2fee04dffc0af5d1152c10f9..8739f9e849bd2a2b6d80138fb2ef51b22a808e3f 100644
--- a/test/multidomain/facet/tracer_tracer/problem_tracer_lowdim.hh
+++ b/test/multidomain/facet/tracer_tracer/problem_tracer_lowdim.hh
@@ -28,6 +28,7 @@
#include <dumux/common/boundarytypes.hh>
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh>
@@ -50,7 +51,7 @@ class TracerLowDimProblem : public PorousMediumFlowProblem<TypeTag>
using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using CouplingManager = GetPropType<TypeTag, Properties::CouplingManager>;
diff --git a/test/multidomain/poromechanics/el1p/problem_1p.hh b/test/multidomain/poromechanics/el1p/problem_1p.hh
index 8c4546b416197117355d83dd052f3c5493f68bdf..aa10e7866be3b5299fdc07fb56d868f528c913e0 100644
--- a/test/multidomain/poromechanics/el1p/problem_1p.hh
+++ b/test/multidomain/poromechanics/el1p/problem_1p.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>
@@ -50,8 +51,8 @@ class OnePSubProblem : public PorousMediumFlowProblem<TypeTag>
// copy pressure index for convenience
enum { pressureIdx = GetPropType<TypeTag, Properties::ModelTraits>::Indices::pressureIdx };
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
diff --git a/test/multidomain/poromechanics/el2p/problem_2p.hh b/test/multidomain/poromechanics/el2p/problem_2p.hh
index 3ab0efc2f9e9f7964e956859429c2fa4a642e760..c36171eccc7bf9a4f22c4e41798a42d50dc94c60 100644
--- a/test/multidomain/poromechanics/el2p/problem_2p.hh
+++ b/test/multidomain/poromechanics/el2p/problem_2p.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 <dumux/porousmediumflow/problem.hh>
@@ -58,8 +59,8 @@ class TwoPSubProblem : public PorousMediumFlowProblem<TypeTag>
dimWorld = GridView::dimensionworld
};
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
diff --git a/test/porousmediumflow/1p/convergence/analyticsolution/problem.hh b/test/porousmediumflow/1p/convergence/analyticsolution/problem.hh
index a9b6ce136dca3781828987b674b452e11c16f0a1..dddd97a4d7ff624d5a0c8245ff81c3f1c81d85ba 100644
--- a/test/porousmediumflow/1p/convergence/analyticsolution/problem.hh
+++ b/test/porousmediumflow/1p/convergence/analyticsolution/problem.hh
@@ -29,6 +29,7 @@
#include <dumux/common/properties.hh>
#include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh>
namespace Dumux {
@@ -44,7 +45,7 @@ class ConvergenceProblem : public PorousMediumFlowProblem<TypeTag>
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
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 GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using Element = typename GridView::template Codim<0>::Entity;
diff --git a/test/porousmediumflow/1p/convergence/discretesolution/problem.hh b/test/porousmediumflow/1p/convergence/discretesolution/problem.hh
index f51d671aafbc21c34bb286585ba1bf3c29b1a0f1..e7aeda7baa1ff2a5db9836a2c13a435c4855666a 100644
--- a/test/porousmediumflow/1p/convergence/discretesolution/problem.hh
+++ b/test/porousmediumflow/1p/convergence/discretesolution/problem.hh
@@ -32,6 +32,7 @@
#include <dumux/common/parameters.hh>
#include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh>
namespace Dumux {
@@ -46,8 +47,8 @@ class OnePTestProblem : public PorousMediumFlowProblem<TypeTag>
using ParentType = PorousMediumFlowProblem<TypeTag>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
diff --git a/test/porousmediumflow/1p/internaldirichlet/problem.hh b/test/porousmediumflow/1p/internaldirichlet/problem.hh
index fa973da8045508c39dfc9d7f9304749fbbef1cdc..031909238395b80560e95b20c9d634d83dee873e 100644
--- a/test/porousmediumflow/1p/internaldirichlet/problem.hh
+++ b/test/porousmediumflow/1p/internaldirichlet/problem.hh
@@ -26,6 +26,7 @@
#define DUMUX_INCOMPRESSIBLE_ONEP_TEST_PROBLEM_INTERNAL_DIRICHLET_HH
#include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
#include <test/porousmediumflow/1p/incompressible/problem.hh>
@@ -42,7 +43,7 @@ class OnePTestProblemInternalDirichlet : public OnePTestProblem<TypeTag>
using Element = typename GridView::template Codim<0>::Entity;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
- using NeumannValues = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NeumannValues = Dumux::NumEqVector<PrimaryVariables>;
using ModelTraits = GetPropType<TypeTag, Properties::ModelTraits>;
using BoundaryTypes = Dumux::BoundaryTypes<ModelTraits::numEq()>;
using Indices = typename ModelTraits::Indices;
diff --git a/test/porousmediumflow/1p/nonisothermal/problem_convection.hh b/test/porousmediumflow/1p/nonisothermal/problem_convection.hh
index e63db68855b8b3839bf71cec5d8bc1f74479d928..d43cdaf25e5ab0e47c96cb7f06773d617fe3a723 100644
--- a/test/porousmediumflow/1p/nonisothermal/problem_convection.hh
+++ b/test/porousmediumflow/1p/nonisothermal/problem_convection.hh
@@ -34,6 +34,7 @@
#include <dumux/common/parameters.hh>
#include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/material/components/h2o.hh>
@@ -96,7 +97,7 @@ class OnePNIConvectionProblem : public PorousMediumFlowProblem<TypeTag>
energyEqIdx = Indices::energyEqIdx
};
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using Element = typename GridView::template Codim<0>::Entity;
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
diff --git a/test/porousmediumflow/1p/periodicbc/problem.hh b/test/porousmediumflow/1p/periodicbc/problem.hh
index 33143222298198d0269bb917df28ab2205ce8e7d..c4174210523e2f7b495961db0754a86b6513eea6 100644
--- a/test/porousmediumflow/1p/periodicbc/problem.hh
+++ b/test/porousmediumflow/1p/periodicbc/problem.hh
@@ -31,6 +31,7 @@
#define FVGEOMCACHING 0
#endif
+#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh>
namespace Dumux {
@@ -50,7 +51,7 @@ class OnePTestProblem : public PorousMediumFlowProblem<TypeTag>
using Element = typename GridView::template Codim<0>::Entity;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
- using SourceValues = GetPropType<TypeTag, Properties::NumEqVector>;
+ using SourceValues = Dumux::NumEqVector<PrimaryVariables>;
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
static constexpr int dimWorld = GridView::dimensionworld;
diff --git a/test/porousmediumflow/1p/rootbenchmark/problem.hh b/test/porousmediumflow/1p/rootbenchmark/problem.hh
index 0b748697ef5db13e1aa78619bcd4bfc5dbd1d7de..3e44b87af099da62e1d76e0f3b724b6ecfe30af4 100644
--- a/test/porousmediumflow/1p/rootbenchmark/problem.hh
+++ b/test/porousmediumflow/1p/rootbenchmark/problem.hh
@@ -31,6 +31,7 @@
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
#include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/io/format.hh>
@@ -60,7 +61,7 @@ class RootBenchmarkProblem : public PorousMediumFlowProblem<TypeTag>
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:
RootBenchmarkProblem(std::shared_ptr<const GridGeometry> gridGeometry)
diff --git a/test/porousmediumflow/1pnc/1p2c/isothermal/problem.hh b/test/porousmediumflow/1pnc/1p2c/isothermal/problem.hh
index edcd18def4f6fb4212bbff9529b3f191c6a2c4ea..7a399a5635b4e950baae2406d5ead5bef8d3ee65 100644
--- a/test/porousmediumflow/1pnc/1p2c/isothermal/problem.hh
+++ b/test/porousmediumflow/1pnc/1p2c/isothermal/problem.hh
@@ -30,6 +30,7 @@
#include <dumux/common/parameters.hh>
#include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh>
@@ -69,7 +70,7 @@ class OnePTwoCTestProblem : public PorousMediumFlowProblem<TypeTag>
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using Element = typename GridView::template Codim<0>::Entity;
diff --git a/test/porousmediumflow/1pnc/1p2c/nonisothermal/conduction/problem.hh b/test/porousmediumflow/1pnc/1p2c/nonisothermal/conduction/problem.hh
index 1d75a69cae4733a1d4ce60fe84b12a2783b3b8fb..92875d12f172b6f66aaa6f5544f3c24d73e11a26 100644
--- a/test/porousmediumflow/1pnc/1p2c/nonisothermal/conduction/problem.hh
+++ b/test/porousmediumflow/1pnc/1p2c/nonisothermal/conduction/problem.hh
@@ -30,6 +30,7 @@
#include <dumux/common/parameters.hh>
#include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/material/components/h2o.hh>
@@ -71,7 +72,7 @@ class OnePTwoCNIConductionProblem : public PorousMediumFlowProblem<TypeTag>
using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using Element = typename GridView::template Codim<0>::Entity;
using ThermalConductivityModel = GetPropType<TypeTag, Properties::ThermalConductivityModel>;
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
diff --git a/test/porousmediumflow/1pnc/1p2c/nonisothermal/convection/problem.hh b/test/porousmediumflow/1pnc/1p2c/nonisothermal/convection/problem.hh
index 7ccfe17c054597ea9f76d64c64db9bf800578c61..027fe96e112442bbd2248b779a068b5b240edc45 100644
--- a/test/porousmediumflow/1pnc/1p2c/nonisothermal/convection/problem.hh
+++ b/test/porousmediumflow/1pnc/1p2c/nonisothermal/convection/problem.hh
@@ -30,6 +30,7 @@
#include <dumux/common/parameters.hh>
#include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/material/components/h2o.hh>
@@ -73,7 +74,7 @@ class OnePTwoCNIConvectionProblem : public PorousMediumFlowProblem<TypeTag>
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
using GridGeometry = 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 ElementVolumeVariables = typename GridVariables::GridVolumeVariables::LocalView;
diff --git a/test/porousmediumflow/1pnc/1p2c/nonisothermal/transientbc/problem.hh b/test/porousmediumflow/1pnc/1p2c/nonisothermal/transientbc/problem.hh
index 8a3c4b414324e4d62140de3d0e939ed9d660cfcd..24c51b1d3cd7fbe424ed50aea93f6ed96165a18e 100644
--- a/test/porousmediumflow/1pnc/1p2c/nonisothermal/transientbc/problem.hh
+++ b/test/porousmediumflow/1pnc/1p2c/nonisothermal/transientbc/problem.hh
@@ -30,6 +30,7 @@
#include <dumux/common/parameters.hh>
#include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/material/components/h2o.hh>
@@ -73,7 +74,7 @@ class OnePTwoCNITransientBCProblem : public PorousMediumFlowProblem<TypeTag>
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
using Element = typename GridView::template Codim<0>::Entity;
diff --git a/test/porousmediumflow/1pnc/1p3c/problem.hh b/test/porousmediumflow/1pnc/1p3c/problem.hh
index 37df0c5110fffb63b5368b38219d4ba0c7abc194..1217268db3b0c3d61696ed53dbd8eb2ca5e40a43 100644
--- a/test/porousmediumflow/1pnc/1p3c/problem.hh
+++ b/test/porousmediumflow/1pnc/1p3c/problem.hh
@@ -29,6 +29,7 @@
#include <dumux/common/parameters.hh>
#include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/io/gnuplotinterface.hh>
@@ -58,7 +59,7 @@ class MaxwellStefanOnePThreeCTestProblem : public PorousMediumFlowProblem<TypeTa
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
diff --git a/test/porousmediumflow/1pnc/nonequilibrium/problem.hh b/test/porousmediumflow/1pnc/nonequilibrium/problem.hh
index 42adfbec8427ca40b6faa7271720620024374b4b..6950b05e46eaf04308feace3f16e1353cf8936ba 100644
--- a/test/porousmediumflow/1pnc/nonequilibrium/problem.hh
+++ b/test/porousmediumflow/1pnc/nonequilibrium/problem.hh
@@ -30,6 +30,7 @@
#include <dumux/common/parameters.hh>
#include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/material/components/h2o.hh>
@@ -66,7 +67,7 @@ class OnePTwoCThermalNonequilibriumProblem : public PorousMediumFlowProblem<Type
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
using GridGeometry = 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 ElementVolumeVariables = typename GridVariables::GridVolumeVariables::LocalView;
diff --git a/test/porousmediumflow/1pncmin/nonisothermal/problem.hh b/test/porousmediumflow/1pncmin/nonisothermal/problem.hh
index 83f52cffb24d7e929ecfce77f21570520217070c..00ca2736785738110e1edd7387b4555075abe334 100644
--- a/test/porousmediumflow/1pncmin/nonisothermal/problem.hh
+++ b/test/porousmediumflow/1pncmin/nonisothermal/problem.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/discretization/elementsolution.hh>
#include <dumux/porousmediumflow/problem.hh>
@@ -71,7 +72,7 @@ class ThermoChemProblem : public PorousMediumFlowProblem<TypeTag>
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
using ReactionRate = ThermoChemReaction;
diff --git a/test/porousmediumflow/2p/boxdfm/problem.hh b/test/porousmediumflow/2p/boxdfm/problem.hh
index 4fcc584b80f3bd02c2d5f021ced1581a15377669..605bf5123f510432dc6142c04ad72631c8084045 100644
--- a/test/porousmediumflow/2p/boxdfm/problem.hh
+++ b/test/porousmediumflow/2p/boxdfm/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>
@@ -47,7 +48,7 @@ class TwoPTestProblem : public PorousMediumFlowProblem<TypeTag>
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
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 GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using SubControlVolume = typename GridGeometry::SubControlVolume;
diff --git a/test/porousmediumflow/2p/cornerpoint/problem.hh b/test/porousmediumflow/2p/cornerpoint/problem.hh
index 84f53984f4def613788ea279bbedd100abc41921..e3263cb65b667646813889ddec221caf67fcdffc 100644
--- a/test/porousmediumflow/2p/cornerpoint/problem.hh
+++ b/test/porousmediumflow/2p/cornerpoint/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>
@@ -52,7 +53,7 @@ class TwoPCornerPointTestProblem : public PorousMediumFlowProblem<TypeTag>
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
enum { dimWorld = GridView::dimensionworld };
diff --git a/test/porousmediumflow/2p/fracture/problem.hh b/test/porousmediumflow/2p/fracture/problem.hh
index dab7fb15dc6564a1705d330be188ce94f6fc16b8..1b6cd24f543d70072696b988996cdb6a17dbed66 100644
--- a/test/porousmediumflow/2p/fracture/problem.hh
+++ b/test/porousmediumflow/2p/fracture/problem.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>
@@ -49,7 +50,7 @@ class FractureProblem : public PorousMediumFlowProblem<TypeTag>
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
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>;
enum
{
diff --git a/test/porousmediumflow/2p/incompressible/problem.hh b/test/porousmediumflow/2p/incompressible/problem.hh
index ef6228e4b9b1fb8edd6a5ead89ec30b1aa4345be..4132376e546245adf43ddcf5328c353c2255e63f 100644
--- a/test/porousmediumflow/2p/incompressible/problem.hh
+++ b/test/porousmediumflow/2p/incompressible/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>
@@ -47,7 +48,7 @@ class TwoPTestProblem : public PorousMediumFlowProblem<TypeTag>
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
enum {
pressureH2OIdx = Indices::pressureIdx,
diff --git a/test/porousmediumflow/2p/nonisothermal/problem.hh b/test/porousmediumflow/2p/nonisothermal/problem.hh
index 1e81ef0129f36ceb05e91e232549dcecf0ff85f9..0bcb48b1a3e3468d531af7e9cc33f19d54add866 100644
--- a/test/porousmediumflow/2p/nonisothermal/problem.hh
+++ b/test/porousmediumflow/2p/nonisothermal/problem.hh
@@ -31,6 +31,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>
@@ -97,7 +98,7 @@ class InjectionProblem2PNI : public PorousMediumFlowProblem<TypeTag>
};
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
diff --git a/test/porousmediumflow/2p1c/problem.hh b/test/porousmediumflow/2p1c/problem.hh
index d4a97bdbac595a5d272580de9d1380a46784ba31..6e054df3c822de94c02c296a9d5ac9116740577c 100644
--- a/test/porousmediumflow/2p1c/problem.hh
+++ b/test/porousmediumflow/2p1c/problem.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>
@@ -51,7 +52,7 @@ class InjectionProblem : public PorousMediumFlowProblem<TypeTag>
using BoundaryTypes = Dumux::BoundaryTypes<ModelTraits::numEq()>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
using ElementVolumeVariables = typename GridVariables::GridVolumeVariables::LocalView;
diff --git a/test/porousmediumflow/2p2c/chemicalnonequilibrium/problem.hh b/test/porousmediumflow/2p2c/chemicalnonequilibrium/problem.hh
index 45addcfad1a1c0ec32880b2ef53480bb8ce1c39c..d94f5ae81914425e9dfd17bd8ad8cc156b748dff 100644
--- a/test/porousmediumflow/2p2c/chemicalnonequilibrium/problem.hh
+++ b/test/porousmediumflow/2p2c/chemicalnonequilibrium/problem.hh
@@ -30,6 +30,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>
@@ -49,7 +50,7 @@ class TwoPTwoCChemicalNonequilibriumProblem : public PorousMediumFlowProblem<Typ
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
- using NeumannFluxes = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NeumannFluxes = Dumux::NumEqVector<PrimaryVariables>;
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
using ElementVolumeVariables = typename GridVariables::GridVolumeVariables::LocalView;
using ElementFluxVariablesCache = typename GridVariables::GridFluxVariablesCache::LocalView;
diff --git a/test/porousmediumflow/2p2c/mpnccomparison/problem.hh b/test/porousmediumflow/2p2c/mpnccomparison/problem.hh
index 71cee588bd20088ad6a7c562d3dc7ce3141b8eb6..20bddf504a59b7e200a9d4704d7c39ae473f43ec 100644
--- a/test/porousmediumflow/2p2c/mpnccomparison/problem.hh
+++ b/test/porousmediumflow/2p2c/mpnccomparison/problem.hh
@@ -30,6 +30,7 @@
#include <dumux/common/boundarytypes.hh>
#include <dumux/common/parameters.hh>
#include <dumux/common/properties.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh>
@@ -49,7 +50,7 @@ class TwoPTwoCComparisonProblem : public PorousMediumFlowProblem<TypeTag>
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
- using NeumannFluxes = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NeumannFluxes = Dumux::NumEqVector<PrimaryVariables>;
using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
diff --git a/test/porousmediumflow/2p2c/waterair/problem.hh b/test/porousmediumflow/2p2c/waterair/problem.hh
index 681ed000e489c206189a4b2360a28372b6fb9e10..63069a2a51e42ed9bcd33973c5b779a15ac23f5d 100644
--- a/test/porousmediumflow/2p2c/waterair/problem.hh
+++ b/test/porousmediumflow/2p2c/waterair/problem.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/material/components/n2.hh>
#include <dumux/porousmediumflow/problem.hh>
@@ -103,7 +104,7 @@ class WaterAirProblem : public PorousMediumFlowProblem<TypeTag>
enum { N2Idx = FluidSystem::N2Idx };
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/test/porousmediumflow/2pnc/diffusion/problem.hh b/test/porousmediumflow/2pnc/diffusion/problem.hh
index be946cc01380ee92216425677a67f897c7bfac06..fb3b1279cb74e480ce5407271694f1f034867258 100644
--- a/test/porousmediumflow/2pnc/diffusion/problem.hh
+++ b/test/porousmediumflow/2pnc/diffusion/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>
@@ -52,7 +53,7 @@ class TwoPNCDiffusionProblem : public PorousMediumFlowProblem<TypeTag>
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
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/test/porousmediumflow/2pnc/fuelcell/problem.hh b/test/porousmediumflow/2pnc/fuelcell/problem.hh
index d0fa1eb0c5f83ede37a939d8f2b0ea9f9e7cf73a..e601b70adb33ea90505d4c1e04a479c35fe8abcd 100644
--- a/test/porousmediumflow/2pnc/fuelcell/problem.hh
+++ b/test/porousmediumflow/2pnc/fuelcell/problem.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>
@@ -56,7 +57,7 @@ class FuelCellProblem : public PorousMediumFlowProblem<TypeTag>
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
diff --git a/test/porousmediumflow/2pncmin/isothermal/problem.hh b/test/porousmediumflow/2pncmin/isothermal/problem.hh
index 1c73c44c925a8da76313b4b2a0e9269ea66d5e94..358aafd60e99d555bdffa30bcb846ef206ffc93e 100644
--- a/test/porousmediumflow/2pncmin/isothermal/problem.hh
+++ b/test/porousmediumflow/2pncmin/isothermal/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>
@@ -106,7 +107,7 @@ class DissolutionProblem : 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 ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
using Element = typename GridView::template Codim<0>::Entity;
diff --git a/test/porousmediumflow/2pncmin/nonisothermal/problem.hh b/test/porousmediumflow/2pncmin/nonisothermal/problem.hh
index cd38da30afa48821c206cda6a82b07e517bf3b23..d7a4f99b52c5510532adb13fc0f754bcb2673135 100644
--- a/test/porousmediumflow/2pncmin/nonisothermal/problem.hh
+++ b/test/porousmediumflow/2pncmin/nonisothermal/problem.hh
@@ -27,6 +27,7 @@
#include <dumux/common/boundarytypes.hh>
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/io/gnuplotinterface.hh>
@@ -110,7 +111,7 @@ class SalinizationProblem : 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 GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
using ElementFluxVariablesCache = typename GridVariables::GridFluxVariablesCache::LocalView;
diff --git a/test/porousmediumflow/3p/conduction/problem.hh b/test/porousmediumflow/3p/conduction/problem.hh
index aaf40af3d831af494feb4cca87a67646ed3c6640..6597bc5eab9dacf3cbe01e5cc1505a37ece2c7eb 100644
--- a/test/porousmediumflow/3p/conduction/problem.hh
+++ b/test/porousmediumflow/3p/conduction/problem.hh
@@ -32,6 +32,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/components/h2o.hh>
@@ -77,7 +78,7 @@ class ThreePNIConductionProblem : public PorousMediumFlowProblem<TypeTag>
using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
using IapwsH2O = Components::H2O<Scalar>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
// copy some indices for convenience
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
diff --git a/test/porousmediumflow/3p/convection/problem.hh b/test/porousmediumflow/3p/convection/problem.hh
index 7f2b92bf840277a83edf2849d281468fcb0987e9..9e68077ebf94e7bbf087f09f5bd2425543b0767d 100644
--- a/test/porousmediumflow/3p/convection/problem.hh
+++ b/test/porousmediumflow/3p/convection/problem.hh
@@ -31,6 +31,7 @@
#include <dumux/common/boundarytypes.hh>
#include <dumux/common/parameters.hh>
#include <dumux/common/properties.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/material/components/h2o.hh>
@@ -73,7 +74,7 @@ class ThreePNIConvectionProblem : public PorousMediumFlowProblem<TypeTag>
using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
diff --git a/test/porousmediumflow/3p/infiltration/problem.hh b/test/porousmediumflow/3p/infiltration/problem.hh
index 306e0686db585d779911731602a9ca5ca441ad23..03695247a75f1630cfa5c004e3b2d2c9e1fd8d9c 100644
--- a/test/porousmediumflow/3p/infiltration/problem.hh
+++ b/test/porousmediumflow/3p/infiltration/problem.hh
@@ -26,6 +26,7 @@
#define DUMUX_INFILTRATION_THREEP_PROBLEM_HH
#include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh>
@@ -79,7 +80,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 GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
diff --git a/test/porousmediumflow/3p3c/columnxylol/problem.hh b/test/porousmediumflow/3p3c/columnxylol/problem.hh
index cc5e3388387ed59a250103fdf920e4ac2aa9b9c5..35c79ce73ab969a77bf28abdf391ad4daf6f39cc 100644
--- a/test/porousmediumflow/3p3c/columnxylol/problem.hh
+++ b/test/porousmediumflow/3p3c/columnxylol/problem.hh
@@ -29,6 +29,7 @@
#include <dumux/common/parameters.hh>
#include <dumux/common/properties.hh>
#include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh>
@@ -89,7 +90,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/test/porousmediumflow/3p3c/infiltration/problem.hh b/test/porousmediumflow/3p3c/infiltration/problem.hh
index fc91470d1da7f005a3e392a9643c6484b4223e45..4f48a995d68725eb4f6ca6659342d268760330d0 100644
--- a/test/porousmediumflow/3p3c/infiltration/problem.hh
+++ b/test/porousmediumflow/3p3c/infiltration/problem.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>
@@ -93,7 +94,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 GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
diff --git a/test/porousmediumflow/3p3c/kuevette/problem.hh b/test/porousmediumflow/3p3c/kuevette/problem.hh
index 3a22412930b83bd438cfef205797ac27a6e14645..b6c1a84aea32723c681964afdd68371de2ec8215 100644
--- a/test/porousmediumflow/3p3c/kuevette/problem.hh
+++ b/test/porousmediumflow/3p3c/kuevette/problem.hh
@@ -32,6 +32,7 @@
#include <dumux/common/parameters.hh>
#include <dumux/common/properties.hh>
#include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh>
@@ -96,7 +97,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 GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
diff --git a/test/porousmediumflow/3pwateroil/problem.hh b/test/porousmediumflow/3pwateroil/problem.hh
index ce7207eb13bef85c403de2b0ed75f3615e03134f..3cd8697ae4da217fbe59df2477892c8bd64426ff 100644
--- a/test/porousmediumflow/3pwateroil/problem.hh
+++ b/test/porousmediumflow/3pwateroil/problem.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>
@@ -68,7 +69,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 ElementVolumeVariables = typename GridVariables::GridVolumeVariables::LocalView;
using ElementFluxVariablesCache = typename GridVariables::GridFluxVariablesCache::LocalView;
diff --git a/test/porousmediumflow/co2/problem.hh b/test/porousmediumflow/co2/problem.hh
index f9cafaaa746ad89918894414074a5eea2c04d995..f9ff56e0d7319b7fe48218109676e8ebdf152e5a 100644
--- a/test/porousmediumflow/co2/problem.hh
+++ b/test/porousmediumflow/co2/problem.hh
@@ -30,6 +30,7 @@
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
#include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/parallel/vectorcommdatahandle.hh>
@@ -111,7 +112,7 @@ class HeterogeneousProblem : 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/test/porousmediumflow/mpnc/2p2ccomparison/problem.hh b/test/porousmediumflow/mpnc/2p2ccomparison/problem.hh
index 43225c7b53b7cd9d49fc4e9ef94beb7fbd3ea9aa..034f6fed0565d916597c5f0ba492dfefedab3185 100644
--- a/test/porousmediumflow/mpnc/2p2ccomparison/problem.hh
+++ b/test/porousmediumflow/mpnc/2p2ccomparison/problem.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>
#include <dumux/material/constraintsolvers/misciblemultiphasecomposition.hh>
@@ -52,7 +53,7 @@ class MPNCComparisonProblem
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
- using NeumannFluxes = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NeumannFluxes = Dumux::NumEqVector<PrimaryVariables>;
using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
diff --git a/test/porousmediumflow/mpnc/kinetic/problem.hh b/test/porousmediumflow/mpnc/kinetic/problem.hh
index c7da4b3aead0194927d7de88681fda199dcf69d2..e5e6554528d82e64252e5f19a3c3d60b19d2532c 100644
--- a/test/porousmediumflow/mpnc/kinetic/problem.hh
+++ b/test/porousmediumflow/mpnc/kinetic/problem.hh
@@ -38,6 +38,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/constraintsolvers/misciblemultiphasecomposition.hh>
@@ -59,7 +60,7 @@ class EvaporationAtmosphereProblem: public PorousMediumFlowProblem<TypeTag>
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
using ElementFluxVariablesCache = typename GetPropType<TypeTag, Properties::GridFluxVariablesCache>::LocalView;
using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
diff --git a/test/porousmediumflow/mpnc/obstacle/problem.hh b/test/porousmediumflow/mpnc/obstacle/problem.hh
index 0ce105e35fca4b0f07b246837ec67b63c63d200a..f3af7d98c333115fdbfb507e96fd4287f9ad32a0 100644
--- a/test/porousmediumflow/mpnc/obstacle/problem.hh
+++ b/test/porousmediumflow/mpnc/obstacle/problem.hh
@@ -31,6 +31,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/constraintsolvers/computefromreferencephase.hh>
@@ -73,8 +74,8 @@ class ObstacleProblem
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
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>;
using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
diff --git a/test/porousmediumflow/mpnc/thermalnonequilibrium/combustionlocalresidual.hh b/test/porousmediumflow/mpnc/thermalnonequilibrium/combustionlocalresidual.hh
index e1102bea270492c06eacc618bfd1d8121290763c..4f049f251dced5beba9eb4ec223e3adf87f0b165 100644
--- a/test/porousmediumflow/mpnc/thermalnonequilibrium/combustionlocalresidual.hh
+++ b/test/porousmediumflow/mpnc/thermalnonequilibrium/combustionlocalresidual.hh
@@ -29,6 +29,7 @@
#include <dumux/common/spline.hh>
#include <dumux/common/exceptions.hh>
#include <dumux/common/properties.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/nonequilibrium/thermal/localresidual.hh>
@@ -44,7 +45,7 @@ class CombustionEnergyLocalResidual
: public EnergyLocalResidualNonEquilibrium<TypeTag, 1/*numEnergyEqFluid*/>
{
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<GetPropType<TypeTag, Properties::PrimaryVariables>>;
using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
diff --git a/test/porousmediumflow/mpnc/thermalnonequilibrium/problem.hh b/test/porousmediumflow/mpnc/thermalnonequilibrium/problem.hh
index 6378d36aad1ae8258094752aa0883c5a4a0a4133..b4df7bde65d137140fbed6e0d27062e9f2a5bf45 100644
--- a/test/porousmediumflow/mpnc/thermalnonequilibrium/problem.hh
+++ b/test/porousmediumflow/mpnc/thermalnonequilibrium/problem.hh
@@ -33,6 +33,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/constraintsolvers/computefromreferencephase.hh>
@@ -52,7 +53,7 @@ class CombustionProblemOneComponent: public PorousMediumFlowProblem<TypeTag>
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
using ElementVolumeVariables = typename GridVariables::GridVolumeVariables::LocalView;
diff --git a/test/porousmediumflow/richards/analytical/problem.hh b/test/porousmediumflow/richards/analytical/problem.hh
index bd02b6d6705124ecee0b2cf961e956e54cf17979..d613fd52d0fee421ab00ec32c7c7e1a294424790 100644
--- a/test/porousmediumflow/richards/analytical/problem.hh
+++ b/test/porousmediumflow/richards/analytical/problem.hh
@@ -36,6 +36,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>
@@ -63,7 +64,7 @@ class RichardsAnalyticalProblem : public PorousMediumFlowProblem<TypeTag>
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
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>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
diff --git a/test/porousmediumflow/richards/benchmarks/problem.hh b/test/porousmediumflow/richards/benchmarks/problem.hh
index 097cbb10aa0fcd423c1b95cbbe5e83cfbe71384e..477f84114b11fe99834ffabe439e856d201b38b2 100644
--- a/test/porousmediumflow/richards/benchmarks/problem.hh
+++ b/test/porousmediumflow/richards/benchmarks/problem.hh
@@ -36,6 +36,7 @@
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
#include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/io/format.hh>
#include <dumux/porousmediumflow/problem.hh>
@@ -59,7 +60,7 @@ class RichardsBenchmarkProblem : public PorousMediumFlowProblem<TypeTag>
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
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>;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
diff --git a/test/porousmediumflow/richards/lens/problem.hh b/test/porousmediumflow/richards/lens/problem.hh
index 196daf954dc21d6d12336a9037a5a9e2d73cdf2b..b7f8e093597909b910043bfd39b438b338e592d8 100644
--- a/test/porousmediumflow/richards/lens/problem.hh
+++ b/test/porousmediumflow/richards/lens/problem.hh
@@ -30,6 +30,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>
@@ -68,7 +69,7 @@ class RichardsLensProblem : public PorousMediumFlowProblem<TypeTag>
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
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>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
diff --git a/test/porousmediumflow/richards/nonisothermal/conduction/problem.hh b/test/porousmediumflow/richards/nonisothermal/conduction/problem.hh
index 1230c423db0b34a13fafff050383fdbee7bb9e15..503d9319d7faf661d13a6bc947397567f000d084 100644
--- a/test/porousmediumflow/richards/nonisothermal/conduction/problem.hh
+++ b/test/porousmediumflow/richards/nonisothermal/conduction/problem.hh
@@ -31,6 +31,7 @@
#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
#include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/discretization/elementsolution.hh>
#include <dumux/porousmediumflow/problem.hh>
@@ -71,7 +72,7 @@ class RichardsNIConductionProblem :public PorousMediumFlowProblem<TypeTag>
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using ThermalConductivityModel = GetPropType<TypeTag, Properties::ThermalConductivityModel>;
using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
diff --git a/test/porousmediumflow/richards/nonisothermal/convection/problem.hh b/test/porousmediumflow/richards/nonisothermal/convection/problem.hh
index 89911bf8a2e48517b99366fe5d90fbb422919a83..35462fa464548024100f5a6232ec1f47a2d707b5 100644
--- a/test/porousmediumflow/richards/nonisothermal/convection/problem.hh
+++ b/test/porousmediumflow/richards/nonisothermal/convection/problem.hh
@@ -32,6 +32,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>
@@ -72,7 +73,7 @@ class RichardsNIConvectionProblem : public PorousMediumFlowProblem<TypeTag>
using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using ThermalConductivityModel = GetPropType<TypeTag, Properties::ThermalConductivityModel>;
diff --git a/test/porousmediumflow/richards/nonisothermal/evaporation/problem.hh b/test/porousmediumflow/richards/nonisothermal/evaporation/problem.hh
index 60becef3bf2d85809892a15bba28ed2e5011dd90..eeab97c9f3114debe0953b82212202eda641eb60 100644
--- a/test/porousmediumflow/richards/nonisothermal/evaporation/problem.hh
+++ b/test/porousmediumflow/richards/nonisothermal/evaporation/problem.hh
@@ -31,6 +31,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/components/h2o.hh>
@@ -60,7 +61,7 @@ class RichardsNIEvaporationProblem : public PorousMediumFlowProblem<TypeTag>
using FVElementGeometry = typename GridGeometry::LocalView;
using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using ThermalConductivityModel = GetPropType<TypeTag, Properties::ThermalConductivityModel>;
diff --git a/test/porousmediumflow/richardsnc/problem.hh b/test/porousmediumflow/richardsnc/problem.hh
index 77cd9a4f7817eba2154ab372f72fe708375e444c..58e64a945f94404cfb3d6ec617bece3c38ec4b35 100644
--- a/test/porousmediumflow/richardsnc/problem.hh
+++ b/test/porousmediumflow/richardsnc/problem.hh
@@ -30,6 +30,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>
@@ -72,7 +73,7 @@ class RichardsWellTracerProblem : public PorousMediumFlowProblem<TypeTag>
using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
- using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using PointSource = GetPropType<TypeTag, Properties::PointSource>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
diff --git a/test/porousmediumflow/solidenergy/problem.hh b/test/porousmediumflow/solidenergy/problem.hh
index 6ad839d2bfb5e092c4981ad43de8b0f6c5657f80..72585e26c90a6c1c7b20ed649a117f1af7d68bbe 100644
--- a/test/porousmediumflow/solidenergy/problem.hh
+++ b/test/porousmediumflow/solidenergy/problem.hh
@@ -30,6 +30,7 @@
#include <dumux/common/boundarytypes.hh>
#include <dumux/common/parameters.hh>
#include <dumux/common/properties.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh>
namespace Dumux {
@@ -45,7 +46,7 @@ class SolidEnergyProblem : public PorousMediumFlowProblem<TypeTag>
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
- using NeumannValues = GetPropType<TypeTag, Properties::NumEqVector>;
+ using NeumannValues = Dumux::NumEqVector<PrimaryVariables>;
using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
using ElementVolumeVariables = typename GridVariables::GridVolumeVariables::LocalView;
diff --git a/test/porousmediumflow/tracer/multiphase/problem.hh b/test/porousmediumflow/tracer/multiphase/problem.hh
index 3bcd57a40f2262e11b3656815a698381cf9843a4..9dcb4631c14b0fdf5d7b556d60acc8330671f02c 100644
--- a/test/porousmediumflow/tracer/multiphase/problem.hh
+++ b/test/porousmediumflow/tracer/multiphase/problem.hh
@@ -30,6 +30,7 @@
#include <dumux/common/parameters.hh>
#include <dumux/common/boundarytypes.hh>
+#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh>
namespace Dumux {
@@ -51,8 +52,8 @@ class TracerTest : public PorousMediumFlowProblem<TypeTag>
using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace;
using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
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>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using SpatialParams = GetPropType<TypeTag, Properties::SpatialParams>;