Update for UFL deprecation (#705)

FEniCS · Jun 10, 2024 · 20f0dbd · 20f0dbd
1 parent 9d1c19b
commit 20f0dbd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/ffcx/ir/integral.py b/ffcx/ir/integral.py
@@ -84,7 +84,7 @@ def compute_integral_ir(cell, integral_type, entity_type, integrands, argument_s
 
  # Check if we have a mixed-dimensional integral
  is_mixed_dim = False
- for domain in integrand.ufl_domains():
+ for domain in ufl.domain.extract_domains(integrand):
  if domain.topological_dimension() != cell.topological_dimension():
  is_mixed_dim = True
 

diff --git a/ffcx/naming.py b/ffcx/naming.py
@@ -47,13 +47,13 @@ def compute_signature(
 
  domains: list[ufl.Mesh] = []
  for coeff in coeffs:
- domains.append(*coeff.ufl_domains())
+ domains.append(*ufl.domain.extract_domains(coeff))
  for arg in args:
- domains.append(*arg.ufl_function_space().ufl_domains())
+ domains.append(*ufl.domain.extract_domains(arg))
  for gc in ufl.algorithms.analysis.extract_type(expr, ufl.classes.GeometricQuantity):
- domains.append(*gc.ufl_domains())
+ domains.append(*ufl.domain.extract_domains(gc))
  for const in consts:
- domains.append(const.ufl_domain())
+ domains.append(*ufl.domain.extract_domains(const))
  domains = ufl.algorithms.analysis.unique_tuple(domains)
  rn.update(dict((d, i) for i, d in enumerate(domains)))