OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-24 18:20:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

test_quadrature: remove support for dune < 2.6

Browse Source
This commit is contained in:
Arne Morten Kvarving 2022-11-14 16:35:42 +01:00
parent c906b55a64
commit a7249bee65
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/models/test_quadrature.cpp
View File

@ -123,11 +123,7 @@ void writeTetrahedronSubControlVolumes([[maybe_unused]] const Grid& grid)
using Stencil = Opm::VcfvStencil<Scalar, GridView>; using Stencil = Opm::VcfvStencil<Scalar, GridView>;
using Mapper = typename Stencil :: Mapper; using Mapper = typename Stencil :: Mapper;
#if DUNE_VERSION_NEWER(DUNE_GRID, 2,6)
Mapper mapper(gridView, Dune::mcmgVertexLayout()); Mapper mapper(gridView, Dune::mcmgVertexLayout());
#else
Mapper mapper(gridView);
#endif
Stencil stencil(gridView, mapper); Stencil stencil(gridView, mapper);
auto eIt = gridView.template begin<0>(); auto eIt = gridView.template begin<0>();
@ -207,13 +203,8 @@ void writeCubeSubControlVolumes([[maybe_unused]] const Grid& grid)
GridFactory2 gf2; GridFactory2 gf2;
const auto &gridView = grid.leafView(); const auto &gridView = grid.leafView();
#if DUNE_VERSION_NEWER(DUNE_GRID, 2,6)
using VertexMapper = Dune::MultipleCodimMultipleGeomTypeMapper<GridView>; using VertexMapper = Dune::MultipleCodimMultipleGeomTypeMapper<GridView>;
VertexMapper vertexMapper(gridView, Dune::mcmgVertexLayout()); VertexMapper vertexMapper(gridView, Dune::mcmgVertexLayout());
#else
using VertexMapper = Dune::MultipleCodimMultipleGeomTypeMapper<GridView, Dune::MCMGVertexLayout>;
VertexMapper vertexMapper(gridView);
#endif
Stencil stencil(gridView, vertexMapper); Stencil stencil(gridView, vertexMapper);
auto eIt = gridView.template begin<0>(); auto eIt = gridView.template begin<0>();
const auto &eEndIt = gridView.template end<0>(); const auto &eEndIt = gridView.template end<0>();
@ -309,11 +300,7 @@ void testQuadrature()
using Stencil = Opm::VcfvStencil<Scalar, GridView>; using Stencil = Opm::VcfvStencil<Scalar, GridView>;
using Mapper = typename Stencil :: Mapper; using Mapper = typename Stencil :: Mapper;
#if DUNE_VERSION_NEWER(DUNE_GRID, 2,6)
Mapper mapper(gridView, Dune::mcmgVertexLayout()); Mapper mapper(gridView, Dune::mcmgVertexLayout());
#else
Mapper mapper(gridView);
#endif
Stencil stencil(gridView, mapper); Stencil stencil(gridView, mapper);
for (; eIt != eEndIt; ++eIt) { for (; eIt != eEndIt; ++eIt) {
const auto &elemGeom = eIt->geometry(); const auto &elemGeom = eIt->geometry();