[Dune-devel] [Dune-Commit] [Commit] dune-grid - 6041288: use new gridfactory based hybrid testgrid in ug's grid test

[Martin Nolte]

Hi Oli,

while I agree that the code does not belong into the doc directory, I am a bit 
suprised. After all, it was your suggestion to move the code into into 
'doc/grid/gridfactory' (see FS#1474). I also understood Christian's reply from 
yesterday in this direction.

Personally, I would like to have this file in 'dune/grid/test' (also in the 
installed tree), so it can be safely used in the tests.

How shall we proceed? Do we need a vote on this?

Best,

Martin

On 10/14/2015 02:00 PM, Oliver Sander wrote:
> Hi Tobias,
> thanks for these patches.  For the UG tests, I actually planned to use the gmsh
> versions of the test grids (in doc/grids/gmsh).  As mentioned, having C++ code
> in doc/grids/gridfactory is problematic, because it is outside of our standard include paths.
> One should therefore only use it if really necessary.  For the UGGrid tests this
> is not the case.
> Best,
> Oliver
>
> Am 14.10.2015 um 13:53 schrieb Tobias Malkmus:
>> New commit, appeared at Wed Oct 14 13:53:42 2015 +0200
>> as part of the following ref changes:
>>
>>      branch refs/heads/feature/FS1474-add-insertionindex-check    updated from 7d9f17f -> 5719810
>>
>> Browsable version: http://cgit.dune-project.org/repositories/dune-grid/commit/?id=604128817ed45c01ec18ff6b125a6169bca35e38
>>
>> ======================================================================
>>
>> commit 604128817ed45c01ec18ff6b125a6169bca35e38
>> Author: Tobias Malkmus <tomalk at mathematik.uni-freiburg.de>
>> Date:   Wed Oct 14 12:22:25 2015 +0200
>>
>>      use new gridfactory based hybrid testgrid in ug's grid test
>>
>>      Patch 9e74640b6b25604d7d61993e7be02a137ae790c0 and this one replaces the usage of the
>>      file doc/grid/gridfactory/hybridtestgrids.hh
>>      It can be marked as deprecated.
>>
>>   dune/grid/test/test-ug.cc | 11 ++++++++---
>>   1 file changed, 8 insertions(+), 3 deletions(-)
>>
>>
>>
>> diff --git a/dune/grid/test/test-ug.cc b/dune/grid/test/test-ug.cc
>> index d6a7603..ffee21c 100644
>> --- a/dune/grid/test/test-ug.cc
>> +++ b/dune/grid/test/test-ug.cc
>> @@ -12,7 +12,7 @@
>>    */
>>
>>   #include <dune/grid/uggrid.hh>
>> -#include <doc/grids/gridfactory/hybridtestgrids.hh>
>> +#include <doc/grids/gridfactory/testgrids.hh>
>>
>>   #include "gridcheck.hh"
>>   #include "checkcommunicate.hh"
>> @@ -168,8 +168,13 @@ void generalTests(bool greenClosure)
>>     //   Make some grids for testing
>>     // //////////////////////////////////////////////////////////
>>
>> -  std::unique_ptr<Dune::UGGrid<2> > grid2d(make2DHybridTestGrid<Dune::UGGrid<2> >());
>> -  std::unique_ptr<Dune::UGGrid<3> > grid3d(make3DHybridTestGrid<Dune::UGGrid<3> >());
>> +  Dune::GridFactory< Dune::UGGrid<2> > factory2d;
>> +  Dune::TestGrids::hybrid2d.addToGridFactory( factory2d );
>> +  std::unique_ptr<Dune::UGGrid<2> > grid2d( factory2d.createGrid() );
>> +
>> +  Dune::GridFactory< Dune::UGGrid<3> > factory3d;
>> +  Dune::TestGrids::hybrid3d.addToGridFactory( factory3d );
>> +  std::unique_ptr<Dune::UGGrid<3> > grid3d( factory3d.createGrid() );
>>
>>     // Switch of the green closure, if requested
>>     if (!greenClosure) {
>>
>> _______________________________________________
>> Dune-Commit mailing list
>> Dune-Commit at dune-project.org
>> http://lists.dune-project.org/mailman/listinfo/dune-commit
>>
>
>
> _______________________________________________
> Dune-devel mailing list
> Dune-devel at dune-project.org
> http://lists.dune-project.org/mailman/listinfo/dune-devel
>

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