diff --git a/grid/uggrid.hh b/grid/uggrid.hh index ab655e455b4ba7591799067fe08bd6660447d176..409ba9049c78db9971a7c03134a364a01349ce15 100644 --- a/grid/uggrid.hh +++ b/grid/uggrid.hh @@ -230,13 +230,6 @@ namespace Dune { return 0; } - -#ifdef UGGRID_WITH_INDEX_SETS - int global_size (int codim) const DUNE_DEPRECATED { return hierarchicIndexSet().size(maxlevel(),codim); } -#else - int global_size (int codim) const DUNE_DEPRECATED { return size(maxlevel(),codim); } -#endif - /** \brief Mark entity for refinement * * This only works for entities of codim 0. @@ -247,12 +240,7 @@ namespace Dune { * <li> false, if nothing changed </li> * </ul> */ - bool mark(int refCount, typename Traits::template codim<0>::EntityPointer & e ) { - return mark(refCount, *e); - } - - /** \brief Tempory for Robert */ - bool mark(int refCount, typename Traits::template codim<0>::Entity& e ); + bool mark(int refCount, typename Traits::template codim<0>::EntityPointer & e ); /** \brief Mark method accepting a UG refinement rule */ diff --git a/grid/uggrid/uggrid.cc b/grid/uggrid/uggrid.cc index ddf92e5030fa75025de664d9cb4e4c99bd8b4c00..89fda3a55e4f327f95f0d8418a21b74e1a8fe4fc 100644 --- a/grid/uggrid/uggrid.cc +++ b/grid/uggrid/uggrid.cc @@ -401,17 +401,14 @@ void Dune::UGGrid < dim, dimworld >::makeNewUGMultigrid() } template < int dim, int dimworld > -// bool Dune::UGGrid < dim, dimworld >::mark(int refCount, -// typename Traits::template codim<0>::EntityPointer & e ) bool Dune::UGGrid < dim, dimworld >::mark(int refCount, - typename Traits::template codim<0>::Entity& e ) + typename Traits::template codim<0>::EntityPointer & e ) { // No refinement requested if (refCount==0) return false; - //typename TargetType<0,dim>::T* target = getRealEntity<0>(*e).target_; - typename TargetType<0,dim>::T* target = getRealEntity<0>(e).target_; + typename TargetType<0,dim>::T* target = getRealEntity<0>(*e).target_; // Check whether element can be marked for refinement if (!EstimateHere(target))