AbstractCell members are now properties

.github/workflows/fenicsx-refs.env

@@ -1,6 +1,6 @@
 basix_repository=FEniCS/basix
 basix_ref=main
 ufl_repository=FEniCS/ufl
-ufl_ref=main
+ufl_ref=schnellerhase/fix_169
 ffcx_repository=FEniCS/ffcx
-ffcx_ref=main
+ffcx_ref=schnellerhase/abstract-cell

python/dolfinx/io/gmsh.py

@@ -138,7 +138,7 @@ def ufl_mesh(gmsh_cell: int, gdim: int, dtype: npt.DTypeLike) -> ufl.Mesh:
     cell = ufl.Cell(shape)
     element = basix.ufl.element(
         basix.ElementFamily.P,
-        cell.cellname(),
+        cell.cellname,
         degree,
         basix.LagrangeVariant.equispaced,
         shape=(gdim,),

python/dolfinx/mesh.py

@@ -721,13 +721,13 @@ def create_mesh(
         e_ufl = basix.ufl.blocked_element(e_ufl, shape=(gdim,))
         domain = ufl.Mesh(e_ufl)
         dtype = cmap.dtype
-        assert domain.geometric_dimension() == gdim
+        assert domain.geometric_dimension == gdim
     elif isinstance(e, ufl.finiteelement.AbstractFiniteElement):
         # e is a Basix 'UFL' element
         cmap = _coordinate_element(e.basix_element)  # type: ignore
         domain = ufl.Mesh(e)
         dtype = cmap.dtype
-        assert domain.geometric_dimension() == gdim
+        assert domain.geometric_dimension == gdim
     elif isinstance(e, _CoordinateElement):
         # e is a CoordinateElement
         cmap = e

python/test/unit/fem/test_interpolation.py

@@ -795,7 +795,7 @@ def test_interpolate_callable_subset(bound):
 def test_vector_element_interpolation(scalar_element):
     """Test interpolation into a range of vector elements."""
     mesh = create_unit_square(
-        MPI.COMM_WORLD, 10, 10, getattr(CellType, scalar_element.cell.cellname())
+        MPI.COMM_WORLD, 10, 10, getattr(CellType, scalar_element.cell.cellname)
     )
     V = functionspace(mesh, blocked_element(scalar_element, shape=(2,)))
     u = Function(V)

python/test/unit/fem/test_mixed_element.py

@@ -33,7 +33,7 @@ def test_mixed_element(rank, family, cell, degree):
 
     shape = (mesh.geometry.dim,) * rank
     norms = []
-    U_el = element(family, cell.cellname(), degree, shape=shape, dtype=default_real_type)
+    U_el = element(family, cell.cellname, degree, shape=shape, dtype=default_real_type)
     for i in range(3):
         U = functionspace(mesh, U_el)
         u = ufl.TrialFunction(U)

python/test/unit/mesh/test_mesh.py

@@ -248,8 +248,8 @@ def test_UFLCell(interval, square, rectangle, cube, box):
 def test_UFLDomain(interval, square, rectangle, cube, box):
     def _check_ufl_domain(mesh):
         domain = mesh.ufl_domain()
-        assert mesh.geometry.dim == domain.geometric_dimension()
-        assert mesh.topology.dim == domain.topological_dimension()
+        assert mesh.geometry.dim == domain.geometric_dimension
+        assert mesh.topology.dim == domain.topological_dimension
         assert mesh.ufl_cell() == domain.ufl_cell()
 
     _check_ufl_domain(interval)