From fe138d5998c550cb96c4043aabd8dc61f5dc294a Mon Sep 17 00:00:00 2001 From: Simon Emmert Date: Thu, 26 Mar 2020 10:43:19 +0100 Subject: [PATCH] [properties][cleanup] deprecate property GridView and replace by GridGeometry::GridView Place no deprecation macros where GridView will be substituted by Grid::LeafGridView after release 3.2. --- dumux/adaptive/initializationindicator.hh | 2 +- dumux/assembly/boxlocalassembler.hh | 4 ++-- dumux/assembly/boxlocalresidual.hh | 2 +- dumux/assembly/cclocalassembler.hh | 8 ++++---- dumux/assembly/cclocalresidual.hh | 2 +- dumux/assembly/fvassembler.hh | 2 +- dumux/assembly/fvlocalassemblerbase.hh | 2 +- dumux/assembly/fvlocalresidual.hh | 2 +- dumux/assembly/staggeredlocalresidual.hh | 2 +- dumux/common/pointsource.hh | 6 +++--- dumux/common/properties.hh | 2 +- dumux/common/properties/grid.hh | 5 ++++- dumux/common/staggeredfvproblem.hh | 2 +- dumux/discretization/box.hh | 3 +++ dumux/discretization/ccmpfa.hh | 5 +++++ dumux/discretization/cctpfa.hh | 4 ++++ dumux/discretization/staggered/freeflow/properties.hh | 8 ++++++-- dumux/flux/box/fickslaw.hh | 2 +- dumux/flux/box/fourierslaw.hh | 2 +- dumux/flux/box/fourierslawnonequilibrium.hh | 2 +- dumux/flux/box/maxwellstefanslaw.hh | 2 +- dumux/flux/ccmpfa/darcyslaw.hh | 2 +- dumux/flux/ccmpfa/fickslaw.hh | 2 +- dumux/flux/ccmpfa/fourierslaw.hh | 2 +- dumux/flux/cctpfa/fickslaw.hh | 2 +- dumux/flux/cctpfa/fourierslaw.hh | 2 +- dumux/flux/cctpfa/fourierslawnonequilibrium.hh | 2 +- dumux/flux/cctpfa/maxwellstefanslaw.hh | 2 +- dumux/freeflow/rans/oneeq/problem.hh | 2 +- dumux/freeflow/rans/oneeq/staggered/fluxvariables.hh | 2 +- dumux/freeflow/rans/oneeq/staggered/localresidual.hh | 2 +- .../rans/twoeq/kepsilon/staggered/fluxvariables.hh | 2 +- .../rans/twoeq/kepsilon/staggered/localresidual.hh | 2 +- .../rans/twoeq/komega/staggered/fluxvariables.hh | 2 +- .../rans/twoeq/komega/staggered/localresidual.hh | 2 +- .../twoeq/lowrekepsilon/staggered/fluxvariables.hh | 2 +- .../twoeq/lowrekepsilon/staggered/localresidual.hh | 2 +- dumux/freeflow/rans/zeroeq/problem.hh | 2 +- dumux/freeflow/shallowwater/localresidual.hh | 2 +- dumux/geomechanics/elastic/localresidual.hh | 2 +- dumux/geomechanics/elastic/model.hh | 4 ++-- dumux/geomechanics/fvproblem.hh | 2 +- dumux/geomechanics/poroelastic/localresidual.hh | 2 +- dumux/geomechanics/poroelastic/model.hh | 6 ++++-- dumux/linear/amgbackend.hh | 2 +- dumux/material/spatialparams/sequentialfv.hh | 2 +- dumux/material/spatialparams/sequentialfv1p.hh | 2 +- .../boundary/stokesdarcy/couplingmanager.hh | 2 +- dumux/multidomain/facet/box/localresidual.hh | 2 +- dumux/multidomain/facet/box/properties.hh | 4 ++++ dumux/multidomain/subdomainboxlocalassembler.hh | 6 +++--- dumux/multidomain/subdomaincclocalassembler.hh | 4 ++-- dumux/multidomain/subdomainstaggeredlocalassembler.hh | 4 ++-- .../1p/incompressiblelocalresidual.hh | 2 +- .../1p/sequential/diffusion/cellcentered/pressure.hh | 2 +- .../1p/sequential/diffusion/cellcentered/velocity.hh | 2 +- .../1p/sequential/diffusion/problem.hh | 2 +- dumux/porousmediumflow/1p/sequential/fluxdata.hh | 2 +- dumux/porousmediumflow/2p/gridadaptindicator.hh | 2 +- .../2p/incompressiblelocalresidual.hh | 2 +- dumux/porousmediumflow/2p/sequential/celldata.hh | 4 ++-- .../2p/sequential/celldataadaptive.hh | 2 +- .../2p/sequential/diffusion/cellcentered/pressure.hh | 2 +- .../diffusion/cellcentered/pressureadaptive.hh | 2 +- .../2p/sequential/diffusion/cellcentered/velocity.hh | 2 +- .../diffusion/cellcentered/velocityadaptive.hh | 2 +- .../2p/sequential/diffusion/mimetic/croperator.hh | 2 +- .../diffusion/mimetic/croperatoradaptive.hh | 2 +- .../2p/sequential/diffusion/mimetic/localstiffness.hh | 4 ++-- .../2p/sequential/diffusion/mimetic/mimetic.hh | 2 +- .../sequential/diffusion/mimetic/mimeticadaptive.hh | 2 +- .../2p/sequential/diffusion/mimetic/operator.hh | 2 +- .../sequential/diffusion/mimetic/operatoradaptive.hh | 2 +- .../2p/sequential/diffusion/mimetic/pressure.hh | 2 +- .../sequential/diffusion/mimetic/pressureadaptive.hh | 2 +- .../sequential/diffusion/mpfa/lmethod/2dpressure.hh | 2 +- .../diffusion/mpfa/lmethod/2dpressureadaptive.hh | 2 +- .../diffusion/mpfa/lmethod/2dpressurevelocity.hh | 2 +- .../mpfa/lmethod/2dpressurevelocityadaptive.hh | 2 +- .../mpfa/lmethod/2dtransmissibilitycalculator.hh | 2 +- .../sequential/diffusion/mpfa/lmethod/2dvelocity.hh | 2 +- .../diffusion/mpfa/lmethod/2dvelocityadaptive.hh | 2 +- .../mpfa/lmethod/3dinteractionvolumecontainer.hh | 2 +- .../lmethod/3dinteractionvolumecontaineradaptive.hh | 2 +- .../sequential/diffusion/mpfa/lmethod/3dpressure.hh | 2 +- .../diffusion/mpfa/lmethod/3dpressureadaptive.hh | 2 +- .../diffusion/mpfa/lmethod/3dpressurevelocity.hh | 2 +- .../mpfa/lmethod/3dpressurevelocityadaptive.hh | 2 +- .../mpfa/lmethod/3dtransmissibilitycalculator.hh | 2 +- .../sequential/diffusion/mpfa/lmethod/3dvelocity.hh | 2 +- .../diffusion/mpfa/lmethod/3dvelocityadaptive.hh | 2 +- .../sequential/diffusion/mpfa/omethod/2dpressure.hh | 2 +- .../diffusion/mpfa/omethod/2dpressurevelocity.hh | 2 +- .../sequential/diffusion/mpfa/omethod/2dvelocity.hh | 2 +- .../2p/sequential/diffusion/problem.hh | 2 +- dumux/porousmediumflow/2p/sequential/fluxdata.hh | 2 +- .../2p/sequential/impes/gridadaptionindicator.hh | 2 +- .../2p/sequential/impes/gridadaptionindicatorlocal.hh | 2 +- dumux/porousmediumflow/2p/sequential/impes/problem.hh | 2 +- .../transport/cellcentered/capillarydiffusion.hh | 2 +- .../transport/cellcentered/convectivepart.hh | 2 +- .../transport/cellcentered/diffusivepart.hh | 2 +- .../sequential/transport/cellcentered/evalcflflux.hh | 2 +- .../transport/cellcentered/evalcflfluxcoats.hh | 2 +- .../transport/cellcentered/evalcflfluxdefault.hh | 2 +- .../sequential/transport/cellcentered/gravitypart.hh | 2 +- .../sequential/transport/cellcentered/saturation.hh | 2 +- .../2p/sequential/transport/problem.hh | 2 +- dumux/porousmediumflow/2p1c/darcyslaw.hh | 2 +- dumux/porousmediumflow/2p1c/localresidual.hh | 2 +- .../2p2c/sequential/celldataadaptive.hh | 2 +- dumux/porousmediumflow/2p2c/sequential/fluxdata.hh | 2 +- .../2p2c/sequential/fv2dpressureadaptive.hh | 2 +- .../2p2c/sequential/fv2dtransportadaptive.hh | 2 +- .../2p2c/sequential/fv3dpressureadaptive.hh | 2 +- .../2p2c/sequential/fv3dtransportadaptive.hh | 2 +- .../fvmpfal3dinteractionvolumecontaineradaptive.hh | 2 +- dumux/porousmediumflow/2p2c/sequential/fvpressure.hh | 2 +- .../2p2c/sequential/fvpressurecompositional.hh | 2 +- .../2p2c/sequential/fvpressuremultiphysics.hh | 2 +- dumux/porousmediumflow/2p2c/sequential/fvtransport.hh | 2 +- .../2p2c/sequential/fvtransportmultiphysics.hh | 2 +- dumux/porousmediumflow/2p2c/sequential/problem.hh | 2 +- .../2p2c/sequential/variableclassadaptive.hh | 2 +- dumux/porousmediumflow/3p3c/localresidual.hh | 2 +- dumux/porousmediumflow/3pwateroil/localresidual.hh | 2 +- dumux/porousmediumflow/boxdfm/fluxvariablescache.hh | 2 +- dumux/porousmediumflow/boxdfm/model.hh | 4 ++++ dumux/porousmediumflow/compositional/localresidual.hh | 2 +- dumux/porousmediumflow/fluxvariablescache.hh | 2 +- dumux/porousmediumflow/fluxvariablescachefiller.hh | 4 ++-- dumux/porousmediumflow/immiscible/localresidual.hh | 2 +- dumux/porousmediumflow/mpnc/localresidual.hh | 2 +- .../porousmediumflow/nonequilibrium/localresidual.hh | 4 ++-- .../nonequilibrium/thermal/localresidual.hh | 4 ++-- dumux/porousmediumflow/nonisothermal/localresidual.hh | 2 +- dumux/porousmediumflow/problem.hh | 2 +- dumux/porousmediumflow/richards/localresidual.hh | 2 +- .../cellcentered/mpfa/linteractionvolume.hh | 2 +- .../cellcentered/mpfa/linteractionvolume3d.hh | 2 +- .../cellcentered/mpfa/linteractionvolume3dadaptive.hh | 2 +- .../cellcentered/mpfa/ointeractionvolume.hh | 2 +- .../cellcentered/mpfa/velocityintransport.hh | 2 +- .../sequential/cellcentered/pressure.hh | 2 +- .../sequential/cellcentered/transport.hh | 2 +- .../sequential/cellcentered/velocity.hh | 2 +- .../sequential/cellcentered/velocitydefault.hh | 2 +- dumux/porousmediumflow/sequential/gridadapt.hh | 2 +- .../sequential/gridadaptinitializationindicator.hh | 2 +- .../gridadaptinitializationindicatordefault.hh | 2 +- dumux/porousmediumflow/sequential/impetproblem.hh | 2 +- dumux/porousmediumflow/sequential/onemodelproblem.hh | 2 +- dumux/porousmediumflow/sequential/properties.hh | 11 ++++++++++- dumux/porousmediumflow/sequential/variableclass.hh | 2 +- .../sequential/variableclassadaptive.hh | 2 +- dumux/porousmediumflow/solidenergy/localresidual.hh | 2 +- dumux/porousmediumflow/tracer/localresidual.hh | 2 +- examples/1ptracer/README.md | 8 ++++---- examples/1ptracer/main.cc | 2 +- examples/1ptracer/problem_1p.hh | 2 +- examples/1ptracer/problem_tracer.hh | 4 ++-- examples/2pinfiltration/README.md | 2 +- examples/2pinfiltration/problem.hh | 2 +- examples/freeflowchannel/README.md | 3 +++ examples/freeflowchannel/main.cc | 3 +++ examples/shallowwaterfriction/README.md | 2 +- examples/shallowwaterfriction/problem.hh | 2 +- test/freeflow/navierstokes/angeli/problem.hh | 2 +- test/freeflow/navierstokes/channel/1d/problem.hh | 2 +- test/freeflow/navierstokes/channel/2d/main.cc | 2 +- test/freeflow/navierstokes/channel/3d/main.cc | 2 +- test/freeflow/navierstokes/channel/3d/problem.hh | 2 +- test/freeflow/navierstokes/closedsystem/problem.hh | 2 +- test/freeflow/navierstokes/donea/problem.hh | 2 +- test/freeflow/navierstokes/kovasznay/problem.hh | 2 +- test/freeflow/navierstokes/sincos/problem.hh | 2 +- test/freeflow/navierstokesnc/channel/problem.hh | 2 +- .../navierstokesnc/densitydrivenflow/problem.hh | 2 +- test/freeflow/ransnc/problem.hh | 2 +- test/freeflow/shallowwater/bowl/problem.hh | 2 +- test/freeflow/shallowwater/dambreak/problem.hh | 2 +- test/freeflow/shallowwater/roughchannel/problem.hh | 2 +- test/geomechanics/elastic/problem.hh | 2 +- test/geomechanics/poroelastic/problem.hh | 2 +- .../1p2c_1p2c/diffusionlawcomparison/problem_darcy.hh | 2 +- .../diffusionlawcomparison/problem_stokes.hh | 2 +- .../boundary/stokesdarcy/1p2c_1p2c/problem_stokes.hh | 2 +- .../boundary/stokesdarcy/1p2c_2p2c/main.cc | 2 +- .../boundary/stokesdarcy/1p2c_2p2c/problem_darcy.hh | 2 +- .../boundary/stokesdarcy/1p2c_2p2c/problem_stokes.hh | 2 +- .../boundary/stokesdarcy/1p3c_1p3c/problem_darcy.hh | 2 +- .../boundary/stokesdarcy/1p3c_1p3c/problem_stokes.hh | 2 +- .../boundary/stokesdarcy/1p_1p/problem_darcy.hh | 2 +- .../boundary/stokesdarcy/1p_1p/problem_stokes.hh | 2 +- .../boundary/stokesdarcy/1p_2p/problem_darcy.hh | 2 +- .../boundary/stokesdarcy/1p_2p/problem_stokes.hh | 2 +- .../facet/tracer_tracer/problem_tracer_bulk.hh | 2 +- .../facet/tracer_tracer/problem_tracer_lowdim.hh | 2 +- .../facet/tracer_tracer/tracerfluidsystem.hh | 2 +- test/multidomain/poromechanics/el1p/problem_1p.hh | 2 +- .../poromechanics/el1p/problem_poroelastic.hh | 2 +- test/multidomain/poromechanics/el2p/problem_2p.hh | 2 +- .../poromechanics/el2p/problem_poroelastic.hh | 2 +- .../1p/implicit/compressible/instationary/problem.hh | 2 +- .../1p/implicit/compressible/stationary/problem.hh | 2 +- .../1p/implicit/fracture2d3d/problem.hh | 2 +- .../1p/implicit/incompressible/problem.hh | 2 +- .../1p/implicit/internaldirichlet/problem.hh | 2 +- .../1p/implicit/isothermal/problem.hh | 2 +- .../1p/implicit/network1d3d/problem.hh | 6 +++++- .../1p/implicit/nonisothermal/problem_conduction.hh | 2 +- .../1p/implicit/nonisothermal/problem_convection.hh | 2 +- .../1p/implicit/periodicbc/problem.hh | 2 +- .../1p/implicit/pointsources/timedependent/problem.hh | 2 +- .../implicit/pointsources/timeindependent/problem.hh | 2 +- test/porousmediumflow/1p/sequential/test_1pproblem.hh | 2 +- .../1p/sequential/test_1pspatialparams.hh | 2 +- .../1p/sequential/test_diffusionproblem.hh | 2 +- .../1p/sequential/test_diffusionproblem3d.hh | 2 +- .../1p/sequential/test_diffusionspatialparams.hh | 2 +- .../1p/sequential/test_diffusionspatialparams3d.hh | 2 +- .../1pnc/implicit/1p2c/isothermal/problem.hh | 2 +- .../1p2c/isothermal/saltwaterintrusion/problem.hh | 2 +- .../implicit/1p2c/nonisothermal/conduction/problem.hh | 2 +- .../implicit/1p2c/nonisothermal/convection/problem.hh | 2 +- .../1p2c/nonisothermal/transientbc/problem.hh | 2 +- test/porousmediumflow/1pnc/implicit/1p3c/problem.hh | 2 +- .../1pnc/implicit/nonequilibrium/problem.hh | 2 +- .../1pncmin/implicit/nonisothermal/problem.hh | 2 +- test/porousmediumflow/2p/implicit/adaptive/problem.hh | 2 +- test/porousmediumflow/2p/implicit/boxdfm/problem.hh | 2 +- test/porousmediumflow/2p/implicit/fracture/problem.hh | 2 +- .../2p/implicit/incompressible/problem.hh | 2 +- .../2p/implicit/nonisothermal/problem.hh | 2 +- .../2p/sequential/buckleyleverettanalyticsolution.hh | 2 +- .../2p/sequential/mcwhorteranalyticsolution.hh | 2 +- .../2p/sequential/test_3d2pproblem.hh | 2 +- .../2p/sequential/test_3d2pspatialparams.hh | 2 +- .../2p/sequential/test_impesadaptiveproblem.hh | 2 +- .../2p/sequential/test_impesadaptivespatialparams.hh | 2 +- .../2p/sequential/test_impesproblem.hh | 2 +- .../2p/sequential/test_impesspatialparams.hh | 2 +- .../2p/sequential/test_mpfa2pproblem.hh | 2 +- .../2p/sequential/test_mpfa2pspatialparams.hh | 2 +- .../2p/sequential/test_transportproblem.hh | 2 +- .../2p/sequential/test_transportspatialparams.hh | 2 +- test/porousmediumflow/2p1c/implicit/problem.hh | 2 +- .../2p2c/implicit/chemicalnonequilibrium/problem.hh | 2 +- .../2p2c/implicit/injection/problem.hh | 2 +- .../2p2c/implicit/mpnccomparison/problem.hh | 2 +- .../2p2c/implicit/waterair/problem.hh | 2 +- .../2p2c/sequential/test_adaptive2p2c2dproblem.hh | 2 +- .../2p2c/sequential/test_adaptive2p2c3dproblem.hh | 2 +- .../2p2c/sequential/test_dec2p2c_spatialparams.hh | 2 +- .../2p2c/sequential/test_dec2p2cproblem.hh | 2 +- .../2p2c/sequential/test_multiphysics2p2cproblem.hh | 2 +- .../2pnc/implicit/diffusion/problem.hh | 2 +- .../2pnc/implicit/fuelcell/problem.hh | 2 +- .../2pncmin/implicit/isothermal/problem.hh | 2 +- .../2pncmin/implicit/nonisothermal/problem.hh | 2 +- .../3p/implicit/conduction/problem.hh | 2 +- .../3p/implicit/convection/problem.hh | 2 +- .../3p/implicit/infiltration/problem.hh | 2 +- .../3p3c/implicit/columnxylol/problem.hh | 2 +- .../3p3c/implicit/infiltration/problem.hh | 2 +- .../3p3c/implicit/kuevette/problem.hh | 2 +- test/porousmediumflow/3pwateroil/implicit/problem.hh | 2 +- test/porousmediumflow/co2/implicit/problem.hh | 2 +- .../mpnc/implicit/2p2ccomparison/problem.hh | 2 +- test/porousmediumflow/mpnc/implicit/kinetic/main.cc | 2 +- .../porousmediumflow/mpnc/implicit/kinetic/problem.hh | 2 +- .../mpnc/implicit/obstacle/problem.hh | 2 +- .../thermalnonequilibrium/combustionlocalresidual.hh | 2 +- .../mpnc/implicit/thermalnonequilibrium/problem.hh | 2 +- .../richards/implicit/analytical/problem.hh | 2 +- .../richards/implicit/lens/problem.hh | 2 +- .../implicit/nonisothermal/conduction/problem.hh | 2 +- .../implicit/nonisothermal/convection/problem.hh | 2 +- .../implicit/nonisothermal/evaporation/problem.hh | 2 +- test/porousmediumflow/richardsnc/implicit/problem.hh | 2 +- test/porousmediumflow/solidenergy/problem.hh | 2 +- .../tracer/2ptracer/problem_tracer.hh | 4 ++-- test/porousmediumflow/tracer/constvel/problem.hh | 4 ++-- 283 files changed, 348 insertions(+), 300 deletions(-) diff --git a/dumux/adaptive/initializationindicator.hh b/dumux/adaptive/initializationindicator.hh index 27cefe277b..13eaaef514 100644 --- a/dumux/adaptive/initializationindicator.hh +++ b/dumux/adaptive/initializationindicator.hh @@ -45,7 +45,7 @@ class GridAdaptInitializationIndicator { using Scalar = GetPropType; using Problem = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::Traits::template Codim<0>::Entity; using GridVariables = GetPropType; diff --git a/dumux/assembly/boxlocalassembler.hh b/dumux/assembly/boxlocalassembler.hh index 89980bded3..292ddf3be6 100644 --- a/dumux/assembly/boxlocalassembler.hh +++ b/dumux/assembly/boxlocalassembler.hh @@ -273,7 +273,7 @@ class BoxLocalAssembler::numEq() }; - enum { dim = GetPropType::dimension }; + enum { dim = GetPropType::GridView::dimension }; static constexpr bool enableGridFluxVarsCache = getPropValue(); @@ -392,7 +392,7 @@ class BoxLocalAssembler::numEq() }; - enum { dim = GetPropType::dimension }; + enum { dim = GetPropType::GridView::dimension }; public: diff --git a/dumux/assembly/boxlocalresidual.hh b/dumux/assembly/boxlocalresidual.hh index 04237a04b5..03cf7d1774 100644 --- a/dumux/assembly/boxlocalresidual.hh +++ b/dumux/assembly/boxlocalresidual.hh @@ -46,7 +46,7 @@ class BoxLocalResidual : public FVLocalResidual using ParentType = FVLocalResidual; using Scalar = GetPropType; using Problem = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using ElementBoundaryTypes = GetPropType; using FVElementGeometry = typename GetPropType::LocalView; diff --git a/dumux/assembly/cclocalassembler.hh b/dumux/assembly/cclocalassembler.hh index 7776e7278c..004bb7e8f0 100644 --- a/dumux/assembly/cclocalassembler.hh +++ b/dumux/assembly/cclocalassembler.hh @@ -56,7 +56,7 @@ template class CCLocalAssemblerBase : public FVLocalAssemblerBase { using ParentType = FVLocalAssemblerBase; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using JacobianMatrix = GetPropType; using GridVariables = GetPropType; using SolutionVector = GetPropType; @@ -136,14 +136,14 @@ class CCLocalAssembler; using Scalar = GetPropType; using NumEqVector = GetPropType; - using Element = typename GetPropType::template Codim<0>::Entity; + using Element = typename GetPropType::GridView::template Codim<0>::Entity; using GridGeometry = GetPropType; using FVElementGeometry = typename GridGeometry::LocalView; using GridVariables = GetPropType; using JacobianMatrix = GetPropType; enum { numEq = GetPropType::numEq() }; - enum { dim = GetPropType::dimension }; + enum { dim = GetPropType::GridView::dimension }; using FluxStencil = Dumux::FluxStencil; static constexpr int maxElementStencilSize = GridGeometry::maxElementStencilSize; @@ -322,7 +322,7 @@ class CCLocalAssembler; using Scalar = GetPropType; using NumEqVector = GetPropType; - using Element = typename GetPropType::template Codim<0>::Entity; + using Element = typename GetPropType::GridView::template Codim<0>::Entity; using GridVariables = GetPropType; using JacobianMatrix = GetPropType; diff --git a/dumux/assembly/cclocalresidual.hh b/dumux/assembly/cclocalresidual.hh index 94e745bc3b..484f2920a0 100644 --- a/dumux/assembly/cclocalresidual.hh +++ b/dumux/assembly/cclocalresidual.hh @@ -42,7 +42,7 @@ class CCLocalResidual : public FVLocalResidual { using ParentType = FVLocalResidual; using Problem = GetPropType; - using Element = typename GetPropType::template Codim<0>::Entity; + using Element = typename GetPropType::GridView::template Codim<0>::Entity; using NumEqVector = GetPropType; using ElementBoundaryTypes = GetPropType; using ElementVolumeVariables = typename GetPropType::LocalView; diff --git a/dumux/assembly/fvassembler.hh b/dumux/assembly/fvassembler.hh index 4200502c63..87ae227d2c 100644 --- a/dumux/assembly/fvassembler.hh +++ b/dumux/assembly/fvassembler.hh @@ -50,7 +50,7 @@ namespace Dumux { template class FVAssembler { - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using LocalResidual = GetPropType; using Element = typename GridView::template Codim<0>::Entity; using TimeLoop = TimeLoopBase>; diff --git a/dumux/assembly/fvlocalassemblerbase.hh b/dumux/assembly/fvlocalassemblerbase.hh index 3574cbb25d..7d894ca276 100644 --- a/dumux/assembly/fvlocalassemblerbase.hh +++ b/dumux/assembly/fvlocalassemblerbase.hh @@ -47,7 +47,7 @@ template; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using JacobianMatrix = GetPropType; using GridVariables = GetPropType; diff --git a/dumux/assembly/fvlocalresidual.hh b/dumux/assembly/fvlocalresidual.hh index 22ed0e4e98..3c105ea8b6 100644 --- a/dumux/assembly/fvlocalresidual.hh +++ b/dumux/assembly/fvlocalresidual.hh @@ -46,7 +46,7 @@ class FVLocalResidual using Implementation = GetPropType; using Problem = GetPropType; using Scalar = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using FVElementGeometry = typename GetPropType::LocalView; using GridVariables = GetPropType; diff --git a/dumux/assembly/staggeredlocalresidual.hh b/dumux/assembly/staggeredlocalresidual.hh index aee023b791..15ef2a4a9a 100644 --- a/dumux/assembly/staggeredlocalresidual.hh +++ b/dumux/assembly/staggeredlocalresidual.hh @@ -38,7 +38,7 @@ namespace Dumux { template class StaggeredLocalResidual { - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using Implementation = GetPropType; diff --git a/dumux/common/pointsource.hh b/dumux/common/pointsource.hh index e7c7a9f093..1bd426ad66 100644 --- a/dumux/common/pointsource.hh +++ b/dumux/common/pointsource.hh @@ -207,11 +207,11 @@ private: * \brief A point source class for time dependent point sources */ template -class SolDependentPointSource : public PointSource::ctype, - GetPropType::dimensionworld>, +class SolDependentPointSource : public PointSource::GridView::ctype, + GetPropType::GridView::dimensionworld>, GetPropType> { - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using SourceValues = GetPropType; using Problem = GetPropType; using ElementVolumeVariables = typename GetPropType::LocalView; diff --git a/dumux/common/properties.hh b/dumux/common/properties.hh index 0c990a1dca..8d1d6e1b31 100644 --- a/dumux/common/properties.hh +++ b/dumux/common/properties.hh @@ -61,7 +61,7 @@ struct PrimaryVariables { using type = UndefinedProperty; }; //!< A vector template struct NumEqVector { using type = UndefinedProperty; }; //!< A vector of size number equations that can be used for Neumann fluxes, sources, residuals, ... template -struct GridView { using type = UndefinedProperty; }; //!< The type of the grid view according to the grid type +struct [[deprecated("Access GridView via 'GridGeometry::GridView' or 'Grid::LeafGridView' instead. Will be removed after 3.2")]] GridView { using type = UndefinedProperty; }; //!< The type of the grid view according to the grid type template struct ModelTraits { using type = UndefinedProperty; }; //!< Traits class encapsulating model specifications template diff --git a/dumux/common/properties/grid.hh b/dumux/common/properties/grid.hh index 609d9fdc17..2fd9478deb 100644 --- a/dumux/common/properties/grid.hh +++ b/dumux/common/properties/grid.hh @@ -24,6 +24,7 @@ #ifndef DUMUX_GRID_PROPERTIES_HH #define DUMUX_GRID_PROPERTIES_HH +#include #include #include @@ -37,9 +38,11 @@ namespace TTag { struct GridProperties {}; } +DUNE_NO_DEPRECATED_BEGIN //! Use the leaf grid view if not defined otherwise template struct GridView { using type = typename GetPropType::LeafGridView; }; +DUNE_NO_DEPRECATED_END //! Use the minimal point source implementation as default template @@ -47,7 +50,7 @@ struct PointSource { private: using SourceValues = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using GlobalPosition = typename Dune::FieldVector; public: using type = Dumux::PointSource; diff --git a/dumux/common/staggeredfvproblem.hh b/dumux/common/staggeredfvproblem.hh index 49eb564b6f..a0ffc55ed3 100644 --- a/dumux/common/staggeredfvproblem.hh +++ b/dumux/common/staggeredfvproblem.hh @@ -45,7 +45,7 @@ class StaggeredFVProblem : public FVProblem { using ParentType = FVProblem; using Implementation = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using GridVariables = GetPropType; diff --git a/dumux/discretization/box.hh b/dumux/discretization/box.hh index 23eec15153..9fb1526732 100644 --- a/dumux/discretization/box.hh +++ b/dumux/discretization/box.hh @@ -25,6 +25,7 @@ #ifndef DUMUX_DISCRETIZTAION_BOX_HH #define DUMUX_DISCRETIZTAION_BOX_HH +#include #include #include @@ -57,7 +58,9 @@ struct GridGeometry { private: static constexpr bool enableCache = getPropValue(); + DUNE_NO_DEPRECATED_BEGIN using GridView = GetPropType; + DUNE_NO_DEPRECATED_END using Scalar = GetPropType; public: using type = BoxFVGridGeometry; diff --git a/dumux/discretization/ccmpfa.hh b/dumux/discretization/ccmpfa.hh index 30a38a7400..686dd176dd 100644 --- a/dumux/discretization/ccmpfa.hh +++ b/dumux/discretization/ccmpfa.hh @@ -25,6 +25,7 @@ #ifndef DUMUX_DISCRETIZATION_CC_MPFA_HH #define DUMUX_DISCRETIZATION_CC_MPFA_HH +#include #include #include @@ -61,7 +62,9 @@ template struct DualGridNodalIndexSet { private: + DUNE_NO_DEPRECATED_BEGIN using GV = GetPropType; + DUNE_NO_DEPRECATED_END using Traits = NodalIndexSetDefaultTraits< GV >; public: @@ -101,7 +104,9 @@ template struct GridGeometry { private: + DUNE_NO_DEPRECATED_BEGIN using GridView = GetPropType; + DUNE_NO_DEPRECATED_END using PrimaryIV = GetPropType; using SecondaryIV = GetPropType; using NodalIndexSet = GetPropType; diff --git a/dumux/discretization/cctpfa.hh b/dumux/discretization/cctpfa.hh index 7bb6b14c05..825d560b77 100644 --- a/dumux/discretization/cctpfa.hh +++ b/dumux/discretization/cctpfa.hh @@ -26,6 +26,8 @@ #ifndef DUMUX_DISCRETIZATION_CC_TPFA_HH #define DUMUX_DISCRETIZATION_CC_TPFA_HH +#include + #include #include @@ -56,7 +58,9 @@ struct GridGeometry { private: static constexpr bool enableCache = getPropValue(); + DUNE_NO_DEPRECATED_BEGIN using GridView = GetPropType; + DUNE_NO_DEPRECATED_END public: using type = CCTpfaFVGridGeometry; }; diff --git a/dumux/discretization/staggered/freeflow/properties.hh b/dumux/discretization/staggered/freeflow/properties.hh index a98ba07308..ea64a567f2 100644 --- a/dumux/discretization/staggered/freeflow/properties.hh +++ b/dumux/discretization/staggered/freeflow/properties.hh @@ -28,6 +28,8 @@ #ifndef DUMUX_STAGGERD_FREE_FLOW_PROPERTIES_HH #define DUMUX_STAGGERD_FREE_FLOW_PROPERTIES_HH +#include + #include #include #include @@ -68,7 +70,7 @@ template struct NumEqCellCenter { private: - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using ModelTraits = GetPropType; static constexpr auto dim = GridView::dimension; static constexpr auto numEq = ModelTraits::numEq(); @@ -83,7 +85,9 @@ struct GridGeometry private: static constexpr auto upwindSchemeOrder = getPropValue(); static constexpr bool enableCache = getPropValue(); + DUNE_NO_DEPRECATED_BEGIN using GridView = GetPropType; + DUNE_NO_DEPRECATED_END using Traits = StaggeredFreeFlowDefaultFVGridGeometryTraits; public: using type = StaggeredFVGridGeometry; @@ -95,7 +99,7 @@ struct FaceVariables { private: using FacePrimaryVariables = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; static constexpr auto upwindSchemeOrder = getPropValue(); public: using type = StaggeredFaceVariables; diff --git a/dumux/flux/box/fickslaw.hh b/dumux/flux/box/fickslaw.hh index d3f72f3f66..0013500480 100644 --- a/dumux/flux/box/fickslaw.hh +++ b/dumux/flux/box/fickslaw.hh @@ -58,7 +58,7 @@ class FicksLawImplementation::LocalView; using FluxVarCache = GetPropType; using BalanceEqOpts = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using ModelTraits = GetPropType; using Indices = typename ModelTraits::Indices; diff --git a/dumux/flux/box/fourierslaw.hh b/dumux/flux/box/fourierslaw.hh index 8c8f7dcc9d..6ebf3aba1d 100644 --- a/dumux/flux/box/fourierslaw.hh +++ b/dumux/flux/box/fourierslaw.hh @@ -51,7 +51,7 @@ class FouriersLawImplementation using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using ElementVolumeVariables = typename GetPropType::LocalView; using ElementFluxVariablesCache = typename GetPropType::LocalView; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; public: diff --git a/dumux/flux/box/fourierslawnonequilibrium.hh b/dumux/flux/box/fourierslawnonequilibrium.hh index 9fae9d327d..25ce9d0f03 100644 --- a/dumux/flux/box/fourierslawnonequilibrium.hh +++ b/dumux/flux/box/fourierslawnonequilibrium.hh @@ -54,7 +54,7 @@ class FouriersLawNonEquilibriumImplementation::LocalView; using ElementFluxVariablesCache = typename GetPropType::LocalView; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using ThermalConductivityModel = GetPropType; using ModelTraits = GetPropType; using Element = typename GridView::template Codim<0>::Entity; diff --git a/dumux/flux/box/maxwellstefanslaw.hh b/dumux/flux/box/maxwellstefanslaw.hh index c0a9644fa5..398c1afa58 100644 --- a/dumux/flux/box/maxwellstefanslaw.hh +++ b/dumux/flux/box/maxwellstefanslaw.hh @@ -58,7 +58,7 @@ class MaxwellStefansLawImplementation::LocalView; using ElementFluxVariablesCache = typename GetPropType::LocalView; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; static constexpr auto numFluidPhases = GetPropType::numFluidPhases(); diff --git a/dumux/flux/ccmpfa/darcyslaw.hh b/dumux/flux/ccmpfa/darcyslaw.hh index 61fb874476..e0878a12f1 100644 --- a/dumux/flux/ccmpfa/darcyslaw.hh +++ b/dumux/flux/ccmpfa/darcyslaw.hh @@ -48,7 +48,7 @@ class DarcysLawImplementation { using Scalar = GetPropType; using Problem = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; static constexpr int dim = GridView::dimension; diff --git a/dumux/flux/ccmpfa/fickslaw.hh b/dumux/flux/ccmpfa/fickslaw.hh index bf367e5afd..ca837259dd 100644 --- a/dumux/flux/ccmpfa/fickslaw.hh +++ b/dumux/flux/ccmpfa/fickslaw.hh @@ -46,7 +46,7 @@ class FicksLawImplementation; using Problem = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; static constexpr int dim = GridView::dimension; diff --git a/dumux/flux/ccmpfa/fourierslaw.hh b/dumux/flux/ccmpfa/fourierslaw.hh index 3930c55fd4..22b658cded 100644 --- a/dumux/flux/ccmpfa/fourierslaw.hh +++ b/dumux/flux/ccmpfa/fourierslaw.hh @@ -45,7 +45,7 @@ class FouriersLawImplementation { using Scalar = GetPropType; using Problem = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; static constexpr int dim = GridView::dimension; diff --git a/dumux/flux/cctpfa/fickslaw.hh b/dumux/flux/cctpfa/fickslaw.hh index 1d0d5a8a45..7fb058f7db 100644 --- a/dumux/flux/cctpfa/fickslaw.hh +++ b/dumux/flux/cctpfa/fickslaw.hh @@ -53,7 +53,7 @@ class FicksLawImplementation::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using VolumeVariables = GetPropType; using ElementVolumeVariables = typename GetPropType::LocalView; using Element = typename GridView::template Codim<0>::Entity; diff --git a/dumux/flux/cctpfa/fourierslaw.hh b/dumux/flux/cctpfa/fourierslaw.hh index 83f686891d..44c2161162 100644 --- a/dumux/flux/cctpfa/fourierslaw.hh +++ b/dumux/flux/cctpfa/fourierslaw.hh @@ -51,7 +51,7 @@ class FouriersLawImplementation using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using ElementVolumeVariables = typename GetPropType::LocalView; using Element = typename GridView::template Codim<0>::Entity; using ElementFluxVarsCache = typename GetPropType::LocalView; diff --git a/dumux/flux/cctpfa/fourierslawnonequilibrium.hh b/dumux/flux/cctpfa/fourierslawnonequilibrium.hh index 286cb4419e..b6bf153cde 100644 --- a/dumux/flux/cctpfa/fourierslawnonequilibrium.hh +++ b/dumux/flux/cctpfa/fourierslawnonequilibrium.hh @@ -49,7 +49,7 @@ class FouriersLawNonEquilibriumImplementation::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using ElementVolumeVariables = typename GetPropType::LocalView; using Element = typename GridView::template Codim<0>::Entity; using ElementFluxVarsCache = typename GetPropType::LocalView; diff --git a/dumux/flux/cctpfa/maxwellstefanslaw.hh b/dumux/flux/cctpfa/maxwellstefanslaw.hh index e93442e8eb..5a0b09ad14 100644 --- a/dumux/flux/cctpfa/maxwellstefanslaw.hh +++ b/dumux/flux/cctpfa/maxwellstefanslaw.hh @@ -53,7 +53,7 @@ class MaxwellStefansLawImplementation::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using VolumeVariables = GetPropType; using ElementVolumeVariables = typename GetPropType::LocalView; using Element = typename GridView::template Codim<0>::Entity; diff --git a/dumux/freeflow/rans/oneeq/problem.hh b/dumux/freeflow/rans/oneeq/problem.hh index 3b7d889cc8..3c8574cbb6 100644 --- a/dumux/freeflow/rans/oneeq/problem.hh +++ b/dumux/freeflow/rans/oneeq/problem.hh @@ -48,7 +48,7 @@ class RANSProblemImpl : public RANSProblemBase< using ParentType = RANSProblemBase; using Implementation = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Grid = typename GridView::Grid; using Scalar = GetPropType; diff --git a/dumux/freeflow/rans/oneeq/staggered/fluxvariables.hh b/dumux/freeflow/rans/oneeq/staggered/fluxvariables.hh index ccf75bfe2c..f5b0385692 100644 --- a/dumux/freeflow/rans/oneeq/staggered/fluxvariables.hh +++ b/dumux/freeflow/rans/oneeq/staggered/fluxvariables.hh @@ -63,7 +63,7 @@ class OneEqFluxVariablesImpl; using Scalar = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Problem = GetPropType; using Element = typename GridView::template Codim<0>::Entity; using FVElementGeometry = typename GetPropType::LocalView; diff --git a/dumux/freeflow/rans/oneeq/staggered/localresidual.hh b/dumux/freeflow/rans/oneeq/staggered/localresidual.hh index 0ae7557515..7eaa98d331 100644 --- a/dumux/freeflow/rans/oneeq/staggered/localresidual.hh +++ b/dumux/freeflow/rans/oneeq/staggered/localresidual.hh @@ -61,7 +61,7 @@ class OneEqResidualImpl; using Problem = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; diff --git a/dumux/freeflow/rans/twoeq/kepsilon/staggered/fluxvariables.hh b/dumux/freeflow/rans/twoeq/kepsilon/staggered/fluxvariables.hh index 0111e0b26b..f0b7879188 100644 --- a/dumux/freeflow/rans/twoeq/kepsilon/staggered/fluxvariables.hh +++ b/dumux/freeflow/rans/twoeq/kepsilon/staggered/fluxvariables.hh @@ -62,7 +62,7 @@ class KEpsilonFluxVariablesImpl; using Scalar = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Problem = GetPropType; using Element = typename GridView::template Codim<0>::Entity; using FVElementGeometry = typename GetPropType::LocalView; diff --git a/dumux/freeflow/rans/twoeq/kepsilon/staggered/localresidual.hh b/dumux/freeflow/rans/twoeq/kepsilon/staggered/localresidual.hh index 451d90f8e0..9cbdfa95e4 100644 --- a/dumux/freeflow/rans/twoeq/kepsilon/staggered/localresidual.hh +++ b/dumux/freeflow/rans/twoeq/kepsilon/staggered/localresidual.hh @@ -61,7 +61,7 @@ class KEpsilonResidualImpl; using Problem = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; diff --git a/dumux/freeflow/rans/twoeq/komega/staggered/fluxvariables.hh b/dumux/freeflow/rans/twoeq/komega/staggered/fluxvariables.hh index e01a73af42..b05ba257fc 100644 --- a/dumux/freeflow/rans/twoeq/komega/staggered/fluxvariables.hh +++ b/dumux/freeflow/rans/twoeq/komega/staggered/fluxvariables.hh @@ -62,7 +62,7 @@ class KOmegaFluxVariablesImpl; using Scalar = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Problem = GetPropType; using Element = typename GridView::template Codim<0>::Entity; using FVElementGeometry = typename GetPropType::LocalView; diff --git a/dumux/freeflow/rans/twoeq/komega/staggered/localresidual.hh b/dumux/freeflow/rans/twoeq/komega/staggered/localresidual.hh index f7d303a51c..d08351fd1c 100644 --- a/dumux/freeflow/rans/twoeq/komega/staggered/localresidual.hh +++ b/dumux/freeflow/rans/twoeq/komega/staggered/localresidual.hh @@ -60,7 +60,7 @@ class KOmegaResidualImpl; using Problem = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; diff --git a/dumux/freeflow/rans/twoeq/lowrekepsilon/staggered/fluxvariables.hh b/dumux/freeflow/rans/twoeq/lowrekepsilon/staggered/fluxvariables.hh index e9bcdcfa38..0550be777f 100644 --- a/dumux/freeflow/rans/twoeq/lowrekepsilon/staggered/fluxvariables.hh +++ b/dumux/freeflow/rans/twoeq/lowrekepsilon/staggered/fluxvariables.hh @@ -62,7 +62,7 @@ class LowReKEpsilonFluxVariablesImpl; using Scalar = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Problem = GetPropType; using Element = typename GridView::template Codim<0>::Entity; using FVElementGeometry = typename GetPropType::LocalView; diff --git a/dumux/freeflow/rans/twoeq/lowrekepsilon/staggered/localresidual.hh b/dumux/freeflow/rans/twoeq/lowrekepsilon/staggered/localresidual.hh index a05a0ca422..e00ec50e6a 100644 --- a/dumux/freeflow/rans/twoeq/lowrekepsilon/staggered/localresidual.hh +++ b/dumux/freeflow/rans/twoeq/lowrekepsilon/staggered/localresidual.hh @@ -60,7 +60,7 @@ class LowReKEpsilonResidualImpl; using Problem = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; diff --git a/dumux/freeflow/rans/zeroeq/problem.hh b/dumux/freeflow/rans/zeroeq/problem.hh index 0a439a5828..86e09ad0a7 100644 --- a/dumux/freeflow/rans/zeroeq/problem.hh +++ b/dumux/freeflow/rans/zeroeq/problem.hh @@ -50,7 +50,7 @@ class RANSProblemImpl : public RANSProblemBase { using ParentType = RANSProblemBase; using Implementation = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Grid = typename GridView::Grid; using Scalar = GetPropType; diff --git a/dumux/freeflow/shallowwater/localresidual.hh b/dumux/freeflow/shallowwater/localresidual.hh index 11344f0316..a7cb6e94e4 100644 --- a/dumux/freeflow/shallowwater/localresidual.hh +++ b/dumux/freeflow/shallowwater/localresidual.hh @@ -38,7 +38,7 @@ class ShallowWaterResidual { using ParentType = GetPropType; using Problem = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using NumEqVector = GetPropType; using VolumeVariables = GetPropType; using ElementVolumeVariables = typename GetPropType::LocalView; diff --git a/dumux/geomechanics/elastic/localresidual.hh b/dumux/geomechanics/elastic/localresidual.hh index 1f2423cf98..0c1a3eb6af 100644 --- a/dumux/geomechanics/elastic/localresidual.hh +++ b/dumux/geomechanics/elastic/localresidual.hh @@ -41,7 +41,7 @@ class ElasticLocalResidual : public GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using Problem = GetPropType; diff --git a/dumux/geomechanics/elastic/model.hh b/dumux/geomechanics/elastic/model.hh index 1f58b487f2..05c041dbf9 100644 --- a/dumux/geomechanics/elastic/model.hh +++ b/dumux/geomechanics/elastic/model.hh @@ -96,7 +96,7 @@ struct LocalResidual { using type = ElasticLocalResidual template struct ModelTraits { - using type = ElasticModelTraits< GetPropType::dimension, + using type = ElasticModelTraits< GetPropType::GridView::dimension, GetPropType::numComponents >; }; @@ -105,7 +105,7 @@ template struct VolumeVariables { private: - static constexpr int dim = GetPropType::dimension; + static constexpr int dim = GetPropType::GridView::dimension; using PV = GetPropType; using DV = Dune::FieldVector; using MT = GetPropType; diff --git a/dumux/geomechanics/fvproblem.hh b/dumux/geomechanics/fvproblem.hh index 6329fa7db9..c0703a789d 100644 --- a/dumux/geomechanics/fvproblem.hh +++ b/dumux/geomechanics/fvproblem.hh @@ -72,7 +72,7 @@ class GeomechanicsFVProblem : public PorousMediumFlowProblem using GridGeometry = GetPropType; using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename GridGeometry::SubControlVolume; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; diff --git a/dumux/geomechanics/poroelastic/localresidual.hh b/dumux/geomechanics/poroelastic/localresidual.hh index bef864626b..26f8f0c53a 100644 --- a/dumux/geomechanics/poroelastic/localresidual.hh +++ b/dumux/geomechanics/poroelastic/localresidual.hh @@ -40,7 +40,7 @@ class PoroElasticLocalResidual: public ElasticLocalResidual { using ParentType = ElasticLocalResidual; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using Problem = GetPropType; diff --git a/dumux/geomechanics/poroelastic/model.hh b/dumux/geomechanics/poroelastic/model.hh index 5bd888dacb..cea6945b12 100644 --- a/dumux/geomechanics/poroelastic/model.hh +++ b/dumux/geomechanics/poroelastic/model.hh @@ -82,7 +82,8 @@ template struct ModelTraits { private: - static constexpr int dim = GetPropType::dimension; + using GridView = typename GetPropType::GridView; + static constexpr int dim = GridView::dimension; static constexpr int numSC = GetPropType::numComponents; static constexpr int numFP = GetPropType::numPhases; static constexpr int numFC = GetPropType::numComponents; @@ -96,7 +97,8 @@ template struct VolumeVariables { private: - static constexpr int dim = GetPropType::dimension; + using GridView = typename GetPropType::GridView; + static constexpr int dim = GridView::dimension; using PV = GetPropType; using DV = Dune::FieldVector; using MT = GetPropType; diff --git a/dumux/linear/amgbackend.hh b/dumux/linear/amgbackend.hh index 9243548481..da23a6a307 100644 --- a/dumux/linear/amgbackend.hh +++ b/dumux/linear/amgbackend.hh @@ -254,7 +254,7 @@ namespace Dumux { */ template using AMGBackend [[deprecated("Use AMGBiCGSTABBackend instead. Will be removed after 3.2!")]] -= ParallelAMGBackend, += ParallelAMGBackend::GridView, LinearSolverTraits>>; } // namespace Dumux diff --git a/dumux/material/spatialparams/sequentialfv.hh b/dumux/material/spatialparams/sequentialfv.hh index 7d12996ca4..d491465768 100644 --- a/dumux/material/spatialparams/sequentialfv.hh +++ b/dumux/material/spatialparams/sequentialfv.hh @@ -43,7 +43,7 @@ class SequentialFVSpatialParams: public SequentialFVSpatialParamsOneP { using Problem = GetPropType; using Scalar = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Implementation = GetPropType; enum diff --git a/dumux/material/spatialparams/sequentialfv1p.hh b/dumux/material/spatialparams/sequentialfv1p.hh index 4c77a4ae3b..c9119f4c1a 100644 --- a/dumux/material/spatialparams/sequentialfv1p.hh +++ b/dumux/material/spatialparams/sequentialfv1p.hh @@ -42,7 +42,7 @@ class SequentialFVSpatialParamsOneP { using Problem = GetPropType; using Scalar = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Implementation = GetPropType; enum diff --git a/dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh b/dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh index 57d3a862d8..29fbb1e217 100644 --- a/dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh +++ b/dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh @@ -73,7 +73,7 @@ private: static constexpr bool isCompositional = GetPropType, Properties::ModelTraits>::numFluidComponents()> 1; - template using GridView = GetPropType, Properties::GridView>; + template using GridView = typename GetPropType, Properties::GridGeometry>::GridView; template using Problem = GetPropType, Properties::Problem>; template using NumEqVector = GetPropType, Properties::NumEqVector>; template using ElementVolumeVariables = typename GetPropType, Properties::GridVolumeVariables>::LocalView; diff --git a/dumux/multidomain/facet/box/localresidual.hh b/dumux/multidomain/facet/box/localresidual.hh index eb4fa68731..94b52c6e64 100644 --- a/dumux/multidomain/facet/box/localresidual.hh +++ b/dumux/multidomain/facet/box/localresidual.hh @@ -44,7 +44,7 @@ class BoxFacetCouplingLocalResidual : public FVLocalResidual using ParentType = FVLocalResidual; using Scalar = GetPropType; using Problem = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using ElementBoundaryTypes = GetPropType; using FVElementGeometry = typename GetPropType::LocalView; diff --git a/dumux/multidomain/facet/box/properties.hh b/dumux/multidomain/facet/box/properties.hh index cb50c6e134..649d4d760a 100644 --- a/dumux/multidomain/facet/box/properties.hh +++ b/dumux/multidomain/facet/box/properties.hh @@ -29,6 +29,8 @@ #ifndef DUMUX_FACETCOUPLING_BOX_PROPERTIES_HH #define DUMUX_FACETCOUPLING_BOX_PROPERTIES_HH +#include + #include #include @@ -82,7 +84,9 @@ struct GridGeometry { private: static constexpr bool enableCache = getPropValue(); + DUNE_NO_DEPRECATED_BEGIN using GridView = GetPropType; + DUNE_NO_DEPRECATED_END using Scalar = GetPropType; public: using type = BoxFacetCouplingFVGridGeometry; diff --git a/dumux/multidomain/subdomainboxlocalassembler.hh b/dumux/multidomain/subdomainboxlocalassembler.hh index 52d9852bab..7e268f4449 100644 --- a/dumux/multidomain/subdomainboxlocalassembler.hh +++ b/dumux/multidomain/subdomainboxlocalassembler.hh @@ -76,7 +76,7 @@ class SubDomainBoxLocalAssemblerBase : public FVLocalAssemblerBase; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using CouplingManager = typename Assembler::CouplingManager; @@ -353,7 +353,7 @@ class SubDomainBoxLocalAssembler::Entity; enum { numEq = GetPropType::numEq() }; - enum { dim = GetPropType::dimension }; + enum { dim = GridView::dimension }; static constexpr bool enableGridFluxVarsCache = getPropValue(); static constexpr bool enableGridVolVarsCache = getPropValue(); @@ -586,7 +586,7 @@ class SubDomainBoxLocalAssembler::Entity; enum { numEq = GetPropType::numEq() }; - enum { dim = GetPropType::dimension }; + enum { dim = GridView::dimension }; static constexpr bool enableGridFluxVarsCache = getPropValue(); static constexpr bool enableGridVolVarsCache = getPropValue(); diff --git a/dumux/multidomain/subdomaincclocalassembler.hh b/dumux/multidomain/subdomaincclocalassembler.hh index 0c715033d3..32cb7c1d81 100644 --- a/dumux/multidomain/subdomaincclocalassembler.hh +++ b/dumux/multidomain/subdomaincclocalassembler.hh @@ -76,7 +76,7 @@ class SubDomainCCLocalAssemblerBase : public FVLocalAssemblerBase; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using CouplingManager = typename Assembler::CouplingManager; @@ -683,7 +683,7 @@ class SubDomainCCLocalAssembler; using Scalar = GetPropType; using LocalResidualValues = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; enum { numEq = GetPropType::numEq() }; diff --git a/dumux/multidomain/subdomainstaggeredlocalassembler.hh b/dumux/multidomain/subdomainstaggeredlocalassembler.hh index c02a12ed78..6b3ddadfd4 100644 --- a/dumux/multidomain/subdomainstaggeredlocalassembler.hh +++ b/dumux/multidomain/subdomainstaggeredlocalassembler.hh @@ -74,7 +74,7 @@ class SubDomainStaggeredLocalAssemblerBase : public FVLocalAssemblerBase; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using CouplingManager = typename Assembler::CouplingManager; @@ -486,7 +486,7 @@ class SubDomainStaggeredLocalAssembler; using CellCenterResidualValue = typename LocalResidual::CellCenterResidualValue; using FaceResidualValue = typename LocalResidual::FaceResidualValue; - using Element = typename GetPropType::template Codim<0>::Entity; + using Element = typename GetPropType::GridView::template Codim<0>::Entity; using GridFaceVariables = GetPropType; using ElementFaceVariables = typename GetPropType::LocalView; using FaceVariables = typename ElementFaceVariables::FaceVariables; diff --git a/dumux/porousmediumflow/1p/incompressiblelocalresidual.hh b/dumux/porousmediumflow/1p/incompressiblelocalresidual.hh index 4056ad5c63..184fffe068 100644 --- a/dumux/porousmediumflow/1p/incompressiblelocalresidual.hh +++ b/dumux/porousmediumflow/1p/incompressiblelocalresidual.hh @@ -50,7 +50,7 @@ class OnePIncompressibleLocalResidual : public ImmiscibleLocalResidual using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using Indices = typename GetPropType::Indices; // first index for the mass balance diff --git a/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/pressure.hh b/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/pressure.hh index b201a1e045..9886d82d92 100644 --- a/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/pressure.hh +++ b/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/pressure.hh @@ -57,7 +57,7 @@ template class FVPressure1P: public FVPressure { using ParentType = FVPressure; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using Problem = GetPropType; diff --git a/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/velocity.hh b/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/velocity.hh index 5a9b0fb324..d5fd72e4bb 100644 --- a/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/velocity.hh +++ b/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/velocity.hh @@ -47,7 +47,7 @@ namespace Dumux { template class FVVelocity1P { - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using Problem = GetPropType; diff --git a/dumux/porousmediumflow/1p/sequential/diffusion/problem.hh b/dumux/porousmediumflow/1p/sequential/diffusion/problem.hh index 57a15cc186..ff4dda371a 100644 --- a/dumux/porousmediumflow/1p/sequential/diffusion/problem.hh +++ b/dumux/porousmediumflow/1p/sequential/diffusion/problem.hh @@ -47,7 +47,7 @@ class DiffusionProblem1P: public OneModelProblem using Implementation = GetPropType; using ParentType = OneModelProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Grid = typename GridView::Grid; using Scalar = GetPropType; diff --git a/dumux/porousmediumflow/1p/sequential/fluxdata.hh b/dumux/porousmediumflow/1p/sequential/fluxdata.hh index c2fd3ffbb1..76bb43279e 100644 --- a/dumux/porousmediumflow/1p/sequential/fluxdata.hh +++ b/dumux/porousmediumflow/1p/sequential/fluxdata.hh @@ -42,7 +42,7 @@ class FluxData1P { private: using Scalar = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; enum { diff --git a/dumux/porousmediumflow/2p/gridadaptindicator.hh b/dumux/porousmediumflow/2p/gridadaptindicator.hh index fbf5205699..e413924f1d 100644 --- a/dumux/porousmediumflow/2p/gridadaptindicator.hh +++ b/dumux/porousmediumflow/2p/gridadaptindicator.hh @@ -44,7 +44,7 @@ template class TwoPGridAdaptIndicator { using GridGeometry = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using Scalar = GetPropType; using Indices = typename GetPropType::Indices; diff --git a/dumux/porousmediumflow/2p/incompressiblelocalresidual.hh b/dumux/porousmediumflow/2p/incompressiblelocalresidual.hh index 05f2a24c02..b61553eeb2 100644 --- a/dumux/porousmediumflow/2p/incompressiblelocalresidual.hh +++ b/dumux/porousmediumflow/2p/incompressiblelocalresidual.hh @@ -60,7 +60,7 @@ class TwoPIncompressibleLocalResidual : public ImmiscibleLocalResidual using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using FluidSystem = GetPropType; using ModelTraits = GetPropType; diff --git a/dumux/porousmediumflow/2p/sequential/celldata.hh b/dumux/porousmediumflow/2p/sequential/celldata.hh index d9eb5f65b7..15920472c2 100644 --- a/dumux/porousmediumflow/2p/sequential/celldata.hh +++ b/dumux/porousmediumflow/2p/sequential/celldata.hh @@ -63,7 +63,7 @@ class CellData2P { private: using Scalar = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using FluxData = FluxData2P; using FluidState = GetPropType; @@ -405,7 +405,7 @@ class CellData2P { private: using Scalar = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using FluxData = FluxData2P; using FluidState = GetPropType; diff --git a/dumux/porousmediumflow/2p/sequential/celldataadaptive.hh b/dumux/porousmediumflow/2p/sequential/celldataadaptive.hh index 4fd8f3f058..6198a8e8ca 100644 --- a/dumux/porousmediumflow/2p/sequential/celldataadaptive.hh +++ b/dumux/porousmediumflow/2p/sequential/celldataadaptive.hh @@ -43,7 +43,7 @@ class CellData2PAdaptive: public CellData2P { private: using Scalar = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Grid = typename GridView::Grid; using Problem = GetPropType; diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressure.hh b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressure.hh index c248918fa2..476923b1c4 100644 --- a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressure.hh +++ b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressure.hh @@ -116,7 +116,7 @@ template class FVPressure2P: public FVPressure //the model implementation using Implementation = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using Problem = GetPropType; diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressureadaptive.hh b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressureadaptive.hh index 6d1d1d3a05..829c43a034 100644 --- a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressureadaptive.hh +++ b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressureadaptive.hh @@ -45,7 +45,7 @@ template class FVPressure2PAdaptive: public FVPressure2P { using ParentType = FVPressure2P; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using Problem = GetPropType; diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/velocity.hh b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/velocity.hh index e191cb38f1..175fcea4ec 100644 --- a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/velocity.hh +++ b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/velocity.hh @@ -59,7 +59,7 @@ namespace Dumux { template class FVVelocity2P { - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using Problem = GetPropType; diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/velocityadaptive.hh b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/velocityadaptive.hh index 9ed529385e..0e06a573cf 100644 --- a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/velocityadaptive.hh +++ b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/velocityadaptive.hh @@ -40,7 +40,7 @@ class FVVelocity2PAdaptive: public FVVelocity2P { using ParentType = FVVelocity2P; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using Problem = GetPropType; diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/croperator.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/croperator.hh index c2779eebb1..3999c466d5 100644 --- a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/croperator.hh +++ b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/croperator.hh @@ -73,7 +73,7 @@ class CROperatorAssemblerTwoP } }; using Scalar = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; enum {dim=GridView::dimension}; using IS = typename GridView::IndexSet; using BlockType = Dune::FieldMatrix; diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/croperatoradaptive.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/croperatoradaptive.hh index 7d2c4345c0..9e50414b8d 100644 --- a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/croperatoradaptive.hh +++ b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/croperatoradaptive.hh @@ -67,7 +67,7 @@ namespace Dumux { template class CROperatorAssemblerTwoPAdaptive { - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; enum {dim=GridView::dimension}; using Element = typename GridView::template Codim<0>::Entity; diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/localstiffness.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/localstiffness.hh index f56bf2766a..c861763cc3 100644 --- a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/localstiffness.hh +++ b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/localstiffness.hh @@ -58,7 +58,7 @@ namespace Dumux { template class LocalStiffness { - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; // grid types using Entity = typename GridView::template Codim<0>::Entity; @@ -266,7 +266,7 @@ protected: template class LinearLocalStiffness : public LocalStiffness { - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; // grid types diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/mimetic.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/mimetic.hh index 7c98f76ab6..a10ba8cbdf 100644 --- a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/mimetic.hh +++ b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/mimetic.hh @@ -51,7 +51,7 @@ namespace Dumux { template class MimeticTwoPLocalStiffness: public LocalStiffness { - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using Problem = GetPropType; diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/mimeticadaptive.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/mimeticadaptive.hh index 5bf9b3bcc7..84f3c381f1 100644 --- a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/mimeticadaptive.hh +++ b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/mimeticadaptive.hh @@ -53,7 +53,7 @@ namespace Dumux { template class MimeticTwoPLocalStiffnessAdaptive: public LocalStiffness { - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using Problem = GetPropType; diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/operator.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/operator.hh index 095b5ce577..cc46647410 100644 --- a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/operator.hh +++ b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/operator.hh @@ -45,7 +45,7 @@ class MimeticOperatorAssemblerTwoP: public CROperatorAssemblerTwoP { using ParentType = CROperatorAssemblerTwoP; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using Problem = GetPropType; enum diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/operatoradaptive.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/operatoradaptive.hh index 14c9a1de0c..434e52fd79 100644 --- a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/operatoradaptive.hh +++ b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/operatoradaptive.hh @@ -45,7 +45,7 @@ class MimeticOperatorAssemblerTwoPAdaptive : public CROperatorAssemblerTwoPAdapt { using ParentType = CROperatorAssemblerTwoPAdaptive; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using Problem = GetPropType; diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/pressure.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/pressure.hh index d23db57673..8176c2be08 100644 --- a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/pressure.hh +++ b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/pressure.hh @@ -62,7 +62,7 @@ namespace Dumux { */ template class MimeticPressure2P { - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using Problem = GetPropType; diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/pressureadaptive.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/pressureadaptive.hh index 948bc3dc83..ba85227d09 100644 --- a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/pressureadaptive.hh +++ b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/pressureadaptive.hh @@ -62,7 +62,7 @@ namespace Dumux { */ template class MimeticPressure2PAdaptive { - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using Problem = GetPropType; diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressure.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressure.hh index 75ec63251e..d7e91e2a1d 100644 --- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressure.hh +++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressure.hh @@ -71,7 +71,7 @@ template class FvMpfaL2dPressure2p: public FVPressure { using ParentType = FVPressure; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; enum { diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressureadaptive.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressureadaptive.hh index ccc682c79d..8ed095778b 100644 --- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressureadaptive.hh +++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressureadaptive.hh @@ -74,7 +74,7 @@ template class FvMpfaL2dPressure2pAdaptive: public FVPressure { using ParentType = FVPressure; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; enum { diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressurevelocity.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressurevelocity.hh index 8ff5bcc224..a3f9de827d 100644 --- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressurevelocity.hh +++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressurevelocity.hh @@ -46,7 +46,7 @@ template class FvMpfaL2dPressureVelocity2p: public FvMpfaL2dPress { using ParentType = FvMpfaL2dPressure2p; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; enum { diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressurevelocityadaptive.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressurevelocityadaptive.hh index 08c8e3de23..a4f86fdbdf 100644 --- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressurevelocityadaptive.hh +++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressurevelocityadaptive.hh @@ -48,7 +48,7 @@ template class FvMpfaL2dPressureVelocity2pAdaptive: public FvMpfa { using ParentType = FvMpfaL2dPressure2pAdaptive; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; enum { diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dtransmissibilitycalculator.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dtransmissibilitycalculator.hh index 34aabd5b76..c8ad60bf22 100644 --- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dtransmissibilitycalculator.hh +++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dtransmissibilitycalculator.hh @@ -42,7 +42,7 @@ namespace Dumux { template class FvMpfaL2dTransmissibilityCalculator { - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; enum { diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dvelocity.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dvelocity.hh index 68917cbe1a..a521a3b319 100644 --- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dvelocity.hh +++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dvelocity.hh @@ -56,7 +56,7 @@ namespace Dumux { */ template class FvMpfaL2dVelocity2p { - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; enum { dim = GridView::dimension, dimWorld = GridView::dimensionworld diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dvelocityadaptive.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dvelocityadaptive.hh index 49275e0101..903def08d0 100644 --- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dvelocityadaptive.hh +++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dvelocityadaptive.hh @@ -53,7 +53,7 @@ namespace Dumux { template class FvMpfaL2dVelocity2pAdaptive : public FvMpfaL2dVelocity2p { using ParentType = FvMpfaL2dVelocity2p; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; enum { dim = GridView::dimension, dimWorld = GridView::dimensionworld diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dinteractionvolumecontainer.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dinteractionvolumecontainer.hh index 2e380dad43..fdc011c85b 100644 --- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dinteractionvolumecontainer.hh +++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dinteractionvolumecontainer.hh @@ -44,7 +44,7 @@ namespace Dumux { template class FvMpfaL3dInteractionVolumeContainer { - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Implementation = GetPropType; enum diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dinteractionvolumecontaineradaptive.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dinteractionvolumecontaineradaptive.hh index 5c3668a01f..5e42bb79ee 100644 --- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dinteractionvolumecontaineradaptive.hh +++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dinteractionvolumecontaineradaptive.hh @@ -47,7 +47,7 @@ class FvMpfaL3dInteractionVolumeContainerAdaptive: public FvMpfaL3dInteractionVo { friend class FvMpfaL3dInteractionVolumeContainer; using ParentType = FvMpfaL3dInteractionVolumeContainer; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; enum { diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressure.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressure.hh index a3d5ab464f..6cce644e5b 100644 --- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressure.hh +++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressure.hh @@ -74,7 +74,7 @@ class FvMpfaL3dPressure2p: public FVPressure { using ParentType = FVPressure; using Implementation = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; enum { diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressureadaptive.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressureadaptive.hh index a917ea974d..ba6a5b38a5 100644 --- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressureadaptive.hh +++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressureadaptive.hh @@ -78,7 +78,7 @@ class FvMpfaL3dPressure2pAdaptive: public FvMpfaL3dPressure2p { using ParentType = FvMpfaL3dPressure2p; using Implementation = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; enum { diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressurevelocity.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressurevelocity.hh index 5c0338ac30..b0db69570b 100644 --- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressurevelocity.hh +++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressurevelocity.hh @@ -44,7 +44,7 @@ template class FvMpfaL3dPressureVelocity2p: public FvMpfaL3dPress { using ParentType = FvMpfaL3dPressure2p; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; enum diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressurevelocityadaptive.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressurevelocityadaptive.hh index 34911a336c..3cf7202a1b 100644 --- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressurevelocityadaptive.hh +++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressurevelocityadaptive.hh @@ -47,7 +47,7 @@ template class FvMpfaL3dPressureVelocity2pAdaptive: public FvMpfa using ParentType = FvMpfaL3dPressure2pAdaptive; using Scalar = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; enum { diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dtransmissibilitycalculator.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dtransmissibilitycalculator.hh index e76112825b..2e63c25611 100644 --- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dtransmissibilitycalculator.hh +++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dtransmissibilitycalculator.hh @@ -49,7 +49,7 @@ namespace Dumux { template class FvMpfaL3dTransmissibilityCalculator { - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; enum { diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dvelocity.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dvelocity.hh index ad4a6820c5..39d7cb2b49 100644 --- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dvelocity.hh +++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dvelocity.hh @@ -53,7 +53,7 @@ namespace Dumux { */ template class FvMpfaL3dVelocity2p { - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; enum { dim = GridView::dimension, dimWorld = GridView::dimensionworld diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dvelocityadaptive.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dvelocityadaptive.hh index df093bf1fe..9cfc94d429 100644 --- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dvelocityadaptive.hh +++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dvelocityadaptive.hh @@ -54,7 +54,7 @@ template class FvMpfaL3dVelocity2pAdaptive: public FvMpfaL3dVeloc { using ParentType = FvMpfaL3dVelocity2p; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; enum { diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dpressure.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dpressure.hh index 516cab9894..1271b3a466 100644 --- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dpressure.hh +++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dpressure.hh @@ -66,7 +66,7 @@ template class FvMpfaO2dPressure2p: public FVPressure { using ParentType = FVPressure; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; enum { diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dpressurevelocity.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dpressurevelocity.hh index c91b301bcd..410570eb85 100644 --- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dpressurevelocity.hh +++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dpressurevelocity.hh @@ -44,7 +44,7 @@ template class FvMpfaO2dPressureVelocity2p: public FvMpfaO2dPress { using ParentType = FvMpfaO2dPressure2p; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; enum { diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dvelocity.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dvelocity.hh index 77031b3b1a..d9b802d68a 100644 --- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dvelocity.hh +++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dvelocity.hh @@ -54,7 +54,7 @@ namespace Dumux { */ template class FvMpfaO2dVelocity2P { - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; enum { dim = GridView::dimension, dimWorld = GridView::dimensionworld diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/problem.hh b/dumux/porousmediumflow/2p/sequential/diffusion/problem.hh index 38c52be8fb..d709882a23 100644 --- a/dumux/porousmediumflow/2p/sequential/diffusion/problem.hh +++ b/dumux/porousmediumflow/2p/sequential/diffusion/problem.hh @@ -41,7 +41,7 @@ class DiffusionProblem2P: public OneModelProblem using Implementation = GetPropType; using ParentType = OneModelProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Grid = typename GridView::Grid; using Scalar = GetPropType; diff --git a/dumux/porousmediumflow/2p/sequential/fluxdata.hh b/dumux/porousmediumflow/2p/sequential/fluxdata.hh index 316a7bb3fe..c3d66b4af3 100644 --- a/dumux/porousmediumflow/2p/sequential/fluxdata.hh +++ b/dumux/porousmediumflow/2p/sequential/fluxdata.hh @@ -41,7 +41,7 @@ class FluxData2P { private: using Scalar = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; enum { diff --git a/dumux/porousmediumflow/2p/sequential/impes/gridadaptionindicator.hh b/dumux/porousmediumflow/2p/sequential/impes/gridadaptionindicator.hh index 4b55e44649..60fa0c7054 100644 --- a/dumux/porousmediumflow/2p/sequential/impes/gridadaptionindicator.hh +++ b/dumux/porousmediumflow/2p/sequential/impes/gridadaptionindicator.hh @@ -41,7 +41,7 @@ class GridAdaptionIndicator2P { private: using Problem = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using Element = typename GridView::Traits::template Codim<0>::Entity; diff --git a/dumux/porousmediumflow/2p/sequential/impes/gridadaptionindicatorlocal.hh b/dumux/porousmediumflow/2p/sequential/impes/gridadaptionindicatorlocal.hh index 5d1574a004..2667743798 100644 --- a/dumux/porousmediumflow/2p/sequential/impes/gridadaptionindicatorlocal.hh +++ b/dumux/porousmediumflow/2p/sequential/impes/gridadaptionindicatorlocal.hh @@ -40,7 +40,7 @@ class GridAdaptionIndicator2PLocal { private: using Problem = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using Element = typename GridView::Traits::template Codim<0>::Entity; diff --git a/dumux/porousmediumflow/2p/sequential/impes/problem.hh b/dumux/porousmediumflow/2p/sequential/impes/problem.hh index e2d24a9c5a..3cef2e3653 100644 --- a/dumux/porousmediumflow/2p/sequential/impes/problem.hh +++ b/dumux/porousmediumflow/2p/sequential/impes/problem.hh @@ -44,7 +44,7 @@ class IMPESProblem2P : public IMPETProblem using TimeManager = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Grid = typename GridView::Grid; using Scalar = GetPropType; diff --git a/dumux/porousmediumflow/2p/sequential/transport/cellcentered/capillarydiffusion.hh b/dumux/porousmediumflow/2p/sequential/transport/cellcentered/capillarydiffusion.hh index 8b7bb19eb9..e0f7da9edf 100644 --- a/dumux/porousmediumflow/2p/sequential/transport/cellcentered/capillarydiffusion.hh +++ b/dumux/porousmediumflow/2p/sequential/transport/cellcentered/capillarydiffusion.hh @@ -48,7 +48,7 @@ template class CapillaryDiffusion: public DiffusivePart { private: - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using Problem = GetPropType; using Indices = typename GetPropType::Indices; diff --git a/dumux/porousmediumflow/2p/sequential/transport/cellcentered/convectivepart.hh b/dumux/porousmediumflow/2p/sequential/transport/cellcentered/convectivepart.hh index 65bfa3e465..4f8adbc365 100644 --- a/dumux/porousmediumflow/2p/sequential/transport/cellcentered/convectivepart.hh +++ b/dumux/porousmediumflow/2p/sequential/transport/cellcentered/convectivepart.hh @@ -38,7 +38,7 @@ template class ConvectivePart { private: - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using Problem = GetPropType; diff --git a/dumux/porousmediumflow/2p/sequential/transport/cellcentered/diffusivepart.hh b/dumux/porousmediumflow/2p/sequential/transport/cellcentered/diffusivepart.hh index 860f46344d..87b9304095 100644 --- a/dumux/porousmediumflow/2p/sequential/transport/cellcentered/diffusivepart.hh +++ b/dumux/porousmediumflow/2p/sequential/transport/cellcentered/diffusivepart.hh @@ -37,7 +37,7 @@ template class DiffusivePart { private: - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using Problem = GetPropType; diff --git a/dumux/porousmediumflow/2p/sequential/transport/cellcentered/evalcflflux.hh b/dumux/porousmediumflow/2p/sequential/transport/cellcentered/evalcflflux.hh index fa06168665..ebac4ef81a 100644 --- a/dumux/porousmediumflow/2p/sequential/transport/cellcentered/evalcflflux.hh +++ b/dumux/porousmediumflow/2p/sequential/transport/cellcentered/evalcflflux.hh @@ -51,7 +51,7 @@ template class EvalCflFlux { private: - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using Intersection = typename GridView::Intersection; using Element = typename GridView::Traits::template Codim<0>::Entity; diff --git a/dumux/porousmediumflow/2p/sequential/transport/cellcentered/evalcflfluxcoats.hh b/dumux/porousmediumflow/2p/sequential/transport/cellcentered/evalcflfluxcoats.hh index 4f06dcc062..763a2c057b 100644 --- a/dumux/porousmediumflow/2p/sequential/transport/cellcentered/evalcflfluxcoats.hh +++ b/dumux/porousmediumflow/2p/sequential/transport/cellcentered/evalcflfluxcoats.hh @@ -39,7 +39,7 @@ template class EvalCflFluxCoats: public EvalCflFlux { private: - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using Problem = GetPropType; diff --git a/dumux/porousmediumflow/2p/sequential/transport/cellcentered/evalcflfluxdefault.hh b/dumux/porousmediumflow/2p/sequential/transport/cellcentered/evalcflfluxdefault.hh index e91beba12e..9793e91f97 100644 --- a/dumux/porousmediumflow/2p/sequential/transport/cellcentered/evalcflfluxdefault.hh +++ b/dumux/porousmediumflow/2p/sequential/transport/cellcentered/evalcflfluxdefault.hh @@ -40,7 +40,7 @@ template class EvalCflFluxDefault: public EvalCflFlux { private: - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using Problem = GetPropType; diff --git a/dumux/porousmediumflow/2p/sequential/transport/cellcentered/gravitypart.hh b/dumux/porousmediumflow/2p/sequential/transport/cellcentered/gravitypart.hh index 442e80aaaf..59cb77ff6a 100644 --- a/dumux/porousmediumflow/2p/sequential/transport/cellcentered/gravitypart.hh +++ b/dumux/porousmediumflow/2p/sequential/transport/cellcentered/gravitypart.hh @@ -48,7 +48,7 @@ template class GravityPart: public ConvectivePart { private: - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using Problem = GetPropType; using Indices = typename GetPropType::Indices; diff --git a/dumux/porousmediumflow/2p/sequential/transport/cellcentered/saturation.hh b/dumux/porousmediumflow/2p/sequential/transport/cellcentered/saturation.hh index 4f5a4e2409..532b35683f 100644 --- a/dumux/porousmediumflow/2p/sequential/transport/cellcentered/saturation.hh +++ b/dumux/porousmediumflow/2p/sequential/transport/cellcentered/saturation.hh @@ -77,7 +77,7 @@ class FVSaturation2P: public FVTransport using ParentType = FVTransport; using Implementation = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; enum { diff --git a/dumux/porousmediumflow/2p/sequential/transport/problem.hh b/dumux/porousmediumflow/2p/sequential/transport/problem.hh index 22f4aa7c69..8acf462f1b 100644 --- a/dumux/porousmediumflow/2p/sequential/transport/problem.hh +++ b/dumux/porousmediumflow/2p/sequential/transport/problem.hh @@ -53,7 +53,7 @@ class TransportProblem2P : public OneModelProblem using Implementation = GetPropType; using ParentType = OneModelProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Grid = typename GridView::Grid; using Scalar = GetPropType; diff --git a/dumux/porousmediumflow/2p1c/darcyslaw.hh b/dumux/porousmediumflow/2p1c/darcyslaw.hh index 1188739f1b..c453a7c690 100644 --- a/dumux/porousmediumflow/2p1c/darcyslaw.hh +++ b/dumux/porousmediumflow/2p1c/darcyslaw.hh @@ -56,7 +56,7 @@ class TwoPOneCDarcysLaw : public DarcysLaw using FluxVarCache = GetPropType; using ElementVolumeVariables = typename GetPropType::LocalView; using VolumeVariables = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using FluidSystem = GetPropType; using Indices = typename GetPropType::Indices; diff --git a/dumux/porousmediumflow/2p1c/localresidual.hh b/dumux/porousmediumflow/2p1c/localresidual.hh index d6f54172f3..c835cedd55 100644 --- a/dumux/porousmediumflow/2p1c/localresidual.hh +++ b/dumux/porousmediumflow/2p1c/localresidual.hh @@ -46,7 +46,7 @@ class TwoPOneCLocalResidual : public ImmiscibleLocalResidual using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using EnergyLocalResidual = GetPropType; using Indices = typename GetPropType::Indices; diff --git a/dumux/porousmediumflow/2p2c/sequential/celldataadaptive.hh b/dumux/porousmediumflow/2p2c/sequential/celldataadaptive.hh index 504aa3bdf7..57372abcab 100644 --- a/dumux/porousmediumflow/2p2c/sequential/celldataadaptive.hh +++ b/dumux/porousmediumflow/2p2c/sequential/celldataadaptive.hh @@ -45,7 +45,7 @@ class CellData2P2CAdaptive: public CellData2P2CMultiPhysics { private: using Scalar = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Grid = typename GridView::Grid; using Problem = GetPropType; using FluidState = GetPropType; diff --git a/dumux/porousmediumflow/2p2c/sequential/fluxdata.hh b/dumux/porousmediumflow/2p2c/sequential/fluxdata.hh index 4522bb07ce..7b587d0105 100644 --- a/dumux/porousmediumflow/2p2c/sequential/fluxdata.hh +++ b/dumux/porousmediumflow/2p2c/sequential/fluxdata.hh @@ -42,7 +42,7 @@ template class FluxData2P2C { private: - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using Indices = typename GetPropType::Indices; diff --git a/dumux/porousmediumflow/2p2c/sequential/fv2dpressureadaptive.hh b/dumux/porousmediumflow/2p2c/sequential/fv2dpressureadaptive.hh index 589e01f8f2..21ba11158a 100644 --- a/dumux/porousmediumflow/2p2c/sequential/fv2dpressureadaptive.hh +++ b/dumux/porousmediumflow/2p2c/sequential/fv2dpressureadaptive.hh @@ -80,7 +80,7 @@ template class FV2dPressure2P2CAdaptive using Implementation = GetPropType; using BaseType = FVPressure; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using Problem = GetPropType; diff --git a/dumux/porousmediumflow/2p2c/sequential/fv2dtransportadaptive.hh b/dumux/porousmediumflow/2p2c/sequential/fv2dtransportadaptive.hh index df2c2755bd..fd19773d84 100644 --- a/dumux/porousmediumflow/2p2c/sequential/fv2dtransportadaptive.hh +++ b/dumux/porousmediumflow/2p2c/sequential/fv2dtransportadaptive.hh @@ -55,7 +55,7 @@ namespace Dumux { template class FV2dTransport2P2CAdaptive : public FVTransport2P2C { - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using Problem = GetPropType; diff --git a/dumux/porousmediumflow/2p2c/sequential/fv3dpressureadaptive.hh b/dumux/porousmediumflow/2p2c/sequential/fv3dpressureadaptive.hh index 94e366048c..98ec017f9f 100644 --- a/dumux/porousmediumflow/2p2c/sequential/fv3dpressureadaptive.hh +++ b/dumux/porousmediumflow/2p2c/sequential/fv3dpressureadaptive.hh @@ -83,7 +83,7 @@ template class FV3dPressure2P2CAdaptive using ParentType = FVPressure2P2CMultiPhysics; using BaseType = FVPressure; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using SolutionTypes = GetProp; using Problem = GetPropType; diff --git a/dumux/porousmediumflow/2p2c/sequential/fv3dtransportadaptive.hh b/dumux/porousmediumflow/2p2c/sequential/fv3dtransportadaptive.hh index 21edb788a9..0a711471e1 100644 --- a/dumux/porousmediumflow/2p2c/sequential/fv3dtransportadaptive.hh +++ b/dumux/porousmediumflow/2p2c/sequential/fv3dtransportadaptive.hh @@ -52,7 +52,7 @@ namespace Dumux { template class FV3dTransport2P2CAdaptive : public FVTransport2P2C { - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using Problem = GetPropType; diff --git a/dumux/porousmediumflow/2p2c/sequential/fvmpfal3dinteractionvolumecontaineradaptive.hh b/dumux/porousmediumflow/2p2c/sequential/fvmpfal3dinteractionvolumecontaineradaptive.hh index 1154d0b265..f5c1c2a69c 100644 --- a/dumux/porousmediumflow/2p2c/sequential/fvmpfal3dinteractionvolumecontaineradaptive.hh +++ b/dumux/porousmediumflow/2p2c/sequential/fvmpfal3dinteractionvolumecontaineradaptive.hh @@ -46,7 +46,7 @@ template class FvMpfaL3d2P2CInteractionVolumeContainerAdaptive : public FvMpfaL3dInteractionVolumeContainerAdaptive { using ParentType = FvMpfaL3dInteractionVolumeContainerAdaptive; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; enum { diff --git a/dumux/porousmediumflow/2p2c/sequential/fvpressure.hh b/dumux/porousmediumflow/2p2c/sequential/fvpressure.hh index b43013496f..b48b0b5948 100644 --- a/dumux/porousmediumflow/2p2c/sequential/fvpressure.hh +++ b/dumux/porousmediumflow/2p2c/sequential/fvpressure.hh @@ -74,7 +74,7 @@ template class FVPressure2P2C //the model implementation using Implementation = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using Problem = GetPropType; diff --git a/dumux/porousmediumflow/2p2c/sequential/fvpressurecompositional.hh b/dumux/porousmediumflow/2p2c/sequential/fvpressurecompositional.hh index 081578adec..156ac32601 100644 --- a/dumux/porousmediumflow/2p2c/sequential/fvpressurecompositional.hh +++ b/dumux/porousmediumflow/2p2c/sequential/fvpressurecompositional.hh @@ -69,7 +69,7 @@ template class FVPressureCompositional using Implementation = GetPropType; using ParentType = FVPressure; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using TransportSolutionType = GetPropType; using Problem = GetPropType; diff --git a/dumux/porousmediumflow/2p2c/sequential/fvpressuremultiphysics.hh b/dumux/porousmediumflow/2p2c/sequential/fvpressuremultiphysics.hh index 9e6bde06d4..0d95a94d09 100644 --- a/dumux/porousmediumflow/2p2c/sequential/fvpressuremultiphysics.hh +++ b/dumux/porousmediumflow/2p2c/sequential/fvpressuremultiphysics.hh @@ -69,7 +69,7 @@ template class FVPressure2P2CMultiPhysics : public FVPressure2P2C { using ParentType = FVPressure2P2C; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using SolutionTypes = GetProp; using Problem = GetPropType; diff --git a/dumux/porousmediumflow/2p2c/sequential/fvtransport.hh b/dumux/porousmediumflow/2p2c/sequential/fvtransport.hh index b758c1c47f..ca31d80701 100644 --- a/dumux/porousmediumflow/2p2c/sequential/fvtransport.hh +++ b/dumux/porousmediumflow/2p2c/sequential/fvtransport.hh @@ -58,7 +58,7 @@ namespace Dumux { template class FVTransport2P2C { - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using Problem = GetPropType; using Implementation = GetPropType; diff --git a/dumux/porousmediumflow/2p2c/sequential/fvtransportmultiphysics.hh b/dumux/porousmediumflow/2p2c/sequential/fvtransportmultiphysics.hh index ee38d1b74f..fb93249722 100644 --- a/dumux/porousmediumflow/2p2c/sequential/fvtransportmultiphysics.hh +++ b/dumux/porousmediumflow/2p2c/sequential/fvtransportmultiphysics.hh @@ -54,7 +54,7 @@ namespace Dumux { template class FVTransport2P2CMultiPhysics : public FVTransport2P2C { - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using Problem = GetPropType; diff --git a/dumux/porousmediumflow/2p2c/sequential/problem.hh b/dumux/porousmediumflow/2p2c/sequential/problem.hh index 017e39c755..3c1a402d34 100644 --- a/dumux/porousmediumflow/2p2c/sequential/problem.hh +++ b/dumux/porousmediumflow/2p2c/sequential/problem.hh @@ -46,7 +46,7 @@ class IMPETProblem2P2C : public IMPESProblem2P using TimeManager = GetPropType; using Indices = typename GetPropType::Indices; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Grid = typename GridView::Grid; using Scalar = GetPropType; diff --git a/dumux/porousmediumflow/2p2c/sequential/variableclassadaptive.hh b/dumux/porousmediumflow/2p2c/sequential/variableclassadaptive.hh index 0a3f511e48..61f11c3adf 100644 --- a/dumux/porousmediumflow/2p2c/sequential/variableclassadaptive.hh +++ b/dumux/porousmediumflow/2p2c/sequential/variableclassadaptive.hh @@ -51,7 +51,7 @@ private: using Problem = GetPropType; using Scalar = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using CellData = GetPropType; using AdaptedValues = typename CellData::AdaptedValues; diff --git a/dumux/porousmediumflow/3p3c/localresidual.hh b/dumux/porousmediumflow/3p3c/localresidual.hh index 2dbf5cd49b..1c8a6f9451 100644 --- a/dumux/porousmediumflow/3p3c/localresidual.hh +++ b/dumux/porousmediumflow/3p3c/localresidual.hh @@ -49,7 +49,7 @@ class ThreePThreeCLocalResidual : public GetPropType; using ElementFluxVariablesCache = typename GetPropType::LocalView; using Indices = typename GetPropType::Indices; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using ElementVolumeVariables = typename GetPropType::LocalView; using VolumeVariables = GetPropType; diff --git a/dumux/porousmediumflow/3pwateroil/localresidual.hh b/dumux/porousmediumflow/3pwateroil/localresidual.hh index 9649a2541d..51e82a556a 100644 --- a/dumux/porousmediumflow/3pwateroil/localresidual.hh +++ b/dumux/porousmediumflow/3pwateroil/localresidual.hh @@ -49,7 +49,7 @@ protected: using FluxVariables = GetPropType; using ElementFluxVariablesCache = typename GetPropType::LocalView; using Indices = typename GetPropType::Indices; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using ElementVolumeVariables = typename GetPropType::LocalView; using VolumeVariables = GetPropType; diff --git a/dumux/porousmediumflow/boxdfm/fluxvariablescache.hh b/dumux/porousmediumflow/boxdfm/fluxvariablescache.hh index 403edda110..ea93e53612 100644 --- a/dumux/porousmediumflow/boxdfm/fluxvariablescache.hh +++ b/dumux/porousmediumflow/boxdfm/fluxvariablescache.hh @@ -45,7 +45,7 @@ class BoxDfmFluxVariablesCache { using Scalar = GetPropType; using Problem = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using FluxVariables = GetPropType; using FVElementGeometry = typename GetPropType::LocalView; using ElementVolumeVariables = typename GetPropType::LocalView; diff --git a/dumux/porousmediumflow/boxdfm/model.hh b/dumux/porousmediumflow/boxdfm/model.hh index e1a652b698..72478ecf26 100644 --- a/dumux/porousmediumflow/boxdfm/model.hh +++ b/dumux/porousmediumflow/boxdfm/model.hh @@ -26,6 +26,8 @@ #ifndef DUMUX_POROUSMEDIUMFLOW_BOXDFM_MODEL_HH #define DUMUX_POROUSMEDIUMFLOW_BOXDFM_MODEL_HH +#include + #include #include "fvgridgeometry.hh" @@ -46,7 +48,9 @@ struct GridGeometry { private: static constexpr bool enableCache = getPropValue(); + DUNE_NO_DEPRECATED_BEGIN using GridView = GetPropType; + DUNE_NO_DEPRECATED_END using Scalar = GetPropType; public: using type = BoxDfmFVGridGeometry; diff --git a/dumux/porousmediumflow/compositional/localresidual.hh b/dumux/porousmediumflow/compositional/localresidual.hh index bf6ac09d29..7aefc7e34d 100644 --- a/dumux/porousmediumflow/compositional/localresidual.hh +++ b/dumux/porousmediumflow/compositional/localresidual.hh @@ -51,7 +51,7 @@ class CompositionalLocalResidual: public GetPropType; using FluxVariables = GetPropType; using ElementFluxVariablesCache = typename GetPropType::LocalView; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using ElementVolumeVariables = typename GetPropType::LocalView; using VolumeVariables = GetPropType; diff --git a/dumux/porousmediumflow/fluxvariablescache.hh b/dumux/porousmediumflow/fluxvariablescache.hh index 6b2d24ba3f..892d251b17 100644 --- a/dumux/porousmediumflow/fluxvariablescache.hh +++ b/dumux/porousmediumflow/fluxvariablescache.hh @@ -95,7 +95,7 @@ class PorousMediumFluxVariablesCacheImplementation::enableMolecularDiffusion()> , public EnergyCacheChooser::enableEnergyBalance()> { - using GridIndexType = typename GetPropType::IndexSet::IndexType; + using GridIndexType = typename GetPropType::GridView::IndexSet::IndexType; using MpfaHelper = typename GetPropType::MpfaHelper; static constexpr bool considerSecondary = MpfaHelper::considerSecondaryIVs(); diff --git a/dumux/porousmediumflow/fluxvariablescachefiller.hh b/dumux/porousmediumflow/fluxvariablescachefiller.hh index d439a7c1c2..5afe55fbc5 100644 --- a/dumux/porousmediumflow/fluxvariablescachefiller.hh +++ b/dumux/porousmediumflow/fluxvariablescachefiller.hh @@ -53,7 +53,7 @@ class PorousMediumFluxVariablesCacheFillerImplementation; using Problem = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; @@ -191,7 +191,7 @@ class PorousMediumFluxVariablesCacheFillerImplementation; using Problem = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using GridGeometry = GetPropType; diff --git a/dumux/porousmediumflow/immiscible/localresidual.hh b/dumux/porousmediumflow/immiscible/localresidual.hh index 888e5f4264..b6abc1d5a0 100644 --- a/dumux/porousmediumflow/immiscible/localresidual.hh +++ b/dumux/porousmediumflow/immiscible/localresidual.hh @@ -48,7 +48,7 @@ class ImmiscibleLocalResidual : public GetPropType::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using EnergyLocalResidual = GetPropType; diff --git a/dumux/porousmediumflow/mpnc/localresidual.hh b/dumux/porousmediumflow/mpnc/localresidual.hh index b25d2b8a19..3ae3b7f5e9 100644 --- a/dumux/porousmediumflow/mpnc/localresidual.hh +++ b/dumux/porousmediumflow/mpnc/localresidual.hh @@ -45,7 +45,7 @@ template class MPNCLocalResidual : public CompositionalLocalResidual { using ParentType = CompositionalLocalResidual; - using Element = typename GetPropType::template Codim<0>::Entity; + using Element = typename GetPropType::GridView::template Codim<0>::Entity; using FVElementGeometry = typename GetPropType::LocalView; using ElementBoundaryTypes = GetPropType; using ElementFluxVariablesCache = typename GetPropType::LocalView; diff --git a/dumux/porousmediumflow/nonequilibrium/localresidual.hh b/dumux/porousmediumflow/nonequilibrium/localresidual.hh index 707d5cdae0..18629c3b70 100644 --- a/dumux/porousmediumflow/nonequilibrium/localresidual.hh +++ b/dumux/porousmediumflow/nonequilibrium/localresidual.hh @@ -52,7 +52,7 @@ class NonEquilibriumLocalResidualImplementation: public GetPropT using NumEqVector = GetPropType; using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using ElementVolumeVariables = typename GetPropType::LocalView; using EnergyLocalResidual = GetPropType; @@ -116,7 +116,7 @@ class NonEquilibriumLocalResidualImplementation: public GetPropTy using NumEqVector = GetPropType; using FluxVariables = GetPropType; using ElementFluxVariablesCache = typename GetPropType::LocalView; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using ElementVolumeVariables = typename GetPropType::LocalView; using VolumeVariables = GetPropType; diff --git a/dumux/porousmediumflow/nonequilibrium/thermal/localresidual.hh b/dumux/porousmediumflow/nonequilibrium/thermal/localresidual.hh index e2dd38dc48..8aa4a73bf6 100644 --- a/dumux/porousmediumflow/nonequilibrium/thermal/localresidual.hh +++ b/dumux/porousmediumflow/nonequilibrium/thermal/localresidual.hh @@ -52,7 +52,7 @@ class EnergyLocalResidualNonEquilibrium using SubControlVolume = typename FVElementGeometry::SubControlVolume; using FluxVariables = GetPropType; using FluidSystem = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using ElementVolumeVariables = typename GetPropType::LocalView; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; @@ -216,7 +216,7 @@ class EnergyLocalResidualNonEquilibrium using FluxVariables = GetPropType; using FluidSystem = GetPropType; using SolidSystem = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using ElementVolumeVariables = typename GetPropType::LocalView; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; diff --git a/dumux/porousmediumflow/nonisothermal/localresidual.hh b/dumux/porousmediumflow/nonisothermal/localresidual.hh index 3b3210464b..42ad880388 100644 --- a/dumux/porousmediumflow/nonisothermal/localresidual.hh +++ b/dumux/porousmediumflow/nonisothermal/localresidual.hh @@ -114,7 +114,7 @@ class EnergyLocalResidualImplementation using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using FluxVariables = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using ElementVolumeVariables = typename GetPropType::LocalView; using Indices = typename GetPropType::Indices; diff --git a/dumux/porousmediumflow/problem.hh b/dumux/porousmediumflow/problem.hh index dcc9f75941..801f846340 100644 --- a/dumux/porousmediumflow/problem.hh +++ b/dumux/porousmediumflow/problem.hh @@ -39,7 +39,7 @@ class PorousMediumFlowProblem : public FVProblem { using ParentType = FVProblem; using GridGeometry = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; enum { dim = GridView::dimension, diff --git a/dumux/porousmediumflow/richards/localresidual.hh b/dumux/porousmediumflow/richards/localresidual.hh index 164cab5a4c..d827158d05 100644 --- a/dumux/porousmediumflow/richards/localresidual.hh +++ b/dumux/porousmediumflow/richards/localresidual.hh @@ -55,7 +55,7 @@ class RichardsLocalResidual : public GetPropType::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using EnergyLocalResidual = GetPropType; using FluidSystem = GetPropType; diff --git a/dumux/porousmediumflow/sequential/cellcentered/mpfa/linteractionvolume.hh b/dumux/porousmediumflow/sequential/cellcentered/mpfa/linteractionvolume.hh index 5f0e9efa0d..122115802b 100644 --- a/dumux/porousmediumflow/sequential/cellcentered/mpfa/linteractionvolume.hh +++ b/dumux/porousmediumflow/sequential/cellcentered/mpfa/linteractionvolume.hh @@ -42,7 +42,7 @@ class FVMPFALInteractionVolume private: using Scalar = GetPropType; using Grid = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; enum { diff --git a/dumux/porousmediumflow/sequential/cellcentered/mpfa/linteractionvolume3d.hh b/dumux/porousmediumflow/sequential/cellcentered/mpfa/linteractionvolume3d.hh index 54fcf8e6c3..3bc8ce6b13 100644 --- a/dumux/porousmediumflow/sequential/cellcentered/mpfa/linteractionvolume3d.hh +++ b/dumux/porousmediumflow/sequential/cellcentered/mpfa/linteractionvolume3d.hh @@ -116,7 +116,7 @@ class FvMpfaL3dInteractionVolume private: using Scalar = GetPropType; using Grid = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Problem = GetPropType; enum diff --git a/dumux/porousmediumflow/sequential/cellcentered/mpfa/linteractionvolume3dadaptive.hh b/dumux/porousmediumflow/sequential/cellcentered/mpfa/linteractionvolume3dadaptive.hh index 663b66221b..33a4d0220d 100644 --- a/dumux/porousmediumflow/sequential/cellcentered/mpfa/linteractionvolume3dadaptive.hh +++ b/dumux/porousmediumflow/sequential/cellcentered/mpfa/linteractionvolume3dadaptive.hh @@ -194,7 +194,7 @@ private: using ParentType = FvMpfaL3dInteractionVolume; using Scalar = GetPropType; using Grid = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Problem = GetPropType; enum diff --git a/dumux/porousmediumflow/sequential/cellcentered/mpfa/ointeractionvolume.hh b/dumux/porousmediumflow/sequential/cellcentered/mpfa/ointeractionvolume.hh index 971df69d4c..1ec9db12a1 100644 --- a/dumux/porousmediumflow/sequential/cellcentered/mpfa/ointeractionvolume.hh +++ b/dumux/porousmediumflow/sequential/cellcentered/mpfa/ointeractionvolume.hh @@ -39,7 +39,7 @@ class FVMPFAOInteractionVolume private: using Scalar = GetPropType; using Grid = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; enum { diff --git a/dumux/porousmediumflow/sequential/cellcentered/mpfa/velocityintransport.hh b/dumux/porousmediumflow/sequential/cellcentered/mpfa/velocityintransport.hh index df1ce5cb4b..e0929fdc52 100644 --- a/dumux/porousmediumflow/sequential/cellcentered/mpfa/velocityintransport.hh +++ b/dumux/porousmediumflow/sequential/cellcentered/mpfa/velocityintransport.hh @@ -41,7 +41,7 @@ template class FvMpfaVelocityInTransport { using Problem = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using CellData = GetPropType; using Intersection = typename GridView::Intersection; diff --git a/dumux/porousmediumflow/sequential/cellcentered/pressure.hh b/dumux/porousmediumflow/sequential/cellcentered/pressure.hh index 9d9df3d381..b00cdcc687 100644 --- a/dumux/porousmediumflow/sequential/cellcentered/pressure.hh +++ b/dumux/porousmediumflow/sequential/cellcentered/pressure.hh @@ -49,7 +49,7 @@ template class FVPressure //the model implementation using Implementation = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using Problem = GetPropType; using CellData = GetPropType; diff --git a/dumux/porousmediumflow/sequential/cellcentered/transport.hh b/dumux/porousmediumflow/sequential/cellcentered/transport.hh index e0c425bced..ec0e35e757 100644 --- a/dumux/porousmediumflow/sequential/cellcentered/transport.hh +++ b/dumux/porousmediumflow/sequential/cellcentered/transport.hh @@ -52,7 +52,7 @@ class FVTransport { using Implementation = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; enum { diff --git a/dumux/porousmediumflow/sequential/cellcentered/velocity.hh b/dumux/porousmediumflow/sequential/cellcentered/velocity.hh index 48d8ab8166..38b999d84b 100644 --- a/dumux/porousmediumflow/sequential/cellcentered/velocity.hh +++ b/dumux/porousmediumflow/sequential/cellcentered/velocity.hh @@ -46,7 +46,7 @@ namespace Dumux */ template class FVVelocity { - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Problem = GetPropType; using CellData = GetPropType; diff --git a/dumux/porousmediumflow/sequential/cellcentered/velocitydefault.hh b/dumux/porousmediumflow/sequential/cellcentered/velocitydefault.hh index 1d5fc40dc5..c8b790d369 100644 --- a/dumux/porousmediumflow/sequential/cellcentered/velocitydefault.hh +++ b/dumux/porousmediumflow/sequential/cellcentered/velocitydefault.hh @@ -41,7 +41,7 @@ template class FVVelocityDefault { using Problem = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using CellData = GetPropType; using Intersection = typename GridView::Intersection; diff --git a/dumux/porousmediumflow/sequential/gridadapt.hh b/dumux/porousmediumflow/sequential/gridadapt.hh index 4af7b80966..45ac878363 100644 --- a/dumux/porousmediumflow/sequential/gridadapt.hh +++ b/dumux/porousmediumflow/sequential/gridadapt.hh @@ -47,7 +47,7 @@ class GridAdapt { using Scalar = GetPropType; using Problem = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Grid = typename GridView::Grid; using LeafGridView = typename Grid::LeafGridView; diff --git a/dumux/porousmediumflow/sequential/gridadaptinitializationindicator.hh b/dumux/porousmediumflow/sequential/gridadaptinitializationindicator.hh index 7718c49c15..8e16148fd4 100644 --- a/dumux/porousmediumflow/sequential/gridadaptinitializationindicator.hh +++ b/dumux/porousmediumflow/sequential/gridadaptinitializationindicator.hh @@ -41,7 +41,7 @@ class GridAdaptInitializationIndicator { private: using Problem = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using Element = typename GridView::Traits::template Codim<0>::Entity; using Intersection = typename GridView::Intersection; diff --git a/dumux/porousmediumflow/sequential/gridadaptinitializationindicatordefault.hh b/dumux/porousmediumflow/sequential/gridadaptinitializationindicatordefault.hh index b73960b51d..263077fabe 100644 --- a/dumux/porousmediumflow/sequential/gridadaptinitializationindicatordefault.hh +++ b/dumux/porousmediumflow/sequential/gridadaptinitializationindicatordefault.hh @@ -41,7 +41,7 @@ template class GridAdaptInitializationIndicatorDefault { private: - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::Traits::template Codim<0>::Entity; using Problem = GetPropType; using AdaptionIndicator = GetPropType; diff --git a/dumux/porousmediumflow/sequential/impetproblem.hh b/dumux/porousmediumflow/sequential/impetproblem.hh index 0d36c0796d..d4957a2052 100644 --- a/dumux/porousmediumflow/sequential/impetproblem.hh +++ b/dumux/porousmediumflow/sequential/impetproblem.hh @@ -46,7 +46,7 @@ class IMPETProblem { private: using Implementation = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Grid = GetPropType; using TimeManager = GetPropType; diff --git a/dumux/porousmediumflow/sequential/onemodelproblem.hh b/dumux/porousmediumflow/sequential/onemodelproblem.hh index 6d1de072cc..bea9dc347d 100644 --- a/dumux/porousmediumflow/sequential/onemodelproblem.hh +++ b/dumux/porousmediumflow/sequential/onemodelproblem.hh @@ -46,7 +46,7 @@ class OneModelProblem { private: using Implementation = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Grid = typename GridView::Grid; using TimeManager = GetPropType; diff --git a/dumux/porousmediumflow/sequential/properties.hh b/dumux/porousmediumflow/sequential/properties.hh index dc9ee4b91f..bb0a550d5c 100644 --- a/dumux/porousmediumflow/sequential/properties.hh +++ b/dumux/porousmediumflow/sequential/properties.hh @@ -19,6 +19,8 @@ #ifndef DUMUX_SEQUENTIAL_PROPERTIES_HH #define DUMUX_SEQUENTIAL_PROPERTIES_HH +#include + #include #include #include @@ -132,6 +134,7 @@ public: using type = DummyTraits; }; +DUNE_NO_DEPRECATED_BEGIN //! Use the leaf grid view if not defined otherwise template struct GridView @@ -142,13 +145,16 @@ private: public: using type = typename Grid::LeafGridView; }; +DUNE_NO_DEPRECATED_END //! Default number of intersections for quadrilaterals template struct MaxIntersections { private: + DUNE_NO_DEPRECATED_BEGIN using GridView = GetPropType; + DUNE_NO_DEPRECATED_END enum { dim = GridView::dimension @@ -161,13 +167,14 @@ public: template struct GridGeometry { +DUNE_NO_DEPRECATED_BEGIN struct MockFVGridGeometry : public DefaultMapperTraits> { static constexpr Dumux::DiscretizationMethod discMethod = Dumux::DiscretizationMethod::cctpfa; using GridView = GetPropType; }; - +DUNE_NO_DEPRECATED_END public: using type = MockFVGridGeometry; }; @@ -189,7 +196,9 @@ template struct SolutionTypes { using Scalar = GetPropType; + DUNE_NO_DEPRECATED_BEGIN using GridView = GetPropType; + DUNE_NO_DEPRECATED_END using Grid = typename GridView::Grid; using Variables = GetPropType; diff --git a/dumux/porousmediumflow/sequential/variableclass.hh b/dumux/porousmediumflow/sequential/variableclass.hh index 4f53f9627e..a0ce8afe8d 100644 --- a/dumux/porousmediumflow/sequential/variableclass.hh +++ b/dumux/porousmediumflow/sequential/variableclass.hh @@ -48,7 +48,7 @@ template class VariableClass { private: - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using SolutionTypes = GetProp; using CellData = GetPropType; diff --git a/dumux/porousmediumflow/sequential/variableclassadaptive.hh b/dumux/porousmediumflow/sequential/variableclassadaptive.hh index e2d6067c72..43bf606420 100644 --- a/dumux/porousmediumflow/sequential/variableclassadaptive.hh +++ b/dumux/porousmediumflow/sequential/variableclassadaptive.hh @@ -49,7 +49,7 @@ private: using ParentType = VariableClass; using Problem = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using CellData = GetPropType; using AdaptedValues = typename CellData::AdaptedValues; diff --git a/dumux/porousmediumflow/solidenergy/localresidual.hh b/dumux/porousmediumflow/solidenergy/localresidual.hh index b0318ed041..8f88c3fa9f 100644 --- a/dumux/porousmediumflow/solidenergy/localresidual.hh +++ b/dumux/porousmediumflow/solidenergy/localresidual.hh @@ -46,7 +46,7 @@ class SolidEnergyLocalResidual : public GetPropType::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; public: diff --git a/dumux/porousmediumflow/tracer/localresidual.hh b/dumux/porousmediumflow/tracer/localresidual.hh index 6b1a2c2a42..5176b7f6bb 100644 --- a/dumux/porousmediumflow/tracer/localresidual.hh +++ b/dumux/porousmediumflow/tracer/localresidual.hh @@ -52,7 +52,7 @@ class TracerLocalResidual: public GetPropType; using FluxVariables = GetPropType; using ElementFluxVariablesCache = typename GetPropType::LocalView; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using ElementVolumeVariables = typename GetPropType::LocalView; using VolumeVariables = GetPropType; diff --git a/examples/1ptracer/README.md b/examples/1ptracer/README.md index 800d566544..02bb507e6c 100644 --- a/examples/1ptracer/README.md +++ b/examples/1ptracer/README.md @@ -385,7 +385,7 @@ We use convenient declarations that we derive from the property system. ```cpp using ParentType = PorousMediumFlowProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using Scalar = GetPropType; using PrimaryVariables = GetPropType; @@ -764,7 +764,7 @@ We define some convenience aliases: ```cpp using Scalar = GetPropType; using Problem = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; @@ -851,7 +851,7 @@ We use convenient declarations that we derive from the property system. using ParentType = PorousMediumFlowProblem; using Scalar = GetPropType; using Indices = typename GetPropType::Indices; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using GridGeometry = GetPropType; using BoundaryTypes = GetPropType; using PrimaryVariables = GetPropType; @@ -1230,7 +1230,7 @@ We update the grid variables with the new solution. We initialize the vtkoutput. Each model has a predefined model specific output with relevant parameters for that model. We add the pressure data from the solution vector (`p`) and the permeability field as output data. ```cpp - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; Dune::VTKWriter onepWriter(leafGridView); onepWriter.addCellData(p, "p"); const auto& k = problemOneP->spatialParams().getKField(); diff --git a/examples/1ptracer/main.cc b/examples/1ptracer/main.cc index acf3502987..55d2c5ae65 100644 --- a/examples/1ptracer/main.cc +++ b/examples/1ptracer/main.cc @@ -153,7 +153,7 @@ int main(int argc, char** argv) try // We initialize the vtkoutput. Each model has a predefined model specific output with relevant parameters for that model. We add the pressure data from the solution vector (`p`) and the permeability field as output data. - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; Dune::VTKWriter onepWriter(leafGridView); onepWriter.addCellData(p, "p"); const auto& k = problemOneP->spatialParams().getKField(); diff --git a/examples/1ptracer/problem_1p.hh b/examples/1ptracer/problem_1p.hh index e5b18505ec..b3776c45b3 100644 --- a/examples/1ptracer/problem_1p.hh +++ b/examples/1ptracer/problem_1p.hh @@ -115,7 +115,7 @@ class OnePTestProblem : public PorousMediumFlowProblem { // We use convenient declarations that we derive from the property system. using ParentType = PorousMediumFlowProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using Scalar = GetPropType; using PrimaryVariables = GetPropType; diff --git a/examples/1ptracer/problem_tracer.hh b/examples/1ptracer/problem_tracer.hh index cea84f103e..19390c7c60 100644 --- a/examples/1ptracer/problem_tracer.hh +++ b/examples/1ptracer/problem_tracer.hh @@ -100,7 +100,7 @@ class TracerFluidSystem : public FluidSystems::Base; using Problem = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; @@ -156,7 +156,7 @@ class TracerTestProblem : public PorousMediumFlowProblem using ParentType = PorousMediumFlowProblem; using Scalar = GetPropType; using Indices = typename GetPropType::Indices; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using GridGeometry = GetPropType; using BoundaryTypes = GetPropType; using PrimaryVariables = GetPropType; diff --git a/examples/2pinfiltration/README.md b/examples/2pinfiltration/README.md index acc2eb9c57..5966e4c431 100644 --- a/examples/2pinfiltration/README.md +++ b/examples/2pinfiltration/README.md @@ -419,7 +419,7 @@ We use convenient declarations that we derive from the property system. ```cpp using ParentType = PorousMediumFlowProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using Vertex = typename GridView::template Codim::Entity; using Scalar = GetPropType; diff --git a/examples/2pinfiltration/problem.hh b/examples/2pinfiltration/problem.hh index 4b1a322597..8fe26897d9 100644 --- a/examples/2pinfiltration/problem.hh +++ b/examples/2pinfiltration/problem.hh @@ -133,7 +133,7 @@ class PointSourceProblem : public PorousMediumFlowProblem { // We use convenient declarations that we derive from the property system. using ParentType = PorousMediumFlowProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using Vertex = typename GridView::template Codim::Entity; using Scalar = GetPropType; diff --git a/examples/freeflowchannel/README.md b/examples/freeflowchannel/README.md index 6ee3225810..7f4303b446 100644 --- a/examples/freeflowchannel/README.md +++ b/examples/freeflowchannel/README.md @@ -298,6 +298,7 @@ The following class contains functionality for additional flux output to the con #include #include #include +#include #include #include @@ -463,7 +464,9 @@ The second surface (second call of addSurface) is placed at the outlet of the ch const Scalar offsetX = (numCellsX % 2 == 0) ? 0.0 : 0.5*((xMax - xMin) / numCellsX); + DUNE_NO_DEPRECATED_BEGIN using GridView = GetPropType; + DUNE_NO_DEPRECATED_END using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; diff --git a/examples/freeflowchannel/main.cc b/examples/freeflowchannel/main.cc index 443e712e55..f1921e4433 100644 --- a/examples/freeflowchannel/main.cc +++ b/examples/freeflowchannel/main.cc @@ -73,6 +73,7 @@ #include #include #include +#include #include #include @@ -222,7 +223,9 @@ int main(int argc, char** argv) try const Scalar offsetX = (numCellsX % 2 == 0) ? 0.0 : 0.5*((xMax - xMin) / numCellsX); + DUNE_NO_DEPRECATED_BEGIN using GridView = GetPropType; + DUNE_NO_DEPRECATED_END using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; diff --git a/examples/shallowwaterfriction/README.md b/examples/shallowwaterfriction/README.md index 45c815cc64..22447bce6b 100644 --- a/examples/shallowwaterfriction/README.md +++ b/examples/shallowwaterfriction/README.md @@ -365,7 +365,7 @@ We use convenient declarations that we derive from the property system. using VolumeVariables = typename ElementVolumeVariables::VolumeVariables; using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; using NumEqVector = GetPropType; diff --git a/examples/shallowwaterfriction/problem.hh b/examples/shallowwaterfriction/problem.hh index f7e3f365d9..5da2f73a7a 100644 --- a/examples/shallowwaterfriction/problem.hh +++ b/examples/shallowwaterfriction/problem.hh @@ -112,7 +112,7 @@ class RoughChannelProblem : public ShallowWaterProblem using VolumeVariables = typename ElementVolumeVariables::VolumeVariables; using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; using NumEqVector = GetPropType; diff --git a/test/freeflow/navierstokes/angeli/problem.hh b/test/freeflow/navierstokes/angeli/problem.hh index bf0a1bc475..e5c65158e7 100644 --- a/test/freeflow/navierstokes/angeli/problem.hh +++ b/test/freeflow/navierstokes/angeli/problem.hh @@ -96,7 +96,7 @@ class AngeliTestProblem : public NavierStokesProblem using SolutionVector = GetPropType; using TimeLoopPtr = std::shared_ptr>; - static constexpr auto dimWorld = GetPropType::dimensionworld; + static constexpr auto dimWorld = GridGeometry::GridView::dimensionworld; using Element = typename GridGeometry::GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; using VelocityVector = Dune::FieldVector; diff --git a/test/freeflow/navierstokes/channel/1d/problem.hh b/test/freeflow/navierstokes/channel/1d/problem.hh index 1ce84007d7..bbb65649c8 100644 --- a/test/freeflow/navierstokes/channel/1d/problem.hh +++ b/test/freeflow/navierstokes/channel/1d/problem.hh @@ -98,7 +98,7 @@ class NavierStokesAnalyticProblem : public NavierStokesProblem using Scalar = GetPropType; using SolutionVector = GetPropType; - static constexpr auto dimWorld = GetPropType::dimensionworld; + static constexpr auto dimWorld = GridGeometry::GridView::dimensionworld; using Element = typename GridGeometry::GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; using DimVector = GlobalPosition; diff --git a/test/freeflow/navierstokes/channel/2d/main.cc b/test/freeflow/navierstokes/channel/2d/main.cc index cd95b48b04..a972b28575 100644 --- a/test/freeflow/navierstokes/channel/2d/main.cc +++ b/test/freeflow/navierstokes/channel/2d/main.cc @@ -134,7 +134,7 @@ int main(int argc, char** argv) try SolutionVector, GetPropType, GetPropType> flux(*gridVariables, x); - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; diff --git a/test/freeflow/navierstokes/channel/3d/main.cc b/test/freeflow/navierstokes/channel/3d/main.cc index 30f792820e..0696fb3442 100644 --- a/test/freeflow/navierstokes/channel/3d/main.cc +++ b/test/freeflow/navierstokes/channel/3d/main.cc @@ -118,7 +118,7 @@ int main(int argc, char** argv) try SolutionVector, GetPropType, GetPropType> flux(*gridVariables, x); - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using GlobalPosition = Dune::FieldVector; diff --git a/test/freeflow/navierstokes/channel/3d/problem.hh b/test/freeflow/navierstokes/channel/3d/problem.hh index db93ebfed5..6bee7e9f13 100644 --- a/test/freeflow/navierstokes/channel/3d/problem.hh +++ b/test/freeflow/navierstokes/channel/3d/problem.hh @@ -98,7 +98,7 @@ class ThreeDChannelTestProblem : public NavierStokesProblem { using ParentType = NavierStokesProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using Indices = typename GetPropType::Indices; diff --git a/test/freeflow/navierstokes/closedsystem/problem.hh b/test/freeflow/navierstokes/closedsystem/problem.hh index 5baadd27fa..c340a64120 100644 --- a/test/freeflow/navierstokes/closedsystem/problem.hh +++ b/test/freeflow/navierstokes/closedsystem/problem.hh @@ -92,7 +92,7 @@ class ClosedSystemTestProblem : public NavierStokesProblem using PrimaryVariables = GetPropType; using Scalar = GetPropType; - static constexpr auto dimWorld = GetPropType::dimensionworld; + static constexpr auto dimWorld = GridGeometry::GridView::dimensionworld; using Element = typename GridGeometry::GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; diff --git a/test/freeflow/navierstokes/donea/problem.hh b/test/freeflow/navierstokes/donea/problem.hh index 5f3e2507e9..65d5ed9603 100644 --- a/test/freeflow/navierstokes/donea/problem.hh +++ b/test/freeflow/navierstokes/donea/problem.hh @@ -99,7 +99,7 @@ class DoneaTestProblem : public NavierStokesProblem using Scalar = GetPropType; using SolutionVector = GetPropType; - static constexpr auto dimWorld = GetPropType::dimensionworld; + static constexpr auto dimWorld = GridGeometry::GridView::dimensionworld; using Element = typename GridGeometry::GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; using VelocityVector = Dune::FieldVector; diff --git a/test/freeflow/navierstokes/kovasznay/problem.hh b/test/freeflow/navierstokes/kovasznay/problem.hh index fb2cd37ef6..348afbc53d 100644 --- a/test/freeflow/navierstokes/kovasznay/problem.hh +++ b/test/freeflow/navierstokes/kovasznay/problem.hh @@ -101,7 +101,7 @@ class KovasznayTestProblem : public NavierStokesProblem using Scalar = GetPropType; using SolutionVector = GetPropType; - static constexpr auto dimWorld = GetPropType::dimensionworld; + static constexpr auto dimWorld = GridGeometry::GridView::dimensionworld; using Element = typename GridGeometry::GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; using VelocityVector = Dune::FieldVector; diff --git a/test/freeflow/navierstokes/sincos/problem.hh b/test/freeflow/navierstokes/sincos/problem.hh index 959560b9ea..f528eb40c0 100644 --- a/test/freeflow/navierstokes/sincos/problem.hh +++ b/test/freeflow/navierstokes/sincos/problem.hh @@ -95,7 +95,7 @@ class SincosTestProblem : public NavierStokesProblem using SubControlVolume = typename GridGeometry::SubControlVolume; using FVElementGeometry = typename GridGeometry::LocalView; - static constexpr auto dimWorld = GetPropType::dimensionworld; + static constexpr auto dimWorld = GridGeometry::GridView::dimensionworld; using Element = typename GridGeometry::GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; using VelocityVector = Dune::FieldVector; diff --git a/test/freeflow/navierstokesnc/channel/problem.hh b/test/freeflow/navierstokesnc/channel/problem.hh index fd6fd5b644..f41689faee 100644 --- a/test/freeflow/navierstokesnc/channel/problem.hh +++ b/test/freeflow/navierstokesnc/channel/problem.hh @@ -117,7 +117,7 @@ class ChannelNCTestProblem : public NavierStokesProblem using PrimaryVariables = GetPropType; using Scalar = GetPropType; - static constexpr auto dimWorld = GetPropType::dimensionworld; + static constexpr auto dimWorld = GridGeometry::GridView::dimensionworld; using GlobalPosition = Dune::FieldVector; using TimeLoopPtr = std::shared_ptr>; diff --git a/test/freeflow/navierstokesnc/densitydrivenflow/problem.hh b/test/freeflow/navierstokesnc/densitydrivenflow/problem.hh index 45b20a7706..9a6fbb0921 100644 --- a/test/freeflow/navierstokesnc/densitydrivenflow/problem.hh +++ b/test/freeflow/navierstokesnc/densitydrivenflow/problem.hh @@ -109,7 +109,7 @@ class DensityDrivenFlowProblem : public NavierStokesProblem using TimeLoopPtr = std::shared_ptr>; - static constexpr auto dimWorld = GetPropType::dimensionworld; + static constexpr auto dimWorld = GridGeometry::GridView::dimensionworld; static constexpr auto transportCompIdx = Indices::conti0EqIdx + 1; static constexpr auto transportEqIdx = Indices::conti0EqIdx + 1; diff --git a/test/freeflow/ransnc/problem.hh b/test/freeflow/ransnc/problem.hh index 77641e476d..a304d53b40 100644 --- a/test/freeflow/ransnc/problem.hh +++ b/test/freeflow/ransnc/problem.hh @@ -137,7 +137,7 @@ class FlatPlateNCTestProblem : public RANSProblem using TimeLoopPtr = std::shared_ptr>; - static constexpr auto dimWorld = GetPropType::dimensionworld; + static constexpr auto dimWorld = GridGeometry::GridView::dimensionworld; static constexpr auto transportEqIdx = Indices::conti0EqIdx + 1; static constexpr auto transportCompIdx = Indices::conti0EqIdx + 1; diff --git a/test/freeflow/shallowwater/bowl/problem.hh b/test/freeflow/shallowwater/bowl/problem.hh index 3cc77a886a..4fac483aff 100644 --- a/test/freeflow/shallowwater/bowl/problem.hh +++ b/test/freeflow/shallowwater/bowl/problem.hh @@ -63,7 +63,7 @@ class BowlProblem : public ShallowWaterProblem using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; diff --git a/test/freeflow/shallowwater/dambreak/problem.hh b/test/freeflow/shallowwater/dambreak/problem.hh index 85f211e1ee..7859f75d2c 100644 --- a/test/freeflow/shallowwater/dambreak/problem.hh +++ b/test/freeflow/shallowwater/dambreak/problem.hh @@ -121,7 +121,7 @@ class DamBreakProblem : public ShallowWaterProblem using ElementFluxVariablesCache = typename GridVariables::GridFluxVariablesCache::LocalView; using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; diff --git a/test/freeflow/shallowwater/roughchannel/problem.hh b/test/freeflow/shallowwater/roughchannel/problem.hh index b24b891bb3..ba8334027b 100644 --- a/test/freeflow/shallowwater/roughchannel/problem.hh +++ b/test/freeflow/shallowwater/roughchannel/problem.hh @@ -124,7 +124,7 @@ class RoughChannelProblem : public ShallowWaterProblem using VolumeVariables = typename ElementVolumeVariables::VolumeVariables; using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; using NumEqVector = GetPropType; diff --git a/test/geomechanics/elastic/problem.hh b/test/geomechanics/elastic/problem.hh index 3a33fc0fc7..559c5f03f2 100644 --- a/test/geomechanics/elastic/problem.hh +++ b/test/geomechanics/elastic/problem.hh @@ -82,7 +82,7 @@ class ElasticProblem : public GeomechanicsFVProblem using SubControlVolume = typename GridGeometry::SubControlVolume; using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; diff --git a/test/geomechanics/poroelastic/problem.hh b/test/geomechanics/poroelastic/problem.hh index 350491a600..69ed2f3a92 100644 --- a/test/geomechanics/poroelastic/problem.hh +++ b/test/geomechanics/poroelastic/problem.hh @@ -90,7 +90,7 @@ class PoroElasticProblem : public GeomechanicsFVProblem using SubControlVolume = typename GridGeometry::SubControlVolume; using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; 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 9f95be0e70..1b40699329 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_darcy.hh +++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_darcy.hh @@ -105,7 +105,7 @@ template class DarcySubProblem : public PorousMediumFlowProblem { using ParentType = PorousMediumFlowProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using PrimaryVariables = GetPropType; using FluidSystem = GetPropType; 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 c549f9dbcf..128fad0286 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_stokes.hh +++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_stokes.hh @@ -104,7 +104,7 @@ template class StokesSubProblem : public NavierStokesProblem { using ParentType = NavierStokesProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using Indices = typename GetPropType::Indices; using FluidSystem = GetPropType; diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_stokes.hh index 86c46ac4c0..4ac51cebda 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_stokes.hh +++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_stokes.hh @@ -87,7 +87,7 @@ template class StokesSubProblem : public NavierStokesProblem { using ParentType = NavierStokesProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using Indices = typename GetPropType::Indices; using BoundaryTypes = GetPropType; diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/main.cc b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/main.cc index 6bba58042f..eac50e9027 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/main.cc +++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/main.cc @@ -199,7 +199,7 @@ int main(int argc, char** argv) try GetPropType, GetPropType> flux(*stokesGridVariables, stokesSol); - using StokesGridView = GetPropType; + using StokesGridView = typename GetPropType::GridView; using StokesElement = typename StokesGridView::template Codim<0>::Entity; using GlobalPosition = typename StokesElement::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 532768463b..e7c3aa40ac 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_darcy.hh +++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_darcy.hh @@ -89,7 +89,7 @@ template class DarcySubProblem : public PorousMediumFlowProblem { using ParentType = PorousMediumFlowProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using PrimaryVariables = GetPropType; using NumEqVector = GetPropType; diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_stokes.hh index 7be2d81de2..870acc8f3e 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_stokes.hh +++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_stokes.hh @@ -93,7 +93,7 @@ class StokesSubProblem : public NavierStokesProblem { using ParentType = NavierStokesProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using FluidSystem = GetPropType; using Indices = typename GetPropType::Indices; diff --git a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_darcy.hh index d92060c217..8a6e9b2573 100644 --- a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_darcy.hh +++ b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_darcy.hh @@ -96,7 +96,7 @@ template class DarcySubProblem : public PorousMediumFlowProblem { using ParentType = PorousMediumFlowProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using PrimaryVariables = GetPropType; using FluidSystem = GetPropType; diff --git a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_stokes.hh index aaaa4553a7..02bbddeb37 100644 --- a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_stokes.hh +++ b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_stokes.hh @@ -89,7 +89,7 @@ template class StokesSubProblem : public NavierStokesProblem { using ParentType = NavierStokesProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using Indices = typename GetPropType::Indices; using FluidSystem = GetPropType; diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p_1p/problem_darcy.hh index fbd698133f..2d55392b55 100644 --- a/test/multidomain/boundary/stokesdarcy/1p_1p/problem_darcy.hh +++ b/test/multidomain/boundary/stokesdarcy/1p_1p/problem_darcy.hh @@ -76,7 +76,7 @@ template class DarcySubProblem : public PorousMediumFlowProblem { using ParentType = PorousMediumFlowProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using PrimaryVariables = GetPropType; using NumEqVector = GetPropType; diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p_1p/problem_stokes.hh index 805712fa8f..2b2f7170d7 100644 --- a/test/multidomain/boundary/stokesdarcy/1p_1p/problem_stokes.hh +++ b/test/multidomain/boundary/stokesdarcy/1p_1p/problem_stokes.hh @@ -79,7 +79,7 @@ class StokesSubProblem : public NavierStokesProblem { using ParentType = NavierStokesProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using Indices = typename GetPropType::Indices; diff --git a/test/multidomain/boundary/stokesdarcy/1p_2p/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p_2p/problem_darcy.hh index f32b5c92d6..ccd7513a64 100644 --- a/test/multidomain/boundary/stokesdarcy/1p_2p/problem_darcy.hh +++ b/test/multidomain/boundary/stokesdarcy/1p_2p/problem_darcy.hh @@ -78,7 +78,7 @@ template class DarcySubProblem : public PorousMediumFlowProblem { using ParentType = PorousMediumFlowProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using PrimaryVariables = GetPropType; using NumEqVector = GetPropType; diff --git a/test/multidomain/boundary/stokesdarcy/1p_2p/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p_2p/problem_stokes.hh index dbcb19217a..7b61225cdc 100644 --- a/test/multidomain/boundary/stokesdarcy/1p_2p/problem_stokes.hh +++ b/test/multidomain/boundary/stokesdarcy/1p_2p/problem_stokes.hh @@ -68,7 +68,7 @@ class StokesSubProblem : public NavierStokesProblem { using ParentType = NavierStokesProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using FluidSystem = GetPropType; diff --git a/test/multidomain/facet/tracer_tracer/problem_tracer_bulk.hh b/test/multidomain/facet/tracer_tracer/problem_tracer_bulk.hh index 680fff33de..499e6e9577 100644 --- a/test/multidomain/facet/tracer_tracer/problem_tracer_bulk.hh +++ b/test/multidomain/facet/tracer_tracer/problem_tracer_bulk.hh @@ -110,7 +110,7 @@ class TracerBulkProblem : public PorousMediumFlowProblem using Scalar = GetPropType; using Indices = typename GetPropType::Indices; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using GridGeometry = GetPropType; using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; using FVElementGeometry = typename GridGeometry::LocalView; diff --git a/test/multidomain/facet/tracer_tracer/problem_tracer_lowdim.hh b/test/multidomain/facet/tracer_tracer/problem_tracer_lowdim.hh index 04aa633a7a..caf77a1160 100644 --- a/test/multidomain/facet/tracer_tracer/problem_tracer_lowdim.hh +++ b/test/multidomain/facet/tracer_tracer/problem_tracer_lowdim.hh @@ -103,7 +103,7 @@ class TracerLowDimProblem : public PorousMediumFlowProblem using Scalar = GetPropType; using Indices = typename GetPropType::Indices; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using GridGeometry = GetPropType; using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; diff --git a/test/multidomain/facet/tracer_tracer/tracerfluidsystem.hh b/test/multidomain/facet/tracer_tracer/tracerfluidsystem.hh index 30c2501c68..aa64db315d 100644 --- a/test/multidomain/facet/tracer_tracer/tracerfluidsystem.hh +++ b/test/multidomain/facet/tracer_tracer/tracerfluidsystem.hh @@ -37,7 +37,7 @@ class TracerFluidSystem : public FluidSystems::Base; using Problem = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; diff --git a/test/multidomain/poromechanics/el1p/problem_1p.hh b/test/multidomain/poromechanics/el1p/problem_1p.hh index 478ef62a95..e3b2c6616f 100644 --- a/test/multidomain/poromechanics/el1p/problem_1p.hh +++ b/test/multidomain/poromechanics/el1p/problem_1p.hh @@ -84,7 +84,7 @@ class OnePSubProblem : public PorousMediumFlowProblem using ParentType = PorousMediumFlowProblem; using Scalar = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; diff --git a/test/multidomain/poromechanics/el1p/problem_poroelastic.hh b/test/multidomain/poromechanics/el1p/problem_poroelastic.hh index 7fbe2e2c6e..97d46e2a7a 100644 --- a/test/multidomain/poromechanics/el1p/problem_poroelastic.hh +++ b/test/multidomain/poromechanics/el1p/problem_poroelastic.hh @@ -91,7 +91,7 @@ class PoroElasticSubProblem : public GeomechanicsFVProblem using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename GridGeometry::SubControlVolume; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; diff --git a/test/multidomain/poromechanics/el2p/problem_2p.hh b/test/multidomain/poromechanics/el2p/problem_2p.hh index 60abeddcd5..7ff7561b3e 100644 --- a/test/multidomain/poromechanics/el2p/problem_2p.hh +++ b/test/multidomain/poromechanics/el2p/problem_2p.hh @@ -86,7 +86,7 @@ class TwoPSubProblem : public PorousMediumFlowProblem using FluidSystem = GetPropType; using Scalar = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; diff --git a/test/multidomain/poromechanics/el2p/problem_poroelastic.hh b/test/multidomain/poromechanics/el2p/problem_poroelastic.hh index c7fa0cab71..d3b93658a0 100644 --- a/test/multidomain/poromechanics/el2p/problem_poroelastic.hh +++ b/test/multidomain/poromechanics/el2p/problem_poroelastic.hh @@ -93,7 +93,7 @@ class PoroElasticSubProblem : public GeomechanicsFVProblem using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename GridGeometry::SubControlVolume; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; diff --git a/test/porousmediumflow/1p/implicit/compressible/instationary/problem.hh b/test/porousmediumflow/1p/implicit/compressible/instationary/problem.hh index d8ee2a284a..228097fb7a 100644 --- a/test/porousmediumflow/1p/implicit/compressible/instationary/problem.hh +++ b/test/porousmediumflow/1p/implicit/compressible/instationary/problem.hh @@ -101,7 +101,7 @@ template class OnePTestProblem : public PorousMediumFlowProblem { using ParentType = PorousMediumFlowProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using Scalar = GetPropType; using PrimaryVariables = GetPropType; diff --git a/test/porousmediumflow/1p/implicit/compressible/stationary/problem.hh b/test/porousmediumflow/1p/implicit/compressible/stationary/problem.hh index d8ee2a284a..228097fb7a 100644 --- a/test/porousmediumflow/1p/implicit/compressible/stationary/problem.hh +++ b/test/porousmediumflow/1p/implicit/compressible/stationary/problem.hh @@ -101,7 +101,7 @@ template class OnePTestProblem : public PorousMediumFlowProblem { using ParentType = PorousMediumFlowProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using Scalar = GetPropType; using PrimaryVariables = GetPropType; diff --git a/test/porousmediumflow/1p/implicit/fracture2d3d/problem.hh b/test/porousmediumflow/1p/implicit/fracture2d3d/problem.hh index 09035dc8dd..f3b1b7b0d4 100644 --- a/test/porousmediumflow/1p/implicit/fracture2d3d/problem.hh +++ b/test/porousmediumflow/1p/implicit/fracture2d3d/problem.hh @@ -102,7 +102,7 @@ template class FractureProblem : public PorousMediumFlowProblem { using ParentType = PorousMediumFlowProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Indices = typename GetPropType::Indices; enum { dimWorld = GridView::dimensionworld }; diff --git a/test/porousmediumflow/1p/implicit/incompressible/problem.hh b/test/porousmediumflow/1p/implicit/incompressible/problem.hh index d778f4f0e9..2d3a34815b 100644 --- a/test/porousmediumflow/1p/implicit/incompressible/problem.hh +++ b/test/porousmediumflow/1p/implicit/incompressible/problem.hh @@ -116,7 +116,7 @@ template class OnePTestProblem : public PorousMediumFlowProblem { using ParentType = PorousMediumFlowProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using Scalar = GetPropType; using PrimaryVariables = GetPropType; diff --git a/test/porousmediumflow/1p/implicit/internaldirichlet/problem.hh b/test/porousmediumflow/1p/implicit/internaldirichlet/problem.hh index 67fd704f16..a4ccb7e08b 100644 --- a/test/porousmediumflow/1p/implicit/internaldirichlet/problem.hh +++ b/test/porousmediumflow/1p/implicit/internaldirichlet/problem.hh @@ -55,7 +55,7 @@ template class OnePTestProblemInternalDirichlet : public OnePTestProblem { using ParentType = OnePTestProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using Scalar = GetPropType; using PrimaryVariables = GetPropType; diff --git a/test/porousmediumflow/1p/implicit/isothermal/problem.hh b/test/porousmediumflow/1p/implicit/isothermal/problem.hh index cd5f8526c2..b78f291c77 100644 --- a/test/porousmediumflow/1p/implicit/isothermal/problem.hh +++ b/test/porousmediumflow/1p/implicit/isothermal/problem.hh @@ -118,7 +118,7 @@ template class OnePTestProblem : public PorousMediumFlowProblem { using ParentType = PorousMediumFlowProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using Scalar = GetPropType; diff --git a/test/porousmediumflow/1p/implicit/network1d3d/problem.hh b/test/porousmediumflow/1p/implicit/network1d3d/problem.hh index 2b95372924..fd3fbe29e2 100644 --- a/test/porousmediumflow/1p/implicit/network1d3d/problem.hh +++ b/test/porousmediumflow/1p/implicit/network1d3d/problem.hh @@ -72,7 +72,9 @@ struct GridGeometry { private: static constexpr bool enableCache = getPropValue(); + DUNE_NO_DEPRECATED_BEGIN using GridView = GetPropType; + DUNE_NO_DEPRECATED_END using ElementMapper = ReorderingDofMapper; using VertexMapper = Dune::MultipleCodimMultipleGeomTypeMapper; @@ -87,7 +89,9 @@ struct GridGeometry { private: static constexpr bool enableCache = getPropValue(); + DUNE_NO_DEPRECATED_BEGIN using GridView = GetPropType; + DUNE_NO_DEPRECATED_END using Scalar = GetPropType; using ElementMapper = Dune::MultipleCodimMultipleGeomTypeMapper; @@ -128,7 +132,7 @@ template class TubesTestProblem : public PorousMediumFlowProblem { using ParentType = PorousMediumFlowProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using ElementVolumeVariables = typename GetPropType::LocalView; diff --git a/test/porousmediumflow/1p/implicit/nonisothermal/problem_conduction.hh b/test/porousmediumflow/1p/implicit/nonisothermal/problem_conduction.hh index 22ae3df812..9f86a99df0 100644 --- a/test/porousmediumflow/1p/implicit/nonisothermal/problem_conduction.hh +++ b/test/porousmediumflow/1p/implicit/nonisothermal/problem_conduction.hh @@ -109,7 +109,7 @@ template class OnePNIConductionProblem : public PorousMediumFlowProblem { using ParentType = PorousMediumFlowProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using PrimaryVariables = GetPropType; using FluidSystem = GetPropType; diff --git a/test/porousmediumflow/1p/implicit/nonisothermal/problem_convection.hh b/test/porousmediumflow/1p/implicit/nonisothermal/problem_convection.hh index fd99103799..cfc21b5db3 100644 --- a/test/porousmediumflow/1p/implicit/nonisothermal/problem_convection.hh +++ b/test/porousmediumflow/1p/implicit/nonisothermal/problem_convection.hh @@ -110,7 +110,7 @@ template class OnePNIConvectionProblem : public PorousMediumFlowProblem { using ParentType = PorousMediumFlowProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; diff --git a/test/porousmediumflow/1p/implicit/periodicbc/problem.hh b/test/porousmediumflow/1p/implicit/periodicbc/problem.hh index 300390ba40..22c2b5055e 100644 --- a/test/porousmediumflow/1p/implicit/periodicbc/problem.hh +++ b/test/porousmediumflow/1p/implicit/periodicbc/problem.hh @@ -108,7 +108,7 @@ template class OnePTestProblem : public PorousMediumFlowProblem { using ParentType = PorousMediumFlowProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using Scalar = GetPropType; using PrimaryVariables = GetPropType; diff --git a/test/porousmediumflow/1p/implicit/pointsources/timedependent/problem.hh b/test/porousmediumflow/1p/implicit/pointsources/timedependent/problem.hh index 902f784774..724055ef6a 100644 --- a/test/porousmediumflow/1p/implicit/pointsources/timedependent/problem.hh +++ b/test/porousmediumflow/1p/implicit/pointsources/timedependent/problem.hh @@ -65,7 +65,7 @@ template class OnePSingularityProblemTimeDependent : public OnePSingularityProblem { using ParentType = OnePSingularityProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using PrimaryVariables = GetPropType; using PointSource = GetPropType; diff --git a/test/porousmediumflow/1p/implicit/pointsources/timeindependent/problem.hh b/test/porousmediumflow/1p/implicit/pointsources/timeindependent/problem.hh index 3f2acb0d76..ef927a35cc 100644 --- a/test/porousmediumflow/1p/implicit/pointsources/timeindependent/problem.hh +++ b/test/porousmediumflow/1p/implicit/pointsources/timeindependent/problem.hh @@ -98,7 +98,7 @@ template class OnePSingularityProblem : public PorousMediumFlowProblem { using ParentType = PorousMediumFlowProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; // copy some indices for convenience diff --git a/test/porousmediumflow/1p/sequential/test_1pproblem.hh b/test/porousmediumflow/1p/sequential/test_1pproblem.hh index b7725d7f2a..e452ec04d5 100644 --- a/test/porousmediumflow/1p/sequential/test_1pproblem.hh +++ b/test/porousmediumflow/1p/sequential/test_1pproblem.hh @@ -83,7 +83,7 @@ class TestProblemOneP: public DiffusionProblem1P using ParentType = DiffusionProblem1P; using TimeManager = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Grid = typename GridView::Grid; using FluidSystem = GetPropType; diff --git a/test/porousmediumflow/1p/sequential/test_1pspatialparams.hh b/test/porousmediumflow/1p/sequential/test_1pspatialparams.hh index 8c219d371f..69c9ad53ba 100644 --- a/test/porousmediumflow/1p/sequential/test_1pspatialparams.hh +++ b/test/porousmediumflow/1p/sequential/test_1pspatialparams.hh @@ -39,7 +39,7 @@ class TestOnePSpatialParams: public SequentialFVSpatialParamsOneP using ParentType = SequentialFVSpatialParamsOneP; using Problem = GetPropType; using Grid = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using IndexSet = typename GridView::IndexSet; using Scalar = GetPropType; using CoordScalar = typename Grid::ctype; diff --git a/test/porousmediumflow/1p/sequential/test_diffusionproblem.hh b/test/porousmediumflow/1p/sequential/test_diffusionproblem.hh index 041217aea5..f26b4a1c9d 100644 --- a/test/porousmediumflow/1p/sequential/test_diffusionproblem.hh +++ b/test/porousmediumflow/1p/sequential/test_diffusionproblem.hh @@ -132,7 +132,7 @@ template class TestDiffusionProblem: public DiffusionProblem2P { using ParentType = DiffusionProblem2P; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Grid = typename GridView::Grid; using Indices = typename GetPropType::Indices; diff --git a/test/porousmediumflow/1p/sequential/test_diffusionproblem3d.hh b/test/porousmediumflow/1p/sequential/test_diffusionproblem3d.hh index 9e772d590e..9e98b6c0e6 100644 --- a/test/porousmediumflow/1p/sequential/test_diffusionproblem3d.hh +++ b/test/porousmediumflow/1p/sequential/test_diffusionproblem3d.hh @@ -114,7 +114,7 @@ template class TestDiffusion3DProblem: public DiffusionProblem2P { using ParentType = DiffusionProblem2P; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Grid = typename GridView::Grid; using Indices = typename GetPropType::Indices; diff --git a/test/porousmediumflow/1p/sequential/test_diffusionspatialparams.hh b/test/porousmediumflow/1p/sequential/test_diffusionspatialparams.hh index 044512d483..7fd27e7dc2 100644 --- a/test/porousmediumflow/1p/sequential/test_diffusionspatialparams.hh +++ b/test/porousmediumflow/1p/sequential/test_diffusionspatialparams.hh @@ -70,7 +70,7 @@ class TestDiffusionSpatialParams: public SequentialFVSpatialParams using ParentType = SequentialFVSpatialParams; using Problem = GetPropType; using Grid = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using IndexSet = typename GridView::IndexSet; using Scalar = GetPropType; using CoordScalar = typename Grid::ctype; diff --git a/test/porousmediumflow/1p/sequential/test_diffusionspatialparams3d.hh b/test/porousmediumflow/1p/sequential/test_diffusionspatialparams3d.hh index ec170a8f7b..58fee09815 100644 --- a/test/porousmediumflow/1p/sequential/test_diffusionspatialparams3d.hh +++ b/test/porousmediumflow/1p/sequential/test_diffusionspatialparams3d.hh @@ -69,7 +69,7 @@ class TestDiffusionSpatialParams3d: public SequentialFVSpatialParams using ParentType = SequentialFVSpatialParams; using Problem = GetPropType; using Grid = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using CoordScalar = typename Grid::ctype; diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/problem.hh b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/problem.hh index f187f283da..68cced0651 100644 --- a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/problem.hh +++ b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/problem.hh @@ -131,7 +131,7 @@ class OnePTwoCTestProblem : public PorousMediumFlowProblem using BoundaryTypes = GetPropType; using PrimaryVariables = GetPropType; using NumEqVector = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using GridGeometry = GetPropType; diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/problem.hh b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/problem.hh index 1f6e4eec60..0933befc22 100644 --- a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/problem.hh +++ b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/problem.hh @@ -91,7 +91,7 @@ class SaltWaterIntrusionTestProblem : public PorousMediumFlowProblem using Scalar = GetPropType; using Indices = typename GetPropType::Indices; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; using FluidSystem = GetPropType; diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/problem.hh b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/problem.hh index 460e7b8ebf..2162d14ec9 100644 --- a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/problem.hh +++ b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/problem.hh @@ -124,7 +124,7 @@ class OnePTwoCNIConductionProblem : public PorousMediumFlowProblem using Scalar = GetPropType; using Indices = typename GetPropType::Indices; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using FluidSystem = GetPropType; using BoundaryTypes = GetPropType; using PrimaryVariables = GetPropType; diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/problem.hh b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/problem.hh index 726c81f496..12e902a99e 100644 --- a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/problem.hh +++ b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/problem.hh @@ -126,7 +126,7 @@ class OnePTwoCNIConvectionProblem : public PorousMediumFlowProblem using Scalar = GetPropType; using Indices = typename GetPropType::Indices; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using FluidSystem = GetPropType; using BoundaryTypes = GetPropType; using PrimaryVariables = GetPropType; diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/problem.hh b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/problem.hh index bc22805813..f26f0c7ac5 100644 --- a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/problem.hh +++ b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/problem.hh @@ -137,7 +137,7 @@ class OnePTwoCNITransientBCProblem : public PorousMediumFlowProblem using Scalar = GetPropType; using Indices = typename GetPropType::Indices; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using FluidSystem = GetPropType; using BoundaryTypes = GetPropType; using PrimaryVariables = GetPropType; diff --git a/test/porousmediumflow/1pnc/implicit/1p3c/problem.hh b/test/porousmediumflow/1pnc/implicit/1p3c/problem.hh index 3b236cdc66..165bdb1c5c 100644 --- a/test/porousmediumflow/1pnc/implicit/1p3c/problem.hh +++ b/test/porousmediumflow/1pnc/implicit/1p3c/problem.hh @@ -243,7 +243,7 @@ class MaxwellStefanOnePThreeCTestProblem : public PorousMediumFlowProblem; using Indices = typename GetPropType::Indices; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using BoundaryTypes = GetPropType; using PrimaryVariables = GetPropType; using NumEqVector = GetPropType; diff --git a/test/porousmediumflow/1pnc/implicit/nonequilibrium/problem.hh b/test/porousmediumflow/1pnc/implicit/nonequilibrium/problem.hh index c89e04bbfd..d36b9813d8 100644 --- a/test/porousmediumflow/1pnc/implicit/nonequilibrium/problem.hh +++ b/test/porousmediumflow/1pnc/implicit/nonequilibrium/problem.hh @@ -110,7 +110,7 @@ class OnePTwoCThermalNonequilibriumProblem : public PorousMediumFlowProblem; using Indices = typename GetPropType::Indices; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using FluidSystem = GetPropType; using BoundaryTypes = GetPropType; using PrimaryVariables = GetPropType; diff --git a/test/porousmediumflow/1pncmin/implicit/nonisothermal/problem.hh b/test/porousmediumflow/1pncmin/implicit/nonisothermal/problem.hh index 54255c0aee..b3c535f6dd 100644 --- a/test/porousmediumflow/1pncmin/implicit/nonisothermal/problem.hh +++ b/test/porousmediumflow/1pncmin/implicit/nonisothermal/problem.hh @@ -117,7 +117,7 @@ template class ThermoChemProblem : public PorousMediumFlowProblem { using ParentType = PorousMediumFlowProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using FluidSystem = GetPropType; using SolidSystem = GetPropType; diff --git a/test/porousmediumflow/2p/implicit/adaptive/problem.hh b/test/porousmediumflow/2p/implicit/adaptive/problem.hh index ad937e92d4..28bf581bd0 100644 --- a/test/porousmediumflow/2p/implicit/adaptive/problem.hh +++ b/test/porousmediumflow/2p/implicit/adaptive/problem.hh @@ -41,7 +41,7 @@ template class TwoPTestProblemAdaptive : public TwoPTestProblem { using ParentType = TwoPTestProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using Vertex = typename GridView::template Codim::Entity; using Scalar = GetPropType; diff --git a/test/porousmediumflow/2p/implicit/boxdfm/problem.hh b/test/porousmediumflow/2p/implicit/boxdfm/problem.hh index e87a5bad7e..faae3a8c15 100644 --- a/test/porousmediumflow/2p/implicit/boxdfm/problem.hh +++ b/test/porousmediumflow/2p/implicit/boxdfm/problem.hh @@ -117,7 +117,7 @@ class TwoPTestProblem : public PorousMediumFlowProblem { using ParentType = PorousMediumFlowProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; diff --git a/test/porousmediumflow/2p/implicit/fracture/problem.hh b/test/porousmediumflow/2p/implicit/fracture/problem.hh index db445eee0e..89def707c1 100644 --- a/test/porousmediumflow/2p/implicit/fracture/problem.hh +++ b/test/porousmediumflow/2p/implicit/fracture/problem.hh @@ -109,7 +109,7 @@ class FractureProblem : public PorousMediumFlowProblem { using ParentType = PorousMediumFlowProblem; using Scalar = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using FluidSystem = GetPropType; using GridGeometry = GetPropType; using Indices = typename GetPropType::Indices; diff --git a/test/porousmediumflow/2p/implicit/incompressible/problem.hh b/test/porousmediumflow/2p/implicit/incompressible/problem.hh index 744809866c..7da3a4a180 100644 --- a/test/porousmediumflow/2p/implicit/incompressible/problem.hh +++ b/test/porousmediumflow/2p/implicit/incompressible/problem.hh @@ -111,7 +111,7 @@ template class TwoPTestProblem : public PorousMediumFlowProblem { using ParentType = PorousMediumFlowProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using Scalar = GetPropType; using FluidSystem = GetPropType; diff --git a/test/porousmediumflow/2p/implicit/nonisothermal/problem.hh b/test/porousmediumflow/2p/implicit/nonisothermal/problem.hh index bbd97e0d70..b951c0f3c4 100644 --- a/test/porousmediumflow/2p/implicit/nonisothermal/problem.hh +++ b/test/porousmediumflow/2p/implicit/nonisothermal/problem.hh @@ -122,7 +122,7 @@ class InjectionProblem2PNI : public PorousMediumFlowProblem { using ParentType = PorousMediumFlowProblem; using Scalar = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; diff --git a/test/porousmediumflow/2p/sequential/buckleyleverettanalyticsolution.hh b/test/porousmediumflow/2p/sequential/buckleyleverettanalyticsolution.hh index 173e369f26..8a8114bb62 100644 --- a/test/porousmediumflow/2p/sequential/buckleyleverettanalyticsolution.hh +++ b/test/porousmediumflow/2p/sequential/buckleyleverettanalyticsolution.hh @@ -70,7 +70,7 @@ struct CheckMaterialLaw > > template class BuckleyLeverettAnalytic { using Problem = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using SpatialParams = GetPropType; diff --git a/test/porousmediumflow/2p/sequential/mcwhorteranalyticsolution.hh b/test/porousmediumflow/2p/sequential/mcwhorteranalyticsolution.hh index d619ec3375..f2e9fe4caf 100644 --- a/test/porousmediumflow/2p/sequential/mcwhorteranalyticsolution.hh +++ b/test/porousmediumflow/2p/sequential/mcwhorteranalyticsolution.hh @@ -43,7 +43,7 @@ template class McWhorterAnalytic { using Problem = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using SpatialParams = GetPropType; diff --git a/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh b/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh index c33da66092..08a0fc48c1 100644 --- a/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh +++ b/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh @@ -120,7 +120,7 @@ class Test3D2PProblem: public IMPESProblem2P { using ThisType = Test3D2PProblem; using ParentType = IMPESProblem2P; -using GridView = GetPropType; +using GridView = typename GetPropType::GridView; using Grid = typename GridView::Grid; using Indices = typename GetPropType::Indices; diff --git a/test/porousmediumflow/2p/sequential/test_3d2pspatialparams.hh b/test/porousmediumflow/2p/sequential/test_3d2pspatialparams.hh index e2336ba9ed..3e1e1f9d20 100644 --- a/test/porousmediumflow/2p/sequential/test_3d2pspatialparams.hh +++ b/test/porousmediumflow/2p/sequential/test_3d2pspatialparams.hh @@ -73,7 +73,7 @@ class Test3d2pSpatialParams: public SequentialFVSpatialParams using ParentType = SequentialFVSpatialParams; using Problem = GetPropType; using Grid = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using CoordScalar = typename Grid::ctype; diff --git a/test/porousmediumflow/2p/sequential/test_impesadaptiveproblem.hh b/test/porousmediumflow/2p/sequential/test_impesadaptiveproblem.hh index b44bdd2a66..53d8ef29dd 100644 --- a/test/porousmediumflow/2p/sequential/test_impesadaptiveproblem.hh +++ b/test/porousmediumflow/2p/sequential/test_impesadaptiveproblem.hh @@ -95,7 +95,7 @@ class TestIMPESAdaptiveProblem: public IMPESProblem2P { using ParentType = IMPESProblem2P; using Grid = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Indices = typename GetPropType::Indices; diff --git a/test/porousmediumflow/2p/sequential/test_impesadaptivespatialparams.hh b/test/porousmediumflow/2p/sequential/test_impesadaptivespatialparams.hh index 36415cb299..42f2a4a129 100644 --- a/test/porousmediumflow/2p/sequential/test_impesadaptivespatialparams.hh +++ b/test/porousmediumflow/2p/sequential/test_impesadaptivespatialparams.hh @@ -69,7 +69,7 @@ class TestIMPESAdaptiveSpatialParams: public SequentialFVSpatialParams { using Problem = GetPropType; using Grid = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using ParentType = SequentialFVSpatialParams; using CoordScalar = typename Grid::ctype; diff --git a/test/porousmediumflow/2p/sequential/test_impesproblem.hh b/test/porousmediumflow/2p/sequential/test_impesproblem.hh index 4f8f414ce2..e9c97499ae 100644 --- a/test/porousmediumflow/2p/sequential/test_impesproblem.hh +++ b/test/porousmediumflow/2p/sequential/test_impesproblem.hh @@ -135,7 +135,7 @@ template class IMPESTestProblem: public IMPESProblem2P { using ParentType = IMPESProblem2P; -using GridView = GetPropType; +using GridView = typename GetPropType::GridView; using Grid = typename GridView::Grid; using Indices = typename GetPropType::Indices; diff --git a/test/porousmediumflow/2p/sequential/test_impesspatialparams.hh b/test/porousmediumflow/2p/sequential/test_impesspatialparams.hh index 984632367c..90e1027a71 100644 --- a/test/porousmediumflow/2p/sequential/test_impesspatialparams.hh +++ b/test/porousmediumflow/2p/sequential/test_impesspatialparams.hh @@ -69,7 +69,7 @@ class TestIMPESSpatialParams: public SequentialFVSpatialParams { using Problem = GetPropType; using Grid = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using ParentType = SequentialFVSpatialParams; using CoordScalar = typename Grid::ctype; diff --git a/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh b/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh index 03188ea533..101d0228dd 100644 --- a/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh +++ b/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh @@ -145,7 +145,7 @@ template class MPFATwoPTestProblem: public IMPESProblem2P { using ParentType = IMPESProblem2P; -using GridView = GetPropType; +using GridView = typename GetPropType::GridView; using Grid = typename GridView::Grid; using Indices = typename GetPropType::Indices; diff --git a/test/porousmediumflow/2p/sequential/test_mpfa2pspatialparams.hh b/test/porousmediumflow/2p/sequential/test_mpfa2pspatialparams.hh index 5274eb79b3..ada177a294 100644 --- a/test/porousmediumflow/2p/sequential/test_mpfa2pspatialparams.hh +++ b/test/porousmediumflow/2p/sequential/test_mpfa2pspatialparams.hh @@ -68,7 +68,7 @@ class Test2PSpatialParams: public SequentialFVSpatialParams using ParentType = SequentialFVSpatialParams; using Problem = GetPropType; using Grid = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using CoordScalar = typename Grid::ctype; diff --git a/test/porousmediumflow/2p/sequential/test_transportproblem.hh b/test/porousmediumflow/2p/sequential/test_transportproblem.hh index be7900e72f..ff8012fbba 100644 --- a/test/porousmediumflow/2p/sequential/test_transportproblem.hh +++ b/test/porousmediumflow/2p/sequential/test_transportproblem.hh @@ -97,7 +97,7 @@ template class TestTransportProblem: public TransportProblem2P { using ParentType = TransportProblem2P; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Grid = typename GridView::Grid; using Indices = typename GetPropType::Indices; diff --git a/test/porousmediumflow/2p/sequential/test_transportspatialparams.hh b/test/porousmediumflow/2p/sequential/test_transportspatialparams.hh index 8f9b4e2485..ef1d19dd80 100644 --- a/test/porousmediumflow/2p/sequential/test_transportspatialparams.hh +++ b/test/porousmediumflow/2p/sequential/test_transportspatialparams.hh @@ -73,7 +73,7 @@ class TestTransportSpatialParams: public SequentialFVSpatialParams using ParentType = SequentialFVSpatialParams; using Problem = GetPropType; using Grid = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using Element = typename Grid::Traits::template Codim<0>::Entity; diff --git a/test/porousmediumflow/2p1c/implicit/problem.hh b/test/porousmediumflow/2p1c/implicit/problem.hh index e779b9732c..add866ac35 100644 --- a/test/porousmediumflow/2p1c/implicit/problem.hh +++ b/test/porousmediumflow/2p1c/implicit/problem.hh @@ -109,7 +109,7 @@ class InjectionProblem : public PorousMediumFlowProblem using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using GridGeometry = GetPropType; diff --git a/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/problem.hh b/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/problem.hh index 2ab7be9b03..d949b97cbd 100644 --- a/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/problem.hh +++ b/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/problem.hh @@ -135,7 +135,7 @@ class TwoPTwoCChemicalNonequilibriumProblem : public PorousMediumFlowProblem::LocalView; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; using GridGeometry = GetPropType; diff --git a/test/porousmediumflow/2p2c/implicit/injection/problem.hh b/test/porousmediumflow/2p2c/implicit/injection/problem.hh index fb8387b210..5db627d58c 100644 --- a/test/porousmediumflow/2p2c/implicit/injection/problem.hh +++ b/test/porousmediumflow/2p2c/implicit/injection/problem.hh @@ -142,7 +142,7 @@ template class InjectionProblem : public PorousMediumFlowProblem { using ParentType = PorousMediumFlowProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using GridGeometry = GetPropType; using Scalar = GetPropType; using FluidSystem = GetPropType; diff --git a/test/porousmediumflow/2p2c/implicit/mpnccomparison/problem.hh b/test/porousmediumflow/2p2c/implicit/mpnccomparison/problem.hh index 2d9cc9fec1..83e4ae8279 100644 --- a/test/porousmediumflow/2p2c/implicit/mpnccomparison/problem.hh +++ b/test/porousmediumflow/2p2c/implicit/mpnccomparison/problem.hh @@ -115,7 +115,7 @@ class TwoPTwoCComparisonProblem : public PorousMediumFlowProblem using NeumannFluxes = GetPropType; using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; using GridGeometry = GetPropType; diff --git a/test/porousmediumflow/2p2c/implicit/waterair/problem.hh b/test/porousmediumflow/2p2c/implicit/waterair/problem.hh index 9a7cd74fea..984e05f286 100644 --- a/test/porousmediumflow/2p2c/implicit/waterair/problem.hh +++ b/test/porousmediumflow/2p2c/implicit/waterair/problem.hh @@ -118,7 +118,7 @@ class WaterAirProblem : public PorousMediumFlowProblem using ParentType = PorousMediumFlowProblem; using Scalar = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using FluidSystem = GetPropType; using ModelTraits = GetPropType; using Indices = typename ModelTraits::Indices; diff --git a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh index 0d440862da..e86c548b17 100644 --- a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh +++ b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh @@ -118,7 +118,7 @@ template class Adaptive2p2c2d: public IMPETProblem2P2C { using ParentType = IMPETProblem2P2C; -using GridView = GetPropType; +using GridView = typename GetPropType::GridView; using Grid = GetPropType; using TimeManager = GetPropType; diff --git a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh index 33a960024d..e62cf2139c 100644 --- a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh +++ b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh @@ -117,7 +117,7 @@ template class Adaptive2p2c3d: public IMPETProblem2P2C { using ParentType = IMPETProblem2P2C; -using GridView = GetPropType; +using GridView = typename GetPropType::GridView; using Grid = GetPropType; using TimeManager = GetPropType; diff --git a/test/porousmediumflow/2p2c/sequential/test_dec2p2c_spatialparams.hh b/test/porousmediumflow/2p2c/sequential/test_dec2p2c_spatialparams.hh index 19f0510cd5..5aea20656e 100644 --- a/test/porousmediumflow/2p2c/sequential/test_dec2p2c_spatialparams.hh +++ b/test/porousmediumflow/2p2c/sequential/test_dec2p2c_spatialparams.hh @@ -67,7 +67,7 @@ template class Test2P2CSpatialParams : public SequentialFVSpatialParams { using Problem = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; enum { dim = GridView::dimension }; diff --git a/test/porousmediumflow/2p2c/sequential/test_dec2p2cproblem.hh b/test/porousmediumflow/2p2c/sequential/test_dec2p2cproblem.hh index 24bf95a133..a35a5b11e1 100644 --- a/test/porousmediumflow/2p2c/sequential/test_dec2p2cproblem.hh +++ b/test/porousmediumflow/2p2c/sequential/test_dec2p2cproblem.hh @@ -101,7 +101,7 @@ template class TestDecTwoPTwoCProblem: public IMPETProblem2P2C { using ParentType = IMPETProblem2P2C; -using GridView = GetPropType; +using GridView = typename GetPropType::GridView; using Grid = typename GridView::Grid; using TimeManager = GetPropType; using Indices = typename GetPropType::Indices; diff --git a/test/porousmediumflow/2p2c/sequential/test_multiphysics2p2cproblem.hh b/test/porousmediumflow/2p2c/sequential/test_multiphysics2p2cproblem.hh index 8b4e006543..e109a2121c 100644 --- a/test/porousmediumflow/2p2c/sequential/test_multiphysics2p2cproblem.hh +++ b/test/porousmediumflow/2p2c/sequential/test_multiphysics2p2cproblem.hh @@ -109,7 +109,7 @@ template class TestMultTwoPTwoCProblem: public IMPETProblem2P2C { using ParentType = IMPETProblem2P2C; -using GridView = GetPropType; +using GridView = typename GetPropType::GridView; using Grid = typename GridView::Grid; using TimeManager = GetPropType; using Indices = typename GetPropType::Indices; diff --git a/test/porousmediumflow/2pnc/implicit/diffusion/problem.hh b/test/porousmediumflow/2pnc/implicit/diffusion/problem.hh index 91dbd1d199..4403d0ba84 100644 --- a/test/porousmediumflow/2pnc/implicit/diffusion/problem.hh +++ b/test/porousmediumflow/2pnc/implicit/diffusion/problem.hh @@ -100,7 +100,7 @@ template class TwoPNCDiffusionProblem : public PorousMediumFlowProblem { using ParentType = PorousMediumFlowProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using FluidSystem = GetPropType; diff --git a/test/porousmediumflow/2pnc/implicit/fuelcell/problem.hh b/test/porousmediumflow/2pnc/implicit/fuelcell/problem.hh index 5d8843c106..ba0360af04 100644 --- a/test/porousmediumflow/2pnc/implicit/fuelcell/problem.hh +++ b/test/porousmediumflow/2pnc/implicit/fuelcell/problem.hh @@ -116,7 +116,7 @@ class FuelCellProblem : public PorousMediumFlowProblem using ElementVolumeVariables = typename GetPropType::LocalView; using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using GridGeometry = GetPropType; using SolutionVector = GetPropType; diff --git a/test/porousmediumflow/2pncmin/implicit/isothermal/problem.hh b/test/porousmediumflow/2pncmin/implicit/isothermal/problem.hh index 6841505646..8e0121fc33 100644 --- a/test/porousmediumflow/2pncmin/implicit/isothermal/problem.hh +++ b/test/porousmediumflow/2pncmin/implicit/isothermal/problem.hh @@ -130,7 +130,7 @@ template class DissolutionProblem : public PorousMediumFlowProblem { using ParentType = PorousMediumFlowProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using FluidSystem = GetPropType; using VolumeVariables = GetPropType; diff --git a/test/porousmediumflow/2pncmin/implicit/nonisothermal/problem.hh b/test/porousmediumflow/2pncmin/implicit/nonisothermal/problem.hh index 3e10e96492..1b0ae1f146 100644 --- a/test/porousmediumflow/2pncmin/implicit/nonisothermal/problem.hh +++ b/test/porousmediumflow/2pncmin/implicit/nonisothermal/problem.hh @@ -135,7 +135,7 @@ template class SalinizationProblem : public PorousMediumFlowProblem { using ParentType = PorousMediumFlowProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using FluidSystem = GetPropType; using VolumeVariables = GetPropType; diff --git a/test/porousmediumflow/3p/implicit/conduction/problem.hh b/test/porousmediumflow/3p/implicit/conduction/problem.hh index 162ed18bc5..88804e0f72 100644 --- a/test/porousmediumflow/3p/implicit/conduction/problem.hh +++ b/test/porousmediumflow/3p/implicit/conduction/problem.hh @@ -110,7 +110,7 @@ class ThreePNIConductionProblem : public PorousMediumFlowProblem { using ParentType = PorousMediumFlowProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using GridGeometry = GetPropType; using PrimaryVariables = GetPropType; diff --git a/test/porousmediumflow/3p/implicit/convection/problem.hh b/test/porousmediumflow/3p/implicit/convection/problem.hh index ac7f00a36e..4ec0fbc1cd 100644 --- a/test/porousmediumflow/3p/implicit/convection/problem.hh +++ b/test/porousmediumflow/3p/implicit/convection/problem.hh @@ -112,7 +112,7 @@ class ThreePNIConvectionProblem : public PorousMediumFlowProblem { using ParentType = PorousMediumFlowProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using FVElementGeometry = typename GetPropType::LocalView; using GridGeometry = GetPropType; diff --git a/test/porousmediumflow/3p/implicit/infiltration/problem.hh b/test/porousmediumflow/3p/implicit/infiltration/problem.hh index 8c936d70a3..0fe922bfcf 100644 --- a/test/porousmediumflow/3p/implicit/infiltration/problem.hh +++ b/test/porousmediumflow/3p/implicit/infiltration/problem.hh @@ -125,7 +125,7 @@ class InfiltrationThreePProblem : public PorousMediumFlowProblem using ParentType = PorousMediumFlowProblem; using Scalar = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Indices = typename GetPropType::Indices; enum { diff --git a/test/porousmediumflow/3p3c/implicit/columnxylol/problem.hh b/test/porousmediumflow/3p3c/implicit/columnxylol/problem.hh index 855d77f67b..e643887e05 100644 --- a/test/porousmediumflow/3p3c/implicit/columnxylol/problem.hh +++ b/test/porousmediumflow/3p3c/implicit/columnxylol/problem.hh @@ -130,7 +130,7 @@ template class ColumnProblem : public PorousMediumFlowProblem { using Scalar = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using ParentType = PorousMediumFlowProblem; using FluidSystem = GetPropType; diff --git a/test/porousmediumflow/3p3c/implicit/infiltration/problem.hh b/test/porousmediumflow/3p3c/implicit/infiltration/problem.hh index 5190809698..e2ee00aef8 100644 --- a/test/porousmediumflow/3p3c/implicit/infiltration/problem.hh +++ b/test/porousmediumflow/3p3c/implicit/infiltration/problem.hh @@ -114,7 +114,7 @@ class InfiltrationThreePThreeCProblem : public PorousMediumFlowProblem using ParentType = PorousMediumFlowProblem; using Scalar = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Indices = typename GetPropType::Indices; using FluidSystem = GetPropType; diff --git a/test/porousmediumflow/3p3c/implicit/kuevette/problem.hh b/test/porousmediumflow/3p3c/implicit/kuevette/problem.hh index dbda4c15f6..9bc7fc2b4a 100644 --- a/test/porousmediumflow/3p3c/implicit/kuevette/problem.hh +++ b/test/porousmediumflow/3p3c/implicit/kuevette/problem.hh @@ -117,7 +117,7 @@ class KuevetteProblem : public PorousMediumFlowProblem { using ParentType = PorousMediumFlowProblem; using Scalar = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; // copy some indices for convenience using Indices = typename GetPropType::Indices; diff --git a/test/porousmediumflow/3pwateroil/implicit/problem.hh b/test/porousmediumflow/3pwateroil/implicit/problem.hh index 1dd22cb197..cce598522e 100644 --- a/test/porousmediumflow/3pwateroil/implicit/problem.hh +++ b/test/porousmediumflow/3pwateroil/implicit/problem.hh @@ -98,7 +98,7 @@ template class SagdProblem : public PorousMediumFlowProblem { using ParentType = PorousMediumFlowProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using GridGeometry = GetPropType; using Scalar = GetPropType; using FluidSystem = GetPropType; diff --git a/test/porousmediumflow/co2/implicit/problem.hh b/test/porousmediumflow/co2/implicit/problem.hh index 6725b14e64..38e2db0766 100644 --- a/test/porousmediumflow/co2/implicit/problem.hh +++ b/test/porousmediumflow/co2/implicit/problem.hh @@ -164,7 +164,7 @@ template class HeterogeneousProblem : public PorousMediumFlowProblem { using ParentType = PorousMediumFlowProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using FluidSystem = GetPropType; using GridVariables = GetPropType; diff --git a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/problem.hh b/test/porousmediumflow/mpnc/implicit/2p2ccomparison/problem.hh index 64d20457b4..9985deec4b 100644 --- a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/problem.hh +++ b/test/porousmediumflow/mpnc/implicit/2p2ccomparison/problem.hh @@ -116,7 +116,7 @@ class MPNCComparisonProblem using ElementVolumeVariables = typename GetPropType::LocalView; using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using GridGeometry = GetPropType; using FluidState = GetPropType; diff --git a/test/porousmediumflow/mpnc/implicit/kinetic/main.cc b/test/porousmediumflow/mpnc/implicit/kinetic/main.cc index 7e548ec344..3725319379 100644 --- a/test/porousmediumflow/mpnc/implicit/kinetic/main.cc +++ b/test/porousmediumflow/mpnc/implicit/kinetic/main.cc @@ -118,7 +118,7 @@ int main(int argc, char** argv) try auto problem = std::make_shared(gridGeometry); // the solution vector - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using SolutionVector = GetPropType; SolutionVector x(leafGridView.size(GridView::dimension)); problem->applyInitialSolution(x); diff --git a/test/porousmediumflow/mpnc/implicit/kinetic/problem.hh b/test/porousmediumflow/mpnc/implicit/kinetic/problem.hh index d23391bbf4..52162374b2 100644 --- a/test/porousmediumflow/mpnc/implicit/kinetic/problem.hh +++ b/test/porousmediumflow/mpnc/implicit/kinetic/problem.hh @@ -140,7 +140,7 @@ class EvaporationAtmosphereProblem: public PorousMediumFlowProblem using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; using GridGeometry = GetPropType; diff --git a/test/porousmediumflow/mpnc/implicit/obstacle/problem.hh b/test/porousmediumflow/mpnc/implicit/obstacle/problem.hh index faa0e93d53..84c813cdb3 100644 --- a/test/porousmediumflow/mpnc/implicit/obstacle/problem.hh +++ b/test/porousmediumflow/mpnc/implicit/obstacle/problem.hh @@ -137,7 +137,7 @@ class ObstacleProblem using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using GridGeometry = GetPropType; using FluidState = GetPropType; diff --git a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/combustionlocalresidual.hh b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/combustionlocalresidual.hh index 964fe935fa..9548939219 100644 --- a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/combustionlocalresidual.hh +++ b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/combustionlocalresidual.hh @@ -48,7 +48,7 @@ class CombustionEnergyLocalResidual using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using FluidSystem = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using ElementVolumeVariables = typename GetPropType::LocalView; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; diff --git a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/problem.hh b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/problem.hh index 247c52a576..1764f4c3b7 100644 --- a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/problem.hh +++ b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/problem.hh @@ -184,7 +184,7 @@ class CombustionProblemOneComponent: public PorousMediumFlowProblem using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; using GridGeometry = GetPropType; diff --git a/test/porousmediumflow/richards/implicit/analytical/problem.hh b/test/porousmediumflow/richards/implicit/analytical/problem.hh index 5f240079e2..28fc2b19b3 100644 --- a/test/porousmediumflow/richards/implicit/analytical/problem.hh +++ b/test/porousmediumflow/richards/implicit/analytical/problem.hh @@ -104,7 +104,7 @@ template class RichardsAnalyticalProblem : public PorousMediumFlowProblem { using ParentType = PorousMediumFlowProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using PrimaryVariables = GetPropType; using BoundaryTypes = GetPropType; using NumEqVector = GetPropType; diff --git a/test/porousmediumflow/richards/implicit/lens/problem.hh b/test/porousmediumflow/richards/implicit/lens/problem.hh index 4300dbb94e..2629110f5d 100644 --- a/test/porousmediumflow/richards/implicit/lens/problem.hh +++ b/test/porousmediumflow/richards/implicit/lens/problem.hh @@ -114,7 +114,7 @@ template class RichardsLensProblem : public PorousMediumFlowProblem { using ParentType = PorousMediumFlowProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using PrimaryVariables = GetPropType; using BoundaryTypes = GetPropType; using NumEqVector = GetPropType; diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/conduction/problem.hh b/test/porousmediumflow/richards/implicit/nonisothermal/conduction/problem.hh index 50168159a9..bab2be4fd1 100644 --- a/test/porousmediumflow/richards/implicit/nonisothermal/conduction/problem.hh +++ b/test/porousmediumflow/richards/implicit/nonisothermal/conduction/problem.hh @@ -106,7 +106,7 @@ class RichardsNIConductionProblem :public PorousMediumFlowProblem { using ParentType = PorousMediumFlowProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using GridGeometry = GetPropType; using PrimaryVariables = GetPropType; diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/convection/problem.hh b/test/porousmediumflow/richards/implicit/nonisothermal/convection/problem.hh index ef57233b77..3b0fb1fd6c 100644 --- a/test/porousmediumflow/richards/implicit/nonisothermal/convection/problem.hh +++ b/test/porousmediumflow/richards/implicit/nonisothermal/convection/problem.hh @@ -108,7 +108,7 @@ class RichardsNIConvectionProblem : public PorousMediumFlowProblem { using ParentType = PorousMediumFlowProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using FVElementGeometry = typename GetPropType::LocalView; using GridGeometry = GetPropType; diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/problem.hh b/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/problem.hh index cadba22725..5b6f9e3e39 100644 --- a/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/problem.hh +++ b/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/problem.hh @@ -98,7 +98,7 @@ class RichardsNIEvaporationProblem : public PorousMediumFlowProblem { using ParentType = PorousMediumFlowProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using GridGeometry = GetPropType; using FVElementGeometry = typename GridGeometry::LocalView; diff --git a/test/porousmediumflow/richardsnc/implicit/problem.hh b/test/porousmediumflow/richardsnc/implicit/problem.hh index 9020c3d496..82a2a94650 100644 --- a/test/porousmediumflow/richardsnc/implicit/problem.hh +++ b/test/porousmediumflow/richardsnc/implicit/problem.hh @@ -110,7 +110,7 @@ class RichardsWellTracerProblem : public PorousMediumFlowProblem { using ParentType = PorousMediumFlowProblem; using Problem = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using PrimaryVariables = GetPropType; using FVElementGeometry = typename GetPropType::LocalView; using ElementVolumeVariables = typename GetPropType::LocalView; diff --git a/test/porousmediumflow/solidenergy/problem.hh b/test/porousmediumflow/solidenergy/problem.hh index 997439d4e8..0422c29096 100644 --- a/test/porousmediumflow/solidenergy/problem.hh +++ b/test/porousmediumflow/solidenergy/problem.hh @@ -41,7 +41,7 @@ template class SolidEnergyProblem : public PorousMediumFlowProblem { using ParentType = PorousMediumFlowProblem; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Scalar = GetPropType; using PrimaryVariables = GetPropType; using NeumannValues = GetPropType; diff --git a/test/porousmediumflow/tracer/2ptracer/problem_tracer.hh b/test/porousmediumflow/tracer/2ptracer/problem_tracer.hh index 906b84732c..2c9a80883f 100644 --- a/test/porousmediumflow/tracer/2ptracer/problem_tracer.hh +++ b/test/porousmediumflow/tracer/2ptracer/problem_tracer.hh @@ -78,7 +78,7 @@ class TracerFluidSystem : public FluidSystems::Base; using Problem = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; @@ -135,7 +135,7 @@ class TwoPTracerTestProblem : public PorousMediumFlowProblem using Scalar = GetPropType; using Indices = typename GetPropType::Indices; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using GridGeometry = GetPropType; using BoundaryTypes = GetPropType; using PrimaryVariables = GetPropType; diff --git a/test/porousmediumflow/tracer/constvel/problem.hh b/test/porousmediumflow/tracer/constvel/problem.hh index c1f4b69977..dab36781c8 100644 --- a/test/porousmediumflow/tracer/constvel/problem.hh +++ b/test/porousmediumflow/tracer/constvel/problem.hh @@ -95,7 +95,7 @@ class TracerFluidSystem : public FluidSystems::Base; using Problem = GetPropType; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using Element = typename GridView::template Codim<0>::Entity; using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; @@ -173,7 +173,7 @@ class TracerTest : public PorousMediumFlowProblem using Scalar = GetPropType; using Indices = typename GetPropType::Indices; - using GridView = GetPropType; + using GridView = typename GetPropType::GridView; using GridGeometry = GetPropType; using BoundaryTypes = GetPropType; using PrimaryVariables = GetPropType; -- GitLab