Merge remote-tracking branch 'origin/master' into refactor/derived-types

Author: sbryngelson

toolchain/mfc/test/test.py

@@ -112,13 +112,23 @@ def __filter(cases_) -> typing.Tuple[typing.List[TestCase], typing.List[TestCase
             raise MFCException(f"--only filter matched zero test cases. Specified: {ARG('only')}. Check that UUIDs/names are valid.")
 
     # Convergence cases are slow (multiple resolutions × MPI ranks). Skip
-    # by default unless the user explicitly opted in via --only "Convergence"
-    # or a convergence UUID. _filter_only above has already narrowed cases
-    # to the user's selection, so any convergence case still present here
-    # was selected on purpose. Listing (`-l`) shows all cases regardless.
-    if not ARG("only") and not ARG("list"):
-        convergence_cases = [c for c in cases if getattr(c, "kind", "golden") == "convergence"]
-        if convergence_cases:
+    # unless the user explicitly opted in via --only "Convergence" or a
+    # specific convergence UUID. A label like --only "2D" must not
+    # accidentally pull in "Convergence -> 2D -> ..." cases.
+    if not ARG("list"):
+
+        def is_uuid(term):
+            return len(term) == 8 and all(c in "0123456789abcdefABCDEF" for c in term)
+
+        only_terms = ARG("only")
+        only_labels = [t for t in only_terms if not is_uuid(t)]
+        only_uuids = [t for t in only_terms if is_uuid(t)]
+
+        convergence_uuids = {c.get_uuid() for c in cases if getattr(c, "kind", "golden") == "convergence"}
+        user_wants_convergence = "Convergence" in only_labels or any(u in convergence_uuids for u in only_uuids)
+
+        if not user_wants_convergence:
+            convergence_cases = [c for c in cases if getattr(c, "kind", "golden") == "convergence"]
             for c in convergence_cases:
                 cases.remove(c)
                 skipped_cases.append(c)

toolchain/patches/fypp-linemarker-resync.patch

@@ -1,25 +1,26 @@
---- a/fypp.py
-+++ b/fypp.py
-@@ -1842,11 +1842,16 @@ class _Renderer:
-             if self._linenums:
-                 # Last line was folded, but no linenums were generated for
-                 # the continuation lines -> current line position is not
-                 # in sync with the one calculated from the last line number
-                 unsync = (
-                     len(foldedlines) and len(foldedlines[-1]) > 1
+--- a/fypp.py	2026-05-14 19:44:34.158817311 -0400
++++ b/fypp.py	2026-05-14 19:44:34.188817564 -0400
+@@ -1848,12 +1848,17 @@
                      and not self._contlinenums)
                  # Eval directive in source consists of more than one line
                  multiline = span[1] - span[0] > 1
 -                if unsync or multiline:
+-                    # For inline eval directives span[0] == span[1]
+-                    # -> next line is span[0] + 1 and not span[1] as for
+-                    # line eval directives
+-                    nextline = max(span[1], span[0] + 1)
+-                    trailing += self._linenumdir(nextline, fname)
 +                # Always emit a resync marker after a $: call. Without this,
 +                # single-line $: calls that expand to multi-line #if/#endif
 +                # blocks (e.g. GPU_PARALLEL_LOOP) cause the compiler to
 +                # attribute the next Fortran statement to the call-site line
 +                # rather than the following source line, producing off-by-1
 +                # errors in backtraces and debugger line info.
-+                if unsync or multiline or True:
-                     # For inline eval directives span[0] == span[1]
-                     # -> next line is span[0] + 1 and not span[1] as for
-                     # line eval directives
-                     nextline = max(span[1], span[0] + 1)
-                     trailing += self._linenumdir(nextline, fname)
++                # For inline eval directives span[0] == span[1]
++                # -> next line is span[0] + 1 and not span[1] as for
++                # line eval directives
++                nextline = max(span[1], span[0] + 1)
++                trailing += self._linenumdir(nextline, fname)
+         else:
+             trailing = ''
+         return result + trailing