Update for UFL deprecation (#705)

Author: garth-wells

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
 

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)))