mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
[bugfix] Make compatibility code compile with DUNE 2.7
This commit is contained in:
parent
8e800f0c93
commit
8b09030139
@ -46,13 +46,6 @@ template <int codim>
|
|||||||
class EntityPointer;
|
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.
|
// specialization of dune-fem compatiblity functions for CpGrid, since CpGrid does not use the interface classes.
|
||||||
namespace Fem {
|
namespace Fem {
|
||||||
|
|
||||||
@ -61,6 +54,7 @@ namespace Fem {
|
|||||||
// make_entity for CpGrid entities
|
// make_entity for CpGrid entities
|
||||||
//
|
//
|
||||||
////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////
|
||||||
|
#if ! DUNE_VERSION_NEWER(DUNE_GRID, 2, 6)
|
||||||
template <int codim>
|
template <int codim>
|
||||||
inline Dune::cpgrid::Entity<codim> make_entity(const Dune::cpgrid::EntityPointer<codim>& entityPointer)
|
inline Dune::cpgrid::Entity<codim> make_entity(const Dune::cpgrid::EntityPointer<codim>& entityPointer)
|
||||||
{ return *entityPointer; }
|
{ return *entityPointer; }
|
||||||
@ -68,6 +62,7 @@ inline Dune::cpgrid::Entity<codim> make_entity(const Dune::cpgrid::EntityPointer
|
|||||||
template <int codim>
|
template <int codim>
|
||||||
inline Dune::cpgrid::Entity<codim> make_entity(Dune::cpgrid::Entity<codim> entity)
|
inline Dune::cpgrid::Entity<codim> make_entity(Dune::cpgrid::Entity<codim> entity)
|
||||||
{ return std::move(entity); }
|
{ return std::move(entity); }
|
||||||
|
#endif
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////
|
||||||
//
|
//
|
||||||
|
Loading…
Reference in New Issue
Block a user