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
......@@ -77,7 +77,7 @@ struct MolecularDiffusionType<TypeTag, TTag::Henry1p2cProblemTypeTag> { using ty
template <class TypeTag>
class Henry1p2cProblem : public PorousMediumFlowProblem<TypeTag>
{
using GridView = GetPropType<TypeTag, Properties::GridView>;
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
......
......@@ -88,7 +88,7 @@ template <class TypeTag >
class Henry2pProblem : 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 FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
......
......@@ -43,7 +43,7 @@ template<typename TypeTag>
class McWhorterAnalytic
{
using Problem = GetPropType<TypeTag, Properties::Problem>;
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 FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
......
......@@ -85,7 +85,7 @@ template<class TypeTag>
class McWhorterProblem: public IMPESProblem2P<TypeTag>
{
using ParentType = IMPESProblem2P<TypeTag>;
using GridView = GetPropType<TypeTag, Properties::GridView>;
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using TimeManager = GetPropType<TypeTag, Properties::TimeManager>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
......
......@@ -123,7 +123,7 @@ class InfiltrationThreePProblem : public PorousMediumFlowProblem<TypeTag>
using ParentType = PorousMediumFlowProblem<TypeTag>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using GridView = GetPropType<TypeTag, Properties::GridView>;
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
enum {
......
......@@ -113,7 +113,7 @@ class InfiltrationThreePThreeCProblem : public PorousMediumFlowProblem<TypeTag>
using ParentType = PorousMediumFlowProblem<TypeTag>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using GridView = GetPropType<TypeTag, Properties::GridView>;
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
......
......@@ -151,7 +151,7 @@ class KuevetteProblem : public PorousMediumFlowProblem<TypeTag>
using ParentType = PorousMediumFlowProblem<TypeTag>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using GridView = GetPropType<TypeTag, Properties::GridView>;
using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
// copy some indices for convenience
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
......
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