Commit 41abd4ab authored by Timo Koch's avatar Timo Koch
Browse files

Merge branch 'cleanup/deprecate_numeqvector' into 'master'

Resolve "Remove deprecation warning from NumEqVector"

Closes #25

See merge request !147
parents 567b69fa ee4b553e
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include <dumux/common/properties.hh> #include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh> #include <dumux/common/parameters.hh>
#include <dumux/common/boundarytypes.hh> #include <dumux/common/boundarytypes.hh>
#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh> #include <dumux/porousmediumflow/problem.hh>
namespace Dumux { namespace Dumux {
...@@ -71,7 +72,7 @@ class LensOnePTwoCProblem : public PorousMediumFlowProblem<TypeTag> ...@@ -71,7 +72,7 @@ class LensOnePTwoCProblem : public PorousMediumFlowProblem<TypeTag>
using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolume = typename FVElementGeometry::SubControlVolume;
using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>; using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>; using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>; using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
enum { enum {
H2OIdx = FluidSystem::compIdx(FluidSystem::MultiPhaseFluidSystem::H2OIdx), H2OIdx = FluidSystem::compIdx(FluidSystem::MultiPhaseFluidSystem::H2OIdx),
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include <dumux/common/properties.hh> #include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh> #include <dumux/common/parameters.hh>
#include <dumux/common/boundarytypes.hh> #include <dumux/common/boundarytypes.hh>
#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh> #include <dumux/porousmediumflow/problem.hh>
namespace Dumux { namespace Dumux {
...@@ -71,7 +72,7 @@ class LensTwoPTwoCProblem: public PorousMediumFlowProblem<TypeTag> ...@@ -71,7 +72,7 @@ class LensTwoPTwoCProblem: public PorousMediumFlowProblem<TypeTag>
using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolume = typename FVElementGeometry::SubControlVolume;
using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
using Element = typename GridView::template Codim<0>::Entity; using Element = typename GridView::template Codim<0>::Entity;
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>; using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>; using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
static constexpr int dim = GridView::dimension; static constexpr int dim = GridView::dimension;
static constexpr int dimWorld = GridView::dimensionworld; static constexpr int dimWorld = GridView::dimensionworld;
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include <dumux/common/properties.hh> #include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh> #include <dumux/common/parameters.hh>
#include <dumux/common/boundarytypes.hh> #include <dumux/common/boundarytypes.hh>
#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh> #include <dumux/porousmediumflow/problem.hh>
namespace Dumux{ namespace Dumux{
...@@ -69,7 +70,7 @@ class LensTwoPProblem : public PorousMediumFlowProblem<TypeTag> ...@@ -69,7 +70,7 @@ class LensTwoPProblem : public PorousMediumFlowProblem<TypeTag>
using GlobalPosition = typename Element::Geometry::GlobalCoordinate; using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>; using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>; using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>; using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
public: public:
/*! /*!
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <dumux/common/parameters.hh> #include <dumux/common/parameters.hh>
#include <dumux/common/boundarytypes.hh> #include <dumux/common/boundarytypes.hh>
#include <dumux/common/timeloop.hh> #include <dumux/common/timeloop.hh>
#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh> #include <dumux/porousmediumflow/problem.hh>
namespace Dumux { namespace Dumux {
...@@ -71,7 +72,7 @@ class LensOnePTwoCProblem : public PorousMediumFlowProblem<TypeTag> ...@@ -71,7 +72,7 @@ class LensOnePTwoCProblem : public PorousMediumFlowProblem<TypeTag>
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>; using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>; using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView; using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>; using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>; using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
static constexpr int dim = GridView::dimension; static constexpr int dim = GridView::dimension;
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <dumux/common/parameters.hh> #include <dumux/common/parameters.hh>
#include <dumux/common/timeloop.hh> #include <dumux/common/timeloop.hh>
#include <dumux/common/boundarytypes.hh> #include <dumux/common/boundarytypes.hh>
#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh> #include <dumux/porousmediumflow/problem.hh>
namespace Dumux { namespace Dumux {
...@@ -83,7 +84,7 @@ class LensTwoPProblem : public PorousMediumFlowProblem<TypeTag> ...@@ -83,7 +84,7 @@ class LensTwoPProblem : public PorousMediumFlowProblem<TypeTag>
using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView; using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolume = typename FVElementGeometry::SubControlVolume;
using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>; using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>; using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
// primary variable indices // primary variable indices
static constexpr int pressureIdx = Indices::pressureIdx; static constexpr int pressureIdx = Indices::pressureIdx;
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <dumux/common/parameters.hh> #include <dumux/common/parameters.hh>
#include <dumux/common/timeloop.hh> #include <dumux/common/timeloop.hh>
#include <dumux/common/boundarytypes.hh> #include <dumux/common/boundarytypes.hh>
#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh> #include <dumux/porousmediumflow/problem.hh>
namespace Dumux { namespace Dumux {
...@@ -75,8 +76,8 @@ class LensTwoPProblem : public PorousMediumFlowProblem<TypeTag> ...@@ -75,8 +76,8 @@ class LensTwoPProblem : public PorousMediumFlowProblem<TypeTag>
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>; using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using FluidState = GetPropType<TypeTag, Properties::FluidState>; using FluidState = GetPropType<TypeTag, Properties::FluidState>;
using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>; using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>; using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
// primary variable indices // primary variable indices
static constexpr int pressureIdx = Indices::pressureIdx; static constexpr int pressureIdx = Indices::pressureIdx;
static constexpr int saturationIdx = Indices::saturationIdx; static constexpr int saturationIdx = Indices::saturationIdx;
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <dumux/common/properties.hh> #include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh> #include <dumux/common/parameters.hh>
#include <dumux/common/boundarytypes.hh> #include <dumux/common/boundarytypes.hh>
#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh> #include <dumux/porousmediumflow/problem.hh>
#include <dumux/material/fluidsystems/brineco2.hh> #include <dumux/material/fluidsystems/brineco2.hh>
...@@ -104,7 +105,7 @@ class PlumeShapeProblem : public PorousMediumFlowProblem<TypeTag> ...@@ -104,7 +105,7 @@ class PlumeShapeProblem : public PorousMediumFlowProblem<TypeTag>
#endif #endif
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>; 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 BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using Element = typename GridView::template Codim<0>::Entity; using Element = typename GridView::template Codim<0>::Entity;
using GlobalPosition = typename Element::Geometry::GlobalCoordinate; using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <dumux/common/properties.hh> #include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh> #include <dumux/common/parameters.hh>
#include <dumux/common/boundarytypes.hh> #include <dumux/common/boundarytypes.hh>
#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh> #include <dumux/porousmediumflow/problem.hh>
#define ISOTHERMAL 0 #define ISOTHERMAL 0
...@@ -87,7 +88,7 @@ class ColumnProblem : public PorousMediumFlowProblem<TypeTag> ...@@ -87,7 +88,7 @@ class ColumnProblem : public PorousMediumFlowProblem<TypeTag>
}; };
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>; 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 BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using Element = typename GridView::template Codim<0>::Entity; using Element = typename GridView::template Codim<0>::Entity;
using GlobalPosition = typename Element::Geometry::GlobalCoordinate; using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <dumux/common/properties.hh> #include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh> #include <dumux/common/parameters.hh>
#include <dumux/common/boundarytypes.hh> #include <dumux/common/boundarytypes.hh>
#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh> #include <dumux/porousmediumflow/problem.hh>
#include <dumux/material/fluidsystems/brineco2.hh> #include <dumux/material/fluidsystems/brineco2.hh>
...@@ -53,7 +54,7 @@ class ConvmixProblem : public PorousMediumFlowProblem<TypeTag> ...@@ -53,7 +54,7 @@ class ConvmixProblem : public PorousMediumFlowProblem<TypeTag>
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>; using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>; using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView; 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 GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
using ElementFluxVariablesCache = typename GridVariables::GridFluxVariablesCache::LocalView; using ElementFluxVariablesCache = typename GridVariables::GridFluxVariablesCache::LocalView;
using ElementVolumeVariables = typename GridVariables::GridVolumeVariables::LocalView; using ElementVolumeVariables = typename GridVariables::GridVolumeVariables::LocalView;
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <dumux/common/properties.hh> #include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh> #include <dumux/common/parameters.hh>
#include <dumux/common/boundarytypes.hh> #include <dumux/common/boundarytypes.hh>
#include <dumux/common/numeqvector.hh>
// include the base problem we inherit from // include the base problem we inherit from
#include <dumux/porousmediumflow/problem.hh> #include <dumux/porousmediumflow/problem.hh>
...@@ -41,10 +42,10 @@ class FractureSubProblem : public PorousMediumFlowProblem<TypeTag> ...@@ -41,10 +42,10 @@ class FractureSubProblem : public PorousMediumFlowProblem<TypeTag>
using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>; using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using CouplingManager = GetPropType<TypeTag, Properties::CouplingManager>; using CouplingManager = GetPropType<TypeTag, Properties::CouplingManager>;
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>; using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
using ElementVolumeVariables = typename GridVariables::GridVolumeVariables::LocalView;
using PrimaryVariables = typename GridVariables::PrimaryVariables; using PrimaryVariables = typename GridVariables::PrimaryVariables;
using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using ElementVolumeVariables = typename GridVariables::GridVolumeVariables::LocalView;
using Scalar = typename GridVariables::Scalar; using Scalar = typename GridVariables::Scalar;
using FVGridGeometry = typename GridVariables::GridGeometry; using FVGridGeometry = typename GridVariables::GridGeometry;
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <dumux/common/boundarytypes.hh> #include <dumux/common/boundarytypes.hh>
#include <dumux/common/properties.hh> #include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh> #include <dumux/common/parameters.hh>
#include <dumux/common/numeqvector.hh>
// include the base problem we inherit from // include the base problem we inherit from
#include <dumux/porousmediumflow/problem.hh> #include <dumux/porousmediumflow/problem.hh>
...@@ -45,9 +46,9 @@ class MatrixSubProblem : public PorousMediumFlowProblem<TypeTag> ...@@ -45,9 +46,9 @@ class MatrixSubProblem : public PorousMediumFlowProblem<TypeTag>
using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>; using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using CouplingManager = GetPropType<TypeTag, Properties::CouplingManager>; using CouplingManager = GetPropType<TypeTag, Properties::CouplingManager>;
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>; using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
using PrimaryVariables = typename GridVariables::PrimaryVariables; using PrimaryVariables = typename GridVariables::PrimaryVariables;
using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using Scalar = typename GridVariables::Scalar; using Scalar = typename GridVariables::Scalar;
using FVGridGeometry = typename GridVariables::GridGeometry; using FVGridGeometry = typename GridVariables::GridGeometry;
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <dumux/common/properties.hh> #include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh> #include <dumux/common/parameters.hh>
#include <dumux/common/boundarytypes.hh> #include <dumux/common/boundarytypes.hh>
#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh> #include <dumux/porousmediumflow/problem.hh>
#if !ISOTHERMAL #if !ISOTHERMAL
...@@ -53,7 +54,8 @@ class FuelCellLectureProblem : public PorousMediumFlowProblem<TypeTag> ...@@ -53,7 +54,8 @@ class FuelCellLectureProblem : public PorousMediumFlowProblem<TypeTag>
using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView; using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>; using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices; using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>; using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
static constexpr int dim = GridView::dimension; static constexpr int dim = GridView::dimension;
static constexpr int numComponents = GetPropType<TypeTag, Properties::ModelTraits>::numFluidComponents(); static constexpr int numComponents = GetPropType<TypeTag, Properties::ModelTraits>::numFluidComponents();
#if !ISOTHERMAL #if !ISOTHERMAL
...@@ -66,7 +68,6 @@ class FuelCellLectureProblem : public PorousMediumFlowProblem<TypeTag> ...@@ -66,7 +68,6 @@ class FuelCellLectureProblem : public PorousMediumFlowProblem<TypeTag>
#endif #endif
static constexpr int conti0EqIdx = Indices::conti0EqIdx; static constexpr int conti0EqIdx = Indices::conti0EqIdx;
using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>; using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>; using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using Element = typename GridView::template Codim<0>::Entity; using Element = typename GridView::template Codim<0>::Entity;
using GlobalPosition = typename Element::Geometry::GlobalCoordinate; using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <dumux/common/properties.hh> #include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh> #include <dumux/common/parameters.hh>
#include <dumux/common/boundarytypes.hh> #include <dumux/common/boundarytypes.hh>
#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh> #include <dumux/porousmediumflow/problem.hh>
namespace Dumux namespace Dumux
...@@ -41,7 +42,7 @@ class HeatPipeProblem : public PorousMediumFlowProblem<TypeTag> ...@@ -41,7 +42,7 @@ class HeatPipeProblem : public PorousMediumFlowProblem<TypeTag>
using GlobalPosition = typename Element::Geometry::GlobalCoordinate; using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>; 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 BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
public: public:
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <dumux/common/properties.hh> #include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh> #include <dumux/common/parameters.hh>
#include <dumux/common/boundarytypes.hh> #include <dumux/common/boundarytypes.hh>
#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh> #include <dumux/porousmediumflow/problem.hh>
namespace Dumux { namespace Dumux {
...@@ -66,7 +67,7 @@ class SagdProblem : public PorousMediumFlowProblem<TypeTag> ...@@ -66,7 +67,7 @@ class SagdProblem : public PorousMediumFlowProblem<TypeTag>
}; };
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>; using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>; using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>; using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
using ElementFluxVariablesCache = typename GridVariables::GridFluxVariablesCache::LocalView; using ElementFluxVariablesCache = typename GridVariables::GridFluxVariablesCache::LocalView;
using ElementVolumeVariables = typename GridVariables::GridVolumeVariables::LocalView; using ElementVolumeVariables = typename GridVariables::GridVolumeVariables::LocalView;
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <dumux/common/properties.hh> #include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh> #include <dumux/common/parameters.hh>
#include <dumux/common/boundarytypes.hh> #include <dumux/common/boundarytypes.hh>
#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh> #include <dumux/porousmediumflow/problem.hh>
namespace Dumux { namespace Dumux {
...@@ -66,7 +67,7 @@ class SagdCyclicProblem : public PorousMediumFlowProblem<TypeTag> ...@@ -66,7 +67,7 @@ class SagdCyclicProblem : public PorousMediumFlowProblem<TypeTag>
}; };
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>; using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>; using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>; using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
using Problem = GetPropType<TypeTag, Properties::Problem>; using Problem = GetPropType<TypeTag, Properties::Problem>;
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>; using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <dumux/common/properties.hh> #include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh> #include <dumux/common/parameters.hh>
#include <dumux/common/boundarytypes.hh> #include <dumux/common/boundarytypes.hh>
#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh> #include <dumux/porousmediumflow/problem.hh>
namespace Dumux { namespace Dumux {
...@@ -66,7 +67,7 @@ class SagdCyclicHystProblem : public PorousMediumFlowProblem<TypeTag> ...@@ -66,7 +67,7 @@ class SagdCyclicHystProblem : public PorousMediumFlowProblem<TypeTag>
}; };
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>; using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>; using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>; using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
using Problem = GetPropType<TypeTag, Properties::Problem>; using Problem = GetPropType<TypeTag, Properties::Problem>;
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>; using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <dumux/common/properties.hh> #include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh> #include <dumux/common/parameters.hh>
#include <dumux/common/boundarytypes.hh> #include <dumux/common/boundarytypes.hh>
#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh> #include <dumux/porousmediumflow/problem.hh>
namespace Dumux { namespace Dumux {
...@@ -43,7 +44,7 @@ class Henry1p2cProblem : public PorousMediumFlowProblem<TypeTag> ...@@ -43,7 +44,7 @@ class Henry1p2cProblem : public PorousMediumFlowProblem<TypeTag>
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>; using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using Element = typename GridView::template Codim<0>::Entity; using Element = typename GridView::template Codim<0>::Entity;
using ElementIterator = typename GridView::template Codim<0>::Iterator; using ElementIterator = typename GridView::template Codim<0>::Iterator;
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>; using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using ParentType = PorousMediumFlowProblem<TypeTag>; using ParentType = PorousMediumFlowProblem<TypeTag>;
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>; using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
using ElementFluxVariablesCache = typename GridVariables::GridFluxVariablesCache::LocalView; using ElementFluxVariablesCache = typename GridVariables::GridFluxVariablesCache::LocalView;
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <dumux/common/properties.hh> #include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh> #include <dumux/common/parameters.hh>
#include <dumux/common/boundarytypes.hh> #include <dumux/common/boundarytypes.hh>
#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh> #include <dumux/porousmediumflow/problem.hh>
namespace Dumux { namespace Dumux {
...@@ -41,7 +42,8 @@ class Henry2pProblem : public PorousMediumFlowProblem<TypeTag> ...@@ -41,7 +42,8 @@ class Henry2pProblem : public PorousMediumFlowProblem<TypeTag>
using Scalar = GetPropType<TypeTag, Properties::Scalar>; using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>; using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices; using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>; using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>; using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
// primary variable indices // primary variable indices
static constexpr int pressureIdx = Indices::pressureIdx; static constexpr int pressureIdx = Indices::pressureIdx;
...@@ -51,7 +53,6 @@ class Henry2pProblem : public PorousMediumFlowProblem<TypeTag> ...@@ -51,7 +53,6 @@ class Henry2pProblem : public PorousMediumFlowProblem<TypeTag>
// Grid and world dimension // Grid and world dimension
static constexpr int dim = GridView::dimension; static constexpr int dim = GridView::dimension;
static constexpr int dimWorld = GridView::dimensionworld; static constexpr int dimWorld = GridView::dimensionworld;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>; using BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using Element = typename GridView::template Codim<0>::Entity; using Element = typename GridView::template Codim<0>::Entity;
using GlobalPosition = typename Element::Geometry::GlobalCoordinate; using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <dumux/common/properties.hh> #include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh> #include <dumux/common/parameters.hh>
#include <dumux/common/boundarytypes.hh> #include <dumux/common/boundarytypes.hh>
#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh> #include <dumux/porousmediumflow/problem.hh>
namespace Dumux namespace Dumux
...@@ -78,7 +79,7 @@ class InfiltrationThreePProblem : public PorousMediumFlowProblem<TypeTag> ...@@ -78,7 +79,7 @@ class InfiltrationThreePProblem : public PorousMediumFlowProblem<TypeTag>
}; };
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>; 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 BoundaryTypes = Dumux::BoundaryTypes<GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>; using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>; using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <dumux/common/properties.hh> #include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh> #include <dumux/common/parameters.hh>
#include <dumux/common/boundarytypes.hh> #include <dumux/common/boundarytypes.hh>
#include <dumux/common/numeqvector.hh>
#include <dumux/porousmediumflow/problem.hh> #include <dumux/porousmediumflow/problem.hh>
namespace Dumux namespace Dumux
...@@ -89,7 +90,7 @@ class InfiltrationThreePThreeCProblem : public PorousMediumFlowProblem<TypeTag> ...@@ -89,7 +90,7 @@ class InfiltrationThreePThreeCProblem : public PorousMediumFlowProblem<TypeTag>
}; };
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>; using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>; using NumEqVector = Dumux::NumEqVector<PrimaryVariables>;