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

[Martin Nolte]

In my opinion, it does not make a difference to always have all grid dimensions
in the lib. You get the warning when trying to compile your program, anyway. And
I'd consider it more work to additionally recompile my lib (it is taking longer
every day).

Martin

Christian Engwer wrote:
> On Fri, Dec 11, 2009 at 07:41:11PM +0100, mnolte at dune-project.org wrote:
>> Author: mnolte
>> Date: 2009-12-11 19:41:11 +0100 (Fri, 11 Dec 2009)
>> New Revision: 6068
>>
>> Modified:
>>    trunk/dune/grid/albertagrid/dgfparser.cc
>> Log:
>> also compile surface grid support into the lib for ALBERTA 2.0
>>
>> Surface grids are fully supported in ALBERTA 2.0. The problem is just that the
>> grid is required to be oriented. As the errors caused by an unoriented grid are
>> quite hard to trace, we decided to disable this support by default.
> 
> OK, I see. The error message indicated that I wouldn't work at
> all. Thus I avoided compilation all together.
> 
> If you say it does work, I'd just suggest to use the same 
> "#if DUNE_ALBERTA_VERSION < 0x300 && ! DUNE_ALBERTA_SURFACE_GRID"
> conditional to switch between with and without surface support.
> 
> Christian
> 
>>
>> Modified: trunk/dune/grid/albertagrid/dgfparser.cc
>> ===================================================================
>> --- trunk/dune/grid/albertagrid/dgfparser.cc	2009-12-11 18:39:24 UTC (rev 6067)
>> +++ trunk/dune/grid/albertagrid/dgfparser.cc	2009-12-11 18:41:11 UTC (rev 6068)
>> @@ -1,8 +1,11 @@
>>  #include <config.h>
>>  
>> +// compile surface grid support into the lib even for ALBERTA 2.0
>> +#define DUNE_ALBERTA_SURFACE_GRID 1
>> +
>>  #include <dune/grid/albertagrid/dgfparser.hh>
>>  
>> -#if HAVE_ALBERTA 
>> +#if HAVE_ALBERTA
>>  
>>  namespace Dune
>>  {
>> @@ -127,9 +130,6 @@
>>    // Instantiation
>>    // -------------
>>  
>> -#if DUNE_ALBERTA_VERSION < 0x300
>> -  template struct DGFGridFactory< AlbertaGrid< Alberta::dimWorld, Alberta::dimWorld > >;
>> -#else
>>    template struct DGFGridFactory< AlbertaGrid< 1, Alberta::dimWorld > >;
>>  #if ALBERTA_DIM >= 2
>>    template struct DGFGridFactory< AlbertaGrid< 2, Alberta::dimWorld > >;
>> @@ -137,7 +137,6 @@
>>  #if ALBERTA_DIM >= 3
>>    template struct DGFGridFactory< AlbertaGrid< 3, Alberta::dimWorld > >;
>>  #endif // #if ALBERTA_DIM >= 3
>> -#endif
>>  
>>  }
>>  
>>
>>
>> _______________________________________________
>> Dune-Commit mailing list
>> Dune-Commit at dune-project.org
>> http://lists.dune-project.org/mailman/listinfo/dune-commit
>>
> 
> _______________________________________________
> Dune mailing list
> Dune at dune-project.org
> http://lists.dune-project.org/mailman/listinfo/dune

-- 
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