Skip to content

Commit 99dc279

Browse files
AbstractCell members are now properties (#3926)
* Adapt to cell members now properties * Chnage branches * Test * Apply suggestions from code review
1 parent 890fcad commit 99dc279

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

python/dolfinx/io/gmsh.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ def ufl_mesh(gmsh_cell: int, gdim: int, dtype: npt.DTypeLike) -> ufl.Mesh:
138138
cell = ufl.Cell(shape)
139139
element = basix.ufl.element(
140140
basix.ElementFamily.P,
141-
cell.cellname(),
141+
cell.cellname,
142142
degree,
143143
basix.LagrangeVariant.equispaced,
144144
shape=(gdim,),

python/dolfinx/mesh.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -755,13 +755,13 @@ def create_mesh(
755755
e_ufl = basix.ufl.blocked_element(e_ufl, shape=(gdim,))
756756
domain = ufl.Mesh(e_ufl)
757757
dtype = cmap.dtype
758-
assert domain.geometric_dimension() == gdim
758+
assert domain.geometric_dimension == gdim
759759
elif isinstance(e, ufl.finiteelement.AbstractFiniteElement):
760760
# e is a Basix 'UFL' element
761761
cmap = _coordinate_element(e.basix_element) # type: ignore
762762
domain = ufl.Mesh(e)
763763
dtype = cmap.dtype
764-
assert domain.geometric_dimension() == gdim
764+
assert domain.geometric_dimension == gdim
765765
elif isinstance(e, _CoordinateElement):
766766
# e is a CoordinateElement
767767
cmap = e

python/test/unit/fem/test_interpolation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -795,7 +795,7 @@ def test_interpolate_callable_subset(bound):
795795
def test_vector_element_interpolation(scalar_element):
796796
"""Test interpolation into a range of vector elements."""
797797
mesh = create_unit_square(
798-
MPI.COMM_WORLD, 10, 10, getattr(CellType, scalar_element.cell.cellname())
798+
MPI.COMM_WORLD, 10, 10, getattr(CellType, scalar_element.cell.cellname)
799799
)
800800
V = functionspace(mesh, blocked_element(scalar_element, shape=(2,)))
801801
u = Function(V)

python/test/unit/fem/test_mixed_element.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def test_mixed_element(rank, family, cell, degree):
3333

3434
shape = (mesh.geometry.dim,) * rank
3535
norms = []
36-
U_el = element(family, cell.cellname(), degree, shape=shape, dtype=default_real_type)
36+
U_el = element(family, cell.cellname, degree, shape=shape, dtype=default_real_type)
3737
for i in range(3):
3838
U = functionspace(mesh, U_el)
3939
u = ufl.TrialFunction(U)

python/test/unit/mesh/test_mesh.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,8 @@ def test_UFLCell(interval, square, rectangle, cube, box):
248248
def test_UFLDomain(interval, square, rectangle, cube, box):
249249
def _check_ufl_domain(mesh):
250250
domain = mesh.ufl_domain()
251-
assert mesh.geometry.dim == domain.geometric_dimension()
252-
assert mesh.topology.dim == domain.topological_dimension()
251+
assert mesh.geometry.dim == domain.geometric_dimension
252+
assert mesh.topology.dim == domain.topological_dimension
253253
assert mesh.ufl_cell() == domain.ufl_cell()
254254

255255
_check_ufl_domain(interval)

0 commit comments

Comments
 (0)