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

make the coding style of femcpgridcompat.hh consistent with the rest of eWoms/ebos

Browse Source
This commit is contained in:
Andreas Lauser
2019-02-01 17:33:30 +01:00
parent fb34eb304c
commit 0aa9a2c6b8
1 changed files with 39 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
ebos/femcpgridcompat.hh
View File

@@ -37,67 +37,54 @@
#include <dune/fem/misc/compatibility.hh>
#include <dune/fem/io/streams/streams.hh>
namespace Dune
{
namespace Dune {
namespace cpgrid {
template <int codim>
class Entity;
namespace cpgrid
{
template <int codim>
class Entity;
template <int codim>
class EntityPointer;
}
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)
#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());
}
{ 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
{
// specialization of dune-fem compatiblity functions for CpGrid, since CpGrid does not use the interface classes.
namespace Fem {
////////////////////////////////////////////////////////////
//
// make_entity for CpGrid entities
//
////////////////////////////////////////////////////////////
template <int codim>
inline Dune::cpgrid::Entity< codim > make_entity ( const Dune::cpgrid::EntityPointer< codim >& entityPointer )
{
return *entityPointer;
}
////////////////////////////////////////////////////////////
//
// make_entity for CpGrid entities
//
////////////////////////////////////////////////////////////
template <int codim>
inline Dune::cpgrid::Entity<codim> make_entity(const Dune::cpgrid::EntityPointer<codim>& entityPointer)
{ return *entityPointer; }
template <int codim>
inline Dune::cpgrid::Entity<codim> make_entity ( Dune::cpgrid::Entity<codim> entity )
{
return std::move( entity );
}
template <int codim>
inline Dune::cpgrid::Entity<codim> make_entity(Dune::cpgrid::Entity<codim> entity)
{ return std::move(entity); }
////////////////////////////////////////////////////////////
//
// GridEntityAccess for CpGrid entities
//
////////////////////////////////////////////////////////////
template< int codim >
struct GridEntityAccess< Dune::cpgrid::Entity< codim > >
{
typedef Dune::cpgrid::Entity< codim > EntityType;
////////////////////////////////////////////////////////////
//
// GridEntityAccess for CpGrid entities
//
////////////////////////////////////////////////////////////
template<int codim>
struct GridEntityAccess<Dune::cpgrid::Entity<codim> >
{
typedef Dune::cpgrid::Entity<codim> EntityType;
typedef EntityType GridEntityType;
static const GridEntityType& gridEntity ( const EntityType& entity )
{
return entity;
}
};
static const GridEntityType& gridEntity(const EntityType& entity)
{ return entity; }
};
} // namespace Fem
} // namespace Fem
} // end namespace Dune