From 9c5ea7cd00cb33451eb3ef8b5c51480c94c1bc79 Mon Sep 17 00:00:00 2001
From: Marcel Koch <marcel.koch@uni-muenster.de>
Date: Tue, 22 Jan 2019 11:36:00 +0100
Subject: [PATCH] update tests
---
test/blockstructured/poisson/poisson_grid.mini | 18 +++++++++++-------
.../poisson/poisson_tensor.mini | 2 +-
.../poisson/poisson_unstructured.mini | 1 -
.../poisson/poisson_unstructured_vec.mini | 2 +-
4 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/test/blockstructured/poisson/poisson_grid.mini b/test/blockstructured/poisson/poisson_grid.mini
index c3c25648..e7c979d2 100644
--- a/test/blockstructured/poisson/poisson_grid.mini
+++ b/test/blockstructured/poisson/poisson_grid.mini
@@ -1,9 +1,12 @@
__name = blockstructured_poisson_grid_{__exec_suffix}
-__exec_suffix = vec, nonvec | expand vectorize
+__exec_suffix = {vec_suffix}_{dim_suffix}
-dim = 2
+dim = 2, 3 | expand dimension
-gmshFile = square.msh
+vec_suffix = nonvec, vec | expand vectorized
+dim_suffix = 2d, 3d | expand dimension
+
+gmshFile = square.msh, cube.msh | expand dimension
[wrapper.vtkcompare]
name = {__name}
@@ -11,16 +14,17 @@ reference = poisson_ref
extension = vtu
[formcompiler]
-compare_l2errorsquared = 1e-7
+compare_l2errorsquared = 1e-7, 1e-4 | expand dimension
grid_unstructured = 1
[formcompiler.r]
matrix_free = 1
generate_jacobians = 0
blockstructured = 1
-number_of_blocks = 16
-vectorization_blockstructured = 1, 0 | expand vectorize
+number_of_blocks = 16, 4 | expand dimension
+vectorization_blockstructured = 1, 0 | expand vectorized
+geometry_mixins = blockstructured_multilinear
[formcompiler.ufl_variants]
-cell = quadrilateral
+cell = quadrilateral, hexahedron | expand dimension
degree = 1
\ No newline at end of file
diff --git a/test/blockstructured/poisson/poisson_tensor.mini b/test/blockstructured/poisson/poisson_tensor.mini
index 4a737cc9..6f18a924 100644
--- a/test/blockstructured/poisson/poisson_tensor.mini
+++ b/test/blockstructured/poisson/poisson_tensor.mini
@@ -27,7 +27,7 @@ vectorization_blockstructured = 0, 1 | expand vectorized
generate_jacobians = 0
blockstructured = 1
number_of_blocks = 8, 4 | expand dimension
-geometry_mixins = blockstructured_equidistant
+geometry_mixins = blockstructured_equidistant, blockstructured_multilinear | expand unstructured
[formcompiler.ufl_variants]
cell = quadrilateral, hexahedron | expand dimension
diff --git a/test/blockstructured/poisson/poisson_unstructured.mini b/test/blockstructured/poisson/poisson_unstructured.mini
index 4da0b9e1..73ee2072 100644
--- a/test/blockstructured/poisson/poisson_unstructured.mini
+++ b/test/blockstructured/poisson/poisson_unstructured.mini
@@ -4,7 +4,6 @@ __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}
diff --git a/test/blockstructured/poisson/poisson_unstructured_vec.mini b/test/blockstructured/poisson/poisson_unstructured_vec.mini
index ddae7714..681addc5 100644
--- a/test/blockstructured/poisson/poisson_unstructured_vec.mini
+++ b/test/blockstructured/poisson/poisson_unstructured_vec.mini
@@ -9,7 +9,6 @@ upperright = 1.0 | repeat {dim}
elements = 8, 2 | expand dimension | repeat {dim}
elementType = quadrilateral
-
[wrapper.vtkcompare]
name = {__name}
reference = poisson_ref
@@ -25,6 +24,7 @@ generate_jacobians = 0
blockstructured = 1
number_of_blocks = 16, 8 | expand dimension
vectorization_blockstructured = 1
+geometry_mixins = blockstructured_multilinear
[formcompiler.ufl_variants]
cell = quadrilateral, hexahedron | expand dimension
--
GitLab