restructure some tests

test/blockstructured/poisson/CMakeLists.txt

@@ -26,7 +26,12 @@ dune_add_formcompiler_system_test(UFLFILE poisson.ufl
         INIFILE poisson_matrix_free.mini
         )
 
-dune_add_formcompiler_system_test(UFLFILE poisson_vec.ufl
+dune_add_formcompiler_system_test(UFLFILE poisson.ufl
         BASENAME blockstructured_poisson_vec
         INIFILE poisson_vec.mini
+        )
+
+dune_add_formcompiler_system_test(UFLFILE poisson.ufl
+        BASENAME blockstructured_poisson_unstructured_vec
+        INIFILE poisson_unstructured_vec.mini
         )
\ No newline at end of file

test/blockstructured/poisson/poisson.mini

@@ -18,4 +18,5 @@ blockstructured = 1
 number_of_blocks = 3
 
 [formcompiler.ufl_variants]
-cell = quadrilateral
\ No newline at end of file
+cell = quadrilateral
+degree = 2
\ No newline at end of file

test/blockstructured/poisson/poisson.ufl

@@ -3,7 +3,7 @@ x = SpatialCoordinate(cell)
 g = sum([c**2 for c in x])
 f = sum([-2 for _ in x])
 
-V = FiniteElement("CG", cell, 2)
+V = FiniteElement("CG", cell, degree)
 u = TrialFunction(V)
 v = TestFunction(V)
 

test/blockstructured/poisson/poisson_matrix_free.mini

@@ -17,4 +17,5 @@ blockstructured = 1
 number_of_blocks = 4
 
 [formcompiler.ufl_variants]
-cell = quadrilateral
\ No newline at end of file
+cell = quadrilateral
+degree = 2
\ No newline at end of file

test/blockstructured/poisson/poisson_unstructured.mini

@@ -24,4 +24,5 @@ blockstructured = 1
 number_of_blocks = 4
 
 [formcompiler.ufl_variants]
-cell = quadrilateral, hexahedron | expand dimension
\ No newline at end of file
+cell = quadrilateral, hexahedron | expand dimension
+degree = 2
\ No newline at end of file

test/blockstructured/poisson/poisson_unstructured_vec.mini

+__name = blockstructured_poisson_unstructured_vec_{__exec_suffix}
+__exec_suffix = {dimname}
+
+dim = 2, 3 | expand dimension
+dimname = 2d, 3d | expand dimension
+
+lowerleft = 0.0 | repeat {dim}
+upperright = 1.0 | repeat {dim}
+elements = 8, 2 | expand dimension | repeat {dim}
+elementType = quadrilateral
+
+
+[wrapper.vtkcompare]
+name = {__name}
+reference = poisson_ref
+extension = vtu
+
+[formcompiler]
+compare_l2errorsquared = 1e-7
+grid_unstructured = 1
+
+[formcompiler.r]
+numerical_jacobian = 1
+blockstructured = 1
+number_of_blocks = 16
+vectorization_blockstructured = 1
+
+[formcompiler.ufl_variants]
+cell = quadrilateral, hexahedron | expand dimension
+degree = 1
\ No newline at end of file

test/blockstructured/poisson/poisson_vec.mini

@@ -15,4 +15,8 @@ compare_l2errorsquared = 1e-7
 numerical_jacobian = 1
 blockstructured = 1
 number_of_blocks = 16
-vectorization_blockstructured = 1
\ No newline at end of file
+vectorization_blockstructured = 1
+
+[formcompiler.ufl_variants]
+cell = quadrilateral
+degree = 1
\ No newline at end of file

test/blockstructured/poisson/poisson_vec.ufl

-cell = quadrilateral
-x = SpatialCoordinate(cell)
-
-g = x[0]**2 + x[1]**2
-f = -4
-
-V = FiniteElement("CG", cell, 1)
-u = TrialFunction(V)
-v = TestFunction(V)
-
-r =(inner(grad(u), grad(v)) - f*v)*dx
-interpolate_expression = g
-exact_solution = g
-is_dirichlet = 1