ufl2unicode fail (FEniCS#237)

* In a recent change to UFL, subdomain_id was transformed from a single value to a tuple. This broke some assumptions in ufl2unicode that I have fixed here. * Update ufl/formatting/ufl2unicode.py Co-authored-by: Connor Ward <[email protected]> * Update ufl/formatting/ufl2unicode.py Co-authored-by: Connor Ward <[email protected]> * Update ufl/formatting/ufl2unicode.py Co-authored-by: Connor Ward <[email protected]> * Update ufl/formatting/ufl2unicode.py Co-authored-by: Connor Ward <[email protected]> --------- Co-authored-by: Connor Ward <[email protected]>
firedrakeproject · Nov 3, 2023 · 0fe782c · 0fe782c
1 parent 372a93b
commit 0fe782c
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/ufl/formatting/ufl2unicode.py b/ufl/formatting/ufl2unicode.py
@@ -300,14 +300,15 @@ def get_integral_symbol(integral_type, domain, subdomain_id):
 
     # TODO: Render domain description
 
-    if isinstance(subdomain_id, numbers.Integral):
-        istr += subscript_number(int(subdomain_id))
-    elif subdomain_id == "everywhere":
-        pass
-    elif subdomain_id == "otherwise":
-        istr += "[rest of domain]"
-    elif isinstance(subdomain_id, tuple):
-        istr += ",".join([subscript_number(int(i)) for i in subdomain_id])
+    subdomain_strs = []
+    for subdomain in subdomain_id:
+        if isinstance(subdomain, numbers.Integral):
+            subdomain_strs.append(subscript_number(int(subdomain)))
+        elif subdomain == "everywhere":
+            pass
+        elif subdomain == "otherwise":
+            subdomain_strs.append("[rest of domain]")
+    istr += ",".join(subdomain_strs)
 
     dxstr = ufl.measure.integral_type_to_measure_name[integral_type]
     dxstr = measure_font(dxstr)