[Dune] [Dune-Commit] dune-grid r5540 - trunk/grid/albertagrid

[Martin Nolte]

Hi Christian,

what is the problem with the AlbertaGrid check? It works fine with me. Maybe 
your test directory is not up to date?

Martin

christi at dune-project.org wrote:
> Author: christi
> Date: 2009-09-28 15:00:50 +0200 (Mon, 28 Sep 2009)
> New Revision: 5540
> 
> Modified:
>    trunk/grid/albertagrid/indexsets.hh
> Log:
> remove deprecated subIndex<cc> and subId<cc> methods
> 
> hopefully this doesn't break again stuff, test do work for me (well
> alberta has some other failure in the checkTwist-tests)
> 
> 
> Modified: trunk/grid/albertagrid/indexsets.hh
> ===================================================================
> --- trunk/grid/albertagrid/indexsets.hh	2009-09-28 12:53:49 UTC (rev 5539)
> +++ trunk/grid/albertagrid/indexsets.hh	2009-09-28 13:00:50 UTC (rev 5540)
> @@ -43,9 +43,8 @@
>  
>    template< int dim, int dimworld >
>    class AlbertaGridHierarchicIndexSet
> -  : public IndexSetDefaultImplementation
> -    < AlbertaGrid< dim, dimworld >,
> -      AlbertaGridHierarchicIndexSet< dim,dimworld > >
> +  : public IndexSet < AlbertaGrid< dim, dimworld >,
> +                      AlbertaGridHierarchicIndexSet< dim,dimworld > >
>    {
>      typedef AlbertaGridHierarchicIndexSet< dim, dimworld > This;
>  
> @@ -78,6 +77,11 @@
>    public:
>      typedef Alberta::IndexStack IndexStack;
>  
> +    //! import default implementation of subIndex<cc>
> +    //! \todo remove after next release
> +    using IndexSet < AlbertaGrid< dim, dimworld >,
> +                     AlbertaGridHierarchicIndexSet< dim,dimworld > > :: subIndex;
> +
>      //! return true if entity is contained in set
>      template< class Entity >
>      bool contains ( const Entity & ) const
> @@ -111,16 +115,6 @@
>        return subIndex( entityImp.elementInfo().el(), codim, j );
>      }
>  
> -    //! return subIndex of given enitiy's sub entity
> -    template< int codim >
> -    int DUNE_DEPRECATED subIndex ( const typename Traits::template Codim< 0 >::Entity &entity, int i ) const
> -    {
> -      const AlbertaGridEntity< 0, dim, const Grid > &entityImp
> -        = Grid::getRealImplementation( entity );
> -      const int j = entityImp.grid().dune2alberta( codim, i );
> -      return subIndex( entityImp.elementInfo().el(), codim, j );
> -    }
> -
>      //! return size of set for given GeometryType 
>      int size ( GeometryType type ) const
>      {
> @@ -486,15 +480,6 @@
>        return subIndex( entityImp.elementInfo().el(), codim, j );
>      }
>  
> -    template< int codim >
> -    int subIndex ( const typename Traits::template Codim< 0 >::Entity &entity, int i ) const
> -    {
> -      const AlbertaGridEntity< 0, dim, const Grid > &entityImp
> -        = Grid::getRealImplementation( entity );
> -      const int j = entityImp.grid().dune2alberta( codim, i );
> -      return subIndex( entityImp.elementInfo().el(), codim, j );
> -    }
> -
>      int size ( GeometryType type ) const
>      {
>        return (type.isSimplex() ? size( dimension - type.dim() ) : 0);
> @@ -636,15 +621,6 @@
>        return (index << 2) | IdType( codim );
>      }
>  
> -    /** \copydoc IdSet::subId(const typename remove_const<GridImp>::type::Traits::template Codim<0>::Entity &e,int i) const */
> -    template< int codim >
> -    IdType subId ( const typename Grid::template Codim< 0 >::Entity &e, int i ) const
> -    {
> -      assert( (codim >= 0) && (codim <= dimension) );
> -      const IdType index = hIndexSet_.template subIndex< codim >( e, i );
> -      return (index << 2) | IdType( codim );
> -    }
> -
>      /** \copydoc IdSet::subId(const typename remove_const<GridImp>::type::Traits::template Codim<0>::Entity &e,int i,unsigned int codim) const */
>      IdType subId ( const typename Grid::template Codim< 0 >::Entity &e,
>                     int i, int codim ) const
> 
> 
> _______________________________________________
> Dune-Commit mailing list
> Dune-Commit at dune-project.org
> http://lists.dune-project.org/mailman/listinfo/dune-commit

-- 
Martin Nolte <nolte at mathematik.uni-freiburg.de>

Universität Freiburg                                   phone: +49-761-203-5642
Abteilung für angewandte Mathematik                    fax:   +49-761-203-5632
Hermann-Herder-Straße 10
79104 Freiburg, Germany