Skip to content
Snippets Groups Projects
Commit 204ffcde authored by Dominic Kempf's avatar Dominic Kempf
Browse files

Update UFL to 2017.2

parent 201fe2b8
No related branches found
No related tags found
No related merge requests found
......@@ -3,7 +3,7 @@
url = https://gitlab.tiker.net/inducer/loopy.git
[submodule "python/ufl"]
path = python/ufl
url = https://parcomp-git.iwr.uni-heidelberg.de/dominic/ufl.git
url = https://bitbucket.org/fenics-project/ufl.git
[submodule "python/pymbolic"]
path = python/pymbolic
url = https://github.com/inducer/pymbolic.git
......
......@@ -13,7 +13,3 @@ pushd python/ufl
git apply ../../patches/ufl/conditional-uflid.patch
git apply ../../patches/ufl/0001-Remove-special-case-for-variable-in-ufl2dot.patch
popd
pushd python/ufl
git apply ../../patches/ufl/tensor-product-element.patch
popd
commit f87dcd18d765b0200808b79b2e7374f82a0c6199
Author: René Heß <rene.hess@iwr.uni-heidelberg.de>
Date: Tue Aug 29 14:56:17 2017 +0200
Patch for TensorProductElements
diff --git a/ufl/algorithms/compute_form_data.py b/ufl/algorithms/compute_form_data.py
index 3388bbfc..1cef3924 100644
--- a/ufl/algorithms/compute_form_data.py
+++ b/ufl/algorithms/compute_form_data.py
@@ -56,7 +56,7 @@ def _auto_select_degree(elements):
"""
# Use max degree of all elements, at least 1 (to work with
# Lagrange elements)
- return max({e.degree() for e in elements} - {None} | {1})
+ return max({e.degree() if not isinstance(e.degree(), tuple) else max(e.degree()) for e in elements} - {None} | {1})
def _compute_element_mapping(form):
ufl @ 5a9593c9
Subproject commit 962d56f65821fb9c50ca4a5a858882c472243431
Subproject commit 5a9593c956fc843eee6ce3a2ae2b9cbc4aec62bf
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment