diff --git a/test/blockstructured/poisson/poisson_grid.mini b/test/blockstructured/poisson/poisson_grid.mini index c3c256486cb78e7fd74135abc978a5010f8f08db..e7c979d2e8f4da3595367a81ce60e7e27cc04d59 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 4a737cc9b20f034ccd2d9856d17d9e815c6c987f..6f18a924c4deabebaeb8447abd77076b0e2e127f 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 4da0b9e19b8bdba5cef210281d96e872284279c0..73ee2072de494acb4af02e3514a03fd058e5e4ed 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 ddae7714c65011f131ca3a31e85b9197b10901c3..681addc52358037b8daf740c7c4e9aa79a9327e3 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