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] Make compatibility code compile with DUNE 2.7

Browse Source
This commit is contained in:
Robert Kloefkorn 2019-11-28 13:48:06 +01:00
parent 8e800f0c93
commit 8b09030139
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ebos/femcpgridcompat.hh
View File

@ -46,13 +46,6 @@ template <int codim>
class EntityPointer;
}
#if DUNE_VERSION_NEWER(DUNE_FEM, 2, 6)
template <int dim, int cdim>
auto referenceElement(const Dune::cpgrid::Geometry<dim, cdim>& geo)
-> decltype(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.
namespace Fem {
@ -61,6 +54,7 @@ namespace Fem {
// make_entity for CpGrid entities
//
////////////////////////////////////////////////////////////
#if ! DUNE_VERSION_NEWER(DUNE_GRID, 2, 6)
template <int codim>
inline Dune::cpgrid::Entity<codim> make_entity(const Dune::cpgrid::EntityPointer<codim>& entityPointer)
{ return *entityPointer; }
@ -68,6 +62,7 @@ inline Dune::cpgrid::Entity<codim> make_entity(const Dune::cpgrid::EntityPointer
template <int codim>
inline Dune::cpgrid::Entity<codim> make_entity(Dune::cpgrid::Entity<codim> entity)
{ return std::move(entity); }
#endif
////////////////////////////////////////////////////////////
//