Skip to content

Commit 72abff8

Browse files
committed
Updating to latest dolfin version
1 parent 41f00d1 commit 72abff8

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

fenicstools/ClementInterpolation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ def _analyze_expr(expr):
152152
# Elliminate forms
153153
if isinstance(expr, ufl.Form): raise ValueError('Expression is a form')
154154
# Elliminate expressions build from Trial/Test functions, FacetNormals
155-
terminals = [t for t in ufl.algorithms.traverse_unique_terminals(expr)]
155+
terminals = [t for t in ufl.corealg.traversal.traverse_unique_terminals(expr)]
156156
if any(isinstance(t, ClementInterpolant.black_listed) for t in terminals):
157157
raise ValueError('Invalid expression (e.g. has Arguments as operand)')
158158
# At this point the expression is valid

setup.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@
33
from distutils.core import setup
44

55
# Version number
6-
major = 1
7-
minor = 6
8-
maintenance = 0
6+
major = 2016
7+
minor = 2
98

109
setup(name = "fenicstools",
11-
version = "%d.%d.%d" % (major, minor, maintenance),
10+
version = "%d.%d" % (major, minor),
1211
description = "fenicstools -- tools for postprocessing in FEniCS programs",
1312
author = "Mikael Mortensen",
1413
author_email = "mikaem@math.uio.no",

tests/test_StructuredGrid.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@ def Vv(mesh):
2424
return VectorFunctionSpace(mesh, 'CG', 1)
2525

2626
@pytest.fixture(scope="module")
27-
def W(V, Vv):
28-
return V * Vv
27+
def W(mesh):
28+
e1 = FiniteElement("CG", mesh.ufl_cell(), 1)
29+
e2 = VectorElement("CG", mesh.ufl_cell(), 1)
30+
return FunctionSpace(mesh, e1 * e2)
2931

3032
@pytest.fixture(scope="module")
3133
def s0(V):

0 commit comments

Comments
 (0)