d0fus 2.2.1__tar.gz → 2.3.0__tar.gz

{d0fus-2.2.1 → d0fus-2.3.0}/D0FUS.py

@@ -170,12 +170,39 @@ def detect_mode_from_input(input_file):
 #%% Main functions
 
 def print_banner():
-    """Display D0FUS banner"""
-    banner = """
+    """Display the D0FUS startup banner.
+
+    Simple double-line framed banner with title, tagline, version, author,
+    license and repository URL. Can be silenced with the environment variable
+    ``D0FUS_NO_BANNER`` (useful for batch scans, HPC jobs, CI).
+    """
+    if os.environ.get("D0FUS_NO_BANNER", "").strip() not in ("", "0", "false", "False"):
+        return
+
+    # Resolve installed package version, fall back to a static string
+    try:
+        from importlib.metadata import version, PackageNotFoundError
+        try:
+            v = version("d0fus")
+        except PackageNotFoundError:
+            v = "dev"
+    except ImportError:
+        v = "dev"
+
+    # The version is the only dynamic line; the others are hardcoded for clarity.
+    # Inside width is 51 characters; the version is centered programmatically.
+    version_line = f"Version {v}".center(51)
+
+    banner = f"""
     ╔═══════════════════════════════════════════════════╗
     ║                                                   ║
     ║                       D0FUS                       ║
-    ║     Design 0-dimensional for Fusion Systems       ║
+    ║      Design 0-dimensional for Fusion Systems      ║
+    ║                                                   ║
+    ╠═══════════════════════════════════════════════════╣
+    ║{version_line}║
+    ║         T. Auclair, CEA-IRFM  |  CeCILL-C         ║
+    ║           https://github.com/IRFM/D0FUS           ║
     ║                                                   ║
     ╚═══════════════════════════════════════════════════╝
     """

{d0fus-2.2.1 → d0fus-2.3.0}/D0FUS_BIB/D0FUS_figures.py

@@ -48,6 +48,8 @@ if __name__ != "__main__":
         get_Lz,
         f_He_fraction,
         f_q_profile,
+        f_sigmav,
+        _two_point_core, M_F_DT,
     )
     from .D0FUS_radial_build_functions import (
         J_non_Cu_NbTi, J_non_Cu_Nb3Sn, J_non_Cu_REBCO,
@@ -76,6 +78,8 @@ else:
         get_Lz,
         f_He_fraction,
         f_q_profile,
+        f_sigmav,
+        _two_point_core, M_F_DT,
     )
     from D0FUS_BIB.D0FUS_radial_build_functions import (
         J_non_Cu_NbTi, J_non_Cu_Nb3Sn, J_non_Cu_REBCO,
@@ -639,6 +643,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 +805,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 +815,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 +843,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 — Refined 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 refined 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 +871,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 +958,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)
@@ -2016,6 +2216,85 @@ def plot_radiation_profile(
     _save_or_show(fig, save_dir, "run_radiation_profile")
 
 
+def plot_divertor_two_point(
+    run: dict,
+    n_pts: int = 300,
+    save_dir: str | None = None,
+) -> None:
+    """
+    Simple two-point-model view: target temperature versus SOL dissipation.
+
+    A single panel shows the target electron temperature T_et as a function of
+    the SOL power-loss fraction f_cooling, at the converged upstream conditions
+    (q_par_u, p_u read from the run). The dashed line is the detachment
+    threshold T_et = 10 eV (Stangeby 2018). The flat plateau at high T_et is the
+    attached sheath-limited branch where the two-point model no longer applies.
+    The minimum dissipation required for target survival (Eq. 14) is given in
+    the title and marked by the dotted vertical line.
+
+    Parameters
+    ----------
+    run      : dict   D0FUS run output; reads the 'divertor' sub-dict produced
+                      by f_heat_two_point.
+    n_pts    : int    Number of f_cooling samples.
+    save_dir : str or None
+
+    References
+    ----------
+    P.C. Stangeby, Plasma Phys. Control. Fusion 60 (2018) 044022.
+    """
+    div = run.get("divertor", {}) or {}
+    if not {"q_par_u", "T_eu", "n_sep"}.issubset(div):
+        print("  [skip] no two-point-model divertor solution in run dict")
+        return
+
+    q_par_u   = div["q_par_u"]                 # [MW/m^2]
+    T_eu      = div["T_eu"]                     # [eV]
+    n_sep     = div["n_sep"]                    # [m^-3]
+    f_c_op    = div.get("f_cooling", 0.0)
+    f_m_op    = div.get("f_mom", 0.0)
+    T_et_op   = div.get("T_et", np.nan)
+    f_pwr_req = div.get("f_pwr_loss_req", np.nan)
+    R0        = run.get("R0", "?")
+
+    q_par_u_SI = q_par_u * 1e6
+    p_u        = 2.0 * n_sep * E_ELEM * T_eu
+
+    f_c  = np.linspace(0.0, 0.995, n_pts)
+    T_et = np.array([min(_two_point_core(q_par_u_SI, p_u, fc, f_m_op, 7.0, M_F_DT)[0],
+                         T_eu) for fc in f_c])
+
+    fig, ax = plt.subplots(figsize=(7, 4.5))
+    ax.plot(f_c, T_et, color="#4477AA", lw=2.4)
+    ax.axhline(10.0, color="#EE6677", lw=1.3, ls="--")
+    ax.text(0.015, 11.0, "detachment (10 eV)", color="#EE6677",
+            fontsize=9, va="bottom")
+    if np.isfinite(f_pwr_req):
+        ax.axvline(f_pwr_req, color="0.55", lw=1.0, ls=":")
+    if np.isfinite(T_et_op):
+        ax.plot([f_c_op], [T_et_op], "o", ms=9, color="k", zorder=5)
+        near_left = f_c_op < 0.5
+        near_top  = T_et_op > 0.3 * T_eu
+        ax.annotate(f"operating point\n$T_{{e,t}}$ = {T_et_op:.1f} eV",
+                    (f_c_op, T_et_op), textcoords="offset points",
+                    xytext=(14 if near_left else -12, -16 if near_top else 14),
+                    ha="left" if near_left else "right",
+                    va="top" if near_top else "bottom", fontsize=9)
+
+    ax.set_yscale("log")
+    ax.set_xlim(0, 1)
+    ax.set_xlabel(r"SOL power-loss fraction $f_{\rm cooling}$", fontsize=12)
+    ax.set_ylabel(r"Target electron temperature $T_{e,t}$ [eV]", fontsize=12)
+    ttl = (rf"Divertor two-point model:  $R_0$={R0} m,  "
+           rf"$q_{{\parallel u}}$={q_par_u/1e3:.2f} GW/m$^2$")
+    if np.isfinite(f_pwr_req):
+        ttl += f",  required dissipation = {f_pwr_req:.2f}"
+    ax.set_title(ttl, fontsize=11)
+    ax.grid(True, which="both", alpha=0.3)
+    plt.tight_layout()
+    _save_or_show(fig, save_dir, "run_divertor_two_point")
+
+
 # ---------------------------------------------------------------------------
 # A — Convenience wrapper
 # ---------------------------------------------------------------------------
@@ -2663,10 +2942,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]
@@ -2732,6 +3011,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)
 
@@ -2797,23 +3079,24 @@ def plot_run(
     save_dir: str | None = None,
 ) -> None:
     """
-    Render the run-specific figure set (10 figures).
+    Render the run-specific figure set (11 figures).
 
     This is the subset called after each D0FUS run.  It contains only the
     figures that depend on the current run configuration and results —
     no validation curves, no benchmarks, no scaling-law surveys.
 
     Figures produced:
-      [ 1/10]  Tokamak LCFS comparison (with D0FUS overlay)
-      [ 2/10]  Miller flux surfaces (run geometry)
-      [ 3/10]  Shaping profiles κ(ρ), δ(ρ)
-      [ 4/10]  Kinetic profiles n(ρ), T(ρ), p(ρ)
-      [ 5/10]  Safety factor q(ρ) and current decomposition
-      [ 6/10]  Radiation profiles
-      [ 7/10]  TF coil side view
-      [ 8/10]  CICC TF conductor
-      [ 9/10]  CS cross-section
-      [10/10]  CICC CS conductor
+      [ 1/11]  Tokamak LCFS comparison (with D0FUS overlay)
+      [ 2/11]  Miller flux surfaces (run geometry)
+      [ 3/11]  Shaping profiles κ(ρ), δ(ρ)
+      [ 4/11]  Kinetic profiles n(ρ), T(ρ), p(ρ)
+      [ 5/11]  Safety factor q(ρ) and current decomposition
+      [ 6/11]  Radiation profiles
+      [ 7/11]  Divertor two-point model (detachment vs SOL dissipation)
+      [ 8/11]  TF coil side view
+      [ 9/11]  CICC TF conductor
+      [10/11]  CS cross-section
+      [11/11]  CICC CS conductor
 
     Parameters
     ----------
@@ -2822,7 +3105,7 @@ def plot_run(
         If provided, figures are saved as PNG files.
         Pass ``None`` to display interactively.
     """
-    N = 10
+    N = 11
 
     def _p(i, label):
         print(f"  [{i:2d}/{N}] {label}")
@@ -2850,17 +3133,20 @@ def plot_run(
     _p(6, "Radiation profiles")
     plot_radiation_profile(run, save_dir=save_dir)
 
+    _p(7, "Divertor two-point model")
+    plot_divertor_two_point(run, save_dir=save_dir)
+
     # ── Coils & conductors ────────────────────────────────────────────
-    _p(7, "TF coil side view")
+    _p(8, "TF coil side view")
     plot_TF_side_view(run, save_dir=save_dir)
 
-    _p(8, "CICC TF conductor")
+    _p(9, "CICC TF conductor")
     plot_CICC_cross_section(build_conductor_from_run(run, coil="TF"), save_dir=save_dir)
 
-    _p(9, "CS cross-section")
+    _p(10, "CS cross-section")
     plot_CS_cross_section(run, save_dir=save_dir)
 
-    _p(10, "CICC CS conductor")
+    _p(11, "CICC CS conductor")
     plot_CICC_cross_section(build_conductor_from_run(run, coil="CS"), save_dir=save_dir)
 
     print("Done.")
@@ -3107,11 +3393,11 @@ def plot_TF_benchmark_table(cfg=None, save_dir=None) -> None:
         "ARC":     {"a": 1.10, "b": 0.89, "R0": 3.30, "σ": 1000e6, "T_op": 20.0,
                     "B_max": 23.0,  "n_TF": 1,   "sc": "REBCO", "config": "Plug",
                     "κ": 1.84, "I_cond": 50e3, "V_max": 10e3, "N_sub": 6,
-                    "tau_h": 20,   "J_wost": 120e6},
+                    "tau_h": 20,   "J_wost": 200e6},
         "SPARC":   {"a": 0.57, "b": 0.18, "R0": 1.85, "σ": 1000e6, "T_op": 20.0,
                     "B_max": 20.0,  "n_TF": 1,   "sc": "REBCO", "config": "Bucking",
-                    "κ": 1.75, "I_cond": 40.5e3,"V_max": 10e3, "N_sub": 4,
-                    "tau_h": 20,   "J_wost": 120e6},
+                    "κ": 1.75, "I_cond": 40.5e3,"V_max": 10e3, "N_sub": 6,
+                    "tau_h": 20,   "J_wost": 200e6},
     }
 
     def _clean(val):

{d0fus-2.2.1 → d0fus-2.3.0}/D0FUS_BIB/D0FUS_import.py

@@ -18,11 +18,13 @@ os.environ["KMP_DUPLICATE_LIB_OK"] = "TRUE"
 
 import json
 import math
+import multiprocessing
 import random
 import re
 import shutil
 import sys
 import time
+import traceback
 import warnings
 import importlib
 from datetime import datetime
@@ -34,7 +36,7 @@ import numpy as np
 import pandas as pd
 import sympy as sp
 from typing import List, Tuple
-from dataclasses import dataclass
+from dataclasses import dataclass, replace, asdict
 
 #%% Scipy - Optimization and Numerical Methods
 
@@ -66,11 +68,13 @@ import matplotlib.colors as mcolors
 import matplotlib.lines as mlines
 import matplotlib.patches as mpatches
 import matplotlib.cm as cm
+from matplotlib.animation import FuncAnimation, PillowWriter
 from matplotlib.colors import Normalize
 from matplotlib.gridspec import GridSpec
 from matplotlib.patches import Circle, Rectangle, Patch
 from matplotlib.ticker import MultipleLocator
 from mpl_toolkits.axes_grid1 import make_axes_locatable
+from mpl_toolkits.mplot3d import Axes3D  # noqa: F401  (registers the '3d' projection)
 from pandas.plotting import table
 from tqdm import tqdm
 from dataclasses import dataclass