Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integration with Fuse #3885

Draft
wants to merge 10 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ jobs:
--install defcon \
--install gadopt \
--install asQ \
--package-branch fiat indiamai/integrate_fuse \
--package-branch fuse main \
|| (cat firedrake-install.log && /bin/false)
- name: Install test dependencies
run: |
Expand Down
6 changes: 3 additions & 3 deletions firedrake/mesh.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
from firedrake.adjoint_utils import MeshGeometryMixin
from pyadjoint import stop_annotating
import gem
from fuse import constructCellComplex

try:
import netgen
Expand Down Expand Up @@ -1216,15 +1217,14 @@ def _ufl_cell(self):

# TODO: this needs to be updated for mixed-cell meshes.
nfacets = self._comm.allreduce(nfacets, op=MPI.MAX)

# Note that the geometric dimension of the cell is not set here
# despite it being a property of a UFL cell. It will default to
# equal the topological dimension.
# Firedrake mesh topologies, by convention, which specifically
# represent a mesh topology (as here) have geometric dimension
# equal their topological dimension. This is reflected in the
# corresponding UFL mesh.
return ufl.Cell(_cells[tdim][nfacets])
return constructCellComplex(_cells[tdim][nfacets])

@utils.cached_property
def _ufl_mesh(self):
Expand Down Expand Up @@ -1955,7 +1955,7 @@ def _mark_entity_classes(self):

@utils.cached_property
def _ufl_cell(self):
return ufl.Cell(_cells[0][0])
return constructCellComplex(_cells[0][0])

@utils.cached_property
def _ufl_mesh(self):
Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ dependencies = [
"pyadjoint-ad @ git+https://github.com/dolfin-adjoint/pyadjoint.git",
"loopy @ git+https://github.com/firedrakeproject/loopy.git@main",
"libsupermesh @ git+https://github.com/firedrakeproject/libsupermesh.git",
"fuse-element @ git+https://github.com/indiamai/fuse.git",
]
classifiers = [
"Development Status :: 5 - Production/Stable",
Expand Down
1 change: 1 addition & 0 deletions requirements-git.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ git+https://github.com/firedrakeproject/loopy.git@main#egg=loopy
git+https://github.com/firedrakeproject/pytest-mpi.git@main#egg=pytest-mpi
git+https://github.com/firedrakeproject/petsc.git@firedrake#egg=petsc
git+https://github.com/firedrakeproject/libsupermesh.git#egg=libsupermesh
git+https://github.com/indiamai/fuse.git#egg=fuse
Loading