Adapt to UFL changes in subdomain_id (#297)

* Adapt to UFL changes in subdomain_id
* Give kernels a simpler name

gem/coffee.py

@@ -182,7 +182,7 @@ def optimise_monomials(monomials, linear_indices):
 
     :returns: an iterable of factorised :class:`Monomials`s
     """
-    assert len(set(frozenset(m.sum_indices) for m in monomials)) <= 1,\
+    assert len(set(frozenset(m.sum_indices) for m in monomials)) <= 1, \
         "All monomials required to have same sum indices for factorisation"
 
     result = [m for m in monomials if not m.atomics]  # skipped monomials

gem/gem.py

@@ -221,7 +221,7 @@ def __init__(self, array):
             self.array = array.astype(complex)
 
     def is_equal(self, other):
-        if type(self) != type(other):
+        if type(self) is not type(other):
             return False
         if self.shape != other.shape:
             return False
@@ -748,7 +748,7 @@ def __repr__(self):
 
     def is_equal(self, other):
         """Common subexpression eliminating equality predicate."""
-        if type(self) != type(other):
+        if type(self) is not type(other):
             return False
         if (self.array == other.array).all():
             self.array = other.array

gem/node.py

@@ -84,7 +84,7 @@ def is_equal(self, other):
         This is the method to potentially override in derived classes,
         not :meth:`__eq__` or :meth:`__ne__`.
         """
-        if type(self) != type(other):
+        if type(self) is not type(other):
             return False
         self_consargs = self._cons_args(self.children)
         other_consargs = other._cons_args(other.children)

tsfc/driver.py

@@ -115,9 +115,7 @@ def compile_integral(integral_data, form_data, prefix, parameters, interface, *,
         raise NotImplementedError("Sorry, we can't assemble the diagonal of a form for interior facet integrals")
     mesh = integral_data.domain
     arguments = form_data.preprocessed_form.arguments()
-    kernel_name = "%s_%s_integral_%s" % (prefix, integral_type, integral_data.subdomain_id)
-    # Handle negative subdomain_id
-    kernel_name = kernel_name.replace("-", "_")
+    kernel_name = f"{prefix}_{integral_type}_integral"
     # Dict mapping domains to index in original_form.ufl_domains()
     domain_numbering = form_data.original_form.domain_numbering()
     domain_number = domain_numbering[integral_data.domain]