cell check is needed, basix branch

FEniCS · Sep 20, 2023 · 9e5884c · 9e5884c
1 parent ef2427a
commit 9e5884c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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