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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dune.module
View File

@ -10,4 +10,4 @@ Label: 2025.04-pre
Maintainer: atgeirr@sintef.no Maintainer: atgeirr@sintef.no
MaintainerName: Atgeirr F. Rasmussen MaintainerName: Atgeirr F. Rasmussen
Url: http://opm-project.org Url: http://opm-project.org
Depends: dune-istl (>= 2.7) opm-common opm-grid Depends: dune-istl (>= 2.9) opm-common opm-grid

16
opm/simulators/flow/CollectDataOnIORank.cpp
View File

@ -29,9 +29,6 @@
#if HAVE_DUNE_FEM #if HAVE_DUNE_FEM
#include <dune/common/version.hh> #include <dune/common/version.hh>
#include <dune/fem/gridpart/adaptiveleafgridpart.hh> #include <dune/fem/gridpart/adaptiveleafgridpart.hh>
#if !DUNE_VERSION_GTE(DUNE_FEM, 2, 9)
#include <dune/fem/gridpart/common/gridpart2gridview.hh>
#endif
#include <opm/simulators/flow/FemCpGridCompat.hpp> #include <opm/simulators/flow/FemCpGridCompat.hpp>
#endif // HAVE_DUNE_FEM #endif // HAVE_DUNE_FEM
@ -42,25 +39,12 @@ template class CollectDataOnIORank<Dune::CpGrid,
Dune::GridView<Dune::DefaultLeafGridViewTraits<Dune::CpGrid>>>; Dune::GridView<Dune::DefaultLeafGridViewTraits<Dune::CpGrid>>>;
#if HAVE_DUNE_FEM #if HAVE_DUNE_FEM
#if DUNE_VERSION_GTE(DUNE_FEM, 2, 9)
using GV = Dune::Fem::AdaptiveLeafGridPart<Dune::CpGrid, using GV = Dune::Fem::AdaptiveLeafGridPart<Dune::CpGrid,
(Dune::PartitionIteratorType)4, (Dune::PartitionIteratorType)4,
false>; false>;
template class CollectDataOnIORank<Dune::CpGrid, template class CollectDataOnIORank<Dune::CpGrid,
Dune::CpGrid, Dune::CpGrid,
GV>; GV>;
#else
template class CollectDataOnIORank<Dune::CpGrid,
Dune::CpGrid,
Dune::GridView<Dune::Fem::GridPart2GridViewTraits<Dune::Fem::AdaptiveLeafGridPart<Dune::CpGrid, Dune::PartitionIteratorType(4), false>>>>;
template class CollectDataOnIORank<Dune::CpGrid,
Dune::CpGrid,
Dune::Fem::GridPart2GridViewImpl<
Dune::Fem::AdaptiveLeafGridPart<
Dune::CpGrid,
Dune::PartitionIteratorType(4),
false> > >;
#endif
#endif // HAVE_DUNE_FEM #endif // HAVE_DUNE_FEM
} // end namespace Opm } // end namespace Opm

54
opm/simulators/flow/EclGenericWriter.cpp
View File

@ -32,9 +32,6 @@
#if HAVE_DUNE_FEM #if HAVE_DUNE_FEM
#include <dune/common/version.hh> #include <dune/common/version.hh>
#include <dune/fem/gridpart/adaptiveleafgridpart.hh> #include <dune/fem/gridpart/adaptiveleafgridpart.hh>
#if !DUNE_VERSION_GTE(DUNE_FEM, 2, 9)
#include <dune/fem/gridpart/common/gridpart2gridview.hh>
#endif
#include <opm/simulators/flow/FemCpGridCompat.hpp> #include <opm/simulators/flow/FemCpGridCompat.hpp>
#endif // HAVE_DUNE_FEM #endif // HAVE_DUNE_FEM
@ -57,51 +54,20 @@ INSTANTIATE_TYPE(float)
#endif #endif
#if HAVE_DUNE_FEM #if HAVE_DUNE_FEM
#if DUNE_VERSION_GTE(DUNE_FEM, 2, 9)
using GV = Dune::Fem::AdaptiveLeafGridPart<Dune::CpGrid, using GV = Dune::Fem::AdaptiveLeafGridPart<Dune::CpGrid,
(Dune::PartitionIteratorType)4, (Dune::PartitionIteratorType)4,
false>; false>;
#define INSTANTIATE_FEM_TYPE(T) \ template class EclGenericWriter<Dune::CpGrid,
template class EclGenericWriter<Dune::CpGrid, \ Dune::CpGrid,
Dune::CpGrid, \ GV,
GV, \ Dune::MultipleCodimMultipleGeomTypeMapper<GV>,
Dune::MultipleCodimMultipleGeomTypeMapper<GV>, \ double>;
T>;
#else
#define INSTANTIATE_FEM_TYPE(T) \
template class EclGenericWriter<Dune::CpGrid, \
Dune::CpGrid, \
Dune::GridView<Dune::Fem::GridPart2GridViewTraits< \
Dune::Fem::AdaptiveLeafGridPart< \
Dune::CpGrid, \
Dune::PartitionIteratorType(4), false>>>, \
Dune::MultipleCodimMultipleGeomTypeMapper< \
Dune::GridView< \
Dune::Fem::GridPart2GridViewTraits< \
Dune::Fem::AdaptiveLeafGridPart< \
Dune::CpGrid, \
Dune::PartitionIteratorType(4), false>>>>, \
T>; \
template class EclGenericWriter<Dune::CpGrid, \
Dune::CpGrid, \
Dune::Fem::GridPart2GridViewImpl< \
Dune::Fem::AdaptiveLeafGridPart< \
Dune::CpGrid, \
Dune::PartitionIteratorType(4), \
false>>, \
Dune::MultipleCodimMultipleGeomTypeMapper< \
Dune::Fem::GridPart2GridViewImpl< \
Dune::Fem::AdaptiveLeafGridPart< \
Dune::CpGrid, \
Dune::PartitionIteratorType(4), \
false>>>, \
T>;
#endif
INSTANTIATE_FEM_TYPE(double)
#if FLOW_INSTANTIATE_FLOAT #if FLOW_INSTANTIATE_FLOAT
INSTANTIATE_FEM_TYPE(float) template class EclGenericWriter<Dune::CpGrid,
Dune::CpGrid,
GV,
Dune::MultipleCodimMultipleGeomTypeMapper<GV>,
float>;
#endif #endif
#endif // HAVE_DUNE_FEM #endif // HAVE_DUNE_FEM

3
opm/simulators/flow/FemCpGridCompat.hpp
View File

@ -34,9 +34,6 @@
#if HAVE_DUNE_FEM #if HAVE_DUNE_FEM
#include <dune/common/version.hh> #include <dune/common/version.hh>
#include <dune/fem/gridpart/common/gridpart.hh> #include <dune/fem/gridpart/common/gridpart.hh>
#if !DUNE_VERSION_GTE(DUNE_FEM, 2, 9)
#include <dune/fem/misc/compatibility.hh>
#endif
#include <dune/fem/io/streams/streams.hh> #include <dune/fem/io/streams/streams.hh>
namespace Dune { namespace Dune {

30
opm/simulators/flow/FlowGenericProblem.cpp
View File

@ -35,9 +35,6 @@
#if HAVE_DUNE_FEM #if HAVE_DUNE_FEM
#include <dune/common/version.hh> #include <dune/common/version.hh>
#include <dune/fem/gridpart/adaptiveleafgridpart.hh> #include <dune/fem/gridpart/adaptiveleafgridpart.hh>
#if !DUNE_VERSION_GTE(DUNE_FEM, 2, 9)
#include <dune/fem/gridpart/common/gridpart2gridview.hh>
#endif
#include <opm/simulators/flow/FemCpGridCompat.hpp> #include <opm/simulators/flow/FemCpGridCompat.hpp>
#endif // HAVE_DUNE_FEM #endif // HAVE_DUNE_FEM
@ -56,33 +53,14 @@ INSTANTIATE_TYPE(float)
#endif #endif
#if HAVE_DUNE_FEM #if HAVE_DUNE_FEM
#if DUNE_VERSION_GTE(DUNE_FEM, 2, 9)
using GV = Dune::Fem::AdaptiveLeafGridPart<Dune::CpGrid, using GV = Dune::Fem::AdaptiveLeafGridPart<Dune::CpGrid,
(Dune::PartitionIteratorType)4, (Dune::PartitionIteratorType)4,
false>; false>;
#define INSTANTIATE_FEM_TYPE(T) \ template class FlowGenericProblem<GV,
template class FlowGenericProblem<GV, \ BlackOilFluidSystem<double, BlackOilDefaultIndexTraits>>;
BlackOilFluidSystem<T, BlackOilDefaultIndexTraits>>;
#else
#define INSTANTIATE_FEM_TYPE(T) \
template class FlowGenericProblem<Dune::GridView< \
Dune::Fem::GridPart2GridViewTraits< \
Dune::Fem::AdaptiveLeafGridPart< \
Dune::CpGrid, \
Dune::PartitionIteratorType(4), false>>>, \
BlackOilFluidSystem<T,BlackOilDefaultIndexTraits>>; \
template class FlowGenericProblem<Dune::Fem::GridPart2GridViewImpl< \
Dune::Fem::AdaptiveLeafGridPart< \
Dune::CpGrid, \
Dune::PartitionIteratorType(4), \
false> >, \
BlackOilFluidSystem<T,BlackOilDefaultIndexTraits>>;
#endif
INSTANTIATE_FEM_TYPE(double)
#if FLOW_INSTANTIATE_FLOAT #if FLOW_INSTANTIATE_FLOAT
INSTANTIATE_FEM_TYPE(float) template class FlowGenericProblem<GV,
BlackOilFluidSystem<float, BlackOilDefaultIndexTraits>>;
#endif #endif
#endif // HAVE_DUNE_FEM #endif // HAVE_DUNE_FEM

48
opm/simulators/flow/GenericCpGridVanguard.cpp
View File

@ -49,9 +49,6 @@
#if HAVE_DUNE_FEM #if HAVE_DUNE_FEM
#include <dune/fem/gridpart/adaptiveleafgridpart.hh> #include <dune/fem/gridpart/adaptiveleafgridpart.hh>
#if !DUNE_VERSION_GTE(DUNE_FEM, 2, 9)
#include <dune/fem/gridpart/common/gridpart2gridview.hh>
#endif
#include <opm/simulators/flow/FemCpGridCompat.hpp> #include <opm/simulators/flow/FemCpGridCompat.hpp>
#endif //HAVE_DUNE_FEM #endif //HAVE_DUNE_FEM
@ -677,49 +674,16 @@ INSTANTIATE_TYPE(float)
#endif #endif
#if HAVE_DUNE_FEM #if HAVE_DUNE_FEM
#if DUNE_VERSION_GTE(DUNE_FEM, 2, 9)
using GV = Dune::Fem::AdaptiveLeafGridPart<Dune::CpGrid, using GV = Dune::Fem::AdaptiveLeafGridPart<Dune::CpGrid,
(Dune::PartitionIteratorType)4, (Dune::PartitionIteratorType)4,
false>; false>;
#define INSTANTIATE_FEM_TYPE(T) \ template class GenericCpGridVanguard<Dune::MultipleCodimMultipleGeomTypeMapper<GV>,
template class GenericCpGridVanguard<Dune::MultipleCodimMultipleGeomTypeMapper<GV>, \ GV,
GV, \ double>;
T>;
#else
#define INSTANTIATE_FEM_TYPE(T) \
template class GenericCpGridVanguard< \
Dune::MultipleCodimMultipleGeomTypeMapper< \
Dune::GridView< \
Dune::Fem::GridPart2GridViewTraits< \
Dune::Fem::AdaptiveLeafGridPart< \
Dune::CpGrid, \
Dune::PartitionIteratorType(4), \
false>>>>, \
Dune::GridView< \
Dune::Fem::GridPart2GridViewTraits< \
Dune::Fem::AdaptiveLeafGridPart< \
Dune::CpGrid, \
Dune::PartitionIteratorType(4), \
false>>>, \
T>; \
template class GenericCpGridVanguard< \
Dune::MultipleCodimMultipleGeomTypeMapper< \
Dune::Fem::GridPart2GridViewImpl< \
Dune::Fem::AdaptiveLeafGridPart< \
Dune::CpGrid, \
Dune::PartitionIteratorType(4), \
false>>>, \
Dune::Fem::GridPart2GridViewImpl< \
Dune::Fem::AdaptiveLeafGridPart< \
Dune::CpGrid, \
Dune::PartitionIteratorType(4), \
false> >, \
T>;
#endif
INSTANTIATE_FEM_TYPE(double)
#if FLOW_INSTANTIATE_FLOAT #if FLOW_INSTANTIATE_FLOAT
INSTANTIATE_FEM_TYPE(float) template class GenericCpGridVanguard<Dune::MultipleCodimMultipleGeomTypeMapper<GV>,
GV,
float>;
#endif #endif
#endif // HAVE_DUNE_FEM #endif // HAVE_DUNE_FEM

48
opm/simulators/flow/GenericThresholdPressure.cpp
View File

@ -30,9 +30,6 @@
#if HAVE_DUNE_FEM #if HAVE_DUNE_FEM
#include <dune/common/version.hh> #include <dune/common/version.hh>
#include <dune/fem/gridpart/adaptiveleafgridpart.hh> #include <dune/fem/gridpart/adaptiveleafgridpart.hh>
#if !DUNE_VERSION_GTE(DUNE_FEM, 2, 9)
#include <dune/fem/gridpart/common/gridpart2gridview.hh>
#endif
#include <opm/simulators/flow/FemCpGridCompat.hpp> #include <opm/simulators/flow/FemCpGridCompat.hpp>
#endif // HAVE_DUNE_FEM #endif // HAVE_DUNE_FEM
@ -54,48 +51,19 @@ INSTANTIATE_TYPE(float)
#endif #endif
#if HAVE_DUNE_FEM #if HAVE_DUNE_FEM
#if DUNE_VERSION_GTE(DUNE_FEM, 2, 9)
using GV = Dune::Fem::AdaptiveLeafGridPart<Dune::CpGrid, using GV = Dune::Fem::AdaptiveLeafGridPart<Dune::CpGrid,
(Dune::PartitionIteratorType)4, (Dune::PartitionIteratorType)4,
false>; false>;
#define INSTANTIATE_FEM_TYPE(T) \
template class GenericThresholdPressure<Dune::CpGrid, \
GV, \
Dune::MultipleCodimMultipleGeomTypeMapper<GV>, \
T>;
#else
#define INSTANTIATE_FEM_TYPE(T) \
template class GenericThresholdPressure<Dune::CpGrid, \
Dune::GridView< \
Dune::Fem::GridPart2GridViewTraits< \
Dune::Fem::AdaptiveLeafGridPart< \
Dune::CpGrid, \
Dune::PartitionIteratorType(4), false>>>, \
Dune::MultipleCodimMultipleGeomTypeMapper< \
Dune::GridView<Dune::Fem::GridPart2GridViewTraits< \
Dune::Fem::AdaptiveLeafGridPart< \
Dune::CpGrid, \
Dune::PartitionIteratorType(4), false>>>>, \
T>; \
template class GenericThresholdPressure<Dune::CpGrid, \
Dune::Fem::GridPart2GridViewImpl< \
Dune::Fem::AdaptiveLeafGridPart< \
Dune::CpGrid, \
Dune::PartitionIteratorType(4), \
false> >, \
Dune::MultipleCodimMultipleGeomTypeMapper< \
Dune::Fem::GridPart2GridViewImpl< \
Dune::Fem::AdaptiveLeafGridPart< \
Dune::CpGrid, \
Dune::PartitionIteratorType(4), \
false>>>, \
T>;
#endif
INSTANTIATE_FEM_TYPE(double)
template class GenericThresholdPressure<Dune::CpGrid,
GV,
Dune::MultipleCodimMultipleGeomTypeMapper<GV>,
double>;
#if FLOW_INSTANTIATE_FLOAT #if FLOW_INSTANTIATE_FLOAT
INSTANTIATE_FEM_TYPE(float) template class GenericThresholdPressure<Dune::CpGrid,
GV,
Dune::MultipleCodimMultipleGeomTypeMapper<GV>,
float>;
#endif #endif
#endif // HAVE_DUNE_FEM #endif // HAVE_DUNE_FEM

66
opm/simulators/flow/GenericTracerModel.cpp
View File

@ -29,9 +29,6 @@
#if HAVE_DUNE_FEM #if HAVE_DUNE_FEM
#include <dune/common/version.hh> #include <dune/common/version.hh>
#include <dune/fem/gridpart/adaptiveleafgridpart.hh> #include <dune/fem/gridpart/adaptiveleafgridpart.hh>
#if !DUNE_VERSION_GTE(DUNE_FEM, 2, 9)
#include <dune/fem/gridpart/common/gridpart2gridview.hh>
#endif
#include <opm/simulators/flow/FemCpGridCompat.hpp> #include <opm/simulators/flow/FemCpGridCompat.hpp>
#endif // HAVE_DUNE_FEM #endif // HAVE_DUNE_FEM
@ -57,63 +54,24 @@ INSTANTIATE_TYPE(float)
#endif #endif
#if HAVE_DUNE_FEM #if HAVE_DUNE_FEM
#if DUNE_VERSION_GTE(DUNE_FEM, 2, 9)
using GV = Dune::Fem::AdaptiveLeafGridPart<Dune::CpGrid, using GV = Dune::Fem::AdaptiveLeafGridPart<Dune::CpGrid,
(Dune::PartitionIteratorType)4, (Dune::PartitionIteratorType)4,
false>; false>;
#define INSTANTIATE_FEM_TYPE(T) \
template class GenericTracerModel<Dune::CpGrid, \
GV, \
Dune::MultipleCodimMultipleGeomTypeMapper<GV>, \
EcfvStencil<T, GV, false, false>, \
BlackOilFluidSystem<T,BlackOilDefaultIndexTraits>, \
T>;
#else
#define INSTANTIATE_FEM_TYPE(T) \
template class GenericTracerModel<Dune::CpGrid, \
Dune::GridView< \
Dune::Fem::GridPart2GridViewTraits< \
Dune::Fem::AdaptiveLeafGridPart< \
Dune::CpGrid, \
Dune::PartitionIteratorType(4), false>>>, \
Dune::MultipleCodimMultipleGeomTypeMapper< \
Dune::GridView< \
Dune::Fem::GridPart2GridViewTraits< \
Dune::Fem::AdaptiveLeafGridPart< \
Dune::CpGrid, \
Dune::PartitionIteratorType(4), false>>>>, \
EcfvStencil<T,Dune::GridView< \
Dune::Fem::GridPart2GridViewTraits< \
Dune::Fem::AdaptiveLeafGridPart< \
Dune::CpGrid, \
Dune::PartitionIteratorType(4), \
false>>>, \
false,false>, \
BlackOilFluidSystem<T,BlackOilDefaultIndexTraits>, \
T>; \
template class GenericTracerModel<Dune::CpGrid, \
Dune::Fem::GridPart2GridViewImpl< \
Dune::Fem::AdaptiveLeafGridPart< \
Dune::CpGrid, \
(Dune::PartitionIteratorType)4, false> >, \
Dune::MultipleCodimMultipleGeomTypeMapper< \
Dune::Fem::GridPart2GridViewImpl< \
Dune::Fem::AdaptiveLeafGridPart< \
Dune::CpGrid, \
Dune::PartitionIteratorType(4), false> > >, \
EcfvStencil<T, Dune::Fem::GridPart2GridViewImpl< \
Dune::Fem::AdaptiveLeafGridPart< \
Dune::CpGrid, \
Dune::PartitionIteratorType(4), false>>,\
false, false>, \
BlackOilFluidSystem<T,BlackOilDefaultIndexTraits>, \
T>;
#endif
INSTANTIATE_FEM_TYPE(double) template class GenericTracerModel<Dune::CpGrid,
GV,
Dune::MultipleCodimMultipleGeomTypeMapper<GV>,
EcfvStencil<double, GV, false, false>,
BlackOilFluidSystem<double,BlackOilDefaultIndexTraits>,
double>;
#if FLOW_INSTANTIATE_FLOAT #if FLOW_INSTANTIATE_FLOAT
INSTANTIATE_FEM_TYPE(float) template class GenericTracerModel<Dune::CpGrid,
GV,
Dune::MultipleCodimMultipleGeomTypeMapper<GV>,
EcfvStencil<float, GV, false, false>,
BlackOilFluidSystem<float,BlackOilDefaultIndexTraits>,
float>;
#endif #endif
#endif // HAVE_DUNE_FEM #endif // HAVE_DUNE_FEM

54
opm/simulators/flow/Transmissibility.cpp
View File

@ -30,9 +30,6 @@
#if HAVE_DUNE_FEM #if HAVE_DUNE_FEM
#include <dune/common/version.hh> #include <dune/common/version.hh>
#include <dune/fem/gridpart/adaptiveleafgridpart.hh> #include <dune/fem/gridpart/adaptiveleafgridpart.hh>
#if !DUNE_VERSION_GTE(DUNE_FEM, 2, 9)
#include <dune/fem/gridpart/common/gridpart2gridview.hh>
#endif
#include <opm/simulators/flow/FemCpGridCompat.hpp> #include <opm/simulators/flow/FemCpGridCompat.hpp>
#endif #endif
@ -55,52 +52,21 @@ INSTANTIATE_TYPE(float)
#endif #endif
#ifdef HAVE_DUNE_FEM #ifdef HAVE_DUNE_FEM
#if DUNE_VERSION_GTE(DUNE_FEM, 2, 9)
using GV = Dune::Fem::AdaptiveLeafGridPart<Dune::CpGrid, using GV = Dune::Fem::AdaptiveLeafGridPart<Dune::CpGrid,
(Dune::PartitionIteratorType)4, (Dune::PartitionIteratorType)4,
false>; false>;
#define INSTANTIATE_FEM_TYPE(T) \ template class Transmissibility<Dune::CpGrid,
template class Transmissibility<Dune::CpGrid, \ GV,
GV, \ Dune::MultipleCodimMultipleGeomTypeMapper<GV>,
Dune::MultipleCodimMultipleGeomTypeMapper<GV>, \ Dune::CartesianIndexMapper<Dune::CpGrid>,
Dune::CartesianIndexMapper<Dune::CpGrid>, \ double>;
T>;
#else
#define INSTANTIATE_FEM_TYPE(T) \
template class Transmissibility<Dune::CpGrid, \
Dune::GridView< \
Dune::Fem::GridPart2GridViewTraits< \
Dune::Fem::AdaptiveLeafGridPart< \
Dune::CpGrid, \
Dune::PartitionIteratorType(4), false>>>, \
Dune::MultipleCodimMultipleGeomTypeMapper< \
Dune::GridView< \
Dune::Fem::GridPart2GridViewTraits< \
Dune::Fem::AdaptiveLeafGridPart< \
Dune::CpGrid, \
Dune::PartitionIteratorType(4), false>>>>, \
Dune::CartesianIndexMapper<Dune::CpGrid>, \
T>; \
template class Transmissibility<Dune::CpGrid, \
Dune::Fem::GridPart2GridViewImpl< \
Dune::Fem::AdaptiveLeafGridPart< \
Dune::CpGrid, \
Dune::PartitionIteratorType(4), \
false> >, \
Dune::MultipleCodimMultipleGeomTypeMapper< \
Dune::Fem::GridPart2GridViewImpl< \
Dune::Fem::AdaptiveLeafGridPart< \
Dune::CpGrid, \
Dune::PartitionIteratorType(4), \
false> > >, \
Dune::CartesianIndexMapper<Dune::CpGrid>, \
T>;
#endif
INSTANTIATE_FEM_TYPE(double)
#if FLOW_INSTANTIATE_FLOAT #if FLOW_INSTANTIATE_FLOAT
INSTANTIATE_FEM_TYPE(float) template class Transmissibility<Dune::CpGrid,
GV,
Dune::MultipleCodimMultipleGeomTypeMapper<GV>,
Dune::CartesianIndexMapper<Dune::CpGrid>,
float>;
#endif #endif
#endif // HAVE_DUNE_FEM #endif // HAVE_DUNE_FEM

11
opm/simulators/flow/equil/InitStateEquil.cpp
View File

@ -29,9 +29,6 @@
#if HAVE_DUNE_FEM #if HAVE_DUNE_FEM
#include <dune/common/version.hh> #include <dune/common/version.hh>
#include <dune/fem/gridpart/adaptiveleafgridpart.hh> #include <dune/fem/gridpart/adaptiveleafgridpart.hh>
#if !DUNE_VERSION_GTE(DUNE_FEM, 2, 9)
#include <dune/fem/gridpart/common/gridpart2gridview.hh>
#endif
#include <opm/simulators/flow/FemCpGridCompat.hpp> #include <opm/simulators/flow/FemCpGridCompat.hpp>
#endif #endif
@ -72,17 +69,9 @@ INSTANTIATE_COMP(float, GridView, Mapper)
#endif #endif
#if HAVE_DUNE_FEM #if HAVE_DUNE_FEM
#if DUNE_VERSION_GTE(DUNE_FEM, 2, 9)
using GridViewFem = Dune::Fem::AdaptiveLeafGridPart<Dune::CpGrid, using GridViewFem = Dune::Fem::AdaptiveLeafGridPart<Dune::CpGrid,
(Dune::PartitionIteratorType)4, (Dune::PartitionIteratorType)4,
false>; false>;
#else
using GridViewFem = Dune::Fem::GridPart2GridViewImpl<
Dune::Fem::AdaptiveLeafGridPart<
Dune::CpGrid,
Dune::PartitionIteratorType(4),
false>>;
#endif
using MapperFem = Dune::MultipleCodimMultipleGeomTypeMapper<GridViewFem>; using MapperFem = Dune::MultipleCodimMultipleGeomTypeMapper<GridViewFem>;
INSTANTIATE_COMP(double, GridViewFem, MapperFem) INSTANTIATE_COMP(double, GridViewFem, MapperFem)

12
opm/simulators/linalg/ExtraSmoothers.hpp
View File

@ -17,22 +17,12 @@ namespace Amg
struct ConstructionTraits<MultithreadDILU<M, X, Y>> { struct ConstructionTraits<MultithreadDILU<M, X, Y>> {
using Arguments = DefaultConstructionArgs<MultithreadDILU<M, X, Y>>; using Arguments = DefaultConstructionArgs<MultithreadDILU<M, X, Y>>;
#if DUNE_VERSION_NEWER(DUNE_ISTL, 2, 7)
static inline std::shared_ptr<MultithreadDILU<M, X, Y>> construct(Arguments& args) { static inline std::shared_ptr<MultithreadDILU<M, X, Y>> construct(Arguments& args) {
return std::make_shared<MultithreadDILU<M, X, Y>>(args.getMatrix()); return std::make_shared<MultithreadDILU<M, X, Y>>(args.getMatrix());
} }
#else
static inline MultithreadDILU<M, X, Y>* construct(Arguments& args) {
return new MultithreadDILU<M, X, Y>(args.getMatrix());
}
static void deconstruct(MultithreadDILU<M, X, Y>* dilu) {
delete dilu;
}
#endif
}; };
} // namespace Amg } // namespace Amg
} // namespace Dune } // namespace Dune
#endif // OPM_EXTRASMOOTHERS_HPP #endif // OPM_EXTRASMOOTHERS_HPP

4
opm/simulators/linalg/MILU.cpp
View File

@ -246,11 +246,7 @@ void milun_decomposition(const M& A, int n, MILU_VARIANT milu, M& ILU,
isPositiveFunctor<typename M::field_type>); isPositiveFunctor<typename M::field_type>);
break; break;
default: default:
#if DUNE_VERSION_LT(DUNE_GRID, 2, 8)
bilu0_decomposition( ILU );
#else
Dune::ILU::blockILU0Decomposition( ILU ); Dune::ILU::blockILU0Decomposition( ILU );
#endif
break; break;
} }
} }

4
opm/simulators/linalg/ParallelOverlappingILU0_impl.hpp
View File

@ -511,11 +511,7 @@ update()
break; break;
default: default:
if (interiorSize_ == A_->N()) if (interiorSize_ == A_->N())
#if DUNE_VERSION_LT(DUNE_GRID, 2, 8)
bilu0_decomposition( *ILU_ );
#else
Dune::ILU::blockILU0Decomposition( *ILU_ ); Dune::ILU::blockILU0Decomposition( *ILU_ );
#endif
else else
detail::ghost_last_bilu0_decomposition(*ILU_, interiorSize_); detail::ghost_last_bilu0_decomposition(*ILU_, interiorSize_);
break; break;

4
opm/simulators/timestepping/AdaptiveTimeStepping.hpp
View File

@ -4,11 +4,7 @@
#define OPM_ADAPTIVE_TIME_STEPPING_HPP #define OPM_ADAPTIVE_TIME_STEPPING_HPP
#include <dune/common/version.hh> #include <dune/common/version.hh>
#if DUNE_VERSION_NEWER(DUNE_ISTL, 2, 8)
#include <dune/istl/istlexception.hh> #include <dune/istl/istlexception.hh>
#else
#include <dune/istl/ilu.hh>
#endif
#include <opm/common/Exceptions.hpp> #include <opm/common/Exceptions.hpp>
#include <opm/common/ErrorMacros.hpp> #include <opm/common/ErrorMacros.hpp>

8
opm/simulators/utils/GridDataOutput.cpp
View File

@ -26,9 +26,6 @@
#if HAVE_DUNE_FEM #if HAVE_DUNE_FEM
#include <dune/common/version.hh> #include <dune/common/version.hh>
#include <dune/fem/gridpart/adaptiveleafgridpart.hh> #include <dune/fem/gridpart/adaptiveleafgridpart.hh>
#if !DUNE_VERSION_GTE(DUNE_FEM, 2, 9)
#include <dune/fem/gridpart/common/gridpart2gridview.hh>
#endif
#include <opm/simulators/flow/FemCpGridCompat.hpp> #include <opm/simulators/flow/FemCpGridCompat.hpp>
#endif // HAVE_DUNE_FEM #endif // HAVE_DUNE_FEM
@ -50,15 +47,10 @@ template<class T> using DV = DamarisOutput::DamarisVar<T>;
INSTANCE(1, Dune::GridView<Dune::DefaultLeafGridViewTraits<Dune::CpGrid>>) INSTANCE(1, Dune::GridView<Dune::DefaultLeafGridViewTraits<Dune::CpGrid>>)
#if HAVE_DUNE_FEM #if HAVE_DUNE_FEM
#if DUNE_VERSION_GTE(DUNE_FEM, 2, 9)
using GV = Dune::Fem::AdaptiveLeafGridPart<Dune::CpGrid, using GV = Dune::Fem::AdaptiveLeafGridPart<Dune::CpGrid,
(Dune::PartitionIteratorType)4, (Dune::PartitionIteratorType)4,
false>; false>;
INSTANCE(1, GV) INSTANCE(1, GV)
#else
INSTANCE(1, Dune::Fem::GridPart2GridViewImpl<Dune::Fem::AdaptiveLeafGridPart<Dune::CpGrid, (Dune::PartitionIteratorType)4, false> >)
INSTANCE(1, Dune::GridView<Dune::Fem::GridPart2GridViewTraits<Dune::Fem::AdaptiveLeafGridPart<Dune::CpGrid, Dune::PartitionIteratorType(4), false>>>)
#endif
#endif #endif
} // namespace Opm::GridDataOutput } // namespace Opm::GridDataOutput

9
opm/simulators/utils/VectorVectorDataHandle.hpp
View File

@ -64,18 +64,11 @@ public:
return codim == 0; return codim == 0;
} }
#if DUNE_VERSION_LT(DUNE_GRID, 2, 8)
bool fixedsize(int /* dim */, int /* codim */) const
{
return true;
}
#else
bool fixedSize(int /* dim */, int /* codim */) const bool fixedSize(int /* dim */, int /* codim */) const
{ {
return true; return true;
} }
#endif
template<class EntityType> template<class EntityType>
std::size_t size(const EntityType /* entity */) const std::size_t size(const EntityType /* entity */) const
{ {

14
tests/test_RestartSerialization.cpp
View File

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

4
tests/test_milu.cpp
View File

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