diff --git a/python/dolfinx/io/gmsh.py b/python/dolfinx/io/gmsh.py index 9870a333a2..688d0134ff 100644 --- a/python/dolfinx/io/gmsh.py +++ b/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,), diff --git a/python/dolfinx/mesh.py b/python/dolfinx/mesh.py index 0bff236d3d..f36948433d 100644 --- a/python/dolfinx/mesh.py +++ b/python/dolfinx/mesh.py @@ -755,13 +755,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 diff --git a/python/test/unit/fem/test_interpolation.py b/python/test/unit/fem/test_interpolation.py index aa687ea70a..ae71d2d433 100644 --- a/python/test/unit/fem/test_interpolation.py +++ b/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) diff --git a/python/test/unit/fem/test_mixed_element.py b/python/test/unit/fem/test_mixed_element.py index 6dc93620c2..7649494e0f 100644 --- a/python/test/unit/fem/test_mixed_element.py +++ b/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) diff --git a/python/test/unit/mesh/test_mesh.py b/python/test/unit/mesh/test_mesh.py index d58f2be483..2fcad72e94 100644 --- a/python/test/unit/mesh/test_mesh.py +++ b/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)