Commit ee4b553e authored by hanchuan's avatar hanchuan
Browse files

[cleanup] Deprecate old NumeqVector Property

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