diff --git a/dumux/assembly/fvassembler.hh b/dumux/assembly/fvassembler.hh
index abeeb48e597ae5335e52e7f881cee5f92451dfa3..7ea5dd824d836e87bafc010b82413c5e807f5a79 100644
--- a/dumux/assembly/fvassembler.hh
+++ b/dumux/assembly/fvassembler.hh
@@ -53,7 +53,6 @@ class FVAssembler
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using VertexMapper = typename GET_PROP_TYPE(TypeTag, VertexMapper);
using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix);
@@ -167,6 +166,7 @@ public:
// for box communicate the residual with the neighboring processes
if (isBox && gridView().comm().size() > 1)
{
+ using VertexMapper = typename FVGridGeometry::VertexMapper;
VertexHandleSum<typename SolutionVector::block_type, SolutionVector, VertexMapper>
sumResidualHandle(residual, fvGridGeometry_->vertexMapper());
gridView().communicate(sumResidualHandle,
diff --git a/dumux/common/fvproblem.hh b/dumux/common/fvproblem.hh
index e133b8617782cb18bb659a45eae01588992dcf92..a9857b41d0d03bea6798584faa01cd715af67d9e 100644
--- a/dumux/common/fvproblem.hh
+++ b/dumux/common/fvproblem.hh
@@ -53,7 +53,6 @@ class FVProblem
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
using ResidualVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
- using VertexMapper = typename GET_PROP_TYPE(TypeTag, VertexMapper);
using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry)::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
@@ -71,7 +70,6 @@ class FVProblem
};
using Element = typename GridView::template Codim<0>::Entity;
- using Vertex = typename GridView::template Codim<dim>::Entity;
using CoordScalar = typename GridView::ctype;
using GlobalPosition = Dune::FieldVector<CoordScalar, dimWorld>;
diff --git a/dumux/common/properties.hh b/dumux/common/properties.hh
index af8076708e76cab90a795dcd636ff4a2070a21a7..a0ccd5ffdf1d92ddba88b6463f44cc068ed68ed0 100644
--- a/dumux/common/properties.hh
+++ b/dumux/common/properties.hh
@@ -56,8 +56,6 @@ NEW_PROP_TAG(JacobianMatrix); //!< Type of the global jacobian matrix
NEW_PROP_TAG(SolutionVector); //!< Vector containing all primary variable vector of the grid
NEW_PROP_TAG(BoundaryTypes); //!< Stores the boundary types of a single degree of freedom
NEW_PROP_TAG(DiscretizationMethod); //!< Property for the used discretization method
-NEW_PROP_TAG(VertexMapper); //!< mapper for vertices
-NEW_PROP_TAG(ElementMapper); //!< mapper for elements
//! The type of the local residual function, i.e. the equation to be solved. Must inherit
//! from the BaseLocalResidual property and fulfill its interfaces.
diff --git a/dumux/common/properties/grid.hh b/dumux/common/properties/grid.hh
index 2c0c581bc5bf0ae85d7a292d34c50aff7e4eed8f..c3860784c259645b4c265f41f6af33c3105bec9c 100644
--- a/dumux/common/properties/grid.hh
+++ b/dumux/common/properties/grid.hh
@@ -25,7 +25,6 @@
#define DUMUX_GRID_PROPERTIES_HH
#include <dune/common/version.hh>
-#include <dune/grid/common/mcmgmapper.hh>
#include <dumux/common/properties.hh>
#include <dumux/common/pointsource.hh>
@@ -50,32 +49,6 @@ SET_TYPE_PROP(GridProperties, PointSource, PointSource<TypeTag>);
//! Use the point source helper using the bounding box tree as a default
SET_TYPE_PROP(GridProperties, PointSourceHelper, BoundingBoxTreePointSourceHelper<TypeTag>);
-//! Mapper for the grid view's vertices.
-#if DUNE_VERSION_NEWER(DUNE_COMMON,2,6)
-SET_TYPE_PROP(GridProperties,
- VertexMapper,
- Dune::MultipleCodimMultipleGeomTypeMapper<typename GET_PROP_TYPE(TypeTag, GridView)>);
-#else
-SET_TYPE_PROP(GridProperties,
- VertexMapper,
- Dune::MultipleCodimMultipleGeomTypeMapper<typename GET_PROP_TYPE(TypeTag, GridView),
- Dune::MCMGVertexLayout>);
-#endif
-
-//! Mapper for the grid view's elements.
-#if DUNE_VERSION_NEWER(DUNE_COMMON,2,6)
-SET_TYPE_PROP(GridProperties,
- ElementMapper,
- Dune::MultipleCodimMultipleGeomTypeMapper<typename GET_PROP_TYPE(TypeTag, GridView)>);
-#else
-SET_TYPE_PROP(GridProperties,
- ElementMapper,
- Dune::MultipleCodimMultipleGeomTypeMapper<typename GET_PROP_TYPE(TypeTag, GridView),
- Dune::MCMGElementLayout>);
-#endif
-
-
-
} // namespace Properties
} // namespace Dumux
diff --git a/dumux/discretization/cellcentered/mpfa/helper.hh b/dumux/discretization/cellcentered/mpfa/helper.hh
index 67b6d1db95bf8eb6c96061175b6e1557f4355888..71aa0263bae23999892d91bbc0cfdf94446df8f3 100644
--- a/dumux/discretization/cellcentered/mpfa/helper.hh
+++ b/dumux/discretization/cellcentered/mpfa/helper.hh
@@ -580,8 +580,9 @@ class CCMpfaHelperImplementation : public MpfaDimensionHelper<TypeTag, dim, dimW
using PrimaryInteractionVolume = typename GET_PROP_TYPE(TypeTag, PrimaryInteractionVolume);
using SecondaryInteractionVolume = typename GET_PROP_TYPE(TypeTag, SecondaryInteractionVolume);
- using VertexMapper = typename GET_PROP_TYPE(TypeTag, VertexMapper);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry)::LocalView;
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ using VertexMapper = typename FVGridGeometry::VertexMapper;
+ using FVElementGeometry = typename FVGridGeometry::LocalView;
using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
using ScvfCornerVector = typename SubControlVolumeFace::Traits::CornerStorage;
diff --git a/dumux/io/vtkoutputmodule.hh b/dumux/io/vtkoutputmodule.hh
index b053d330ef769455730a42d227cd817717ad31a9..b366093542cf041b3468c4e35e59d2862f1e336f 100644
--- a/dumux/io/vtkoutputmodule.hh
+++ b/dumux/io/vtkoutputmodule.hh
@@ -220,10 +220,10 @@ class VtkOutputModule
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
- using ElementMapper = typename GET_PROP_TYPE(TypeTag, ElementMapper);
- using VertexMapper = typename GET_PROP_TYPE(TypeTag, VertexMapper);
using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ using ElementMapper = typename FVGridGeometry::ElementMapper;
+ using VertexMapper = typename FVGridGeometry::VertexMapper;
using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
diff --git a/dumux/linear/amgtraits.hh b/dumux/linear/amgtraits.hh
index 72e95a441e251cf3654bb6a4d5c442592d2488ee..7ccb7d1204c2fd383107026d188471449bc3654f 100644
--- a/dumux/linear/amgtraits.hh
+++ b/dumux/linear/amgtraits.hh
@@ -88,7 +88,7 @@ struct AmgTraitsImpl<TypeTag, DiscretizationMethods::Box>
using ScalarProduct = typename SolverTraits::ScalarProduct;
using Smoother = typename SolverTraits::Smoother;
- using DofMapper = typename GET_PROP_TYPE(TypeTag, VertexMapper);
+ using DofMapper = typename GET_PROP_TYPE(TypeTag, FVGridGeometry)::VertexMapper;
};
//! OverlappingSolverTraits used by discretization with overlapping parallel model
@@ -136,7 +136,7 @@ struct AmgTraitsImpl<TypeTag, DiscretizationMethods::CCTpfa>
using ScalarProduct = typename SolverTraits::ScalarProduct;
using Smoother = typename SolverTraits::Smoother;
- using DofMapper = typename GET_PROP_TYPE(TypeTag, ElementMapper);
+ using DofMapper = typename GET_PROP_TYPE(TypeTag, FVGridGeometry)::ElementMapper;
};
template<class TypeTag>
diff --git a/dumux/porousmediumflow/sequential/properties.hh b/dumux/porousmediumflow/sequential/properties.hh
index 28e1cb65eaacc1a34aa55565e296491ce4c76c14..21b730f9990a7254ed25377570af3a4bc2055eaa 100644
--- a/dumux/porousmediumflow/sequential/properties.hh
+++ b/dumux/porousmediumflow/sequential/properties.hh
@@ -22,6 +22,7 @@
#include <dumux/common/properties.hh>
#include <dumux/common/properties/model.hh>
#include <dumux/common/properties/grid.hh>
+#include <dumux/common/defaultmappertraits.hh>
#include <dumux/porousmediumflow/sequential/gridadaptproperties.hh>
#include <dumux/porousmediumflow/sequential/gridadaptinitializationindicatordefault.hh>
@@ -130,6 +131,9 @@ public:
static const int value = 2*dim;
};
+//! A simplified grid geometry for compatibility with new style models
+SET_TYPE_PROP(SequentialModel, FVGridGeometry, DefaultMapperTraits<typename GET_PROP_TYPE(TypeTag, GridView)>);
+
/*!
* \brief Specifies the types which are assoicated with a solution.
*