Generate preambles and fix some quadrature stuff

python/dune/perftool/generation/cpp.py

@@ -7,7 +7,7 @@ from dune.perftool.generation import generator_factory
 from dune.perftool.cgen.clazz import AccessModifier
 
 symbol = generator_factory(item_tags=("symbol",))
-preamble = generator_factory(item_tags=("premable",), counted=True)
+preamble = generator_factory(item_tags=("preamble",), counted=True)
 
 
 def include_file(include, filetag=None):

python/dune/perftool/pdelab/geometry.py

 from dune.perftool.generation import preamble, symbol
-
+from dune.perftool.pdelab.quadrature import (name_quadrature_position,
+                                             quadrature_preamble,
+                                             )
 
 @preamble
 def define_geometry(name):
@@ -18,13 +20,14 @@ def name_dimension():
     return "dim"
 
 
-@preamble
 def define_jacobian_inverse_transposed(name):
     geo = name_geometry()
-    return "auto {} = {}.jacobianInverseTransposed();".format(name,
-                                                              geo,
-                                                              )
-
+    pos = name_quadrature_position()
+    return quadrature_preamble("auto {} = {}.jacobianInverseTransposed({});".format(name,
+                                                                                    geo,
+                                                                                    pos,
+                                                                                    )
+                               )
 
 @symbol
 def name_jacobian_inverse_transposed():

python/dune/perftool/pdelab/localoperator.py

@@ -98,13 +98,13 @@ def generate_kernel(integrand=None, measure=None):
     domains = [i for i in retrieve_cache_items("domain")]
     instructions = [i for i in retrieve_cache_items("instruction")]
     temporaries = {i.name: i for i in retrieve_cache_items("temporary")}
-    # preambles = [i for i in retrieve_cache_items("preamble")]
+    preambles = [(i, p) for i, p in enumerate(retrieve_cache_items("preamble"))]
     arguments = [i for i in retrieve_cache_items("argument")]
 
     # Create the kernel
     from loopy import make_kernel, preprocess_kernel
     # kernel = make_kernel(domains, instructions, arguments, temporary_variables=temporaries, preambles=preambles, target=DuneTarget())
-    kernel = make_kernel(domains, instructions, arguments, temporary_variables=temporaries, target=DuneTarget())
+    kernel = make_kernel(domains, instructions, arguments, temporary_variables=temporaries, target=DuneTarget(), preambles=preambles)
     kernel = preprocess_kernel(kernel)
 
     # All items with the kernel tags can be destroyed once a kernel has been generated

python/dune/perftool/pdelab/quadrature.py

@@ -5,8 +5,6 @@ from dune.perftool.generation import (cached,
                                       symbol,
                                       temporary_variable,
                                       )
-from dune.perftool.pdelab.geometry import (name_geometry,
-                                           )
 
 
 @iname
@@ -38,6 +36,7 @@ def name_quadrature_weight():
 
 def define_quadrature_factor(fac):
     weight = name_quadrature_weight()
+    from dune.perftool.pdelab.geometry import name_geometry
     geo = name_geometry()
     pos = name_quadrature_position()
     code = "{} = {}*{}.integrationElement({});".format(fac,
@@ -66,6 +65,7 @@ def name_order():
 @cached
 def quadrature_loop_statement():
     qp = name_quadrature_point()
+    from dune.perftool.pdelab.geometry import name_geometry
     geo = name_geometry()
     order = name_order()
     return "const auto& {} : quadratureRule({}, {})".format(qp,