Fixups after rebasing

python/dune/perftool/blockstructured/basis.py

@@ -12,9 +12,9 @@ from dune.perftool.pdelab.basis import (declare_cache_temporary,
                                         name_localbasis_cache,
                                         type_localbasis,
                                         FEM_name_mangling)
-from dune.perftool.pdelab.driver import (basetype_range,
-                                         isPk,
+from dune.perftool.pdelab.driver import (isPk,
                                          isQk)
+from dune.perftool.pdelab.driver.gridfunctionspace import basetype_range
 from dune.perftool.pdelab.geometry import world_dimension
 from dune.perftool.pdelab.quadrature import pymbolic_quadrature_position_in_cell
 from dune.perftool.pdelab.spaces import type_gfs

python/dune/perftool/pdelab/basis.py

@@ -215,7 +215,7 @@ def evaluate_coefficient_gradient(element, name, container, restriction, index):
         from dune.perftool.pdelab.argument import pymbolic_coefficient
         coeff = pymbolic_coefficient(container, lfs, basisindex)
 
-    assignee = Subscript(Variable(name), tuple(Variable(i) for i in idims))
+    assignee = Subscript(Variable(name), (Variable(dimindex),))
 
     reduction_expr = Product((coeff, basis))
 

python/dune/perftool/pdelab/driver/gridfunctionspace.py

@@ -30,14 +30,18 @@ def type_domainfield():
     return "DF"
 
 
-@preamble
-def typedef_range(name):
+def basetype_range():
     if get_option('opcounter'):
         from dune.perftool.pdelab.driver.timings import setup_timer
         setup_timer()
-        return "using {} = oc::OpCounter<double>;".format(name)
+        return "oc::OpCounter<double>"
     else:
-        return "using {} = double;".format(name)
+        return "double"
+
+
+@preamble
+def typedef_range(name):
+    return "using {} = {};".format(name, basetype_range())
 
 
 def type_range():

python/dune/perftool/pdelab/localoperator.py

@@ -216,7 +216,6 @@ class AccumulationSpace(Record):
 def determine_accumulation_space(info, number):
     if info is None:
         return AccumulationSpace()
-    ma = next(iter(args))
 
     assert info is not None
     element = info.element

test/blockstructured/poisson/3d/CMakeLists.txt

@@ -2,13 +2,3 @@ dune_add_formcompiler_system_test(UFLFILE poisson.ufl
         BASENAME blockstructured_poisson_3d
         INIFILE poisson.mini
         )
-
-dune_add_formcompiler_system_test(UFLFILE poisson_neumann.ufl
-        BASENAME blockstructured_poisson_3d_neumann
-        INIFILE poisson_neumann.mini
-        )
-
-dune_add_formcompiler_system_test(UFLFILE poisson_neumann2.ufl
-        BASENAME blockstructured_poisson_3d_neumann2
-        INIFILE poisson_neumann.mini
-        )
\ No newline at end of file