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

bump minimum dune version to 2.9

Browse Source
This commit is contained in:
Arne Morten Kvarving
2024-08-02 11:28:22 +02:00
parent e10cc5b937
commit 73c45c7282
18 changed files with 53 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/test_RestartSerialization.cpp
View File

@@ -272,17 +272,10 @@ BOOST_AUTO_TEST_CASE(FlowGenericProblemFem)
Opm::EclipseState eclState;
Opm::Schedule schedule;
Dune::CpGrid grid;
#if DUNE_VERSION_GTE(DUNE_FEM, 2, 9)
using GridPart = Dune::Fem::AdaptiveLeafGridPart<Dune::CpGrid, Dune::PartitionIteratorType(4), false>;
using GridView = GridPart::GridViewType;
auto gridPart = GridPart(grid);
auto gridView = gridPart.gridView();
#else
using GridPart = Dune::Fem::AdaptiveLeafGridPart<Dune::CpGrid, Dune::PartitionIteratorType(4), false>;
using GridView = Dune::GridView<Dune::Fem::GridPart2GridViewTraits<GridPart>>;
auto gridPart = GridPart(grid);
auto gridView = GridView(static_cast<GridView>(gridPart));
#endif
auto data_out
= Opm::FlowGenericProblem<GridView, Opm::BlackOilFluidSystem<double, Opm::BlackOilDefaultIndexTraits>>::
serializationTestObject(eclState, schedule, gridView);
@@ -475,17 +468,10 @@ BOOST_AUTO_TEST_CASE(FlowGenericTracerModelFem)
Opm::EclipseState eclState;
Dune::CartesianIndexMapper<Dune::CpGrid> mapper(grid);
auto centroids = [](int) { return std::array<double,Dune::CpGrid::dimensionworld>{}; };
#if DUNE_VERSION_GTE(DUNE_FEM, 2, 9)
using GridPart = Dune::Fem::AdaptiveLeafGridPart<Dune::CpGrid, Dune::PartitionIteratorType(4), false>;
using GridView = GridPart::GridViewType;
auto gridPart = GridPart(grid);
auto gridView = gridPart.gridView();
#else
using GridPart = Dune::Fem::AdaptiveLeafGridPart<Dune::CpGrid, Dune::PartitionIteratorType(4), false>;
using GridView = Dune::GridView<Dune::Fem::GridPart2GridViewTraits<GridPart>>;
auto gridPart = GridPart(grid);
auto gridView = GridView(static_cast<GridView>(gridPart));
#endif
Dune::MultipleCodimMultipleGeomTypeMapper<GridView> dofMapper(gridView, Dune::mcmgElementLayout());
auto data_out = GenericTracerModelTest<Dune::CpGrid,
GridView,

4
tests/test_milu.cpp
View File

@@ -89,11 +89,7 @@ void test_milu0(M& A)
// Test that (LU)^-1Ae=e
A.mv(e, x1);
#if DUNE_VERSION_GTE(DUNE_ISTL, 2, 8)
Dune::ILU::blockILUBacksolve(ILU, x2, x1);
#else
bilu_backsolve(ILU, x2, x1);
#endif
diff = x2;
diff -= e;