OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

remove support for the legacy ALUGrid library provided by dune-grid

Browse Source 
now, the dune-alugrid module is required if these tests are to be
run. (note that due to the fact that the OPM build system has not been
detecting the legacy alugrid library for a while, the practical
implications of this patch should be small to non-existant.)
This commit is contained in:
Andreas Lauser
2016-05-04 13:19:52 +02:00
parent 1d38555f92
commit 4d37a50c83
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
examples/problems/fractureproblem.hh
View File

@@ -34,11 +34,8 @@
#define DISABLE_ALUGRID_SFC_ORDERING 1 #define DISABLE_ALUGRID_SFC_ORDERING 1
#include <dune/alugrid/grid.hh> #include <dune/alugrid/grid.hh>
#include <dune/alugrid/dgf.hh> #include <dune/alugrid/dgf.hh>
#elif HAVE_ALUGRID
#include <dune/grid/alugrid.hh>
#include <dune/grid/io/file/dgfparser/dgfalu.hh>
#else #else
#error "No ALUGrid found" #error "dune-alugrid not found!"
#endif #endif
#include <ewoms/models/discretefracture/discretefracturemodel.hh> #include <ewoms/models/discretefracture/discretefracturemodel.hh>

20
tests/models/test_quadrature.cpp
View File

@@ -33,9 +33,7 @@
#if HAVE_DUNE_ALUGRID #if HAVE_DUNE_ALUGRID
#include <dune/alugrid/grid.hh> #include <dune/alugrid/grid.hh>
#elif HAVE_ALUGRID #endif
#include <dune/grid/alugrid.hh>
#endif // HAVE_ALUGRID
#include <dune/common/version.hh> #include <dune/common/version.hh>
#include <dune/geometry/quadraturerules.hh> #include <dune/geometry/quadraturerules.hh>
@@ -105,7 +103,7 @@ void testIdenityMapping()
template <class Grid> template <class Grid>
void writeTetrahedronSubControlVolumes(const Grid &grid) void writeTetrahedronSubControlVolumes(const Grid &grid)
{ {
#if HAVE_DUNE_ALUGRID || HAVE_ALUGRID #if HAVE_DUNE_ALUGRID
typedef typename Grid::LeafGridView GridView; typedef typename Grid::LeafGridView GridView;
typedef Dune::ALUGrid<dim, dim, Dune::cube, Dune::nonconforming> Grid2; typedef Dune::ALUGrid<dim, dim, Dune::cube, Dune::nonconforming> Grid2;
@@ -154,12 +152,12 @@ void writeTetrahedronSubControlVolumes(const Grid &grid)
typedef Dune::VTKWriter<GridView2> VtkWriter; typedef Dune::VTKWriter<GridView2> VtkWriter;
VtkWriter writer(grid2.leafView(), Dune::VTK::conforming); VtkWriter writer(grid2.leafView(), Dune::VTK::conforming);
writer.write("tetrahedron-scvs", Dune::VTK::ascii); writer.write("tetrahedron-scvs", Dune::VTK::ascii);
#endif // HAVE_DUNE_ALUGRID || HAVE_ALUGRID #endif // HAVE_DUNE_ALUGRID
} }
void testTetrahedron() void testTetrahedron()
{ {
#if HAVE_DUNE_ALUGRID || HAVE_ALUGRID #if HAVE_DUNE_ALUGRID
typedef Dune::ALUGrid<dim, dim, Dune::simplex, Dune::nonconforming> Grid; typedef Dune::ALUGrid<dim, dim, Dune::simplex, Dune::nonconforming> Grid;
typedef Dune::GridFactory<Grid> GridFactory; typedef Dune::GridFactory<Grid> GridFactory;
GridFactory gf; GridFactory gf;
@@ -179,13 +177,13 @@ void testTetrahedron()
writeTetrahedronSubControlVolumes(*grid); writeTetrahedronSubControlVolumes(*grid);
delete grid; delete grid;
#endif // HAVE_DUNE_ALUGRID || HAVE_ALUGRID #endif // HAVE_DUNE_ALUGRID
} }
template <class Grid> template <class Grid>
void writeCubeSubControlVolumes(const Grid &grid) void writeCubeSubControlVolumes(const Grid &grid)
{ {
#if HAVE_DUNE_ALUGRID || HAVE_ALUGRID #if HAVE_DUNE_ALUGRID
typedef typename Grid::LeafGridView GridView; typedef typename Grid::LeafGridView GridView;
typedef Dune::ALUGrid<dim, dim, Dune::cube, Dune::nonconforming> Grid2; typedef Dune::ALUGrid<dim, dim, Dune::cube, Dune::nonconforming> Grid2;
@@ -233,12 +231,12 @@ void writeCubeSubControlVolumes(const Grid &grid)
typedef Dune::VTKWriter<GridView2> VtkWriter; typedef Dune::VTKWriter<GridView2> VtkWriter;
VtkWriter writer(grid2.leafView(), Dune::VTK::conforming); VtkWriter writer(grid2.leafView(), Dune::VTK::conforming);
writer.write("cube-scvs", Dune::VTK::ascii); writer.write("cube-scvs", Dune::VTK::ascii);
#endif // HAVE_DUNE_ALUGRID || HAVE_ALUGRID #endif // HAVE_DUNE_ALUGRID
} }
void testCube() void testCube()
{ {
#if HAVE_DUNE_ALUGRID || HAVE_ALUGRID #if HAVE_DUNE_ALUGRID
typedef Dune::ALUGrid<dim, dim, Dune::cube, Dune::nonconforming> Grid; typedef Dune::ALUGrid<dim, dim, Dune::cube, Dune::nonconforming> Grid;
typedef Dune::GridFactory<Grid> GridFactory; typedef Dune::GridFactory<Grid> GridFactory;
GridFactory gf; GridFactory gf;
@@ -265,7 +263,7 @@ void testCube()
writeCubeSubControlVolumes(*grid); writeCubeSubControlVolumes(*grid);
delete grid; delete grid;
#endif // HAVE_DUNE_ALUGRID || HAVE_ALUGRID #endif // HAVE_DUNE_ALUGRID
} }
void testQuadrature() void testQuadrature()