From 16bf9329b4c07499fb229bdf7399add435f348e9 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:36:04 +0200
Subject: [PATCH] Import missing MixedElement
---
python/dune/perftool/sumfact/accumulation.py | 1 +
python/dune/perftool/sumfact/basis.py | 2 +-
python/dune/perftool/sumfact/tabulation.py | 2 +-
python/dune/perftool/ufl/visitor.py | 1 +
4 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/python/dune/perftool/sumfact/accumulation.py b/python/dune/perftool/sumfact/accumulation.py
index 2baac395..50f4d169 100644
--- a/python/dune/perftool/sumfact/accumulation.py
+++ b/python/dune/perftool/sumfact/accumulation.py
@@ -201,6 +201,7 @@ def generate_accumulation_instruction(expr, visitor):
# Number of basis functions per direction
leaf_element = test_info.element
+ from ufl import MixedElement
if isinstance(leaf_element, MixedElement):
leaf_element = leaf_element.extract_component(test_info.element_index)[1]
degree = leaf_element._degree
diff --git a/python/dune/perftool/sumfact/basis.py b/python/dune/perftool/sumfact/basis.py
index 4e1237c5..8e745c7d 100644
--- a/python/dune/perftool/sumfact/basis.py
+++ b/python/dune/perftool/sumfact/basis.py
@@ -42,7 +42,7 @@ from dune.perftool.tools import maybe_wrap_subscript
from dune.perftool.pdelab.basis import shape_as_pymbolic
from dune.perftool.sumfact.accumulation import sumfact_iname
-from ufl import VectorElement, TensorElement, TensorProductElement
+from ufl import MixedElement, VectorElement, TensorElement, TensorProductElement
from pytools import product, ImmutableRecord
diff --git a/python/dune/perftool/sumfact/tabulation.py b/python/dune/perftool/sumfact/tabulation.py
index 0ae2b832..e8518668 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(order // 2 +1 for order in q)
+ nb_qp = tuple(order // 2 + 1 for order in q)
return nb_qp
diff --git a/python/dune/perftool/ufl/visitor.py b/python/dune/perftool/ufl/visitor.py
index 70b95dbc..31e39fe8 100644
--- a/python/dune/perftool/ufl/visitor.py
+++ b/python/dune/perftool/ufl/visitor.py
@@ -23,6 +23,7 @@ from pymbolic.primitives import (Call,
from ufl.algorithms import MultiFunction
from ufl.checks import is_cellwise_constant
from ufl import (VectorElement,
+ MixedElement,
TensorElement,
TensorProductElement,
)
--
GitLab