test: integrate convergence runs into ./mfc.sh test

Convergence tests now register as TestCases (kind='convergence') with a
'Convergence -> {1D,2D,Sod,Temporal} -> <scheme>' trace prefix, dispatched
through _handle_case to the runner library in toolchain/mfc/test/convergence.py.
Skipped by default; opt in via --only Convergence.

Drops the four standalone run_*.py runner scripts and the _convergence_common
helper module — their content moved into toolchain/mfc/test/convergence.py.
The convergence.yml workflow shrinks from 4 hand-rolled jobs invoking python
runners to a single ./mfc.sh test --only Convergence call.

Author: sbryngelson

.github/workflows/convergence.yml

@@ -10,10 +10,10 @@ env:
   OMPI_MCA_rmaps_base_oversubscribe: 1
 
 jobs:
-  convergence-1d:
-    name: "1D Advection Convergence"
+  convergence:
+    name: "Convergence"
     runs-on: ubuntu-latest
-    timeout-minutes: 60
+    timeout-minutes: 240
 
     steps:
       - uses: actions/checkout@v4
@@ -29,98 +29,8 @@ jobs:
         with:
           python-version: "3.12"
 
-      - name: Initialize MFC
-        run: ./mfc.sh init
+      - name: Build MFC
+        run: ./mfc.sh build -j 4
 
-      - name: Run 1D convergence tests
-        run: |
-          source build/venv/bin/activate
-          python toolchain/mfc/test/run_convergence_1d.py \
-            --resolutions 64 128 256 512 1024 \
-            --num-ranks 4
-
-  convergence-2d:
-    name: "2D Isentropic Vortex Convergence"
-    runs-on: ubuntu-latest
-    timeout-minutes: 60
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Setup Ubuntu
-        run: |
-          sudo apt update -y
-          sudo apt install -y cmake gcc g++ python3 python3-dev \
-                   openmpi-bin libopenmpi-dev
-
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.12"
-
-      - name: Initialize MFC
-        run: ./mfc.sh init
-
-      - name: Run 2D convergence tests
-        run: |
-          source build/venv/bin/activate
-          python toolchain/mfc/test/run_convergence.py \
-            --resolutions 32 64 128 \
-            --num-ranks 4
-
-  convergence-sod:
-    name: "1D Sod Shock Tube L1 Convergence"
-    runs-on: ubuntu-latest
-    timeout-minutes: 90
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Setup Ubuntu
-        run: |
-          sudo apt update -y
-          sudo apt install -y cmake gcc g++ python3 python3-dev \
-                   openmpi-bin libopenmpi-dev
-
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.12"
-
-      - name: Initialize MFC
-        run: ./mfc.sh init
-
-      - name: Run Sod shock tube L1 convergence tests
-        run: |
-          source build/venv/bin/activate
-          python toolchain/mfc/test/run_sod.py \
-            --resolutions 64 128 256 512 \
-            --num-ranks 4
-
-  convergence-temporal:
-    name: "RK3 Temporal Order"
-    runs-on: ubuntu-latest
-    timeout-minutes: 60
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Setup Ubuntu
-        run: |
-          sudo apt update -y
-          sudo apt install -y cmake gcc g++ python3 python3-dev \
-                   openmpi-bin libopenmpi-dev
-
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.12"
-
-      - name: Initialize MFC
-        run: ./mfc.sh init
-
-      - name: Run temporal order tests
-        run: |
-          source build/venv/bin/activate
-          python toolchain/mfc/test/run_temporal_order.py \
-            --num-ranks 4
+      - name: Run convergence tests
+        run: ./mfc.sh test --only Convergence --no-build -j 1

toolchain/mfc/test/_convergence_common.py

@@ -155,12 +155,16 @@ class TestCase(case.Case):
     trace: str
     override_tol: Optional[float] = None
     restart_check: bool = False
+    kind: str = "golden"
+    convergence_spec: Optional[dict] = None
 
-    def __init__(self, trace: str, mods: dict, ppn: int = None, override_tol: float = None, restart_check: bool = False) -> None:
+    def __init__(self, trace: str, mods: dict, ppn: int = None, override_tol: float = None, restart_check: bool = False, kind: str = "golden", convergence_spec: Optional[dict] = None) -> None:
         self.trace = trace
         self.ppn = ppn or 1
         self.override_tol = override_tol
         self.restart_check = restart_check
+        self.kind = kind
+        self.convergence_spec = convergence_spec
         merge = {**BASE_CFG.copy(), **mods}
         merge = {key: val for key, val in merge.items() if val is not None}
         super().__init__(merge)
@@ -361,11 +365,18 @@ class TestCaseBuilder:
     functor: Optional[Callable]
     override_tol: Optional[float] = None
     restart_check: bool = False
+    kind: str = "golden"
+    convergence_spec: Optional[dict] = None
 
     def get_uuid(self) -> str:
         return trace_to_uuid(self.trace)
 
     def to_case(self) -> TestCase:
+        if self.kind == "convergence":
+            # Convergence cases drive their own runs — the BASE_CFG mods/path
+            # machinery is unused. Trace + spec are the only inputs.
+            return TestCase(self.trace, {}, self.ppn, self.override_tol, self.restart_check, kind=self.kind, convergence_spec=self.convergence_spec)
+
         dictionary = {}
         if self.path:
             dictionary.update(input.load(self.path, self.args, do_print=False).params)
@@ -411,6 +422,15 @@ def define_case_f(trace: str, path: str, args: List[str] = None, ppn: int = None
     return TestCaseBuilder(trace, mods or {}, path, args or [], ppn or 1, functor, override_tol)
 
 
+def define_convergence_case(trace: str, spec: dict, ppn: int = None) -> TestCaseBuilder:
+    """Register a convergence-rate test (kind='convergence').
+
+    `spec` must include a `runner` key naming a runner in
+    `toolchain/mfc/test/convergence.py` plus runner-specific arguments.
+    """
+    return TestCaseBuilder(trace, {}, None, None, ppn or 1, None, None, False, kind="convergence", convergence_spec=spec)
+
+
 def define_case_d(stack: CaseGeneratorStack, newTrace: str, newMods: dict, ppn: int = None, functor: Callable = None, override_tol: float = None, restart_check: bool = False) -> TestCaseBuilder:
     mods: dict = {}