From 0fe782c97bcd1f7cc054a21861a45d7eaf1761ed Mon Sep 17 00:00:00 2001 From: Daiane Iglesia Dolci <63597005+Ig-dolci@users.noreply.github.com> Date: Fri, 3 Nov 2023 15:21:01 +0000 Subject: [PATCH] ufl2unicode fail (#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 * Update ufl/formatting/ufl2unicode.py Co-authored-by: Connor Ward * Update ufl/formatting/ufl2unicode.py Co-authored-by: Connor Ward * Update ufl/formatting/ufl2unicode.py Co-authored-by: Connor Ward --------- Co-authored-by: Connor Ward --- ufl/formatting/ufl2unicode.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/ufl/formatting/ufl2unicode.py b/ufl/formatting/ufl2unicode.py index 90a5d7bf7..0a5f0549f 100644 --- 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)