Remove IrreducibleInt (#702)

* remove irreducible int * ufl branch * update DOLFINx demo running * CI fix * main UFL --------- Co-authored-by: Garth N. Wells <[email protected]>
FEniCS · Sep 21, 2023 · b172e62 · b172e62
1 parent dbf4a73
commit b172e62
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/.github/workflows/dolfin-tests.yml b/.github/workflows/dolfin-tests.yml
@@ -86,7 +86,7 @@ jobs:
 
       - name: Build DOLFINx C++ unit tests
         run: |
-          cmake -G Ninja -DCMAKE_BUILD_TYPE=Developer -B build/test/ -S build/test/
+          cmake -G Ninja -DCMAKE_BUILD_TYPE=Developer -B build/test/ -S dolfinx/cpp/test/
           cmake --build build/test
       - name: Run DOLFINx C++ unit tests
         run: |

diff --git a/python/basix/ufl.py b/python/basix/ufl.py
@@ -11,8 +11,6 @@
 import numpy.typing as _npt
 import ufl as _ufl
 # TODO: remove gdim arguments once UFL handles cells better
-# TODO: remove IrreducibleInt once UFL handles element degrees better
-from ufl.algorithms.estimate_degrees import IrreducibleInt as _IrreducibleInt
 from ufl.finiteelement import FiniteElementBase as _FiniteElementBase
 
 import basix as _basix
@@ -51,7 +49,7 @@ class _ElementBase(_FiniteElementBase):
     """
 
     def __init__(self, repr: str, name: str, cellname: str, value_shape: _typing.Tuple[int, ...],
-                 degree: _typing.Union[int, _IrreducibleInt] = -1, mapname: _typing.Optional[str] = None,
+                 degree: int = -1, mapname: _typing.Optional[str] = None,
                  gdim: _typing.Optional[int] = None):
         """Initialise the element."""
         super().__init__(name, _ufl.cell.Cell(cellname, gdim), degree, None, value_shape, value_shape)
@@ -342,15 +340,9 @@ def __init__(self, element: _basix.finite_element.FiniteElement, gdim: _typing.O
             repr = (f"Basix element ({element.family.name}, {element.cell_type.name}, {element.degree}, "
                     f"{element.lagrange_variant.name}, {element.dpc_variant.name}, {element.discontinuous})")
 
-        if element.cell_type.name in ["interval", "triangle", "tetrahedron"]:
-            super().__init__(
-                repr, element.family.name, element.cell_type.name, tuple(element.value_shape), element.degree,
-                _map_type_to_string(element.map_type), gdim=gdim)
-        else:
-            # TODO: remove IrreducibleInt once UFL handles element degrees better
-            super().__init__(
-                repr, element.family.name, element.cell_type.name, tuple(element.value_shape),
-                _IrreducibleInt(element.degree), _map_type_to_string(element.map_type), gdim=gdim)
+        super().__init__(
+            repr, element.family.name, element.cell_type.name, tuple(element.value_shape), element.degree,
+            _map_type_to_string(element.map_type), gdim=gdim)
 
         self.element = element