Implement sumfact_multilinear Geometry Mixin

python/dune/codegen/options.py

@@ -113,7 +113,7 @@ class CodegenFormOptionsArray(ImmutableRecord):
     geometry_mixins = CodegenOption(default="generic", helpstr="A comma separated list of mixin identifiers to use for geometries. Currently implemented mixins: generic, axiparallel, equidistant, sumfact_multilinear, sumfact_axiparallel, sumfact_equidistant")
     quadrature_mixins = CodegenOption(default="generic", helpstr="A comma separated list of mixin identifiers to use for quadrature. Currently implemented: generic, sumfact")
     basis_mixins = CodegenOption(default="generic", helpstr="A comma separated list of mixin identifiers to use for basis function evaluation. Currently implemented: generic, sumfact")
-    accumulation_mixins = CodegenOption(default="generic", helpstr="A comma separated list of mixin identifiers to use for accumulation. Currently implemented: generic")
+    accumulation_mixins = CodegenOption(default="generic", helpstr="A comma separated list of mixin identifiers to use for accumulation. Currently implemented: generic, sumfact")
     enable_volume = CodegenOption(default=True, helpstr="Whether to assemble volume integrals")
     enable_skeleton = CodegenOption(default=True, helpstr="Whether to assemble skeleton integrals")
     enable_boundary = CodegenOption(default=True, helpstr="Whether to assemble boundary integrals")

python/dune/codegen/pdelab/__init__.py

@@ -20,19 +20,6 @@ class PDELabInterface(object):
         # The visitor instance will be registered by its init method
         self.visitor = None
 
-    # Accumulation interfaces
-    def get_accumulation_info(self, expr, visitor):
-        from dune.codegen.pdelab.localoperator import get_accumulation_info
-        return get_accumulation_info(expr, visitor)
-
-    def list_accumulation_infos(self, expr, visitor):
-        from dune.codegen.pdelab.localoperator import list_accumulation_infos
-        return list_accumulation_infos(expr, visitor)
-
-    def generate_accumulation_instruction(self, expr, visitor):
-        from dune.codegen.pdelab.localoperator import generate_accumulation_instruction
-        return generate_accumulation_instruction(expr, visitor)
-
     #
     # TODO: The following ones are actually entirely PDELab independent!
     # They should be placed elsewhere and be used directly in the visitor.

python/dune/codegen/sumfact/quadrature.py

@@ -141,15 +141,6 @@ def base_weight_function_mangler(target, func, dtypes):
         return CallMangleInfo(func.name, (NumpyType(dtype_floatingpoint()),), ())
 
 
-def default_quadrature_inames(visitor):
-    info = visitor.current_info[1]
-    if info is None:
-        element = None
-    else:
-        element = info.element
-    return quadrature_inames(element)
-
-
 @kernel_cached
 def _quadrature_inames(element):
     if element is None:
@@ -193,8 +184,7 @@ def additional_inames(visitor):
         restriction = Restriction.NONE
         if get_global_context_value("integral_type") == "interior_facet":
             restriction = Restriction.POSITIVE
-        from dune.codegen.sumfact.basis import lfs_inames
-        lfs_inames = lfs_inames(element, restriction)
+        lfs_inames = visitor.lfs_inames(element, restriction)
         return lfs_inames
     else:
         return ()

python/dune/codegen/ufl/visitor.py

@@ -56,14 +56,14 @@ class UFL2LoopyVisitor(ModifiedTerminalTracker):
         return self._call(o, do_predicates)
 
     def accumulate(self, o):
-        for info in self.interface.list_accumulation_infos(o, self):
+        for info in self.list_accumulation_infos(o):
             self.current_info = info
             expr = self._call(o, False)
             if expr != 0:
                 if get_form_option("simplify"):
                     from dune.codegen.sympy import simplify_pymbolic_expression
                     expr = simplify_pymbolic_expression(expr)
-                self.interface.generate_accumulation_instruction(expr, self)
+                self.generate_accumulation_instruction(expr)
 
     def _call(self, o, do_predicates):
         # Reset state variables
@@ -96,7 +96,7 @@ class UFL2LoopyVisitor(ModifiedTerminalTracker):
     def argument(self, o):
         self.interface.initialize_function_spaces(o, self)
         # Update the information on where to accumulate this
-        info = self.interface.get_accumulation_info(o, self)
+        info = self.get_accumulation_info(o)
         if o.number() == 0:
             if info != self.current_info[0]:
                 self.indices = None

test/sumfact/poisson/poisson_2d_unstructured.mini

@@ -30,6 +30,7 @@ numerical_jacobian = 1, 0 | expand num
 sumfact = 1
 vectorization_quadloop = 1, 0 | expand quad
 vectorization_strategy = explicit, none | expand grad
+geometry_mixins = sumfact_multilinear
 
 [formcompiler.ufl_variants]
 degree = 1, 2 | expand deg

test/sumfact/poisson/poisson_3d_unstructured.mini

@@ -30,6 +30,7 @@ numerical_jacobian = 1, 0 | expand num
 sumfact = 1
 vectorization_quadloop = 1, 0 | expand quad
 vectorization_strategy = explicit, none | expand grad
+geometry_mixins = sumfact_multilinear
 
 [formcompiler.ufl_variants]
 degree = 1, 2 | expand deg

test/sumfact/poisson/poisson_dg_2d_gmsh.mini

@@ -29,6 +29,7 @@ sumfact = 1
 sumfact_regular_jacobians = 1
 vectorization_quadloop = 1, 0 | expand quad
 vectorization_strategy = explicit, none | expand grad
+geometry_mixins = sumfact_multilinear
 
 [formcompiler.ufl_variants]
 degree = 1, 2 | expand deg

test/sumfact/poisson/poisson_dg_2d_unstructured.mini

@@ -30,6 +30,7 @@ numerical_jacobian = 1, 0 | expand num
 sumfact = 1
 vectorization_quadloop = 1, 0 | expand quad
 vectorization_strategy = explicit, none | expand grad
+geometry_mixins = sumfact_multilinear
 
 [formcompiler.ufl_variants]
 degree = 1, 2 | expand deg

test/sumfact/poisson/poisson_dg_3d_gmsh.mini

@@ -31,6 +31,7 @@ sumfact = 1
 sumfact_regular_jacobians = 1
 vectorization_quadloop = 1, 0 | expand quad
 vectorization_strategy = explicit, none | expand grad
+geometry_mixins = sumfact_multilinear
 
 [formcompiler.ufl_variants]
 degree = 1, 2 | expand deg

test/sumfact/poisson/poisson_dg_3d_unstructured.mini

@@ -31,6 +31,7 @@ sumfact = 1
 sumfact_regular_jacobians = 1
 vectorization_quadloop = 1, 0 | expand quad
 vectorization_strategy = explicit, none | expand grad
+geometry_mixins = sumfact_multilinear
 
 [formcompiler.ufl_variants]
 degree = 1, 2 | expand deg

test/sumfact/poisson/poisson_fastdg_3d_gmsh.mini

@@ -30,6 +30,7 @@ fastdg = 1
 sumfact_regular_jacobians = 1
 vectorization_quadloop = 1, 0 | expand quad
 vectorization_strategy = explicit, none | expand grad
+geometry_mixins = sumfact_multilinear
 
 [formcompiler.ufl_variants]
 degree = 1, 2 | expand deg