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

[bugfix][Ewoms] make compile with dune-fem 2.5

Browse Source
This commit is contained in:
Robert Kloefkorn
2018-05-22 22:17:04 +02:00
parent 98c2b03667
commit 5c19ead909
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ebos/femcpgridcompat.hh
View File

@@ -32,6 +32,7 @@
#define EWOMS_FEM_CPGRID_COMPAT_HH #define EWOMS_FEM_CPGRID_COMPAT_HH
#if HAVE_DUNE_FEM #if HAVE_DUNE_FEM
#include <dune/common/version.hh>
#include <dune/fem/gridpart/common/gridpart.hh> #include <dune/fem/gridpart/common/gridpart.hh>
#include <dune/fem/misc/compatibility.hh> #include <dune/fem/misc/compatibility.hh>
#include <dune/fem/io/streams/streams.hh> #include <dune/fem/io/streams/streams.hh>
@@ -48,12 +49,14 @@ namespace Dune
class EntityPointer; class EntityPointer;
} }
#if DUNE_VERSION_NEWER( DUNE_FEM, 2, 6 )
template <int dim, int cdim> template <int dim, int cdim>
auto referenceElement(const Dune::cpgrid::Geometry<dim, cdim>& geo) auto referenceElement(const Dune::cpgrid::Geometry<dim, cdim>& geo)
-> decltype(referenceElement<double, dim>(geo.type())) -> decltype(referenceElement<double, dim>(geo.type()))
{ {
return referenceElement<double, dim>(geo.type()); return referenceElement<double, dim>(geo.type());
} }
#endif
// specialization of dune-fem compatiblity functions for CpGrid, since CpGrid does not use the interface classes. // specialization of dune-fem compatiblity functions for CpGrid, since CpGrid does not use the interface classes.
namespace Fem namespace Fem