Commit b14b8b28 authored by Stenger, Florian's avatar Stenger, Florian
Browse files

Merge branch 'issue/remove_Warnings' into 'master'

remove warnings about deprecated functionality getRealImplementation()

See merge request iwr/dune-curvedsurfacegrid!2
parents 5297f82b 1de6281e
......@@ -59,7 +59,7 @@ namespace Dune
FieldVector<double, 3> operator()(const FieldVector<double, 3> &x) const{
crvsrf::Vertex hit_vertex;
crvsrf::Vertex v(x[0], x[1], x[2]);
double dist = backgrid->distance_to_surface_3d(v, hit_vertex);
backgrid->distance_to_surface_3d(v, hit_vertex);
return {hit_vertex[0], hit_vertex[1], hit_vertex[2]};
}
......
......@@ -139,7 +139,7 @@ namespace Dune
{}
EntityBase ( const Grid &grid, const EntitySeed &seed )
: hostEntity_( grid.hostGrid().entity( grid.getRealImplementation(seed).hostEntitySeed() ) )
: hostEntity_( grid.hostGrid().entity( seed.impl().hostEntitySeed() ) )
, grid_( &grid )
{}
......@@ -437,8 +437,8 @@ namespace Dune
{}
EntityBase ( const Grid &grid, const EntitySeed &seed )
: hostElement_( grid.hostGrid().entity( grid.getRealImplementation(seed).hostElementSeed() ) )
, subEntity_( grid.getRealImplementation(seed).subEntity() )
: hostElement_( grid.hostGrid().entity( seed.impl().hostElementSeed() ) )
, subEntity_( seed.impl().subEntity() )
, grid_( &grid )
{}
......
......@@ -585,9 +585,6 @@ namespace Dune
levelIndexSets_.resize( newNumLevels, nullptr );
}
using Base::getRealImplementation;
/** \brief obtain constant reference to the coordinate function */
const CoordFunction &coordFunction () const { return *coordFunction_; }
......@@ -601,7 +598,7 @@ namespace Dune
static const typename HostGrid::template Codim< codim >::Entity &
getHostEntity( const typename Codim< codim >::Entity &entity )
{
return getRealImplementation( entity ).hostEntity();
return entity.impl().hostEntity();
}
void *allocateStorage ( std::size_t size ) const
......
......@@ -190,13 +190,13 @@ namespace Dune
IntersectionIterator ibegin ( const typename Codim< 0 >::Entity &entity ) const
{
typedef crvsrf::IntersectionIterator< const Grid, typename HostGridView::IntersectionIterator > IntersectionIteratorImpl;
return IntersectionIteratorImpl( entity, hostGridView().ibegin( Grid::getRealImplementation( entity ).hostEntity() ) );
return IntersectionIteratorImpl( entity, hostGridView().ibegin( entity.impl().hostEntity() ) );
}
IntersectionIterator iend ( const typename Codim< 0 >::Entity &entity ) const
{
typedef crvsrf::IntersectionIterator< const Grid, typename HostGridView::IntersectionIterator > IntersectionIteratorImpl;
return IntersectionIteratorImpl( entity, hostGridView().iend( Grid::getRealImplementation( entity ).hostEntity() ) );
return IntersectionIteratorImpl( entity, hostGridView().iend( entity.impl().hostEntity() ) );
}
const CollectiveCommunication &comm () const
......
......@@ -49,7 +49,7 @@ namespace Dune
template< int codim >
IdType id ( const typename Traits::template Codim< codim >::Entity &entity ) const
{
return Grid::getRealImplementation( entity ).id( hostIdSet() );
return entity.impl().id( hostIdSet() );
}
template< class Entity >
......
......@@ -58,13 +58,13 @@ namespace Dune
template< int cc >
IndexType index ( const typename Traits::template Codim< cc >::Entity &entity ) const
{
return Grid::getRealImplementation( entity ).index( hostIndexSet() );
return entity.impl().index( hostIndexSet() );
}
template< int cc >
IndexType subIndex ( const typename Traits::template Codim< cc >::Entity &entity, int i, unsigned int codim ) const
{
return Grid::getRealImplementation( entity ).subIndex( hostIndexSet(), i, codim );
return entity.impl().subIndex( hostIndexSet(), i, codim );
}
IndexType size ( GeometryType type ) const
......@@ -80,7 +80,7 @@ namespace Dune
template< class Entity >
bool contains ( const Entity &entity ) const
{
return Grid::getRealImplementation( entity ).isContained( hostIndexSet() );
return entity.impl().isContained( hostIndexSet() );
}
Types types ( int codim ) const { return hostIndexSet().types( codim ); }
......
......@@ -34,7 +34,7 @@ namespace Dune
IntersectionIterator ( const Entity &inside,
const HostIntersectionIterator &hostIterator )
: hostIterator_( hostIterator )
, insideGeo_( Grid::getRealImplementation( inside.geometry() ) )
, insideGeo_( inside.geometry().impl() )
{}
IntersectionIterator ( const IntersectionIterator &other )
......
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