From 5f9210033b0c6eb30d36a9743e0eec29ed4da449 Mon Sep 17 00:00:00 2001
From: Marcel Koch <marcel.koch@uni-muenster.de>
Date: Mon, 21 Jan 2019 16:15:22 +0100
Subject: [PATCH] add geometry mixin option
---
python/dune/codegen/options.py | 1 -
test/blockstructured/nonlinear/nonlinear.mini | 1 +
test/blockstructured/poisson/poisson.mini | 1 +
test/blockstructured/poisson/poisson_matrix_free.mini | 1 +
test/blockstructured/poisson/poisson_neumann.mini | 1 +
test/blockstructured/poisson/poisson_tensor.mini | 1 +
test/blockstructured/poisson/poisson_vec.mini | 1 +
test/blockstructured/stokes/stokes.mini | 1 +
8 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/python/dune/codegen/options.py b/python/dune/codegen/options.py
index 7f48ba58..bb6bbafa 100644
--- a/python/dune/codegen/options.py
+++ b/python/dune/codegen/options.py
@@ -186,7 +186,6 @@ def process_form_options(opt, form):
if opt.blockstructured:
opt = opt.copy(accumulation_mixins="blockstructured",
- geometry_mixins="blockstructured",
quadrature_mixins="blockstructured",
basis_mixins="blockstructured"
)
diff --git a/test/blockstructured/nonlinear/nonlinear.mini b/test/blockstructured/nonlinear/nonlinear.mini
index 5e9835a0..29d8d531 100644
--- a/test/blockstructured/nonlinear/nonlinear.mini
+++ b/test/blockstructured/nonlinear/nonlinear.mini
@@ -14,3 +14,4 @@ compare_l2errorsquared = 6e-4
[formcompiler.r]
blockstructured = 1
number_of_blocks = 5
+geometry_mixins = blockstructured_equidistant
diff --git a/test/blockstructured/poisson/poisson.mini b/test/blockstructured/poisson/poisson.mini
index a3a1ff05..1d7df30a 100644
--- a/test/blockstructured/poisson/poisson.mini
+++ b/test/blockstructured/poisson/poisson.mini
@@ -16,6 +16,7 @@ compare_l2errorsquared = 1e-7
numerical_jacobian = 1, 0 | expand num
blockstructured = 1
number_of_blocks = 3
+geometry_mixins = blockstructured_equidistant
[formcompiler.ufl_variants]
cell = quadrilateral
diff --git a/test/blockstructured/poisson/poisson_matrix_free.mini b/test/blockstructured/poisson/poisson_matrix_free.mini
index 3a76151c..514ab95b 100644
--- a/test/blockstructured/poisson/poisson_matrix_free.mini
+++ b/test/blockstructured/poisson/poisson_matrix_free.mini
@@ -15,6 +15,7 @@ compare_l2errorsquared = 1e-7
matrix_free = 1
blockstructured = 1
number_of_blocks = 4
+geometry_mixins = blockstructured_equidistant
[formcompiler.ufl_variants]
cell = quadrilateral
diff --git a/test/blockstructured/poisson/poisson_neumann.mini b/test/blockstructured/poisson/poisson_neumann.mini
index 1512f88b..26e75dd9 100644
--- a/test/blockstructured/poisson/poisson_neumann.mini
+++ b/test/blockstructured/poisson/poisson_neumann.mini
@@ -16,3 +16,4 @@ compare_l2errorsquared = 1e-8
numerical_jacobian = 1, 0 | expand num
blockstructured = 1
number_of_blocks = 4
+geometry_mixins = blockstructured_equidistant
diff --git a/test/blockstructured/poisson/poisson_tensor.mini b/test/blockstructured/poisson/poisson_tensor.mini
index 29232636..4a737cc9 100644
--- a/test/blockstructured/poisson/poisson_tensor.mini
+++ b/test/blockstructured/poisson/poisson_tensor.mini
@@ -27,6 +27,7 @@ vectorization_blockstructured = 0, 1 | expand vectorized
generate_jacobians = 0
blockstructured = 1
number_of_blocks = 8, 4 | expand dimension
+geometry_mixins = blockstructured_equidistant
[formcompiler.ufl_variants]
cell = quadrilateral, hexahedron | expand dimension
diff --git a/test/blockstructured/poisson/poisson_vec.mini b/test/blockstructured/poisson/poisson_vec.mini
index 9ec5cb24..7b132230 100644
--- a/test/blockstructured/poisson/poisson_vec.mini
+++ b/test/blockstructured/poisson/poisson_vec.mini
@@ -21,6 +21,7 @@ generate_jacobians = 0
blockstructured = 1
number_of_blocks = 16, 8 | expand dimension
vectorization_blockstructured = 1
+geometry_mixins = blockstructured_equidistant
[formcompiler.ufl_variants]
cell = quadrilateral, hexahedron | expand dimension
diff --git a/test/blockstructured/stokes/stokes.mini b/test/blockstructured/stokes/stokes.mini
index 532a4159..251f8a84 100644
--- a/test/blockstructured/stokes/stokes.mini
+++ b/test/blockstructured/stokes/stokes.mini
@@ -16,3 +16,4 @@ compare_l2errorsquared = 1e-9
numerical_jacobian = 0, 1 | expand num
blockstructured = 1
number_of_blocks = 3
+geometry_mixins = blockstructured_equidistant
--
GitLab