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.

Sign up for GitHub

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

Resolve jacobians from duplicate meshes #733

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Resolve jacobians from duplicate meshes #733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b1b2e00
Fix multiple jacobians
jorgensd Dec 5, 2024
a04a6df
add test that currently fails on main
mscroggs Dec 5, 2024
aa7e21f
ruff
mscroggs Dec 5, 2024
94fe753
Merge branch 'main' into dokken/fix-duplicate-jacobians
jorgensd Jan 14, 2025
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
5 changes: 3 additions & 2 deletions ffcx/codegeneration/symbols.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,9 @@ def x_component(self, mt):

def J_component(self, mt):
"""Jacobian component."""
# FIXME: Add domain number!
return L.Symbol(format_mt_name("J", mt), dtype=L.DataType.REAL)
return L.Symbol(
format_mt_name(f"J{mt.expr.ufl_domain().ufl_id()}", mt), dtype=L.DataType.REAL
)

def domain_dof_access(self, dof, component, gdim, num_scalar_dofs, restriction):
"""Domain DOF access."""
Expand Down
24 changes: 24 additions & 0 deletions test/test_jit_forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1126,6 +1126,30 @@ def test_integral_grouping(compile_args):
assert len(unique_integrals) == 2


def test_derivative_domains(compile_args):
"""Test a form with derivatives on two different domains will generate valid code."""

V_ele = basix.ufl.element("Lagrange", "triangle", 2)
W_ele = basix.ufl.element("Lagrange", "interval", 1)

gdim = 2
V_domain = ufl.Mesh(basix.ufl.element("Lagrange", "triangle", 1, shape=(gdim,)))
W_domain = ufl.Mesh(basix.ufl.element("Lagrange", "interval", 1, shape=(gdim,)))

V = ufl.FunctionSpace(V_domain, V_ele)
W = ufl.FunctionSpace(W_domain, W_ele)

u = ufl.TrialFunction(V)
q = ufl.TestFunction(W)

ds = ufl.Measure("ds", domain=V_domain)

forms = [ufl.inner(u.dx(0), q.dx(0)) * ds]
compiled_forms, module, code = ffcx.codegeneration.jit.compile_forms(
forms, options={"scalar_type": np.float64}, cffi_extra_compile_args=compile_args
)


@pytest.mark.parametrize("dtype", ["float64"])
@pytest.mark.parametrize("permutation", [[0], [1]])
def test_mixed_dim_form(compile_args, dtype, permutation):
Expand Down
Loading