Commit 4365dce3 authored by Christoph Grueninger's avatar Christoph Grueninger
Browse files

Remove self-written VertexLayout and use one from dune-grid.

Similar for ElementLayout.
(reviewed by fetzer)


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@14111 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 9f61cb18
......@@ -134,30 +134,16 @@ SET_PROP(DecoupledModel, SolutionTypes)
maxIntersections = GET_PROP_VALUE(TypeTag, MaxIntersections)
};
template<int dim>
struct VertexLayout
{
bool contains (Dune::GeometryType gt) const
{ return gt.dim() == 0;}
};
template<int dim>
struct ElementLayout
{
bool contains (Dune::GeometryType gt) const
{ return gt.dim() == dim;}
};
public:
/*!
* \brief Mapper for the grid view's vertices.
*/
typedef Dune::MultipleCodimMultipleGeomTypeMapper<GridView, VertexLayout> VertexMapper;
typedef Dune::MultipleCodimMultipleGeomTypeMapper<GridView, Dune::MCMGVertexLayout> VertexMapper;
/*!
* \brief Mapper for the grid view's elements.
*/
typedef Dune::MultipleCodimMultipleGeomTypeMapper<GridView, ElementLayout> ElementMapper;
typedef Dune::MultipleCodimMultipleGeomTypeMapper<GridView, Dune::MCMGElementLayout> ElementMapper;
/*!
* \brief The type of a solution at a fixed time.
......
......@@ -814,16 +814,8 @@ public:
saturationIdx = 1
};
template<int dim>
struct VertexLayout
{
bool contains(Dune::GeometryType geomType) const
{
return geomType.dim() == 0;
}
};
typedef typename Dune::MultipleCodimMultipleGeomTypeMapper<GridView,
VertexLayout> VertexMapper;
Dune::MCMGVertexLayout> VertexMapper;
typedef typename GridView::template Codim<GridView::dimension>::Iterator
VertexIterator;
......
......@@ -123,13 +123,6 @@ SET_TYPE_PROP(TwoCNIStokesTwoPTwoCNIProblem, LinearSolver, SuperLUBackend<TypeTa
template <class TypeTag = TTAG(TwoCNIStokesTwoPTwoCNIProblem) >
class TwoCNIStokesTwoPTwoCNIProblem : public MultiDomainProblem<TypeTag>
{
template<int dim>
struct VertexLayout
{
bool contains(Dune::GeometryType geomtype)
{ return geomtype.dim() == 0; }
};
typedef TwoCNIStokesTwoPTwoCNIProblem<TypeTag> ThisType;
typedef MultiDomainProblem<TypeTag> ParentType;
......
......@@ -123,13 +123,6 @@ SET_TYPE_PROP(TwoCStokesTwoPTwoCProblem, LinearSolver, SuperLUBackend<TypeTag>);
template <class TypeTag = TTAG(TwoCStokesTwoPTwoCProblem) >
class TwoCStokesTwoPTwoCProblem : public MultiDomainProblem<TypeTag>
{
template<int dim>
struct VertexLayout
{
bool contains(Dune::GeometryType geomtype)
{ return geomtype.dim() == 0; }
};
typedef TwoCStokesTwoPTwoCProblem<TypeTag> ThisType;
typedef MultiDomainProblem<TypeTag> ParentType;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment