Commit f139ac42 authored by Theresa Schollenberger's avatar Theresa Schollenberger
Browse files

Merge branch 'cleanup/deprecate-gridview-property' into 'master'

[properties][cleanup] replace deprecated GridView by GridGeometry::GridView

See merge request !102
parents 56126ea6 a28378a2
......@@ -109,7 +109,7 @@ template <class TypeTag >
class LensOnePTwoCProblem : public PorousMediumFlowProblem<TypeTag>
{
using ParentType = PorousMediumFlowProblem<TypeTag>;
using GridView = GetPropType<TypeTag, Properties::GridView>;
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
......
......@@ -107,7 +107,7 @@ template<class TypeTag>
class LensTwoPTwoCProblem: public PorousMediumFlowProblem<TypeTag>
{
using ParentType = PorousMediumFlowProblem<TypeTag>;
using GridView = GetPropType<TypeTag, Properties::GridView>;
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
......
......@@ -111,7 +111,7 @@ template <typename TypeTag>
class LensTwoPProblem : public PorousMediumFlowProblem<TypeTag>
{
using ParentType = PorousMediumFlowProblem<TypeTag>;
using GridView = GetPropType<TypeTag, Properties::GridView>;
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
......
......@@ -112,7 +112,7 @@ class LensOnePTwoCProblem : public PorousMediumFlowProblem<TypeTag>
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
using GridView = GetPropType<TypeTag, Properties::GridView>;
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
......
......@@ -120,7 +120,7 @@ template <class TypeTag >
class LensTwoPProblem : public PorousMediumFlowProblem<TypeTag>
{
using ParentType = PorousMediumFlowProblem<TypeTag>;
using GridView = GetPropType<TypeTag, Properties::GridView>;
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
......
......@@ -118,7 +118,7 @@ template <class TypeTag >
class LensTwoPProblem : public PorousMediumFlowProblem<TypeTag>
{
using ParentType = PorousMediumFlowProblem<TypeTag>;
using GridView = GetPropType<TypeTag, Properties::GridView>;
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
......
......@@ -76,7 +76,7 @@ class GroundwaterProblem : public DiffusionProblem1P<TypeTag>
{
typedef DiffusionProblem1P<TypeTag> ParentType;
typedef GetPropType<TypeTag, Properties::TimeManager> TimeManager;
typedef GetPropType<TypeTag, Properties::GridView> GridView;
typedef typename GetPropType<TypeTag, Properties::GridGeometry>::GridView GridView;
typedef typename GridView::Grid Grid;
typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
typedef GetPropType<TypeTag, Properties::PrimaryVariables> PrimaryVariables;
......
......@@ -34,7 +34,7 @@ namespace Dumux {
template<class TypeTag>
class GroundwaterSpatialParams: public SequentialFVSpatialParamsOneP<TypeTag>
{
typedef GetPropType<TypeTag, Properties::GridView> GridView;
typedef typename GetPropType<TypeTag, Properties::GridGeometry>::GridView GridView;
typedef GetPropType<TypeTag, Properties::Problem> Problem;
typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
......
......@@ -67,7 +67,7 @@ template<class TypeTag> class BuckleyLeverettAnalytic
{
using Problem = GetPropType<TypeTag, Properties::Problem>;
using Grid = GetPropType<TypeTag, Properties::Grid>;
using GridView = GetPropType<TypeTag, Properties::GridView>;
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using SpatialParams = GetPropType<TypeTag, Properties::SpatialParams>;
using MaterialLaw = typename SpatialParams::MaterialLaw;
......
......@@ -82,7 +82,7 @@ template<typename TypeTag>
class BuckleyLeverettProblem: public IMPESProblem2P<TypeTag>
{
using ParentType = IMPESProblem2P<TypeTag>;
using GridView = GetPropType<TypeTag, Properties::GridView>;
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using Indices = GetPropType<TypeTag, Properties::Indices>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using TimeManager = GetPropType<TypeTag, Properties::TimeManager>;
......
......@@ -61,7 +61,7 @@ template<class TypeTag>
class BuckleyLeverettSpatialParams: public SequentialFVSpatialParams<TypeTag>
{
using Grid = GetPropType<TypeTag, Properties::Grid>;
using GridView = GetPropType<TypeTag, Properties::GridView>;
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using Problem = GetPropType<TypeTag, Properties::Problem>;
using ParentType = SequentialFVSpatialParams<TypeTag>;
......
......@@ -120,7 +120,7 @@ class PlumeShapeProblem : public PorousMediumFlowProblem<TypeTag>
{
using ParentType = PorousMediumFlowProblem<TypeTag>;
using GridView = GetPropType<TypeTag, Properties::GridView>;
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
......
......@@ -132,7 +132,7 @@ template <class TypeTag >
class ColumnProblem : public PorousMediumFlowProblem<TypeTag>
{
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using GridView = GetPropType<TypeTag, Properties::GridView>;
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using ParentType = PorousMediumFlowProblem<TypeTag>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
......
......@@ -111,7 +111,7 @@ class ConvmixProblem : public PorousMediumFlowProblem<TypeTag>
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
using GridView = GetPropType<TypeTag, Properties::GridView>;
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
......
......@@ -99,7 +99,7 @@ template <class TypeTag>
class FuelCellLectureProblem : public PorousMediumFlowProblem<TypeTag>
{
using ParentType = PorousMediumFlowProblem<TypeTag>;
using GridView = GetPropType<TypeTag, Properties::GridView>;
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
......
......@@ -76,7 +76,7 @@ class HeatPipeProblem : public PorousMediumFlowProblem<TypeTag>
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using GridView = GetPropType<TypeTag, Properties::GridView>;
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using Element = typename GridView::template Codim<0>::Entity;
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
......
......@@ -106,7 +106,7 @@ template <class TypeTag >
class SagdProblem : public PorousMediumFlowProblem<TypeTag>
{
using ParentType = PorousMediumFlowProblem<TypeTag>;
using GridView = GetPropType<TypeTag, Properties::GridView>;
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
......
......@@ -106,7 +106,7 @@ template <class TypeTag >
class SagdCyclicProblem : public PorousMediumFlowProblem<TypeTag>
{
using ParentType = PorousMediumFlowProblem<TypeTag>;
using GridView = GetPropType<TypeTag, Properties::GridView>;
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
......
......@@ -105,7 +105,7 @@ template <class TypeTag>
class SagdCyclicHystProblem : public PorousMediumFlowProblem<TypeTag>
{
using ParentType = PorousMediumFlowProblem<TypeTag>;
using GridView = GetPropType<TypeTag, Properties::GridView>;
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
......
......@@ -55,7 +55,7 @@ class FicksLawDispersionImplementation<TypeTag, DiscretizationMethod::box, refer
using ElementFluxVariablesCache = typename GetPropType<TypeTag, Properties::GridFluxVariablesCache>::LocalView;
using FluxVarCache = GetPropType<TypeTag, Properties::FluxVariablesCache>;
using BalanceEqOpts = GetPropType<TypeTag, Properties::BalanceEqOpts>;
using GridView = GetPropType<TypeTag, Properties::GridView>;
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using Element = typename GridView::template Codim<0>::Entity;
using IndexType = typename GridView::IndexSet::IndexType;
using ModelTraits = GetPropType<TypeTag, Properties::ModelTraits>;
......
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