diff --git a/.github/workflows/fenicsx-tests.yml b/.github/workflows/fenicsx-tests.yml index 2075498b0..e96ad9ede 100644 --- a/.github/workflows/fenicsx-tests.yml +++ b/.github/workflows/fenicsx-tests.yml @@ -34,7 +34,7 @@ jobs: - name: Install Basix run: | - python3 -m pip install git+https://github.com/FEniCS/basix.git + python3 -m pip install git+https://github.com/FEniCS/basix.git@mscroggs/irreducibleint - name: Clone FFCx uses: actions/checkout@v3 @@ -78,7 +78,7 @@ jobs: - name: Install Basix and FFCx run: | - python3 -m pip install git+https://github.com/FEniCS/basix.git + python3 -m pip install git+https://github.com/FEniCS/basix.git@mscroggs/irreducibleint python3 -m pip install git+https://github.com/FEniCS/ffcx.git - name: Clone DOLFINx diff --git a/ufl/algorithms/estimate_degrees.py b/ufl/algorithms/estimate_degrees.py index 48332b252..b4fdb1915 100644 --- a/ufl/algorithms/estimate_degrees.py +++ b/ufl/algorithms/estimate_degrees.py @@ -96,9 +96,7 @@ def _reduce_degree(self, v, f): are taken. Does not reduce the degree when TensorProduct elements or quadrilateral elements are involved. """ - # This cell check might be needed here. If all tests pass, remove this comment before merging (!) - # if isinstance(f, int) and v.ufl_domain().ufl_cell().cellname() not in ["quadrilateral", "hexahedron"]: - if isinstance(f, int): + if isinstance(f, int) and v.ufl_domain().ufl_cell().cellname() not in ["quadrilateral", "hexahedron"]: return max(f - 1, 0) else: return f