Equidistant PDELab geometrys and test adaption

python/dune/codegen/pdelab/geometry.py

@@ -235,13 +235,16 @@ class AxiparallelGeometryMixin(GenericPDELabGeometryMixin):
         # embedded into higher dimensional world space.
         return self.jacobian_determinant(o)
 
-    @preamble
     def define_facet_jacobian_determinant(self, name):
+        valuearg(name)
+        self._define_facet_jacobian_determinant(name)
+
+    @preamble
+    def _define_facet_jacobian_determinant(self, name):
         # NB: In the equidistant case, this might be optimized to store *d* values on the operator level
         #     We don't do that right now for laziness.
         geo = name_geometry()
         pos = name_localcenter()
-        valuearg(name)
 
         return "auto {} = {}.integrationElement({});".format(name,
                                                              geo,
@@ -251,16 +254,18 @@ class AxiparallelGeometryMixin(GenericPDELabGeometryMixin):
 
 @geometry_mixin("equidistant")
 class EquidistantGeometryMixin(AxiparallelGeometryMixin):
-    @class_member(classtag="operator")
     def define_jacobian_determinant(self, name):
         valuearg(name)
-        self._define_jacobian_determinant_eval(name)
+        self._define_jacobian_determinant(name)
+
+    @class_member(classtag="operator")
+    def _define_jacobian_determinant(self, name):
         from dune.codegen.pdelab.localoperator import lop_template_ansatz_gfs
         gfst = lop_template_ansatz_gfs()
         return "typename {}::Traits::GridView::template Codim<0>::Geometry::ctype {};".format(gfst, name)
 
     @preamble(kernel="operator")
-    def _define_jacobian_determinant_eval(name):
+    def _define_jacobian_determinant_eval(self, name):
         from dune.codegen.pdelab.localoperator import name_ansatz_gfs_constructor_param, lop_template_range_field
         gfs = name_ansatz_gfs_constructor_param()
         rft = lop_template_range_field()
@@ -276,7 +281,7 @@ class EquidistantGeometryMixin(AxiparallelGeometryMixin):
         return "typename {}::Traits::GridView::template Codim<0>::Geometry::JacobianInverseTransposed {};".format(gfst, name)
 
     @preamble(kernel="operator")
-    def _define_jacobian_inverse_transposed_eval(name):
+    def _define_jacobian_inverse_transposed_eval(self, name):
         from dune.codegen.pdelab.localoperator import name_ansatz_gfs_constructor_param, lop_template_range_field
         gfs = name_ansatz_gfs_constructor_param()
         rft = lop_template_range_field()

test/hyperbolic/linearacoustics.mini

@@ -15,6 +15,7 @@ extension = vtu
 [formcompiler]
 explicit_time_stepping = 1
 operators = mass, r
+geometry_mixins = equidistant
 
 [formcompiler.mass]
 numerical_jacobian = 1

test/navier-stokes/navierstokes_2d_dg_quadrilateral.mini

@@ -23,6 +23,7 @@ l2error_tree_path = 1, 1, 0
 explicit_time_stepping = 0
 yaspgrid_offset = 1
 overlapping = 1
+geometry_mixins = equidistant
 
 [formcompiler.mass]
 numerical_jacobian = 0, 1 | expand num

test/navier-stokes/navierstokes_3d_dg_quadrilateral.mini

@@ -18,6 +18,7 @@ compare_l2errorsquared = 5e-4
 # Only calculate error for the velocity part
 l2error_tree_path = 1, 1, 1, 0
 operators = mass, r
+geometry_mixins = equidistant
 
 [formcompiler.mass]
 numerical_jacobian = 0, 1 | expand num

test/nonlinear/diffusivewave.mini

@@ -15,6 +15,7 @@ T = 0.01
 
 [formcompiler]
 operators = mass, poisson
+geometry_mixins = equidistant
 
 [formcompiler.mass]
 sumfact = 0, 1 | expand sf

test/poisson/dimension-grid-variations/poisson_2d_cg_quadrilateral.mini

@@ -9,3 +9,4 @@ extension = vtu
 
 [formcompiler]
 compare_l2errorsquared = 9e-8
+geometry_mixins = equidistant

test/poisson/dimension-grid-variations/poisson_2d_dg_quadrilateral.mini

@@ -9,3 +9,4 @@ extension = vtu
 
 [formcompiler]
 compare_l2errorsquared = 6e-7
+geometry_mixins = equidistant

test/poisson/dimension-grid-variations/poisson_3d_cg_hexahedron.mini

@@ -9,3 +9,4 @@ extension = vtu
 
 [formcompiler]
 compare_l2errorsquared = 9e-5
+geometry_mixins = equidistant

test/poisson/dimension-grid-variations/poisson_3d_dg_hexahedron.mini

@@ -9,3 +9,4 @@ extension = vtu
 
 [formcompiler]
 compare_l2errorsquared = 1e-4
+geometry_mixins = equidistant

test/poisson/opcount_poisson_dg_symdiff.mini

@@ -10,3 +10,4 @@ extension = vtu
 [formcompiler]
 opcounter = 1
 instrumentation_level = 3
+geometry_mixins = equidistant

test/poisson/poisson_dg_quadrilateral.mini

@@ -11,7 +11,7 @@ extension = vtu
 
 [formcompiler]
 compare_l2errorsquared = 7e-7
-geometry = equidistant
+geometry_mixins = equidistant
 
 [formcompiler.r]
 numerical_jacobian = 1, 0 | expand num

test/poisson/poisson_dg_tensor.mini

@@ -13,6 +13,7 @@ extension = vtu
 
 [formcompiler]
 compare_l2errorsquared = 4e-6
+geometry_mixins = equidistant
 
 [formcompiler.r]
 numerical_jacobian = 1, 0 | expand num
\ No newline at end of file

test/stokes/stokes_3d_dg_quadrilateral.mini

@@ -11,6 +11,7 @@ extension = vtu
 
 [formcompiler]
 compare_l2errorsquared = 6e-8
+geometry_mixins = equidistant
 
 [formcompiler.r]
 numerical_jacobian = 0, 1 | expand num

test/stokes/stokes_3d_quadrilateral.mini

@@ -12,6 +12,7 @@ extension = vtu
 
 [formcompiler]
 compare_l2errorsquared = 1e-10
+geometry_mixins = equidistant
 
 [formcompiler.r]
 numerical_jacobian = 1, 0 | expand num

test/stokes/stokes_dg_quadrilateral.mini

@@ -11,6 +11,7 @@ extension = vtu
 
 [formcompiler]
 compare_l2errorsquared = 1e-8
+geometry_mixins = equidistant
 
 [formcompiler.r]
 numerical_jacobian = 0, 1 | expand num

test/stokes/stokes_quadrilateral.mini

@@ -12,6 +12,7 @@ extension = vtu
 
 [formcompiler]
 compare_l2errorsquared = 1e-10
+geometry_mixins = equidistant
 
 [formcompiler.r]
 numerical_jacobian = 1, 0 | expand num