[feature][DGPyOp] added flag for defaultQuadrature or fempy quadratures.

dune/fem-dg/operator/dg/dgpyoperator.hh

@@ -8,6 +8,10 @@
 #include <dune/fem/solver/timeprovider.hh>
 #include <dune/fem/operator/common/spaceoperatorif.hh>
 
+#include <dune/fem/space/lagrange.hh>
+#include <dune/fem/quadrature/interpolationquadrature.hh>
+
+
 #include <dune/fem-dg/algorithm/evolution.hh>
 
 // dune-fem-dg includes
@@ -19,9 +23,8 @@
 #include <dune/fem-dg/misc/algorithmcreatorselector.hh>
 #include <dune/fem-dg/operator/adaptation/estimator.hh>
 
-#if HAVE_DUNE_FEMPY
+// this is part of dune-fem now
 #include <dune/fempy/quadrature/fempyquadratures.hh>
-#endif
 
 namespace Dune
 {
@@ -79,14 +82,45 @@ namespace Fem
 
     typedef typename DiffusionFluxSelector< ModelType, DiscreteFunctionSpaceType, diffFluxId, formId >::type  DiffusionFluxType;
 
-    typedef DefaultOperatorTraits< ModelType, DestinationType, AdvectionFluxType, DiffusionFluxType,
-                std::tuple<>, typename DiscreteFunctionSpaceType::FunctionSpaceType,
-#if HAVE_DUNE_FEMPY
-                Dune::FemPy::FempyQuadratureTraits, // use quadratures from dune-fempy
-#else
-                Dune::Fem::DefaultQuadratureTraits,
+    template <int d, class Space>
+    struct OperatorTraitsSelector
+    {
+      // default quadratures for normal spaces
+      typedef DefaultOperatorTraits< ModelType, DestinationType, AdvectionFluxType, DiffusionFluxType,
+                                     std::tuple<>, typename Space::FunctionSpaceType,
+                                     Dune::Fem::DefaultQuadratureTraits,
+                                     threading> type;
+    };
+
+#if HAVE_DUNE_LOCALFUNCTIONS
+    template < int d, class FunctionSpace, class GridPart, unsigned int order, template< class > class Storage >
+    struct OperatorTraitsSelector< d, Dune::Fem::FixedOrderDGLagrangeSpace< FunctionSpace, GridPart, order, Dune::GaussLobattoPointSet, Storage > >
+    {
+      // default quadratures for normal spaces
+      typedef DefaultOperatorTraits< ModelType, DestinationType, AdvectionFluxType, DiffusionFluxType,
+                                     std::tuple<>, FunctionSpace,
+                                     Dune::Fem::GaussLobattoQuadratureTraits,
+                                     threading> type;
+    };
+
+    template < int d, class FunctionSpace, class GridPart, unsigned int order, template< class > class Storage >
+    struct OperatorTraitsSelector< d, Dune::Fem::FixedOrderDGLagrangeSpace< FunctionSpace, GridPart, order, Dune::GaussLegendrePointSet, Storage > >
+    {
+      // default quadratures for normal spaces
+      typedef DefaultOperatorTraits< ModelType, DestinationType, AdvectionFluxType, DiffusionFluxType,
+                                     std::tuple<>, FunctionSpace,
+                                     Dune::Fem::GaussLegendreQuadratureTraits,
+                                     threading> type;
+    };
 #endif
-                threading >  OpTraits;
+
+    typedef typename std::conditional< Additional::defaultQuadrature,
+            typename OperatorTraitsSelector< 0, DiscreteFunctionSpaceType > :: type,
+            // fempy quadratures
+            DefaultOperatorTraits< ModelType, DestinationType, AdvectionFluxType, DiffusionFluxType,
+                                   std::tuple<>, typename DiscreteFunctionSpaceType::FunctionSpaceType,
+                                   Dune::FemPy::FempyQuadratureTraits,
+                                   threading> > ::type OpTraits;
 
     typedef AdvectionDiffusionOperatorSelector< OpTraits, formId, limiterId > OperatorSelectorType ;
 

python/dune/femdg/_operators.py

@@ -149,6 +149,7 @@ def femDGOperator(Model, space,
         limiter="minmod",
         advectionFlux="default",
         diffusionScheme = "cdg2", threading=False,
+        defaultQuadrature = True,
         initialTime=0.0, parameters=None):
 
     if type(Model)==list or type(Model)==tuple:
@@ -334,6 +335,9 @@ def femDGOperator(Model, space,
     struct.append([Declaration(
         Variable("const Dune::Fem::DiffusionFlux::Enum", "diffFluxId = " + diffFluxId),
         static=True)])
+    struct.append([Declaration(
+        Variable("const bool", "defaultQuadrature"), initializer=defaultQuadrature,
+        static=True)])
 
     writer = SourceWriter(StringWriter())
     writer.emit([struct])