diff --git a/dumux/common/properties.hh b/dumux/common/properties.hh
index 29fe1fcbaea5b1dab24462049925950ec7ad09f8..2acccd0dc6412667284c9dc2d470cf14b1e5b8d9 100644
--- a/dumux/common/properties.hh
+++ b/dumux/common/properties.hh
@@ -50,8 +50,6 @@ struct PrimaryVariables { using type = UndefinedProperty; }; //!< A vector
template<class TypeTag, class MyTypeTag>
struct NumEqVector { using type = UndefinedProperty; }; //!< A vector of size number equations that can be used for Neumann fluxes, sources, residuals, ...
template<class TypeTag, class MyTypeTag>
-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<class TypeTag, class MyTypeTag>
struct ModelTraits { using type = UndefinedProperty; }; //!< Traits class encapsulating model specifications
template<class TypeTag, class MyTypeTag>
struct BaseModelTraits { using type = UndefinedProperty; }; //!< Model traits to be used as a base for nonisothermal, mineralization ... models
diff --git a/dumux/common/properties/grid.hh b/dumux/common/properties/grid.hh
index 2fd9478debd55f4d61bc926338f06c0d61c3d576..1adddcea0207ecc3548da9c3958a1ae33e3f6c19 100644
--- a/dumux/common/properties/grid.hh
+++ b/dumux/common/properties/grid.hh
@@ -24,7 +24,6 @@
#ifndef DUMUX_GRID_PROPERTIES_HH
#define DUMUX_GRID_PROPERTIES_HH
-#include <dune/common/deprecated.hh>
#include <dune/common/fvector.hh>
#include <dumux/common/properties.hh>
@@ -38,12 +37,6 @@ namespace TTag {
struct GridProperties {};
}
-DUNE_NO_DEPRECATED_BEGIN
-//! Use the leaf grid view if not defined otherwise
-template<class TypeTag>
-struct GridView<TypeTag, TTag::GridProperties> { using type = typename GetPropType<TypeTag, Properties::Grid>::LeafGridView; };
-DUNE_NO_DEPRECATED_END
-
//! Use the minimal point source implementation as default
template<class TypeTag>
struct PointSource<TypeTag, TTag::GridProperties>
diff --git a/dumux/discretization/box.hh b/dumux/discretization/box.hh
index 9fb15267326f3bc03932fc1e4e3d066cd4a71360..a9df7e72d99a15d0c7ea5ba3e07eea4b179d0b49 100644
--- a/dumux/discretization/box.hh
+++ b/dumux/discretization/box.hh
@@ -25,7 +25,6 @@
#ifndef DUMUX_DISCRETIZTAION_BOX_HH
#define DUMUX_DISCRETIZTAION_BOX_HH
-#include <dune/common/deprecated.hh>
#include <dune/common/fvector.hh>
#include <dune/geometry/multilineargeometry.hh>
@@ -58,9 +57,7 @@ struct GridGeometry<TypeTag, TTag::BoxModel>
{
private:
static constexpr bool enableCache = getPropValue<TypeTag, Properties::EnableGridGeometryCache>();
- DUNE_NO_DEPRECATED_BEGIN
- using GridView = GetPropType<TypeTag, Properties::GridView>;
- DUNE_NO_DEPRECATED_END
+ using GridView = typename GetPropType<TypeTag, Properties::Grid>::LeafGridView;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
public:
using type = BoxFVGridGeometry<Scalar, GridView, enableCache>;
diff --git a/dumux/discretization/ccmpfa.hh b/dumux/discretization/ccmpfa.hh
index 686dd176ddc0d6e78a30633fa3c87261b08aabce..0abdf72c34e0bf22655e5726c8a0ced9cdc5b966 100644
--- a/dumux/discretization/ccmpfa.hh
+++ b/dumux/discretization/ccmpfa.hh
@@ -25,7 +25,6 @@
#ifndef DUMUX_DISCRETIZATION_CC_MPFA_HH
#define DUMUX_DISCRETIZATION_CC_MPFA_HH
-#include <dune/common/deprecated.hh>
#include <dune/common/reservedvector.hh>
#include <dumux/common/properties.hh>
@@ -62,9 +61,7 @@ template<class TypeTag>
struct DualGridNodalIndexSet<TypeTag, TTag::CCMpfaModel>
{
private:
- DUNE_NO_DEPRECATED_BEGIN
- using GV = GetPropType<TypeTag, Properties::GridView>;
- DUNE_NO_DEPRECATED_END
+ using GV = typename GetPropType<TypeTag, Properties::Grid>::LeafGridView;
using Traits = NodalIndexSetDefaultTraits< GV >;
public:
@@ -104,9 +101,7 @@ template<class TypeTag>
struct GridGeometry<TypeTag, TTag::CCMpfaModel>
{
private:
- DUNE_NO_DEPRECATED_BEGIN
- using GridView = GetPropType<TypeTag, Properties::GridView>;
- DUNE_NO_DEPRECATED_END
+ using GridView = typename GetPropType<TypeTag, Properties::Grid>::LeafGridView;
using PrimaryIV = GetPropType<TypeTag, Properties::PrimaryInteractionVolume>;
using SecondaryIV = GetPropType<TypeTag, Properties::SecondaryInteractionVolume>;
using NodalIndexSet = GetPropType<TypeTag, Properties::DualGridNodalIndexSet>;
diff --git a/dumux/discretization/cctpfa.hh b/dumux/discretization/cctpfa.hh
index 825d560b776feaf9cc6d1110432c1a464dfbc129..b1c17411d50bbf89e5ced8629a168b97c2f3a98f 100644
--- a/dumux/discretization/cctpfa.hh
+++ b/dumux/discretization/cctpfa.hh
@@ -26,8 +26,6 @@
#ifndef DUMUX_DISCRETIZATION_CC_TPFA_HH
#define DUMUX_DISCRETIZATION_CC_TPFA_HH
-#include <dune/common/deprecated.hh>
-
#include <dumux/common/properties.hh>
#include <dumux/common/boundaryflag.hh>
@@ -58,9 +56,7 @@ struct GridGeometry<TypeTag, TTag::CCTpfaModel>
{
private:
static constexpr bool enableCache = getPropValue<TypeTag, Properties::EnableGridGeometryCache>();
- DUNE_NO_DEPRECATED_BEGIN
- using GridView = GetPropType<TypeTag, Properties::GridView>;
- DUNE_NO_DEPRECATED_END
+ using GridView = typename GetPropType<TypeTag, Properties::Grid>::LeafGridView;
public:
using type = CCTpfaFVGridGeometry<GridView, enableCache>;
};
diff --git a/dumux/discretization/staggered/freeflow/properties.hh b/dumux/discretization/staggered/freeflow/properties.hh
index ea64a567f24f399a09dea9d60545224ec50502e6..9623f91f8fa31e768636e544323b3d4d6208d04c 100644
--- a/dumux/discretization/staggered/freeflow/properties.hh
+++ b/dumux/discretization/staggered/freeflow/properties.hh
@@ -28,8 +28,6 @@
#ifndef DUMUX_STAGGERD_FREE_FLOW_PROPERTIES_HH
#define DUMUX_STAGGERD_FREE_FLOW_PROPERTIES_HH
-#include <dune/common/deprecated.hh>
-
#include <dumux/common/properties.hh>
#include <dumux/common/intersectionmapper.hh>
#include <dumux/common/defaultmappertraits.hh>
@@ -85,9 +83,7 @@ struct GridGeometry<TypeTag, TTag::StaggeredFreeFlowModel>
private:
static constexpr auto upwindSchemeOrder = getPropValue<TypeTag, Properties::UpwindSchemeOrder>();
static constexpr bool enableCache = getPropValue<TypeTag, Properties::EnableGridGeometryCache>();
- DUNE_NO_DEPRECATED_BEGIN
- using GridView = GetPropType<TypeTag, Properties::GridView>;
- DUNE_NO_DEPRECATED_END
+ using GridView = typename GetPropType<TypeTag, Properties::Grid>::LeafGridView;
using Traits = StaggeredFreeFlowDefaultFVGridGeometryTraits<GridView, upwindSchemeOrder>;
public:
using type = StaggeredFVGridGeometry<GridView, enableCache, Traits>;
diff --git a/dumux/multidomain/facet/box/properties.hh b/dumux/multidomain/facet/box/properties.hh
index 07a0efe428dd80f82b592d9534b63cb150bb665e..a1efedc612963c3299ddd676f8b5569368a7662e 100644
--- a/dumux/multidomain/facet/box/properties.hh
+++ b/dumux/multidomain/facet/box/properties.hh
@@ -29,8 +29,6 @@
#ifndef DUMUX_FACETCOUPLING_BOX_PROPERTIES_HH
#define DUMUX_FACETCOUPLING_BOX_PROPERTIES_HH
-#include <dune/common/deprecated.hh>
-
#include <dumux/common/properties.hh>
#include <dumux/discretization/box.hh>
@@ -100,9 +98,7 @@ struct GridGeometry<TypeTag, TTag::BoxFacetCouplingModel>
{
private:
static constexpr bool enableCache = getPropValue<TypeTag, Properties::EnableGridGeometryCache>();
- DUNE_NO_DEPRECATED_BEGIN
- using GridView = GetPropType<TypeTag, Properties::GridView>;
- DUNE_NO_DEPRECATED_END
+ using GridView = typename GetPropType<TypeTag, Properties::Grid>::LeafGridView;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
public:
using type = BoxFacetCouplingFVGridGeometry<Scalar, GridView, enableCache>;
diff --git a/dumux/porousmediumflow/boxdfm/model.hh b/dumux/porousmediumflow/boxdfm/model.hh
index 72478ecf26a2b68b0e625f5576b29c69223c50ac..3632e843b3e0afdef7c581d8b27a276c40a41549 100644
--- a/dumux/porousmediumflow/boxdfm/model.hh
+++ b/dumux/porousmediumflow/boxdfm/model.hh
@@ -26,8 +26,6 @@
#ifndef DUMUX_POROUSMEDIUMFLOW_BOXDFM_MODEL_HH
#define DUMUX_POROUSMEDIUMFLOW_BOXDFM_MODEL_HH
-#include <dune/common/deprecated.hh>
-
#include <dumux/discretization/box.hh>
#include "fvgridgeometry.hh"
@@ -48,9 +46,7 @@ struct GridGeometry<TypeTag, TTag::BoxDfmModel>
{
private:
static constexpr bool enableCache = getPropValue<TypeTag, Properties::EnableGridGeometryCache>();
- DUNE_NO_DEPRECATED_BEGIN
- using GridView = GetPropType<TypeTag, Properties::GridView>;
- DUNE_NO_DEPRECATED_END
+ using GridView = typename GetPropType<TypeTag, Properties::Grid>::LeafGridView;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
public:
using type = BoxDfmFVGridGeometry<Scalar, GridView, enableCache>;
diff --git a/dumux/porousmediumflow/sequential/properties.hh b/dumux/porousmediumflow/sequential/properties.hh
index bb0a550d5c2c6751f21e3251f4266c5a5d961549..c4e5ba1350bd9e6f366d79a681a8971b3aa136ff 100644
--- a/dumux/porousmediumflow/sequential/properties.hh
+++ b/dumux/porousmediumflow/sequential/properties.hh
@@ -19,8 +19,6 @@
#ifndef DUMUX_SEQUENTIAL_PROPERTIES_HH
#define DUMUX_SEQUENTIAL_PROPERTIES_HH
-#include <dune/common/deprecated.hh>
-
#include <dumux/common/properties.hh>
#include <dumux/common/properties/model.hh>
#include <dumux/common/properties/grid.hh>
@@ -134,47 +132,27 @@ public:
using type = DummyTraits;
};
-DUNE_NO_DEPRECATED_BEGIN
-//! Use the leaf grid view if not defined otherwise
-template<class TypeTag>
-struct GridView<TypeTag, TTag::SequentialModel>
-{
-private:
- using Grid = GetPropType<TypeTag, Properties::Grid>;
-
-public:
- using type = typename Grid::LeafGridView;
-};
-DUNE_NO_DEPRECATED_END
-
//! Default number of intersections for quadrilaterals
template<class TypeTag>
struct MaxIntersections<TypeTag, TTag::SequentialModel>
{
private:
- DUNE_NO_DEPRECATED_BEGIN
- using GridView = GetPropType<TypeTag, Properties::GridView>;
- DUNE_NO_DEPRECATED_END
- enum
- {
- dim = GridView::dimension
- };
+ using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
public:
- static const int value = 2*dim;
+ static constexpr int value = 2*GridView::dimension;
};
//! A simplified grid geometry for compatibility with new style models
template<class TypeTag>
struct GridGeometry<TypeTag, TTag::SequentialModel>
{
-DUNE_NO_DEPRECATED_BEGIN
+ using GV = typename GetPropType<TypeTag, Properties::Grid>::LeafGridView;
struct MockFVGridGeometry
- : public DefaultMapperTraits<GetPropType<TypeTag, Properties::GridView>>
+ : public DefaultMapperTraits<GV>
{
static constexpr Dumux::DiscretizationMethod discMethod = Dumux::DiscretizationMethod::cctpfa;
- using GridView = GetPropType<TypeTag, Properties::GridView>;
+ using GridView = GV;
};
-DUNE_NO_DEPRECATED_END
public:
using type = MockFVGridGeometry;
};
@@ -196,10 +174,7 @@ template<class TypeTag>
struct SolutionTypes<TypeTag, TTag::SequentialModel>
{
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
- DUNE_NO_DEPRECATED_BEGIN
- using GridView = GetPropType<TypeTag, Properties::GridView>;
- DUNE_NO_DEPRECATED_END
- using Grid = typename GridView::Grid;
+ using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using Variables = GetPropType<TypeTag, Properties::Variables>;
enum
diff --git a/examples/1ptracer/main.cc b/examples/1ptracer/main.cc
index d8406e8db8b4906d3ce42baf96f9142bb0f49582..c33269ab8da6ad9e0045cefca1ba9429f4304df3 100644
--- a/examples/1ptracer/main.cc
+++ b/examples/1ptracer/main.cc
@@ -153,7 +153,7 @@ int main(int argc, char** argv) try
// problem defined in `problem_1p.hh`. Let us now write this solution to a VTK file using the Dune
// `VTKWriter`. Moreover, we add the permeability distribution to the writer.
// [[codeblock]]
- using GridView = GetPropType<OnePTypeTag, Properties::GridView>;
+ using GridView = typename GridGeometry::GridView;
Dune::VTKWriter<GridView> onepWriter(leafGridView);
onepWriter.addCellData(p, "p");
diff --git a/examples/1ptracer/properties_tracer.hh b/examples/1ptracer/properties_tracer.hh
index 1ebcaac3c08195f785aa8af0a8165c2d601de1ee..a7db2bd57429449d6fc3e6cb458daea0447961f5 100644
--- a/examples/1ptracer/properties_tracer.hh
+++ b/examples/1ptracer/properties_tracer.hh
@@ -64,7 +64,7 @@ class TracerFluidSystem : public FluidSystems::Base<GetPropType<TypeTag, Propert
// Some convenience aliases to be used inside this class.
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using Problem = GetPropType<TypeTag, Properties::Problem>;
- using GridView = GetPropType<TypeTag, Properties::GridView>;
+ using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using Element = typename GridView::template Codim<0>::Entity;
using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
diff --git a/examples/freeflowchannel/main.cc b/examples/freeflowchannel/main.cc
index d42b694d71421fe405a976706addfa29fc0096ba..eefdbe2fb30547118abfc70733bc52262d834fe5 100644
--- a/examples/freeflowchannel/main.cc
+++ b/examples/freeflowchannel/main.cc
@@ -178,9 +178,7 @@ 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<TypeTag, Properties::GridView>;
- DUNE_NO_DEPRECATED_END
+ using GridView = typename GridGeometry::GridView;
using Element = typename GridView::template Codim<0>::Entity;
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/problem_darcy.hh
index 8312e44e9b12429eec836dde956fe79fe44690b3..c6c1602e26e39bbe471424ab23bd9f559178ac41 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/problem_darcy.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/problem_darcy.hh
@@ -81,7 +81,7 @@ template <class TypeTag>
class DarcySubProblem : public PorousMediumFlowProblem<TypeTag>
{
using ParentType = PorousMediumFlowProblem<TypeTag>;
- using GridView = GetPropType<TypeTag, Properties::GridView>;
+ using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/problem_stokes.hh
index 25cd89a66203d2d82adad33afc110421e570d1b5..95e40d3f65e1cdf21af3e3106809aa08f546b5c4 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/problem_stokes.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/problem_stokes.hh
@@ -77,10 +77,10 @@ template <class TypeTag>
class StokesSubProblem : public NavierStokesProblem<TypeTag>
{
using ParentType = NavierStokesProblem<TypeTag>;
- using GridView = GetPropType<TypeTag, Properties::GridView>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
+ using GridView = typename GridGeometry::GridView;
using FVElementGeometry = typename GridGeometry::LocalView;
using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
using Element = typename GridView::template Codim<0>::Entity;
diff --git a/test/porousmediumflow/1p/implicit/network1d3d/problem.hh b/test/porousmediumflow/1p/implicit/network1d3d/problem.hh
index fd3fbe29e29dacf8cb83ef634905a56bd4559be0..369d491ba71716c6bcf82e273a5e86c04e2695d5 100644
--- a/test/porousmediumflow/1p/implicit/network1d3d/problem.hh
+++ b/test/porousmediumflow/1p/implicit/network1d3d/problem.hh
@@ -72,9 +72,7 @@ struct GridGeometry<TypeTag, TTag::TubesTestCCTpfa>
{
private:
static constexpr bool enableCache = getPropValue<TypeTag, Properties::EnableGridGeometryCache>();
- DUNE_NO_DEPRECATED_BEGIN
- using GridView = GetPropType<TypeTag, Properties::GridView>;
- DUNE_NO_DEPRECATED_END
+ using GridView = typename GetPropType<TypeTag, Properties::Grid>::LeafGridView;
using ElementMapper = ReorderingDofMapper<GridView>;
using VertexMapper = Dune::MultipleCodimMultipleGeomTypeMapper<GridView>;
@@ -89,9 +87,7 @@ struct GridGeometry<TypeTag, TTag::TubesTestBox>
{
private:
static constexpr bool enableCache = getPropValue<TypeTag, Properties::EnableGridGeometryCache>();
- DUNE_NO_DEPRECATED_BEGIN
- using GridView = GetPropType<TypeTag, Properties::GridView>;
- DUNE_NO_DEPRECATED_END
+ using GridView = typename GetPropType<TypeTag, Properties::Grid>::LeafGridView;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using ElementMapper = Dune::MultipleCodimMultipleGeomTypeMapper<GridView>;