Skip to content
Snippets Groups Projects
Commit 7570b5e4 authored by Robert K's avatar Robert K
Browse files

[bugfix][OperatorTraits] use ElementQuadrature for Polygon and 

PolyhedralGrid since no ref mapping is available.
parent c4f378fe
No related branches found
No related tags found
1 merge request!15Exchange troubled cell
Pipeline #28911 failed
Stage: test
Hide whitespace changes
Inline Side-by-side
dune/fem-dg/operator/dg/operatortraits.hh
+ 86
− 45
View file @ 7570b5e4
......@@ -8,49 +8,19 @@
#include <dune/fem/function/adaptivefunction/adaptivefunction.hh>
#include <dune/fem-dg/operator/fluxes/diffusion/parameters.hh>
#if HAVE_DUNE_POLYGONGRID
#include <dune/polygongrid/declaration.hh>
#endif
#if HAVE_OPM_GRID
#include <opm/grid/polyhedralgrid/declaration.hh>
#endif // #if HAVE_OPM_GRID
namespace Dune
{
namespace Fem
{
// traits for the operator passes
template< class GridPart,
int polOrd,
class ModelImp,
class DiscreteFunctionImp,
class AdvectionFluxImp,
class DiffusionFluxImp,
class LimiterIndicatorFunctionImp,
class AdaptationHandlerImp,
class ExtraParameterTupleImp = std::tuple<>,
template <class F, int d> class QuadratureTraits = Dune::Fem::DefaultQuadratureTraits
>
struct OperatorTraits
{
typedef GridPart GridPartType;
typedef typename GridPartType::GridType GridType;
typedef ModelImp ModelType;
typedef AdvectionFluxImp AdvectionFluxType;
typedef DiffusionFluxImp DiffusionFluxType;
// polynomial order of ansatz space
static const int polynomialOrder = polOrd;
typedef DiscreteFunctionImp DestinationType ;
//static_assert( std::is_same<typename ModelType::RangeType, typename DiscreteFunctionType::RangeType>::value, "range type does not fit.");
typedef typename DestinationType::DiscreteFunctionSpaceType DiscreteFunctionSpaceType;
typedef Fem::CachingQuadrature< GridPartType, 0, QuadratureTraits > VolumeQuadratureType;
typedef Fem::CachingQuadrature< GridPartType, 1, QuadratureTraits > FaceQuadratureType;
typedef LimiterIndicatorFunctionImp LimiterIndicatorType;
typedef AdaptationHandlerImp AdaptationHandlerType ;
typedef ExtraParameterTupleImp ExtraParameterTupleType;
};
// traits for the operator passes
template< class ModelImp,
class DiscreteFunctionImp,
......@@ -89,9 +59,8 @@ namespace Fem
static_assert( std::is_same<typename ModelType::RangeType, typename DestinationType::RangeType>::value, "range type does not fit.");
// default quadrature selection should be CachingQuadrature
template <class DFS>
template <class Grid, bool useCaching>
struct SelectQuadrature
{
typedef Fem::CachingQuadrature< GridPartType, 0, QuadratureTraits > VolumeQuadratureType;
......@@ -100,15 +69,46 @@ namespace Fem
// if selected discrete function space has no caching storage,
// then select ElementQuadrature, and not CachingQuadrature
template <class FS, class GP, int polOrd,
template <class, class, int, template <class> class> class DFS>
struct SelectQuadrature< DFS< FS, GP, polOrd, Dune::Fem::SimpleStorage > >
// also, if the grid is polygonal or polyhedral
// CachingQuadarature cannot be used
template <class Grid>
struct SelectQuadrature< Grid, false >
{
typedef Fem::ElementQuadrature< GridPartType, 0, QuadratureTraits > VolumeQuadratureType;
typedef Fem::ElementQuadrature< GridPartType, 1, QuadratureTraits > FaceQuadratureType;
};
typedef SelectQuadrature< DiscreteFunctionSpaceType > SelectQuadratureType;
template <class Grid>
struct CheckGrid { static const bool value = true; };
// also, if the grid is polygonal or polyhedral
// CachingQuadarature cannot be used
#if HAVE_DUNE_POLYGONGRID
template <class ct>
struct CheckGrid< Dune::PolygonGrid< ct > > { static const bool value = false; };
#endif
#if HAVE_OPM_GRID
template <int dim, int dimworld, class ct>
struct CheckGrid< Dune::PolyhedralGrid< dim, dimworld, ct > > { static const bool value = false; };
#endif
template <class DFS>
struct CheckSpace { static const bool value = true; };
// if selected discrete function space has no caching storage,
// then select ElementQuadrature, and not CachingQuadrature
template <class FS, class GP, int polOrd,
template <class, class, int, template <class> class> class DFS>
struct CheckSpace< DFS< FS, GP, polOrd, Dune::Fem::SimpleStorage > >
{
static const bool value = false;
};
static const bool useCaching = CheckSpace< DiscreteFunctionSpaceType > :: value &&
CheckGrid < GridType > :: value;
typedef SelectQuadrature< GridType, useCaching > SelectQuadratureType;
typedef typename SelectQuadratureType::VolumeQuadratureType VolumeQuadratureType;
typedef typename SelectQuadratureType::FaceQuadratureType FaceQuadratureType;
......@@ -125,6 +125,47 @@ namespace Fem
typedef ExtraParameterTupleImp ExtraParameterTupleType;
};
/*
// traits for the operator passes
template< class GridPart,
int polOrd,
class ModelImp,
class DiscreteFunctionImp,
class AdvectionFluxImp,
class DiffusionFluxImp,
class LimiterIndicatorFunctionImp,
class AdaptationHandlerImp,
class ExtraParameterTupleImp = std::tuple<>,
template <class F, int d> class QuadratureTraits = Dune::Fem::DefaultQuadratureTraits
>
struct OperatorTraits
{
typedef GridPart GridPartType;
typedef typename GridPartType::GridType GridType;
typedef ModelImp ModelType;
typedef AdvectionFluxImp AdvectionFluxType;
typedef DiffusionFluxImp DiffusionFluxType;
// polynomial order of ansatz space
static const int polynomialOrder = polOrd;
typedef DiscreteFunctionImp DestinationType ;
//static_assert( std::is_same<typename ModelType::RangeType, typename DiscreteFunctionType::RangeType>::value, "range type does not fit.");
typedef typename DestinationType::DiscreteFunctionSpaceType DiscreteFunctionSpaceType;
typedef Fem::CachingQuadrature< GridPartType, 0, QuadratureTraits > VolumeQuadratureType;
typedef Fem::CachingQuadrature< GridPartType, 1, QuadratureTraits > FaceQuadratureType;
typedef LimiterIndicatorFunctionImp LimiterIndicatorType;
typedef AdaptationHandlerImp AdaptationHandlerType ;
typedef ExtraParameterTupleImp ExtraParameterTupleType;
};
*/
} // end namespace
} // end namespace
#endif
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment