d0fus 2.2.0__tar.gz → 2.2.2__tar.gz

{d0fus-2.2.0 → d0fus-2.2.2}/D0FUS_BIB/D0FUS_figures.py

@@ -48,14 +48,15 @@ if __name__ != "__main__":
         get_Lz,
         f_He_fraction,
         f_q_profile,
+        f_sigmav,
     )
     from .D0FUS_radial_build_functions import (
         J_non_Cu_NbTi, J_non_Cu_Nb3Sn, J_non_Cu_REBCO,
         calculate_cable_current_density,
         eta_old, eta_spitzer, eta_sauter, eta_redl,
-        f_TF_academic, f_TF_D0FUS,
-        Winding_Pack_D0FUS, gamma_func, _last_graded_profile,
-        f_CS_ACAD, f_CS_D0FUS, f_CS_CIRCE,
+        f_TF_academic, f_TF_refined,
+        Winding_Pack_refined, gamma_func, _last_graded_profile,
+        f_CS_ACAD, f_CS_refined, f_CS_CIRCE,
         F_CIRCE0D, compute_von_mises_stress,
         calculate_E_mag_TF,
     )
@@ -76,14 +77,15 @@ else:
         get_Lz,
         f_He_fraction,
         f_q_profile,
+        f_sigmav,
     )
     from D0FUS_BIB.D0FUS_radial_build_functions import (
         J_non_Cu_NbTi, J_non_Cu_Nb3Sn, J_non_Cu_REBCO,
         calculate_cable_current_density,
         eta_old, eta_spitzer, eta_sauter, eta_redl,
-        f_TF_academic, f_TF_D0FUS,
-        Winding_Pack_D0FUS, gamma_func, _last_graded_profile,
-        f_CS_ACAD, f_CS_D0FUS, f_CS_CIRCE,
+        f_TF_academic, f_TF_refined,
+        Winding_Pack_refined, gamma_func, _last_graded_profile,
+        f_CS_ACAD, f_CS_refined, f_CS_CIRCE,
         F_CIRCE0D, compute_von_mises_stress,
         calculate_E_mag_TF,
     )
@@ -193,9 +195,9 @@ def plot_shaping_profiles(
     """
     Plot radial elongation κ(ρ) and triangularity δ(ρ) profiles.
 
-    Both the 'Academic' (constant-κ, δ=0) and the 'D0FUS PCHIP' profiles are
-    shown.  For δ, both positive and negative triangularity cases are
-    superimposed.
+    Both the 'Academic' (constant-κ, δ=0) and the 'Refined PCHIP'
+    profiles are shown.  For δ, both positive and negative triangularity
+    cases are superimposed.
 
     Parameters
     ----------
@@ -206,7 +208,7 @@ def plot_shaping_profiles(
 
     References
     ----------
-    Christiansen et al., Nucl. Fusion 32, 291 (1992) — PCHIP parameterisation.
+    Fritsch & Carlson, SIAM J. Numer. Anal. 17, 238 (1980) — PCHIP scheme.
     Ball & Parra, PPCF 57, 045006 (2015) — κ core penetration.
     """
     rho = np.linspace(1e-4, 1.0, 500)
@@ -223,7 +225,7 @@ def plot_shaping_profiles(
                label=f"Academic: κ = κ_edge = {kappa_edge}  (const)")
     ax.plot(rho, kappa_profile(rho, kappa_edge, kappa_95),
             color="tab:red", lw=2,
-            label="D0FUS: flat core at κ₉₅, edge rise (PCHIP)")
+            label="Refined: flat core at κ₉₅, edge rise (PCHIP)")
     ax.axvline(rho_95,   color="gray", lw=1, ls="--", alpha=0.7)
     ax.axhline(kappa_95, color="gray", lw=1, ls="--", alpha=0.7)
     ax.plot(rho_95, kappa_95, "o", color="tab:red", ms=7, zorder=5,
@@ -243,10 +245,10 @@ def plot_shaping_profiles(
     ax.axhline(0, color="tab:blue", lw=2, ls="-", label="Academic: δ = 0")
     ax.plot(rho, delta_profile(rho, delta_edge, delta_95),
             color="tab:red", lw=2,
-            label=f"D0FUS PCHIP: δ_edge = +{delta_edge} (D-shape)")
+            label=f"Refined PCHIP: δ_edge = +{delta_edge} (D-shape)")
     ax.plot(rho, delta_profile(rho, delta_edge_neg, delta_95_neg),
             color="tab:purple", lw=2,
-            label=f"D0FUS PCHIP: δ_edge = {delta_edge_neg} (neg. triang.)")
+            label=f"Refined PCHIP: δ_edge = {delta_edge_neg} (neg. triang.)")
     ax.axvline(rho_95,   color="gray",       lw=1, ls="--", alpha=0.7)
     ax.axhline(delta_95, color="tab:red",    lw=1, ls="--", alpha=0.6)
     ax.plot(rho_95, delta_95, "o", color="tab:red", ms=7, zorder=5,
@@ -283,9 +285,9 @@ def plot_miller_surfaces(
 ) -> None:
     """
     Plot Miller flux surfaces for three geometry configurations side by side:
-      1. D0FUS PCHIP — positive triangularity
-      2. Academic      — circular (κ const, δ = 0)
-      3. D0FUS PCHIP — negative triangularity
+      1. Refined PCHIP — positive triangularity
+      2. Academic     — circular (κ const, δ = 0)
+      3. Refined PCHIP — negative triangularity
 
     Parameters
     ----------
@@ -309,15 +311,15 @@ def plot_miller_surfaces(
     colors_fs  = cm.Blues(np.linspace(0.20, 0.95, n_levels))
 
     configs = [
-        ("D0FUS",
-         f"D0FUS PCHIP — positive δ\n"
+        ("refined",
+         f"Refined PCHIP — positive δ\n"
          f"(κ₉₅ = {kappa_95:.3f}, δ_edge = +{delta_edge}, δ₉₅ = +{delta_95:.3f})",
          kappa_edge, delta_edge, kappa_95, delta_95),
         ("Academic",
          f"Academic  (κ = {kappa_edge} const, δ = 0)",
          kappa_edge, 0.0, kappa_95, 0.0),
-        ("D0FUS",
-         f"D0FUS PCHIP — negative δ\n"
+        ("refined",
+         f"Refined PCHIP — negative δ\n"
          f"(κ₉₅ = {kappa_95:.3f}, δ_edge = {delta_edge_neg}, δ₉₅ = {delta_95_neg:.3f})",
          kappa_edge, delta_edge_neg, kappa_95, delta_95_neg),
     ]
@@ -348,7 +350,7 @@ def plot_miller_surfaces(
         ax.grid(True, alpha=0.3)
 
     plt.suptitle(
-        f"Miller flux surfaces — Academic | D0FUS (+δ) | D0FUS (−δ)\n"
+        f"Miller flux surfaces — Academic | Refined (+δ) | Refined (−δ)\n"
         f"(R₀ = {R0} m, a = {a} m, κ = {kappa_edge}, |δ| = {delta_edge})",
         fontsize=12, fontweight="bold"
     )
@@ -461,7 +463,7 @@ def plot_first_wall_surface(
 ) -> None:
     """
     Compare first-wall surface area from the Academic (Ramanujan ellipse)
-    and D0FUS (Miller LCFS numerical) models.
+    and refined (Miller LCFS numerical) models.
 
     Left panel  : S vs κ  (δ fixed).
     Right panel : S vs δ  (κ fixed, including negative triangularity).
@@ -483,11 +485,11 @@ def plot_first_wall_surface(
 
     S_ac_k = [f_first_wall_surface(R0, a, k, delta_fix, "Academic")
               for k in kappa_scan]
-    S_d0_k = [f_first_wall_surface(R0, a, k, delta_fix, "D0FUS")
+    S_d0_k = [f_first_wall_surface(R0, a, k, delta_fix, "refined")
               for k in kappa_scan]
     S_ac_d = [f_first_wall_surface(R0, a, kappa_fix, d, "Academic")
               for d in delta_scan]
-    S_d0_d = [f_first_wall_surface(R0, a, kappa_fix, d, "D0FUS")
+    S_d0_d = [f_first_wall_surface(R0, a, kappa_fix, d, "refined")
               for d in delta_scan]
 
     fig, axes = plt.subplots(1, 2, figsize=(13, 5))
@@ -501,7 +503,7 @@ def plot_first_wall_surface(
          f"First wall surface vs δ  (κ = {kappa_fix})"),
     ]:
         ax.plot(xarr, S_ac, "b-",  lw=2, label="Academic (Ramanujan ellipse)")
-        ax.plot(xarr, S_d0, "r--", lw=2, label="D0FUS (Miller LCFS)")
+        ax.plot(xarr, S_d0, "r--", lw=2, label="Refined (Miller LCFS)")
         ax.set_xlabel(xlabel, fontsize=12)
         ax.set_ylabel("S  [m²]", fontsize=12)
         ax.set_title(title, fontsize=11)
@@ -639,6 +641,96 @@ def plot_density_line_vol(
 # 3. Nuclear / radiation physics
 # =============================================================================
 
+def plot_DT_reactivity(
+    T_min_keV: float = 1.0,
+    T_max_keV: float = 100.0,
+    n_points: int = 600,
+    T_op_min: float = 10.0,
+    T_op_max: float = 25.0,
+    save_dir: str | None = None,
+) -> None:
+    """
+    Plot the D-T Maxwellian reactivity ⟨σv⟩(T) used by D0FUS, together with
+    the pressure-limited fusion power density metric ⟨σv⟩/T².
+
+    Left panel:
+        ⟨σv⟩(T) computed from the Bosch & Hale (1992) parameterisation,
+        with the power plant operating window [T_op_min, T_op_max] shaded
+        and the reactivity maximum marked.
+
+    Right panel:
+        Pressure-limited figure of merit ⟨σv⟩/T² (arbitrary units).
+        At fixed plasma pressure p = nT, the fuel ion density scales as
+        n ∝ 1/T, so the volumetric fusion power density p_fus ∝ n² ⟨σv⟩
+        is proportional to ⟨σv⟩/T². This identifies the optimal operating
+        temperature for a β-limited tokamak near 14 keV.
+
+    Parameters
+    ----------
+    T_min_keV, T_max_keV : float  Ion temperature scan range [keV].
+    n_points             : int    Number of temperature grid points.
+    T_op_min, T_op_max   : float  Power plant operating window bounds [keV].
+    save_dir             : str or None
+
+    References
+    ----------
+    Bosch & Hale, Nucl. Fusion 32, 611 (1992) — DT reactivity fit (Table IV).
+    Freidberg, Plasma Physics and Fusion Energy (2007) — pressure-limited optimum.
+    """
+    # Temperature grid (linear, since the operating window lies in the rapid-rise zone)
+    T_arr  = np.linspace(T_min_keV, T_max_keV, n_points)
+    sv_arr = f_sigmav(T_arr)
+
+    # Reactivity maximum
+    i_peak           = int(np.argmax(sv_arr))
+    T_peak, sv_peak  = T_arr[i_peak], sv_arr[i_peak]
+
+    # Pressure-limited metric ⟨σv⟩/T² (units arbitrary, normalised below)
+    metric           = sv_arr / T_arr**2
+    i_opt            = int(np.argmax(metric))
+    T_opt, m_opt     = T_arr[i_opt], metric[i_opt]
+
+    # --- Figure ------------------------------------------------------------
+    fig, axes = plt.subplots(1, 2, figsize=(11, 4.5))
+
+    # Left panel: reactivity curve on log scale
+    ax = axes[0]
+    ax.semilogy(T_arr, sv_arr, color="tab:red", lw=2.0,
+                label="Bosch & Hale (1992)")
+    ax.axvspan(T_op_min, T_op_max, color="goldenrod", alpha=0.20,
+               label=f"Operating window\n{T_op_min:.0f}–{T_op_max:.0f} keV")
+    ax.axvline(T_peak, color="k", lw=1.0, ls="--",
+               label=f"peak: T = {T_peak:.0f} keV")
+    ax.set_xlabel(r"Ion temperature $T$  [keV]", fontsize=11)
+    ax.set_ylabel(r"$\langle\sigma v\rangle_{DT}$  [m$^3$ s$^{-1}$]", fontsize=11)
+    ax.set_title("D-T Maxwellian reactivity", fontsize=11)
+    ax.set_xlim(T_min_keV, T_max_keV)
+    ax.set_ylim(1e-25, 3e-21)
+    ax.grid(True, which="both", alpha=0.25)
+    ax.legend(fontsize=9, loc="lower right")
+
+    # Right panel: pressure-limited figure of merit
+    ax = axes[1]
+    ax.plot(T_arr, metric / m_opt, color="tab:blue", lw=2.0,
+            label=r"$\langle\sigma v\rangle / T^2$  (normalised)")
+    ax.axvspan(T_op_min, T_op_max, color="goldenrod", alpha=0.20,
+               label=f"Operating window\n{T_op_min:.0f}–{T_op_max:.0f} keV")
+    ax.axvline(T_opt, color="k", lw=1.0, ls="--",
+               label=f"optimum: T = {T_opt:.1f} keV")
+    ax.set_xlabel(r"Ion temperature $T$  [keV]", fontsize=11)
+    ax.set_ylabel(r"$\langle\sigma v\rangle / T^2$  [normalised]", fontsize=11)
+    ax.set_title(r"Pressure-limited fusion power figure of merit", fontsize=11)
+    ax.set_xlim(0, 50)
+    ax.set_ylim(0, 1.08)
+    ax.grid(True, alpha=0.25)
+    ax.legend(fontsize=9, loc="lower right")
+
+    plt.suptitle("Fusion reactivity and operating temperature window",
+                 fontsize=12, fontweight="bold")
+    plt.tight_layout()
+    _save_or_show(fig, save_dir, "DT_reactivity")
+
+
 def plot_Lz_cooling(
     Te_min_keV: float = 0.05,
     Te_max_keV: float = 100.0,
@@ -711,7 +803,8 @@ def plot_He_fraction(
     nbar: float = 1.0,
     Tbar: float = 8.9,
     tauE: float = 3.7,
-    C_Alpha: float = 5.0,
+    C_Alpha_ITER: float = 5.0,
+    C_Alpha_DEMO: float = 7.0,
     nu_T: float = 1.0,
     save_dir: str | None = None,
 ) -> None:
@@ -720,16 +813,25 @@ def plot_He_fraction(
     C_α = τ_α / τ_E for ITER and EU-DEMO reference parameters, comparing
     academic (no pedestal) and H-mode pedestal profile assumptions.
 
+    Two D0FUS default values for C_α are highlighted with vertical dotted
+    lines: C_α = 5 for ITER (consistent with Progress in the ITER Physics
+    Basis projections) and C_α = 7 for EU-DEMO 2017 (PROCESS reference run).
+
     Parameters
     ----------
     nbar, Tbar, tauE : float  Reference plasma parameters [10²⁰ m⁻³, keV, s].
-    C_Alpha          : float  Reference C_α value (drawn as vertical line) [-].
+    C_Alpha_ITER     : float  D0FUS default C_α for ITER (vertical line) [-].
+    C_Alpha_DEMO     : float  D0FUS default C_α for EU-DEMO 2017 (vertical line) [-].
     nu_T             : float  Temperature peaking exponent [-].
     save_dir         : str or None
 
     References
     ----------
     ITER Physics Basis, Nucl. Fusion 39, §2.4 (1999).
+    Shimada et al., Progress in the ITER Physics Basis, Ch. 1,
+        Nucl. Fusion 47, S1 (2007).
+    Kovari et al., Fus. Eng. Des. 89, 3054 (2014) — PROCESS systems code.
+    Reiter, Wolf and Kever, Nucl. Fusion 30, 2141 (1990) — ignition bound on C_α.
     """
     C_arr = np.linspace(2, 15, 150)
 
@@ -739,16 +841,22 @@ def plot_He_fraction(
                    for C in C_arr]
     fa_DEMO     = [f_He_fraction(1.2, 12.5,  4.6, C, nu_T) * 100 for C in C_arr]
 
-    fig, ax = plt.subplots(figsize=(6.5, 4.2))
-    ax.plot(C_arr, fa_ITER,     "b-",  lw=1.8, label="ITER — academic (no pedestal)")
-    ax.plot(C_arr, fa_ITER_ped, "b--", lw=1.4, label="ITER — D0FUS H-mode pedestal")
-    ax.plot(C_arr, fa_DEMO,     "r-",  lw=1.8, label="EU-DEMO — academic")
-    ax.axvline(C_Alpha, color="k", lw=0.9, ls=":", label=f"$C_\\alpha$ = {C_Alpha:.0f}")
-    ax.axhspan(4, 6, color="grey", alpha=0.12, label="ITER target 5 %")
-    ax.set_xlabel(r"Removal efficiency $C_\alpha = \tau_\alpha / \tau_E$", fontsize=11)
-    ax.set_ylabel(r"Helium ash fraction $f_\alpha$ [%]", fontsize=11)
-    ax.set_title("He ash fraction — academic vs D0FUS H-mode pedestal", fontsize=10)
-    ax.legend(fontsize=8)
+    fig, ax = plt.subplots(figsize=(8.0, 5.2))
+    ax.plot(C_arr, fa_ITER,     "b-",  lw=2.0, label="ITER — academic (no pedestal)")
+    ax.plot(C_arr, fa_ITER_ped, "b--", lw=1.6, label="ITER — Refined H-mode pedestal")
+    ax.plot(C_arr, fa_DEMO,     "r-",  lw=2.0, label="EU-DEMO — academic")
+    # Two D0FUS default operating points: ITER and EU-DEMO 2017
+    ax.axvline(C_Alpha_ITER, color="tab:blue", lw=1.6, ls=":",
+               label=f"ITER default $C_\\alpha$ = {C_Alpha_ITER:.0f}")
+    ax.axvline(C_Alpha_DEMO, color="tab:red",  lw=1.6, ls=":",
+               label=f"EU-DEMO 2017 default $C_\\alpha$ = {C_Alpha_DEMO:.0f}")
+    ax.axhspan(4, 6, color="grey", alpha=0.12, label="ITER target 4–6 %")
+    ax.set_xlabel(r"Removal efficiency $C_\alpha = \tau_\alpha / \tau_E$", fontsize=14)
+    ax.set_ylabel(r"Helium ash fraction $f_\alpha$  [%]", fontsize=14)
+    ax.set_title("He ash fraction — academic vs refined H-mode pedestal",
+                 fontsize=13)
+    ax.legend(fontsize=11, loc="upper left")
+    ax.tick_params(axis="both", labelsize=12)
     ax.set_xlim(2, 15)
     ax.set_ylim(0, 25)
     ax.grid(True, alpha=0.3)
@@ -761,12 +869,84 @@ def plot_He_fraction(
 # 4. Superconductor / cable engineering
 # =============================================================================
 
+# -----------------------------------------------------------------------------
+# NHMFL engineering current density reference data (T = 4.2 K)
+# -----------------------------------------------------------------------------
+# Source: National High Magnetic Field Laboratory (NHMFL / MagLab) "Engineering
+# Current Density Plot", file Je_vs_B-041118a (updated 2021-01-04).  Values are
+# whole-strand / whole-tape engineering current density Je [A/mm²] vs applied
+# field B [T].  Only the three series directly comparable to the D0FUS strand
+# scalings (NbTi, Nb3Sn bronze, REBCO worst-orientation) are kept here.
+#
+# Per-series provenance:
+#   * REBCO B perp tape plane : SuperPower SP26, 50 µm substrate, 7.5%Zr,
+#     measured at NHMFL (Braccini, Jaroszynski, Xu) - DOI 10.1088/0953-2048/24/3/035001
+#   * Nb3Sn High Sn Bronze    : Miyazaki et al., MT-18 (IEEE TASC 14:2, 2004)
+#     DOI 10.1109/TASC.2004.830344
+#   * NbTi LHC 4.2 K          : Boutboul et al., MT-19 (IEEE TASC 16:2, 2006)
+#     DOI 10.1109/TASC.2006.870777
+_NHMFL_JE_REFERENCE = {
+    "NbTi": {
+        "label": "NbTi LHC strand",
+        "B": np.array([0.61, 0.95, 1.34, 1.68, 2.23, 3.18, 4.15, 5.12, 6.10]),
+        "Je": np.array([5106.88, 4054.15, 3180.60, 2710.23, 2217.46,
+                        1724.69, 1411.11, 1187.12, 918.34]),
+    },
+    "Nb3Sn": {
+        "label": "Nb₃Sn high-Sn bronze",
+        "B": np.array([18.00, 19.01, 20.01, 21.01, 22.02, 23.00, 24.00, 25.00]),
+        "Je": np.array([166.64, 137.81, 111.10, 84.38, 60.82, 40.08, 19.34, 8.09]),
+    },
+    "REBCO": {
+        "label": "REBCO tape, B⊥ (worst case)",
+        "B": np.array([1.0, 1.5, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0,
+                       10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 18.0,
+                       20.0, 22.0, 24.0, 25.0, 26.0, 28.0, 30.0, 31.0]),
+        "Je": np.array([3665.00, 2920.00, 2380.00, 1796.15, 1447.69, 1188.46,
+                        1034.37,  956.92,  851.83,  780.84,  720.00,  679.44,
+                         626.09,  593.24,  563.48,  535.38,  516.52,  469.56,
+                         433.08,  406.96,  391.30,  367.69,  360.00,  344.35,
+                         328.70,  322.31]),
+    },
+}
+
+
+def _overlay_nhmfl_reference(ax, color_map: dict, alpha: float = 0.30) -> None:
+    """
+    Overlay the NHMFL engineering current density reference (4.2 K) on ``ax``
+    as transparent markers connected by a thin line, color-matched per material.
+
+    Parameters
+    ----------
+    ax        : matplotlib Axes  Target axes (assumed log-y in A/mm²).
+    color_map : dict             Mapping {material_key: hex_color} for NbTi,
+                                 Nb3Sn, REBCO; the same colours used for the
+                                 D0FUS curves so the visual pairing is direct.
+    alpha     : float            Transparency for both markers and connecting
+                                 line (default 0.30, "background" appearance).
+    """
+    for key, ref in _NHMFL_JE_REFERENCE.items():
+        col = color_map.get(key, "#808080")
+        ax.plot(
+            ref["B"], ref["Je"],
+            linestyle="-", linewidth=1.0,
+            marker="o", markersize=4.5,
+            color=col, alpha=alpha,
+            zorder=1,
+        )
+    # Single neutral legend handle for the whole NHMFL reference set.
+    ax.plot([], [], linestyle="-", linewidth=1.0, marker="o", markersize=4.5,
+            color="#555555", alpha=alpha,
+            label="NHMFL strand/tape data @ 4.2 K (2011 vintage, ref.)")
+
+
 def plot_Jc_scaling(
     B_min: float = 0.5,
     B_max: float = 45.0,
     T_op: float = 4.2,
     f_non_Cu_LTS: float = 0.50,
     f_non_Cu_HTS: float = 0.60,
+    show_nhmfl_ref: bool = True,
     save_dir: str | None = None,
 ) -> None:
     """
@@ -776,29 +956,47 @@ def plot_Jc_scaling(
       * Nb₃Sn  (LTS, ITER/EU-DEMO TF/CS)
       * REBCO  (HTS, ARC / SPARC)
 
+    When ``show_nhmfl_ref`` is True, the NHMFL/MagLab experimental engineering
+    current density data at 4.2 K is overlaid as a transparent background
+    reference (color-matched markers + thin line per material).
+
     Parameters
     ----------
-    B_min, B_max : float  Field scan range [T].
-    T_op         : float  Operating temperature [K].
-    f_non_Cu_LTS : float  Non-copper fraction for LTS strands [-].
-    f_non_Cu_HTS : float  Non-copper fraction for HTS tapes [-].
-    save_dir     : str or None
+    B_min, B_max   : float  Field scan range [T].
+    T_op           : float  Operating temperature [K].
+    f_non_Cu_LTS   : float  Non-copper fraction for LTS strands [-].
+    f_non_Cu_HTS   : float  Non-copper fraction for HTS tapes [-].
+    show_nhmfl_ref : bool   Overlay NHMFL 4.2 K reference data (default True).
+    save_dir       : str or None
 
     References
     ----------
     ITER TF strand specifications; Nijhuis (2008); Fleiter & Ballarino (2014).
+    NHMFL/MagLab Engineering Current Density Plot, updated 2021-01-04.
     """
     B_vals  = np.linspace(B_min, B_max, 300)
     J_NbTi  = J_non_Cu_NbTi(B_vals, T_op)  * f_non_Cu_LTS / 1e6   # [A/mm²]
     J_Nb3Sn = J_non_Cu_Nb3Sn(B_vals, T_op, Eps=-0.003) * f_non_Cu_LTS / 1e6
     J_REBCO = J_non_Cu_REBCO(B_vals, T_op, Tet=0) * f_non_Cu_HTS / 1e6
 
+    # Colour palette shared between D0FUS curves and NHMFL reference overlay.
+    col_NbTi, col_Nb3Sn, col_REBCO = "#A06AB4", "#E06C75", "#D4B000"
+
     fig, ax = plt.subplots(figsize=(7, 5))
-    ax.plot(B_vals, J_NbTi,  lw=2, color="#A06AB4", label="NbTi strand")
-    ax.plot(B_vals, J_Nb3Sn, lw=2, color="#E06C75", label="Nb₃Sn strand")
-    ax.plot(B_vals, J_REBCO, lw=2, color="#D4B000", label="REBCO tape")
+
+    # NHMFL background reference (drawn first → lower z-order).
+    if show_nhmfl_ref:
+        _overlay_nhmfl_reference(
+            ax,
+            color_map={"NbTi": col_NbTi, "Nb3Sn": col_Nb3Sn, "REBCO": col_REBCO},
+            alpha=0.30,
+        )
+
+    ax.plot(B_vals, J_NbTi,  lw=2, color=col_NbTi,  label="NbTi strand",  zorder=3)
+    ax.plot(B_vals, J_Nb3Sn, lw=2, color=col_Nb3Sn, label="Nb₃Sn strand", zorder=3)
+    ax.plot(B_vals, J_REBCO, lw=2, color=col_REBCO, label="REBCO tape",   zorder=3)
     ax.set_xlabel("Magnetic field B [T]", fontsize=12)
-    ax.set_ylabel("Engineering current density J [A/mm²]", fontsize=12)
+    ax.set_ylabel("Strand/Tape current density [A/mm²]", fontsize=12)
     ax.set_title(f"Superconductor Jc scalings @ {T_op} K", fontsize=12)
     ax.legend(loc="upper right", fontsize=10)
     ax.grid(True, alpha=0.3)
@@ -937,7 +1135,7 @@ def plot_TF_thickness_vs_field(
 ) -> None:
     """
     Plot TF coil total inboard thickness vs peak magnetic field for four
-    mechanical models (Academic/D0FUS × Wedging/Bucking).
+    mechanical models (Academic/refined × Wedging/Bucking).
 
     An optional MADE benchmark scatter dataset is superimposed on the Wedging
     panel for EU-DEMO validation.
@@ -949,7 +1147,7 @@ def plot_TF_thickness_vs_field(
     sigma_TF   : float  Allowable TF coil stress [Pa].
                          Default 867 MPa (SDC-IC Pm+Pb, austenitic steel at 4 K).
     J_max_TF   : float  Current density on the non-steel area [A/m²].
-                         Default 60 MA/m². The D0FUS cable model (Maddock
+                         Default 60 MA/m². The refined cable model (Maddock
                          adiabatic hotspot) predicts ~40 MA/m² for HTS at
                          20 T,
                          From Giannini 2023 Fig. 20 (validated FEM
@@ -983,11 +1181,11 @@ def plot_TF_thickness_vs_field(
                                     "Bucking", cfg.coef_inboard_tension,
                                     cfg.F_CClamp)[0])
         # c_BP = 0: MADE total radial build = WP + case vault (no backplate)
-        d0_w.append(f_TF_D0FUS(a, b, R0, sigma_TF, J_max_TF, B,
+        d0_w.append(f_TF_refined(a, b, R0, sigma_TF, J_max_TF, B,
                                 "Wedging", 0.5, 1,
                                 0.0, cfg.coef_inboard_tension,
                                 cfg.F_CClamp)[0])
-        d0_b.append(f_TF_D0FUS(a, b, R0, sigma_TF, J_max_TF, B,
+        d0_b.append(f_TF_refined(a, b, R0, sigma_TF, J_max_TF, B,
                                 "Bucking", 1.0, 1,
                                 0.0, cfg.coef_inboard_tension,
                                 cfg.F_CClamp)[0])
@@ -1007,7 +1205,7 @@ def plot_TF_thickness_vs_field(
     # Wedging panel
     ax = axes[0]
     ax.plot(B_vals, acad_w, color=colors[0], lw=2, label="Academic — Wedging")
-    ax.plot(B_vals, d0_w,   color=colors[1], lw=2, label="D0FUS — Wedging")
+    ax.plot(B_vals, d0_w,   color=colors[1], lw=2, label="Refined — Wedging")
     ax.scatter(x_made, y_made, color="k", marker="x", s=80, label="MADE")
     ax.set_xlabel("Peak field B_max [T]", fontsize=12)
     ax.set_ylabel("TF total inboard thickness [m]", fontsize=12)
@@ -1018,7 +1216,7 @@ def plot_TF_thickness_vs_field(
     # Bucking panel
     ax = axes[1]
     ax.plot(B_vals, acad_b, color=colors[0], lw=2, label="Academic — Bucking")
-    ax.plot(B_vals, d0_b,   color=colors[1], lw=2, label="D0FUS — Bucking")
+    ax.plot(B_vals, d0_b,   color=colors[1], lw=2, label="Refined — Bucking")
     ax.set_xlabel("Peak field B_max [T]", fontsize=12)
     ax.set_ylabel("TF total inboard thickness [m]", fontsize=12)
     ax.set_title("Bucking configuration", fontsize=12)
@@ -1067,9 +1265,9 @@ def plot_TF_grading_thickness_vs_field(
     c_g = np.full_like(B_scan, np.nan)
 
     for i, Bm in enumerate(B_scan):
-        ru = Winding_Pack_D0FUS(R0, a, b, sigma_TF, J_max_TF, Bm,
+        ru = Winding_Pack_refined(R0, a, b, sigma_TF, J_max_TF, Bm,
                                 0.5, n, grading=False)
-        rg = Winding_Pack_D0FUS(R0, a, b, sigma_TF, J_max_TF, Bm,
+        rg = Winding_Pack_refined(R0, a, b, sigma_TF, J_max_TF, Bm,
                                 0.5, n, grading=True)
         if np.isfinite(ru[0]):
             c_u[i] = ru[0] * 100
@@ -1116,9 +1314,9 @@ def plot_TF_grading_reduction(
     c_g = np.full_like(B_scan, np.nan)
 
     for i, Bm in enumerate(B_scan):
-        ru = Winding_Pack_D0FUS(R0, a, b, sigma_TF, J_max_TF, Bm,
+        ru = Winding_Pack_refined(R0, a, b, sigma_TF, J_max_TF, Bm,
                                 0.5, n, grading=False)
-        rg = Winding_Pack_D0FUS(R0, a, b, sigma_TF, J_max_TF, Bm,
+        rg = Winding_Pack_refined(R0, a, b, sigma_TF, J_max_TF, Bm,
                                 0.5, n, grading=True)
         if np.isfinite(ru[0]):
             c_u[i] = ru[0] * 100
@@ -1164,9 +1362,9 @@ def plot_TF_grading_alpha_profile(
         cfg = DEFAULT_CONFIG
 
     # Run graded (populates _last_graded_profile) then ungraded
-    rg = Winding_Pack_D0FUS(R0, a, b, sigma_TF, J_max_TF, B_max,
+    rg = Winding_Pack_refined(R0, a, b, sigma_TF, J_max_TF, B_max,
                             0.5, n, grading=True)
-    ru = Winding_Pack_D0FUS(R0, a, b, sigma_TF, J_max_TF, B_max,
+    ru = Winding_Pack_refined(R0, a, b, sigma_TF, J_max_TF, B_max,
                             0.5, n, grading=False)
 
     if not np.isfinite(rg[0]) or not np.isfinite(ru[0]):
@@ -1221,7 +1419,7 @@ def plot_CS_thickness_vs_flux(
 ) -> None:
     """
     Plot CS coil winding-pack thickness and peak field vs volt-second budget
-    for three mechanical models (Academic, D0FUS, CIRCE) and three
+    for three mechanical models (Academic, refined, CIRCE) and three
     configuration types (Wedging, Bucking, Plug).
 
     For the Wedging configuration, a MADE benchmark scatter dataset
@@ -1234,7 +1432,7 @@ def plot_CS_thickness_vs_flux(
       Geometry: a_cs=3 m, b_cs=1.2 m, c_cs=2 m, R0=9 m, Gap=0.1 m
         → R_CS_ext = 9 - 3 - 1.2 - 2 - 0.1 = 2.7 m
 
-      Stress:  σ_CS = 600 MPa.  D0FUS applies fatigue_CS = 2 internally
+      Stress:  σ_CS = 600 MPa.  The refined model applies fatigue_CS = 2 internally
         → σ_eff = 300 MPa as the fig.2 source
 
       J_wost = 85 MA/m², derived from Sarasola 2020 Sec. II-B:
@@ -1281,7 +1479,7 @@ def plot_CS_thickness_vs_flux(
     # subtracted). The MADE reference data published by Sarasola et al.
     # corresponds to the CS hardware design output at full bipolar swing
     # (the curve is parameterised on the total volt-second capacity of
-    # the coil, not on the plasma inductive demand). To compare D0FUS to
+    # the coil, not on the plasma inductive demand). To compare the refined model to
     # MADE on the same footing, we feed the full-bipolar abscissa to the
     # solver and disable the additional 1/f_swing_usable rescaling. The
     # design-mode default (0.75 = 25% control reserve) is restored
@@ -1299,8 +1497,8 @@ def plot_CS_thickness_vs_flux(
 
     psi_values  = np.linspace(0, psi_max, n_psi)
     mech_confs  = ["Wedging", "Bucking", "Plug"]
-    model_funcs = {"Academic": f_CS_ACAD, "D0FUS": f_CS_D0FUS, "CIRCE": f_CS_CIRCE}
-    colors      = {"Academic": "blue", "D0FUS": "green", "CIRCE": "red"}
+    model_funcs = {"Academic": f_CS_ACAD, "refined": f_CS_refined, "CIRCE": f_CS_CIRCE}
+    colors      = {"Academic": "blue", "refined": "green", "CIRCE": "red"}
 
     # Storage: results[model][config] = {"thickness": [], "B": []}
     results = {m: {c: {"thickness": [], "B": []} for c in mech_confs}
@@ -1653,10 +1851,11 @@ def plot_shaping_run(
     Plot radial elongation κ(ρ) and triangularity δ(ρ) profiles for the
     geometry used in a D0FUS run.
 
-    In 'D0FUS' geometry mode, the Christiansen PCHIP parameterisation is
-    used (radially varying κ and δ with core penetration).
-    In 'Academic' mode, κ(ρ) = κ_edge = const and δ(ρ) = 0 everywhere,
-    consistent with the cylindrical-torus approximation.
+    In 'refined' geometry mode, three-point PCHIP profiles are used for
+    κ(ρ) and δ(ρ) (C¹ continuous globally, monotonicity-preserving,
+    with radially varying core penetration).  In 'Academic' mode,
+    κ(ρ) = κ_edge = const and δ(ρ) = 0 everywhere, consistent with the
+    cylindrical-torus approximation.
 
     Parameters
     ----------
@@ -1666,11 +1865,11 @@ def plot_shaping_run(
 
     References
     ----------
-    Christiansen et al., Nucl. Fusion 32, 291 (1992).
+    Fritsch & Carlson, SIAM J. Numer. Anal. 17, 238 (1980) — PCHIP scheme.
     Ball & Parra, PPCF 57, 045006 (2015) — κ core penetration.
     """
     R0, a, kappa_edge, delta_edge, kappa_95, delta_95, _ = _resolve_geometry(run)
-    geom_mode = run.get("Plasma_geometry", "D0FUS")
+    geom_mode = run.get("Plasma_geometry", "refined")
     rho = np.linspace(1e-4, 1.0, n_rho)
 
     if geom_mode == "Academic":
@@ -1678,7 +1877,7 @@ def plot_shaping_run(
         kap_arr = np.full_like(rho, kappa_edge)
         del_arr = np.zeros_like(rho)
     else:
-        # D0FUS PCHIP profiles with radial variation
+        # Refined Miller PCHIP profiles with radial variation
         kap_arr = kappa_profile(rho, kappa_edge, kappa_95)
         del_arr = delta_profile(rho, delta_edge, delta_95)
 
@@ -1690,7 +1889,7 @@ def plot_shaping_run(
         ax.axhline(kappa_edge, color="tab:blue", lw=2.2,
                    label=f"Academic: κ = κ_edge = {kappa_edge:.3f} (const)")
     else:
-        ax.plot(rho, kap_arr, "tab:blue", lw=2.2, label="D0FUS PCHIP")
+        ax.plot(rho, kap_arr, "tab:blue", lw=2.2, label="Refined PCHIP")
         ax.axhline(kappa_edge, color="tab:orange", lw=1.4, ls="--",
                    label=f"κ_edge = {kappa_edge:.3f}")
         ax.axhline(kappa_95,   color="tab:gray",   lw=1.0, ls=":",
@@ -1709,7 +1908,7 @@ def plot_shaping_run(
         ax.axhline(0, color="tab:blue", lw=2.2,
                    label="Academic: δ = 0 (const)")
     else:
-        ax.plot(rho, del_arr, "tab:red", lw=2.2, label="D0FUS PCHIP")
+        ax.plot(rho, del_arr, "tab:red", lw=2.2, label="Refined PCHIP")
         ax.axhline(delta_edge, color="tab:orange", lw=1.4, ls="--",
                    label=f"δ_edge = {delta_edge:.3f}")
         ax.axhline(delta_95,   color="tab:gray",   lw=1.0, ls=":",
@@ -1723,7 +1922,7 @@ def plot_shaping_run(
     ax.grid(True, alpha=0.3)
     ax.set_xlim(0, 1)
 
-    _mode_str = "Academic" if geom_mode == "Academic" else "D0FUS PCHIP"
+    _mode_str = "Academic" if geom_mode == "Academic" else "Refined PCHIP"
     plt.suptitle(
         f"Run shaping profiles ({_mode_str}) — R₀={R0} m, a={a} m\n"
         f"κ_edge={kappa_edge:.3f}, δ_edge={delta_edge:.3f}",
@@ -1746,8 +1945,9 @@ def plot_flux_surfaces_run(
     """
     Plot nested flux surfaces for the actual geometry of a D0FUS run.
 
-    When Plasma_geometry == 'D0FUS', surfaces follow the Miller PCHIP
-    parameterisation with radially varying κ(ρ) and δ(ρ).
+    When Plasma_geometry == 'refined', surfaces follow the Miller
+    parameterisation with radially varying κ(ρ) and δ(ρ) built from
+    three-point PCHIP profiles (C¹ continuous, monotonicity-preserving).
     When Plasma_geometry == 'Academic' (or unset), surfaces are concentric
     ellipses with constant κ = κ_edge and δ = 0, consistent with the
     cylindrical-torus approximation used in the Academic solver branch.
@@ -1767,7 +1967,7 @@ def plot_flux_surfaces_run(
     Miller et al., Phys. Plasmas 5, 973 (1998).
     """
     R0, a, kappa_edge, delta_edge, kappa_95, delta_95, _ = _resolve_geometry(run)
-    geom_mode = run.get("Plasma_geometry", "D0FUS")
+    geom_mode = run.get("Plasma_geometry", "refined")
 
     theta      = np.linspace(0, 2 * np.pi, n_theta)
     rho_levels = np.linspace(0.1, 1.0, n_levels)
@@ -1781,7 +1981,7 @@ def plot_flux_surfaces_run(
             R_surf = R0 + rho_val * a * np.cos(theta)
             Z_surf = kappa_edge * rho_val * a * np.sin(theta)
         else:
-            # D0FUS PCHIP Miller surfaces with radially varying κ(ρ), δ(ρ)
+            # Refined Miller PCHIP surfaces with radially varying κ(ρ), δ(ρ)
             R_surf, Z_surf = miller_RZ(rho_val, theta,
                                        R0, a, kappa_edge, delta_edge,
                                        kappa_95, delta_95)
@@ -1802,7 +2002,7 @@ def plot_flux_surfaces_run(
     if geom_mode == "Academic":
         _geom_label = "Academic (elliptic, δ = 0)"
     else:
-        _geom_label = f"D0FUS PCHIP (δ_edge = {delta_edge:.3f})"
+        _geom_label = f"Refined PCHIP (δ_edge = {delta_edge:.3f})"
 
     ax.set_title(
         f"Flux surfaces — {_geom_label}\n"
@@ -1827,16 +2027,16 @@ def plot_q_profile(
     """
     Plot the safety factor profile q(rho).
 
-    Uses the parametric q-profile from f_q_profile_selfconsistent() when
-    available in run['_q_sc']. Falls back to the analytical f_q_profile()
-    model with a prescribed alpha_J otherwise.
+    Picks data from run['_q_sc'], which is populated by the q,j dispatcher
+    (f_q_profile_academic or f_q_profile_refined according to
+    config.q_profile_mode).  When the dict is unavailable, falls back to
+    the analytical parametric q(rho) from f_q_profile() with alpha_J = 1.5.
 
-    The current density decomposition j_total = j_Ohm + j_CD + j_bs is
-    deliberately NOT plotted. Those profiles are built inside
-    f_q_profile_selfconsistent() only to close the self-consistency loop
-    on the integral scalar l_i(3); they are not calibrated quantities
-    that downstream D0FUS modules consume. The scalars that do propagate
-    (alpha_J, q_0, l_i, f_bs) are reported in the figure title.
+    The current density decomposition j_Ohm + j_CD + j_bs is meaningful
+    only in 'refined' mode (in 'academic' mode those components are zero
+    by construction).  The figure stays focused on q(rho) and reports the
+    integral diagnostic l_i(3) along with q_0 and either q(0.95) or the
+    imposed q95.
 
     Parameters
     ----------
@@ -1852,18 +2052,20 @@ def plot_q_profile(
     """
     q95    = float(run["q95"])
     _q_sc  = run.get("_q_sc", None)
+    q_mode = str(run.get("q_profile_mode", "refined"))   # default for legacy runs
 
-    # ── Data source: parametric solve or analytical fallback ──────────
+    # ── Data source: dispatcher solution or analytical fallback ──────────
     if _q_sc is not None and 'q_arr' in _q_sc:
         rho   = _q_sc['rho']
         q_arr = _q_sc['q_arr']
         li    = _q_sc['li']
-
-        suptitle_str = r"Safety factor profile $q(\rho)$"
+        q_at_95 = float(_q_sc.get('q_at_95', np.interp(0.95, rho, q_arr)))
+        suptitle_str = (rf"Safety factor profile $q(\rho)$  "
+                        rf"({q_mode} mode)")
     else:
-        # Analytical fallback (no self-consistent data available)
+        # Analytical fallback (no run output available — used by tests).
         rho     = np.linspace(0.0, 0.99, n_rho)
-        alpha_J = 1.5    # IPDG89 reference
+        alpha_J = float(run.get("alpha_J", 1.5))
         q_arr   = f_q_profile(rho, q95=q95, rho95=0.95, alpha_J=alpha_J)
 
         # Cylindrical li estimate from the analytical form
@@ -1874,7 +2076,9 @@ def plot_q_profile(
         li_integ = np.where(rho > 1e-8, I_norm**2 / rho_s, 0.0)
         li       = 2.0 * np.trapezoid(li_integ, rho)
 
-        suptitle_str = r"Safety factor profile $q(\rho)$ (analytical fallback)"
+        q_at_95 = float(np.interp(0.95, rho, q_arr))
+        suptitle_str = (rf"Safety factor profile $q(\rho)$  "
+                        rf"(analytical fallback, $\alpha_J = {alpha_J:.2f}$)")
 
     # ── Figure ────────────────────────────────────────────────────────
     fig, ax = plt.subplots(1, 1, figsize=(7, 5))
@@ -1883,12 +2087,23 @@ def plot_q_profile(
     ax.axhline(q95, color="gray", ls="--", lw=0.8, alpha=0.5)
     ax.axvline(0.95, color="gray", ls=":", lw=0.8, alpha=0.4)
     ax.plot(rho[0],  q_arr[0], "o", color="tab:blue", ms=7, zorder=5)
-    ax.plot(0.95, q95, "s", color="tab:red",  ms=7, zorder=5,
-            label=rf"$q_{{95}} = {q95:.2f}$")
-    ax.text(0.04, 0.95,
-            rf"$q_0 = {q_arr[0]:.2f}$" + "\n"
-            rf"$l_i(3) = {li:.2f}$" + "\n"
-            rf"$q(1) = {q_arr[-1]:.2f}$",
+    # In academic mode, q(rho_95) = q95 by construction; in refined mode,
+    # q(rho_95) generally differs and is a meaningful diagnostic.
+    if q_mode == "refined":
+        ax.plot(0.95, q_at_95, "o", color="tab:blue", ms=7, zorder=5)
+        ax.plot(0.95, q95,     "s", color="tab:red",  ms=7, zorder=5,
+                label=rf"$q_{{95}}^{{\rm scaling}} = {q95:.2f}$")
+        info_text = (rf"$q_0 = {q_arr[0]:.2f}$" + "\n"
+                     rf"$q(\rho_{{95}}) = {q_at_95:.2f}$" + "\n"
+                     rf"$l_i(3) = {li:.2f}$" + "\n"
+                     rf"$q(1) = {q_arr[-1]:.2f}$")
+    else:  # academic mode: q95 is imposed
+        ax.plot(0.95, q95, "s", color="tab:red", ms=7, zorder=5,
+                label=rf"$q_{{95}} = {q95:.2f}$ (imposed)")
+        info_text = (rf"$q_0 = {q_arr[0]:.2f}$" + "\n"
+                     rf"$l_i(3) = {li:.2f}$" + "\n"
+                     rf"$q(1) = {q_arr[-1]:.2f}$")
+    ax.text(0.04, 0.95, info_text,
             transform=ax.transAxes, fontsize=10, va="top",
             bbox=dict(boxstyle="round,pad=0.3", fc="lightyellow", alpha=0.85))
     ax.set_xlabel(r"$\rho$", fontsize=12)
@@ -2646,10 +2861,10 @@ def plot_all(
 
       ── Plasma shaping           [ 1– 7]
       ── Kinetic profiles         [ 8–11]
-      ── Transport & current      [12–14]
-      ── Radiation & impurities   [15–17]
-      ── Superconductor eng.      [18–20]
-      ── Coil sizing & mechanics  [21–29]
+      ── Transport & current      [12–13]
+      ── Radiation & impurities   [14–16]
+      ── Superconductor eng.      [17–19]
+      ── Coil sizing & mechanics  [20–29]
           · TF grading            [21–23]
           · CS / CIRCE / geometry [24–27]
           · Benchmarks            [28–29]
@@ -2715,6 +2930,9 @@ def plot_all(
     _p(14, "Coronal cooling coefficient L_z(T)")
     plot_Lz_cooling(save_dir=save_dir)
 
+    _p(15, "D-T reactivity ⟨σv⟩(T)")
+    plot_DT_reactivity(save_dir=save_dir)
+
     _p(16, "Helium ash fraction")
     plot_He_fraction(save_dir=save_dir)
 
@@ -3121,8 +3339,8 @@ def plot_TF_benchmark_table(cfg=None, save_dir=None) -> None:
             return f_TF_academic(a, b, R0, sigma, J_wost, B_max,
                                  conf, cfg.coef_inboard_tension, cfg.F_CClamp)
         else:
-            # f_TF_D0FUS returns same tuple layout
-            return f_TF_D0FUS(a, b, R0, sigma, J_wost, B_max,
+            # f_TF_refined returns the same tuple layout
+            return f_TF_refined(a, b, R0, sigma, J_wost, B_max,
                               conf, omega, n_frac,
                               cfg.c_BP, cfg.coef_inboard_tension, cfg.F_CClamp)
 
@@ -3133,7 +3351,7 @@ def plot_TF_benchmark_table(cfg=None, save_dir=None) -> None:
     # consistent with the CS benchmark.
     model_specs = [
         ("Academic", "#9C27B0"),
-        ("D0FUS",    "#4CAF50"),
+        ("refined",    "#4CAF50"),
     ]
 
     cols = ["Machine", "SC", "Config", "B_max [T]", "J [MA/m²]", "σ [MPa]", "c [m]"]
@@ -3428,7 +3646,7 @@ def plot_CS_benchmark_table(cfg=None, save_dir=None) -> None:
     # Model definitions: (label, function, header colour)
     model_specs = [
         ("Academic", f_CS_ACAD,  "#9C27B0"),
-        ("D0FUS",    f_CS_D0FUS, "#2196F3"),
+        ("refined", f_CS_refined, "#2196F3"),
         ("CIRCE",    f_CS_CIRCE, "#F44336"),
     ]
 
@@ -3994,7 +4212,7 @@ if __name__ == "__main__":
         # Plasma geometry
         "R0":               6.2,
         "a":                2.0,
-        "Plasma_geometry": "D0FUS",
+        "Plasma_geometry": "refined",
         "kappa_edge":       1.85,
         "delta_edge":       0.33,
         "Vprime_data":      None,