Commit 5e11ae86 authored by Bernd Flemisch's avatar Bernd Flemisch
Browse files

[mappers] get rid of self-defined layouts

Use the layouts that are pre-defined by Dune.



git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@14241 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 5a2bceee
......@@ -33,16 +33,6 @@ namespace Dumux
template<class GridView>
class IntersectionMapper
{
// mapper: one data element in every entity
template<int dim>
struct ElementLayout
{
bool contains (Dune::GeometryType geomType)
{
return geomType.dim() == dim;
}
};
typedef typename GridView::Grid Grid;
enum {dim=Grid::dimension};
typedef typename Grid::template Codim<0>::Entity Element;
......@@ -50,9 +40,7 @@ class IntersectionMapper
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
typedef typename GridView::IntersectionIterator IntersectionIterator;
typedef typename GridView::Intersection Intersection;
typedef Dune::MultipleCodimMultipleGeomTypeMapper<GridView,ElementLayout> ElementMapper;
typedef Dune::MultipleCodimMultipleGeomTypeMapper<GridView, Dune::MCMGElementLayout> ElementMapper;
public:
IntersectionMapper(const GridView& gridview)
......
......@@ -37,15 +37,6 @@ namespace Dumux
struct BenchmarkResult
{
private:
template<int dim>
struct ElementLayout
{
bool contains (Dune::GeometryType gt)
{
return gt.dim() == dim;
}
};
template<int dim>
struct FaceLayout
{
......@@ -97,7 +88,7 @@ public:
typedef typename GV::IndexSet IS;
typedef typename GV::template Codim<0>::Iterator Iterator;
typedef typename GV::IntersectionIterator IntersectionIterator;
typedef Dune::MultipleCodimMultipleGeomTypeMapper<GV,ElementLayout> EM;
typedef Dune::MultipleCodimMultipleGeomTypeMapper<GV,Dune::MCMGElementLayout> EM;
typedef Dune::MultipleCodimMultipleGeomTypeMapper<GV,FaceLayout> FM;
typedef typename Grid::ctype ct;
......@@ -385,15 +376,6 @@ public:
struct ResultEvaluation
{
private:
template<int dim>
struct ElementLayout
{
bool contains (Dune::GeometryType gt)
{
return gt.dim() == dim;
}
};
template<int dim>
struct FaceLayout
{
......@@ -447,7 +429,7 @@ public:
typedef typename Element::Geometry Geometry;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
typedef typename GridView::IntersectionIterator IntersectionIterator;
typedef Dune::MultipleCodimMultipleGeomTypeMapper<GridView,ElementLayout> ElementMapper;
typedef Dune::MultipleCodimMultipleGeomTypeMapper<GridView, Dune::MCMGElementLayout> ElementMapper;
typedef Dune::BlockVector<Dune::FieldVector<Scalar, 1> > SolVector;
typedef typename Geometry::JacobianInverseTransposed JacobianInverseTransposed;
typedef typename Dune::ReferenceElements<Scalar, dim> ReferenceElements;
......@@ -735,7 +717,7 @@ public:
typedef typename Element::Geometry Geometry;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
typedef typename GridView::IntersectionIterator IntersectionIterator;
typedef Dune::MultipleCodimMultipleGeomTypeMapper<GridView,ElementLayout> ElementMapper;
typedef Dune::MultipleCodimMultipleGeomTypeMapper<GridView, Dune::MCMGElementLayout> ElementMapper;
typedef typename Dune::ReferenceElements<Scalar, dim> ReferenceElements;
typedef typename Dune::ReferenceElements<Scalar, dim-1> ReferenceFaces;
......
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