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

[Martin Nolte]

Hi Oli,

the variable was already gone from my branch (without removing the 
assertions). So, unfortunately, there will not be any memory gain, here.

Best,

Martin

On 08/03/2012 04:02 PM, sander at dune-project.org wrote:
> Author: sander
> Date: 2012-08-03 16:02:55 +0200 (Fri, 03 Aug 2012)
> New Revision: 158
>
> Modified:
>     trunk/dune/geometry/genericreferenceelements.hh
>     trunk/dune/geometry/referenceelements.hh
> Log:
> Remove unused variable 'codim_' from SubEntityInfo
>
> If I understand the code correctly, this may alleviate
> Martin's memory consumptions woes in 8D a little(!) bit.
>
> Modified: trunk/dune/geometry/genericreferenceelements.hh
> ===================================================================
> --- trunk/dune/geometry/genericreferenceelements.hh	2012-08-03 14:02:54 UTC (rev 157)
> +++ trunk/dune/geometry/genericreferenceelements.hh	2012-08-03 14:02:55 UTC (rev 158)
> @@ -373,7 +373,6 @@
>         template<  int subcodim>  struct SubCodim;
>       };
>
> -    int codim_;
>       std::vector<  int>  numbering_[ dim+1 ];
>       FieldVector<  ctype, dim>  baryCenter_;
>       GeometryType type_;
> @@ -381,13 +380,13 @@
>     public:
>       int size ( int cc ) const
>       {
> -      assert( (cc>= codim_)&&  (cc<= dim) );
> +      assert( cc<= dim );
>         return numbering_[ cc ].size();
>       }
>
>       int number ( int ii, int cc ) const
>       {
> -      assert( (cc>= codim_)&&  (cc<= dim) );
> +      assert( cc<= dim );
>         return numbering_[ cc ][ ii ];
>       }
>
> @@ -407,8 +406,6 @@
>         typedef Initialize<  Topology, codim>  Init;
>         typedef GenericGeometry::ReferenceDomain<  Topology>  RefDomain;
>
> -      codim_ = codim;
> -
>         const unsigned int iVariable = i;
>         Dune::ForLoop<  Init::template SubCodim, 0, dim-codim>::apply( iVariable, numbering_ );
>
>
> Modified: trunk/dune/geometry/referenceelements.hh
> ===================================================================
> --- trunk/dune/geometry/referenceelements.hh	2012-08-03 14:02:54 UTC (rev 157)
> +++ trunk/dune/geometry/referenceelements.hh	2012-08-03 14:02:55 UTC (rev 158)
> @@ -371,7 +371,6 @@
>         template<  int subcodim>  struct SubCodim;
>       };
>
> -    int codim_;
>       std::vector<  int>  numbering_[ dim+1 ];
>       FieldVector<  ctype, dim>  baryCenter_;
>       GeometryType type_;
> @@ -379,13 +378,13 @@
>     public:
>       int size ( int cc ) const
>       {
> -      assert( (cc>= codim_)&&  (cc<= dim) );
> +      assert( cc<= dim );
>         return numbering_[ cc ].size();
>       }
>
>       int number ( int ii, int cc ) const
>       {
> -      assert( (cc>= codim_)&&  (cc<= dim) );
> +      assert( cc<= dim );
>         return numbering_[ cc ][ ii ];
>       }
>
> @@ -405,8 +404,6 @@
>         typedef Initialize<  Topology, codim>  Init;
>         typedef GenericGeometry::ReferenceDomain<  Topology>  RefDomain;
>
> -      codim_ = codim;
> -
>         const unsigned int iVariable = i;
>         Dune::ForLoop<  Init::template SubCodim, 0, dim-codim>::apply( iVariable, numbering_ );
>
>
>
> _______________________________________________
> 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