Merge branch 'main' into release

ufl/constant.py

@@ -66,6 +66,12 @@ def __eq__(self, other):
                 self._ufl_domain == other._ufl_domain and
                 self._ufl_shape == self._ufl_shape)
 
+    def _ufl_signature_data_(self, renumbering):
+        "Signature data for constant depends on renumbering"
+        return "Constant({}, {}, {})".format(
+            self._ufl_domain._ufl_signature_data_(renumbering), repr(self._ufl_shape),
+            repr(renumbering[self]))
+
 
 def VectorConstant(domain, count=None):
     domain = as_domain(domain)

ufl/form.py

@@ -81,6 +81,7 @@ class Form(object):
         "_arguments",
         "_coefficients",
         "_coefficient_numbering",
+        "_constant_numbering",
         "_constants",
         "_hash",
         "_signature",
@@ -111,9 +112,12 @@ def __init__(self, integrals):
         self._arguments = None
         self._coefficients = None
         self._coefficient_numbering = None
+        self._constant_numbering = None
 
         from ufl.algorithms.analysis import extract_constants
         self._constants = extract_constants(self)
+        self._constant_numbering = dict(
+            (c, i) for i, c in enumerate(self._constants))
 
         # Internal variables for caching of hash and signature after
         # first request
@@ -237,6 +241,11 @@ def coefficient_numbering(self):
     def constants(self):
         return self._constants
 
+    def constant_numbering(self):
+        """Return a contiguous numbering of constants in a mapping
+        ``{constant:number}``."""
+        return self._constant_numbering
+
     def signature(self):
         "Signature for use with jit cache (independent of incidental numbering of indices etc.)"
         if self._signature is None:
@@ -458,9 +467,11 @@ def _compute_renumbering(self):
         # Include integration domains and coefficients in renumbering
         dn = self.domain_numbering()
         cn = self.coefficient_numbering()
+        cnstn = self.constant_numbering()
         renumbering = {}
         renumbering.update(dn)
         renumbering.update(cn)
+        renumbering.update(cnstn)
 
         # Add domains of coefficients, these may include domains not
         # among integration domains
@@ -479,6 +490,14 @@ def _compute_renumbering(self):
                 renumbering[d] = k
                 k += 1
 
+        # Add domains of constants, these may include domains not
+        # among integration domains
+        for c in self._constants:
+            d = c.ufl_domain()
+            if d is not None and d not in renumbering:
+                renumbering[d] = k
+                k += 1
+
         return renumbering
 
     def _compute_signature(self):