Update to match UFL interface changes (#39)

Author: indiamai

.github/workflows/setup_repos.sh

@@ -16,12 +16,12 @@ git checkout indiamai/integrate_fuse
 git status
 python3 -m pip install --break-system-packages -e .
 
-/usr/bin/git config --global --add safe.directory ~
-cd ~
-git clone https://github.com/firedrakeproject/ufl.git
-/usr/bin/git config --global --add safe.directory ~/ufl
-cd ufl
-git fetch
-git checkout indiamai/integrate-fuse
-git status
-python3 -m pip install --break-system-packages -e .
+#/usr/bin/git config --global --add safe.directory ~
+#cd ~
+#git clone https://github.com/firedrakeproject/ufl.git
+#/usr/bin/git config --global --add safe.directory ~/ufl
+#cd ufl
+#git fetch
+#git checkout indiamai/integrate-fuse
+#git status
+#python3 -m pip install --break-system-packages -e .

.github/workflows/test.yml

@@ -14,7 +14,8 @@ jobs:
     # Run on the Github hosted runner
     runs-on: ubuntu-latest
     container:
-      image: firedrakeproject/firedrake-vanilla-default:latest
+      #image: firedrakeproject/firedrake-vanilla-default:latest
+      image: firedrakeproject/firedrake-vanilla-default:dev-main
     # Steps represent a sequence of tasks that will be executed as
     # part of the jobs
     steps:
@@ -44,17 +45,6 @@ jobs:
           git checkout indiamai/integrate_fuse
           git status
           python3 -m pip install --break-system-packages -e .
-      - name: Checkout correct UFL branch
-        run: |
-          /usr/bin/git config --global --add safe.directory ~
-          cd ~
-          git clone https://github.com/firedrakeproject/ufl.git
-          /usr/bin/git config --global --add safe.directory ~/ufl
-          cd ufl
-          git fetch
-          git checkout indiamai/integrate-fuse
-          git status
-          python3 -m pip install --break-system-packages -e .
       - name: Run tests
         run: |
           pip list
@@ -104,4 +94,4 @@ jobs:
             message: ${{ env.total }}%
             minColorRange: 50
             maxColorRange: 90
-            valColorRange: ${{ env.total }}
+            valColorRange: ${{ env.total }}

Makefile

@@ -19,12 +19,12 @@ lint:
 
 test_examples:
 	@echo "    Running examples"
-	@python3 -m pytest test/test_2d_examples_docs.py
-	@python3 -m pytest test/test_3d_examples_docs.py
+	@FIREDRAKE_USE_FUSE=1 python3 -m pytest test/test_2d_examples_docs.py
+	@FIREDRAKE_USE_FUSE=1 python3 -m pytest test/test_3d_examples_docs.py
 
 tests:
 	@echo "    Running all tests"
-	@python3 -m coverage run -p -m pytest -rx test
+	@FIREDRAKE_USE_FUSE=1 python3 -m coverage run -p -m pytest -rx test
 
 coverage:
 	@python3 -m coverage combine
@@ -34,13 +34,13 @@ coverage:
 test_cells:
 	@echo "    Running all cell comparison tests"
 	@firedrake-clean
-	@python3 -m pytest -rPx --run-cleared test/test_cells.py::test_ref_els[expect0]
+	@FIREDRAKE_USE_FUSE=1 python3 -m pytest -rPx --run-cleared test/test_cells.py::test_ref_els[expect0]
 	@firedrake-clean
-	@python3 -m pytest -rPx --run-cleared test/test_cells.py::test_ref_els[expect1]
+	@FIREDRAKE_USE_FUSE=1 python3 -m pytest -rPx --run-cleared test/test_cells.py::test_ref_els[expect1]
 
 clean:
 	@(cd docs/ && make clean)
 
 prepush: lint tests
 	@rm .coverage.*
-	make clean docs
+	make clean docs

fuse/cells.py

@@ -1074,7 +1074,7 @@ def __init__(self, cell, name=None):
         super(CellComplexToUFL, self).__init__(name)
 
     def to_fiat(self):
-        return self.cell_complex.to_fiat(name=self.cellname())
+        return self.cell_complex.to_fiat(name=self.cellname)
 
     def __repr__(self):
         return super(CellComplexToUFL, self).__repr__()

test/test_convert_to_fiat.py

@@ -470,7 +470,7 @@ def test_helmholtz_3d(elem_gen, elem_code, deg, conv_rate):
 
 def helmholtz_solve(V, mesh):
     # Define variational problem
-    dim = mesh.ufl_cell().topological_dimension()
+    dim = mesh.ufl_cell().topological_dimension
     u = TrialFunction(V)
     v = TestFunction(V)
     f = Function(V)