Merge branch 'master' into 'feature/remove-trivial-reductions'

# Conflicts:
#   python/dune/perftool/sumfact/vectorization.py

dune/perftool/common/opcounter.hh

@@ -5,6 +5,11 @@
 #include <iostream>
 #include <cmath>
 #include <cstdlib>
+#include <ostream>
+#include <sstream>
+#include <istream>
+
+#include <dune/common/typetraits.hh>
 
 namespace oc {
 

python/dune/perftool/pdelab/quadrature.py

@@ -105,7 +105,7 @@ def name_quadrature_points():
     """Name of vector storing quadrature points as class member"""
     from dune.perftool.pdelab.geometry import local_dimension
     dim = local_dimension()
-    name = "qp_order" + str(dim)
+    name = "qp_dim" + str(dim)
     shape = (name_quadrature_bound(), dim)
     globalarg(name, shape=shape, dtype=numpy.float64, managed=False)
     define_quadrature_points(name)
@@ -166,7 +166,7 @@ def name_quadrature_weights():
     """"Name of vector storing quadrature weights as class member"""
     from dune.perftool.pdelab.geometry import local_dimension
     dim = local_dimension()
-    name = "qw_order" + str(dim)
+    name = "qw_dim" + str(dim)
     define_quadrature_weights(name)
     fill_quadrature_weights_cache(name)
 

python/dune/perftool/sumfact/vectorization.py

@@ -135,4 +135,4 @@ class HasSumfactMapper(lp.symbolic.CombineMapper):
 
 
 def find_sumfact(expr):
-    return HasSumfactMapper()(expr)
+    return HasSumfactMapper()(expr)
\ No newline at end of file