Merge branch 'main' into schnellerhase/form-arity

Author: schnellerhase

test/test_classcoverage.py

@@ -5,8 +5,8 @@
 from utils import LagrangeElement, MixedElement
 
 import ufl
-from ufl import *  # noqa: F403
 from ufl import (
+    H1,  # noqa: F401
     And,
     Argument,
     CellDiameter,
@@ -116,8 +116,8 @@
     all_ufl_classes,
 )
 
-has_repr = set()
-has_dict = set()
+has_repr: set[str] = set()
+has_dict: set[str] = set()
 
 
 def _test_object(a, shape, free_indices):

ufl/algorithms/analysis.py

@@ -62,6 +62,7 @@ def extract_type(a, ufl_types, base_form_op_as_expr=None):
     """
     if not isinstance(ufl_types, list | tuple):
         ufl_types = (ufl_types,)
+    original_ufl_types = tuple(ufl_types)
 
     if all(t is not BaseFormOperator for t in ufl_types):
         remove_base_form_ops = True
@@ -127,7 +128,7 @@ def extract_type(a, ufl_types, base_form_op_as_expr=None):
 
     # `Remove BaseFormOperator` objects if there were initially not in `ufl_types`
     if remove_base_form_ops:
-        objects -= base_form_ops
+        objects -= {o for o in base_form_ops if not isinstance(o, original_ufl_types)}
     return objects
 
 

ufl/formatting/ufl2unicode.py

@@ -361,7 +361,7 @@ def format_index(ii):
     if isinstance(ii, FixedIndex):
         s = f"{ii._value}"
     elif isinstance(ii, Index):
-        s = "i{subscript_number(ii._count)}"
+        s = f"i{subscript_number(ii._count)}"
     else:
         raise ValueError(f"Invalid index type {type(ii)}.")
     return s

ufl/measure.py

@@ -287,6 +287,7 @@ def __call__(
         subdomain_data=None,
         degree=None,
         scheme=None,
+        intersect_measures=None,
     ):
         """Reconfigure measure with new domain specification or metadata."""
         # Let syntax dx() mean integral over everywhere
@@ -324,6 +325,7 @@ def __call__(
             domain=domain,
             metadata=metadata,
             subdomain_data=subdomain_data,
+            intersect_measures=intersect_measures,
         )
 
     def __str__(self):