Skip to content
Snippets Groups Projects
Commit 61b54d55 authored by René Fritze's avatar René Fritze
Browse files

Revert remaining dune-alugrid usages 

This reverts commit b6adad23.
This reverts commit a9cdfeee.
This reverts commit a9bc2b1b.
parent 14755032
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 66 additions and 66 deletions
dune.module
+ 1
− 1
View file @ 61b54d55
......@@ -10,5 +10,5 @@
Module: dune-gdt
Version: 0.2-dev
Maintainer: felix.schindler@wwu.de
Depends: dune-common (>= 2.4) dune-stuff (>= 2.2) dune-grid
Depends: dune-common (>= 2.4) dune-stuff (>= 2.2)dune-grid
Suggests: dune-fem (>= 1.3) dune-pdelab dune-grid-multiscale dune-alugrid
dune/gdt/test/grids.hh
+ 4
− 4
View file @ 61b54d55
......@@ -11,8 +11,8 @@
#include <dune/grid/sgrid.hh>
#include <dune/grid/yaspgrid.hh>
#if HAVE_DUNE_ALUGRID
#include <dune/alugrid/dgf.hh>
#if HAVE_ALUGRID
#include <dune/grid/alugrid.hh>
#endif
#include <dune/gdt/spaces/tools.hh>
......@@ -45,7 +45,7 @@ YASPGRID_TYPES(2)
YASPGRID_TYPES(3)
#undef YASPGRID_TYPES
#if HAVE_DUNE_ALUGRID
#if HAVE_ALUGRID
typedef Dune::ALUGrid<2, 2, Dune::simplex, Dune::conforming> AluConform2dGridType;
typedef
......@@ -95,6 +95,6 @@ typedef typename Dune::GDT::SpaceTools::LevelGridPartView<AluCube3dGridType, fal
typedef typename Dune::GDT::SpaceTools::LeafGridPartView<AluCube3dGridType, true>::Type AluCube3dLeafGridViewType;
typedef typename Dune::GDT::SpaceTools::LevelGridPartView<AluCube3dGridType, true>::Type AluCube3dLevelGridViewType;
#endif // HAVE_DUNE_ALUGRID
#endif // HAVE_ALUGRID
#endif // DUNE_GDT_TEST_GRIDS_HH
dune/gdt/test/linearelliptic/cg-testcases.hh
+ 5
− 5
View file @ 61b54d55
......@@ -9,7 +9,7 @@
#define DUNE_GDT_TEST_LINEARELLIPTIC_CG_TESTCASES_HH
#include <dune/grid/sgrid.hh>
#include <dune/alugrid/dgf.hh>
#include <dune/grid/alugrid.hh>
#include <dune/stuff/test/gtest/gtest.h>
......@@ -25,7 +25,7 @@ typedef testing::Types<Dune::GDT::LinearElliptic::AO2013TestCase<Dune::SGrid<2,
SGridTestCases;
#if HAVE_DUNE_ALUGRID
#if HAVE_ALUGRID
typedef testing::
......@@ -42,7 +42,7 @@ typedef testing::
AluGridTestCases;
#endif // HAVE_DUNE_ALUGRID
#endif // HAVE_ALUGRID
namespace Dune {
......@@ -68,7 +68,7 @@ extern template class LinearEllipticEocExpectations<LinearElliptic::Spe10Model1T
LinearElliptic::ChooseDiscretizer::cg, 1>;
#if HAVE_DUNE_ALUGRID
#if HAVE_ALUGRID
// ALUGrid< 2, 2, simplex, conforming >
......@@ -124,7 +124,7 @@ extern template class LinearEllipticEocExpectations<LinearElliptic::Spe10Model1T
LinearElliptic::ChooseDiscretizer::cg, 1>;
#endif // HAVE_DUNE_ALUGRID
#endif // HAVE_ALUGRID
} // namespace Test
} // namespace GDT
......
dune/gdt/test/linearelliptic/eocexpectations/cg-ao2013-2dalugrid.cxx
+ 3
− 3
View file @ 61b54d55
......@@ -7,9 +7,9 @@
#include "config.h"
#if HAVE_DUNE_ALUGRID
#if HAVE_ALUGRID
#include <dune/alugrid/dgf.hh>
#include <dune/grid/alugrid.hh>
#include "../problems/AO2013.hh"
#include "../eocexpectations.hh"
......@@ -94,4 +94,4 @@ template class LinearEllipticEocExpectations<LinearElliptic::AO2013TestCase<ALUG
} // namespace GDT
} // namespace Dune
#endif // HAVE_DUNE_ALUGRID
#endif // HAVE_ALUGRID
dune/gdt/test/linearelliptic/eocexpectations/cg-er2007-2dalugrid.cxx
+ 3
− 3
View file @ 61b54d55
......@@ -7,9 +7,9 @@
#include "config.h"
#if HAVE_DUNE_ALUGRID
#if HAVE_ALUGRID
#include <dune/alugrid/dgf.hh>
#include <dune/grid/alugrid.hh>
#include "../problems/ER2007.hh"
#include "../eocexpectations.hh"
......@@ -73,4 +73,4 @@ template class LinearEllipticEocExpectations<LinearElliptic::ER2007TestCase<ALUG
} // namespace GDT
} // namespace Dune
#endif // HAVE_DUNE_ALUGRID
#endif // HAVE_ALUGRID
dune/gdt/test/linearelliptic/eocexpectations/cg-esv2007-2dalugrid.cxx
+ 3
− 3
View file @ 61b54d55
......@@ -7,9 +7,9 @@
#include "config.h"
#if HAVE_DUNE_ALUGRID
#if HAVE_ALUGRID
#include <dune/alugrid/dgf.hh>
#include <dune/grid/alugrid.hh>
#include "../problems/ESV2007.hh"
#include "../eocexpectations.hh"
......@@ -73,4 +73,4 @@ template class LinearEllipticEocExpectations<LinearElliptic::ESV2007TestCase<ALU
} // namespace GDT
} // namespace Dune
#endif // HAVE_DUNE_ALUGRID
#endif // HAVE_ALUGRID
dune/gdt/test/linearelliptic/eocexpectations/cg-mixedboundary-2dalugrid.cxx
+ 3
− 3
View file @ 61b54d55
......@@ -7,9 +7,9 @@
#include "config.h"
#if HAVE_DUNE_ALUGRID
#if HAVE_ALUGRID
#include <dune/alugrid/dgf.hh>
#include <dune/grid/alugrid.hh>
#include "../problems/mixedboundary.hh"
#include "../eocexpectations.hh"
......@@ -88,4 +88,4 @@ template class LinearEllipticEocExpectations<LinearElliptic::MixedBoundaryTestCa
} // namespace GDT
} // namespace Dune
#endif // HAVE_DUNE_ALUGRID
#endif // HAVE_ALUGRID
dune/gdt/test/linearelliptic/eocexpectations/cg-spe10-2dalugrid.cxx
+ 3
− 3
View file @ 61b54d55
......@@ -7,9 +7,9 @@
#include "config.h"
#if HAVE_DUNE_ALUGRID
#if HAVE_ALUGRID
#include <dune/alugrid/dgf.hh>
#include <dune/grid/alugrid.hh>
#include "../problems/spe10.hh"
#include "../eocexpectations.hh"
......@@ -78,4 +78,4 @@ template class LinearEllipticEocExpectations<LinearElliptic::Spe10Model1TestCase
} // namespace GDT
} // namespace Dune
#endif // HAVE_DUNE_ALUGRID
#endif // HAVE_ALUGRID
dune/gdt/test/linearelliptic/eocexpectations/swipdg-ao2013-2dalugrid.cxx
+ 3
− 3
View file @ 61b54d55
......@@ -7,9 +7,9 @@
#include "config.h"
#if HAVE_DUNE_ALUGRID
#if HAVE_ALUGRID
#include <dune/alugrid/dgf.hh>
#include <dune/grid/alugrid.hh>
#include "../problems/AO2013.hh"
#include "../eocexpectations.hh"
......@@ -169,4 +169,4 @@ template class LinearEllipticEocExpectations<LinearElliptic::AO2013TestCase<ALUG
} // namespace GDT
} // namespace Dune
#endif // HAVE_DUNE_ALUGRID
#endif // HAVE_ALUGRID
dune/gdt/test/linearelliptic/eocexpectations/swipdg-er2007-2dalugrid.cxx
+ 3
− 3
View file @ 61b54d55
......@@ -7,9 +7,9 @@
#include "config.h"
#if HAVE_DUNE_ALUGRID
#if HAVE_ALUGRID
#include <dune/alugrid/dgf.hh>
#include <dune/grid/alugrid.hh>
#include "../problems/ER2007.hh"
#include "../eocexpectations.hh"
......@@ -126,4 +126,4 @@ template class LinearEllipticEocExpectations<LinearElliptic::ER2007TestCase<ALUG
} // namespace GDT
} // namespace Dune
#endif // HAVE_DUNE_ALUGRID
#endif // HAVE_ALUGRID
dune/gdt/test/linearelliptic/eocexpectations/swipdg-esv2007-2dalugrid.cxx
+ 3
− 3
View file @ 61b54d55
......@@ -7,9 +7,9 @@
#include "config.h"
#if HAVE_DUNE_ALUGRID
#if HAVE_ALUGRID
#include <dune/alugrid/dgf.hh>
#include <dune/grid/alugrid.hh>
#include "../problems/ESV2007.hh"
#include "../eocexpectations.hh"
......@@ -126,4 +126,4 @@ template class LinearEllipticEocExpectations<LinearElliptic::ESV2007TestCase<ALU
} // namespace GDT
} // namespace Dune
#endif // HAVE_DUNE_ALUGRID
#endif // HAVE_ALUGRID
dune/gdt/test/linearelliptic/eocexpectations/swipdg-mixedboundary-2dalugrid.cxx
+ 3
− 3
View file @ 61b54d55
......@@ -7,9 +7,9 @@
#include "config.h"
#if HAVE_DUNE_ALUGRID
#if HAVE_ALUGRID
#include <dune/alugrid/dgf.hh>
#include <dune/grid/alugrid.hh>
#include "../problems/mixedboundary.hh"
#include "../eocexpectations.hh"
......@@ -156,4 +156,4 @@ template class LinearEllipticEocExpectations<LinearElliptic::MixedBoundaryTestCa
} // namespace GDT
} // namespace Dune
#endif // HAVE_DUNE_ALUGRID
#endif // HAVE_ALUGRID
dune/gdt/test/linearelliptic/eocexpectations/swipdg-spe10-2dalugrid.cxx
+ 3
− 3
View file @ 61b54d55
......@@ -7,9 +7,9 @@
#include "config.h"
#if HAVE_DUNE_ALUGRID
#if HAVE_ALUGRID
#include <dune/alugrid/dgf.hh>
#include <dune/grid/alugrid.hh>
#include "../problems/spe10.hh"
#include "../eocexpectations.hh"
......@@ -136,4 +136,4 @@ template class LinearEllipticEocExpectations<LinearElliptic::Spe10Model1TestCase
} // namespace GDT
} // namespace Dune
#endif // HAVE_DUNE_ALUGRID
#endif // HAVE_ALUGRID
dune/gdt/test/linearelliptic/problems/AO2013.hh
+ 4
− 4
View file @ 61b54d55
......@@ -8,8 +8,8 @@
#ifndef DUNE_GDT_TESTS_LINEARELLIPTIC_PROBLEMS_AO2013_HH
#define DUNE_GDT_TESTS_LINEARELLIPTIC_PROBLEMS_AO2013_HH
#if HAVE_DUNE_ALUGRID
#include <dune/alugrid/dgf.hh>
#if HAVE_ALUGRID
#include <dune/grid/alugrid.hh>
#endif
#include <dune/grid/sgrid.hh>
......@@ -109,7 +109,7 @@ private:
}
};
#if HAVE_DUNE_ALUGRID
#if HAVE_ALUGRID
template <bool anything>
struct Helper<ALUGrid<2, 2, simplex, conforming>, anything>
{
......@@ -130,7 +130,7 @@ private:
return cfg;
}
};
#endif // HAVE_DUNE_ALUGRID
#endif // HAVE_ALUGRID
static Stuff::Common::Configuration grid_cfg()
{
......
dune/gdt/test/linearelliptic/problems/ER2007.hh
+ 4
− 4
View file @ 61b54d55
......@@ -8,8 +8,8 @@
#ifndef DUNE_GDT_TESTS_LINEARELLIPTIC_PROBLEMS_ER2007_HH
#define DUNE_GDT_TESTS_LINEARELLIPTIC_PROBLEMS_ER2007_HH
#if HAVE_DUNE_ALUGRID
#include <dune/alugrid/dgf.hh>
#if HAVE_ALUGRID
#include <dune/grid/alugrid.hh>
#endif
#include <dune/grid/sgrid.hh>
......@@ -111,7 +111,7 @@ private:
}
};
#if HAVE_DUNE_ALUGRID
#if HAVE_ALUGRID
template <bool anything>
struct Helper<ALUGrid<2, 2, simplex, conforming>, anything>
{
......@@ -132,7 +132,7 @@ private:
return cfg;
}
};
#endif // HAVE_DUNE_ALUGRID
#endif // HAVE_ALUGRID
static Stuff::Common::Configuration grid_cfg()
{
......
dune/gdt/test/linearelliptic/problems/ESV2007.hh
+ 4
− 4
View file @ 61b54d55
......@@ -8,8 +8,8 @@
#ifndef DUNE_GDT_TESTS_LINEARELLIPTIC_PROBLEMS_ESV2007_HH
#define DUNE_GDT_TESTS_LINEARELLIPTIC_PROBLEMS_ESV2007_HH
#if HAVE_DUNE_ALUGRID
#include <dune/alugrid/dgf.hh>
#if HAVE_ALUGRID
#include <dune/grid/alugrid.hh>
#endif
#include <dune/grid/sgrid.hh>
......@@ -109,7 +109,7 @@ private:
}
};
#if HAVE_DUNE_ALUGRID
#if HAVE_ALUGRID
template <bool anything>
struct Helper<ALUGrid<2, 2, simplex, conforming>, anything>
{
......@@ -130,7 +130,7 @@ private:
return cfg;
}
};
#endif // HAVE_DUNE_ALUGRID
#endif // HAVE_ALUGRID
static Stuff::Common::Configuration grid_cfg()
{
......
dune/gdt/test/linearelliptic/problems/mixedboundary.hh
+ 4
− 4
View file @ 61b54d55
......@@ -8,8 +8,8 @@
#ifndef DUNE_GDT_TESTS_LINEARELLIPTIC_PROBLEMS_MIXEDBOUNDARY_HH
#define DUNE_GDT_TESTS_LINEARELLIPTIC_PROBLEMS_MIXEDBOUNDARY_HH
#if HAVE_DUNE_ALUGRID
#include <dune/alugrid/dgf.hh>
#if HAVE_ALUGRID
#include <dune/grid/alugrid.hh>
#endif
#include <dune/grid/sgrid.hh>
......@@ -112,7 +112,7 @@ private:
}
};
#if HAVE_DUNE_ALUGRID
#if HAVE_ALUGRID
template <bool anything>
struct Helper<ALUGrid<2, 2, simplex, conforming>, anything>
{
......@@ -133,7 +133,7 @@ private:
return cfg;
}
};
#endif // HAVE_DUNE_ALUGRID
#endif // HAVE_ALUGRID
static Stuff::Common::Configuration grid_cfg()
{
......
dune/gdt/test/linearelliptic/problems/spe10.hh
+ 4
− 4
View file @ 61b54d55
......@@ -9,8 +9,8 @@
#ifndef DUNE_GDT_TESTS_LINEARELLIPTIC_PROBLEMS_SPE10_HH
#define DUNE_GDT_TESTS_LINEARELLIPTIC_PROBLEMS_SPE10_HH
#if HAVE_DUNE_ALUGRID
#include <dune/alugrid/dgf.hh>
#if HAVE_ALUGRID
#include <dune/grid/alugrid.hh>
#endif
#include <dune/grid/sgrid.hh>
......@@ -115,7 +115,7 @@ private:
}
};
#if HAVE_DUNE_ALUGRID
#if HAVE_ALUGRID
template <bool anything>
struct Helper<ALUGrid<2, 2, simplex, conforming>, anything>
{
......@@ -136,7 +136,7 @@ private:
return cfg;
}
};
#endif // HAVE_DUNE_ALUGRID
#endif // HAVE_ALUGRID
static Stuff::Common::Configuration grid_cfg()
{
......
dune/gdt/test/linearelliptic/swipdg-estimator-expectations/ao2013-2dalugrid.cxx
+ 3
− 3
View file @ 61b54d55
......@@ -7,9 +7,9 @@
#include "config.h"
#if HAVE_DUNE_ALUGRID
#if HAVE_ALUGRID
#include <dune/alugrid/dgf.hh>
#include <dune/grid/alugrid.hh>
#include "../problems/AO2013.hh"
#include "../swipdg-estimator-expectations.hh"
......@@ -65,4 +65,4 @@ template class LinearEllipticSwipdgEstimatorExpectations<LinearElliptic::AO2013T
} // namespace GDT
} // namespace Dune
#endif // HAVE_DUNE_ALUGRID
#endif // HAVE_ALUGRID
dune/gdt/test/linearelliptic/swipdg-estimator-expectations/esv2007-2dalugrid.cxx
+ 3
− 3
View file @ 61b54d55
......@@ -7,9 +7,9 @@
#include "config.h"
#if HAVE_DUNE_ALUGRID
#if HAVE_ALUGRID
#include <dune/alugrid/dgf.hh>
#include <dune/grid/alugrid.hh>
#include "../problems/ESV2007.hh"
#include "../swipdg-estimator-expectations.hh"
......@@ -66,4 +66,4 @@ template class LinearEllipticSwipdgEstimatorExpectations<LinearElliptic::ESV2007
} // namespace GDT
} // namespace Dune
#endif // HAVE_DUNE_ALUGRID
#endif // HAVE_ALUGRID
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment