From 5ed9dd16b4af051452a375323e5b091239377219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20He=C3=9F?= <rene.hess@iwr.uni-heidelberg.de> Date: Fri, 1 Sep 2017 13:24:13 +0200 Subject: [PATCH] Use anisotropic quadrature order in test and small improvements --- python/dune/perftool/sumfact/tabulation.py | 4 ++-- test/sumfact/poisson/poisson_2d.mini | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/python/dune/perftool/sumfact/tabulation.py b/python/dune/perftool/sumfact/tabulation.py index 9624f1a9..0ae2b832 100644 --- a/python/dune/perftool/sumfact/tabulation.py +++ b/python/dune/perftool/sumfact/tabulation.py @@ -208,7 +208,7 @@ def quadrature_points_per_direction(): q = (q,) * world_dimension() # Quadrature points in per direction - nb_qp = tuple([(lambda x: x // 2 + 1)(order) for order in q]) + nb_qp = tuple(order // 2 +1 for order in q) return nb_qp @@ -229,7 +229,7 @@ def local_quadrature_points_per_direction(): def polynomial_degree(): form = get_global_context_value("formdata").preprocessed_form - degree = form.coefficients()[0].ufl_element()._degree + degree = form.coefficients()[0].ufl_element().degree() if isinstance(degree, int): degree = (degree,) * world_dimension() return degree diff --git a/test/sumfact/poisson/poisson_2d.mini b/test/sumfact/poisson/poisson_2d.mini index 96a863df..129c2ff3 100644 --- a/test/sumfact/poisson/poisson_2d.mini +++ b/test/sumfact/poisson/poisson_2d.mini @@ -18,7 +18,7 @@ numerical_jacobian = 1, 0 | expand num compare_l2errorsquared = 4e-5, 4e-9 | expand deg sumfact = 1 vectorize_grads = 1, 0 | expand grad -# quadrature_order = 2, 4 +quadrature_order = 2, 4 [formcompiler.ufl_variants] degree = 1, 2 | expand deg -- GitLab