Commit 60948833 authored by Christian Engwer's avatar Christian Engwer Committed by Ansgar Burchardt

Merge branch 'feature/remove-generic-geometry' into 'master'

remove genericgeometry subdirectory from dune-geometry

The removal of the `genericgeometry` subdirectory in dune-geometry will require some minor changes to dune-grid. This merge request collects those and should be merged once the corresponding branch in dune-geometry is merged, too.

See merge request !120
parent 1e852e86
Pipeline #1269 failed with stage
in 175 minutes and 43 seconds
......@@ -3,6 +3,8 @@
#ifndef DUNE_ALBERTA_ALBERTAREADER_HH
#define DUNE_ALBERTA_ALBERTAREADER_HH
#include <dune/geometry/type.hh>
#include <dune/grid/common/grid.hh>
#include <dune/grid/common/gridfactory.hh>
......@@ -65,7 +67,7 @@ namespace Dune
const typename MacroData::ElementId &id = macroData_.element( i );
for( int j = 0; j <= dimension; ++j )
vertices[ j ] = id[ j ];
typedef typename GenericGeometry::SimplexTopology< dimension >::type Topology;
typedef typename Impl::SimplexTopology< dimension >::type Topology;
factory.insertElement( GeometryType( Topology() ), vertices );
}
......
......@@ -3,9 +3,9 @@
#ifndef DUNE_ALBERTA_CAPABILITIES_HH
#define DUNE_ALBERTA_CAPABILITIES_HH
#include <dune/grid/common/capabilities.hh>
#include <dune/geometry/genericgeometry/topologytypes.hh>
#include <dune/geometry/type.hh>
#include <dune/grid/common/capabilities.hh>
#if HAVE_ALBERTA
......@@ -33,7 +33,7 @@ namespace Dune
struct hasSingleGeometryType< AlbertaGrid< dim, dimworld > >
{
static const bool v = true;
static const unsigned int topologyId = GenericGeometry :: SimplexTopology< dim > :: type :: id ;
static const unsigned int topologyId = Impl::SimplexTopology< dim >::type::id;
};
......
......@@ -5,6 +5,8 @@
// compile surface grid support into the lib even for ALBERTA 2.0
#define DUNE_ALBERTA_SURFACE_GRID 1
#include <dune/geometry/type.hh>
#include <dune/grid/albertagrid/dgfparser.hh>
#if HAVE_ALBERTA
......@@ -52,7 +54,7 @@ namespace Dune
elementId[ i ] = dgf_.elements[ n ][ i ];
}
typedef typename GenericGeometry::SimplexTopology< dimension >::type Topology;
typedef typename Impl::SimplexTopology< dimension >::type Topology;
factory_.insertElement( GeometryType( Topology() ), elementId );
// look for bounaries and insert them
......@@ -101,7 +103,7 @@ namespace Dune
const std::vector< unsigned int > &vertices = projectionBlock.boundaryFace( i );
const DuneBoundaryProjection< dimworld > *projection
= projectionBlock.template boundaryProjection< dimworld >( i );
typedef typename GenericGeometry::SimplexTopology< dimension-1 >::type Topology;
typedef typename Impl::SimplexTopology< dimension-1 >::type Topology;
factory_.insertBoundaryProjection( GeometryType( Topology() ), vertices, projection );
}
......
......@@ -111,7 +111,7 @@ namespace Dune
template< int codim, int dim, class Grid >
inline GeometryType AlbertaGridEntity< codim, dim, Grid >::type () const
{
typedef typename GenericGeometry::SimplexTopology< mydimension >::type Topology;
typedef typename Impl::SimplexTopology< mydimension >::type Topology;
return GeometryType( Topology() );
}
......@@ -267,7 +267,7 @@ namespace Dune
template< int dim, class Grid >
inline GeometryType AlbertaGridEntity< 0, dim, Grid>::type () const
{
typedef typename GenericGeometry::SimplexTopology< mydimension >::type Topology;
typedef typename Impl::SimplexTopology< mydimension >::type Topology;
return GeometryType( Topology() );
}
......
......@@ -147,7 +147,7 @@ namespace Dune
/** \brief obtain the type of reference element */
GeometryType type () const
{
typedef typename GenericGeometry::SimplexTopology< mydimension >::type Topology;
typedef typename Impl::SimplexTopology< mydimension >::type Topology;
return GeometryType( Topology() );
}
......@@ -349,7 +349,7 @@ namespace Dune
/** \brief obtain the type of reference element */
GeometryType type () const
{
typedef typename GenericGeometry::SimplexTopology< mydimension >::type Topology;
typedef typename Impl::SimplexTopology< mydimension >::type Topology;
return GeometryType( Topology() );
}
......
......@@ -214,7 +214,7 @@ namespace Dune
virtual void
insertBoundarySegment ( const std::vector< unsigned int >& vertices )
{
typedef typename GenericGeometry::SimplexTopology< dimension-1 >::type Topology;
typedef typename Impl::SimplexTopology< dimension-1 >::type Topology;
insertBoundaryProjection( GeometryType( Topology() ), vertices, 0 );
}
......
......@@ -79,7 +79,7 @@ namespace Dune
template< class Grid >
inline GeometryType AlbertaGridIntersectionBase< Grid >::type () const
{
typedef typename GenericGeometry::SimplexTopology< dimension-1 >::type Topology;
typedef typename Impl::SimplexTopology< dimension-1 >::type Topology;
return GeometryType( Topology() );
}
......
......@@ -7,8 +7,9 @@
#include <dune/common/typetraits.hh>
#include <dune/geometry/referenceelements.hh>
#include <dune/geometry/multilineargeometry.hh>
#include <dune/geometry/referenceelements.hh>
#include <dune/geometry/type.hh>
#include <dune/grid/common/capabilities.hh>
#include <dune/grid/geometrygrid/cornerstorage.hh>
......@@ -38,14 +39,14 @@ namespace Dune
struct InferHasSingleGeometryType< hasSingleGeometryType, dim, 1 >
{
static const bool v = true;
static const unsigned int topologyId = GenericGeometry::CubeTopology< 1 >::type::id;
static const unsigned int topologyId = Impl::CubeTopology< 1 >::type::id;
};
template< class hasSingleGeometryType, int dim >
struct InferHasSingleGeometryType< hasSingleGeometryType, dim, 0 >
{
static const bool v = true;
static const unsigned int topologyId = GenericGeometry::CubeTopology< 0 >::type::id;
static const unsigned int topologyId = Impl::CubeTopology< 0 >::type::id;
};
......@@ -60,7 +61,7 @@ namespace Dune
typedef typename Traits::ctype ctype;
typedef GenericGeometry::MatrixHelper< GenericGeometry::DuneCoordTraits< ctype > > MatrixHelper;
typedef Impl::FieldMatrixHelper< ctype > MatrixHelper;
static ctype tolerance () { return 16 * std::numeric_limits< ctype >::epsilon(); }
......
......@@ -13,8 +13,8 @@
#include <dune/grid/common/grid.hh>
#include <dune/grid/common/gridfactory.hh>
#include <dune/geometry/genericgeometry/topologytypes.hh>
#include <dune/geometry/axisalignedcubegeometry.hh>
#include <dune/geometry/type.hh>
/** \file
* \brief The OneDGrid class
......@@ -419,7 +419,7 @@ namespace Dune {
struct hasSingleGeometryType< OneDGrid >
{
static const bool v = true;
static const unsigned int topologyId = GenericGeometry :: CubeTopology< 1 > :: type :: id ;
static const unsigned int topologyId = Impl::CubeTopology< 1 >::type::id;
};
......
......@@ -11,6 +11,7 @@
#include <set>
#include <dune/common/hybridutilities.hh>
#include <dune/common/std/type_traits.hh>
#include <dune/grid/common/grid.hh>
namespace Dune {
......
......@@ -25,8 +25,8 @@ typedef unsigned char uint8_t;
#include <dune/common/parallel/collectivecommunication.hh>
#include <dune/common/parallel/mpihelper.hh>
#include <dune/common/deprecated.hh>
#include <dune/geometry/genericgeometry/topologytypes.hh>
#include <dune/geometry/axisalignedcubegeometry.hh>
#include <dune/geometry/type.hh>
#include <dune/grid/common/indexidset.hh>
#include <dune/grid/common/datahandleif.hh>
......@@ -1804,7 +1804,7 @@ namespace Dune {
struct hasSingleGeometryType< YaspGrid<dim, Coordinates> >
{
static const bool v = true;
static const unsigned int topologyId = GenericGeometry :: CubeTopology< dim > :: type :: id ;
static const unsigned int topologyId = Impl::CubeTopology< dim >::type::id;
};
/** \brief YaspGrid is a Cartesian grid
......
Markdown is supported
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