[Dune-devel] [Dune-Commit] dune-geometry r386 - trunk/dune/geometry

[Martin Nolte]

Hi Oli,

as far as I know, the method 'mapping' was never part of the actual interface 
but is an implementation detail of the generic reference implementation (it was 
only introduced to implement the method 'global'). In that sense, I would 
consider testing for it an interface change.

Best,

Martin

On 02/17/2013 09:38 PM, sander at dune-project.org wrote:
> Author: sander
> Date: 2013-02-17 21:38:35 +0100 (Sun, 17 Feb 2013)
> New Revision: 386
>
> Modified:
>     trunk/dune/geometry/referenceelements.hh
> Log:
> Revert accidental interface change
>
> In Martin's branch, the geometry (type + method) is called 'Geometry'.
> On the trunk it's called 'Mapping'.  I accidentally backported the
> name change, but since the name is part of the interface, it needs
> to remain 'mapping', unless popular vote decides otherwise.
>
> Modified: trunk/dune/geometry/referenceelements.hh
> ===================================================================
> --- trunk/dune/geometry/referenceelements.hh	2013-02-17 20:38:33 UTC (rev 385)
> +++ trunk/dune/geometry/referenceelements.hh	2013-02-17 20:38:35 UTC (rev 386)
> @@ -71,7 +71,7 @@
>       struct Codim
>       {
>         //! type of mapping embedding a subentity into the reference element
> -      typedef AffineGeometry< ctype, dim-codim, dim > Geometry;
> +      typedef AffineGeometry< ctype, dim-codim, dim > Mapping;
>       };
>
>       /** \brief number of subentities of codimension c
> @@ -254,7 +254,7 @@
>        *  \param[in]  i      number of subentity E (0 <= i < size( codim ))
>        */
>       template< int codim >
> -    const typename Codim< codim >::Geometry &mapping( int i ) const
> +    const typename Codim< codim >::Mapping &mapping( int i ) const
>       {
>         integral_constant< int, codim > codimVariable;
>         return geometries_[ codimVariable ][ i ];
> @@ -339,7 +339,7 @@
>       /** \brief Stores all subentities of a given codimension */
>       template< int codim >
>       struct GeometryArray
> -    : public std::vector< typename Codim< codim >::Geometry >
> +    : public std::vector< typename Codim< codim >::Mapping >
>       {};
>
>       /** \brief Type to store all subentities of all codimensions */
> @@ -463,7 +463,7 @@
>         geometries[ codimVariable ].reserve( size );
>         for( int i = 0; i < size; ++i )
>         {
> -        typename Codim< codim >::Geometry geometry( subRefElement( refElement, i, codimVariable ), origins[ i ], jacobianTransposeds[ i ] );
> +        typename Codim< codim >::Mapping geometry( subRefElement( refElement, i, codimVariable ), origins[ i ], jacobianTransposeds[ i ] );
>           geometries[ codimVariable ].push_back( geometry );
>         }
>       }
>
>
> _______________________________________________
> Dune-Commit mailing list
> Dune-Commit at dune-project.org
> http://lists.dune-project.org/mailman/listinfo/dune-commit
>

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

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