d0fus 2.2.1__tar.gz → 2.2.2__tar.gz

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

@@ -48,6 +48,7 @@ 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,
@@ -76,6 +77,7 @@ 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,
@@ -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 — 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 +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)
@@ -2663,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]
@@ -2732,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)
 

{d0fus-2.2.1 → d0fus-2.2.2}/D0FUS_BIB/D0FUS_radial_build_functions.py

@@ -3063,7 +3063,7 @@ if __name__ == "__main__":
 #%% Academic model
 
 def f_TF_academic(a, b, R0, σ_TF, J_max_TF, B_max_TF, Choice_Buck_Wedg,
-                  coef_inboard_tension, F_CClamp):
+                  coef_inboard_tension, F_CClamp, delta_port=0.0):
     """
     Calculate the thickness of the TF coil using a 2-layer thin cylinder model.
 
@@ -3094,6 +3094,12 @@ def f_TF_academic(a, b, R0, σ_TF, J_max_TF, B_max_TF, Choice_Buck_Wedg,
         Fraction of total tension carried by inboard leg [-].
     F_CClamp : float
         Clamping force subtracted from tension [N].
+    delta_port : float, optional
+        Additional radial margin between the blanket outer edge and the
+        TF outer-leg conductor [m], driven by toroidal-ripple and minimum
+        port-access constraints. Pushes R2 outward so that the F_z log
+        term ln(R2 / R1) reflects the actual outer-leg position. Default:
+        0.0 (matches the original analytic formula).
 
     Returns
     -------
@@ -3149,9 +3155,11 @@ def f_TF_academic(a, b, R0, σ_TF, J_max_TF, B_max_TF, Choice_Buck_Wedg,
     # 5. Inner layer thickness c1 derived from the circular cross-section
     c_WP = R1_0 - np.sqrt(R1_0**2 - S_cond / np.pi)
 
-    # 6. Calculate new radii after adding c1
+    # 6. Calculate new radii after adding c1.
+    #    delta_port shifts R2 outward to capture the ripple and port-access
+    #    margin between the blanket outer edge and the TF outer-leg conductor.
     R1 = R1_0 - c_WP  # Effective inner radius
-    R2 = R2_0 + c_WP  # Effective outer radius
+    R2 = R2_0 + c_WP + delta_port  # Effective outer radius
 
     # 7. Vertical separating force from Maxwell stress integral through midplane:
     #    T_sep = π B0² R0² / μ0 × ln(R2/R1),  corrected by clamping and inboard fraction.
@@ -3197,20 +3205,28 @@ def f_TF_academic(a, b, R0, σ_TF, J_max_TF, B_max_TF, Choice_Buck_Wedg,
 #%% Refined model
 
 def Winding_Pack_refined(R_0, a, b, sigma_max, J_max, B_max, omega, n,
-                       grading=False):
-    
+                       grading=False, delta_port=0.0):
+
     """
     Computes the winding pack thickness and stress ratio under Tresca criterion.
-    
+
     When grading=False (default):
         Uniform α. Log-spaced adaptive bracket search + brentq root-finding.
         Tresca is satisfied at the most loaded point only.
-    
+
     When grading=True:
         Radially varying α(R). Tresca is saturated at every radius.
         Uses inward radial integration with self-consistent σ_z (Picard).
         Typically reduces c_WP by 8 to 25% depending on B_max.
-    
+        A strict-refinement guarantee is enforced: the graded result is
+        compared against the ungraded analytical baseline and the smaller
+        c_WP is returned. The ungraded solver acts as a safety net when
+        the graded radial integration converges on an unphysical state
+        (e.g. NI(R) reaching R = 0 before being consumed, which would
+        otherwise propagate as c_WP ≈ R_ext, TF occupying all the
+        inboard radial budget). Grading can therefore never degrade the
+        ungraded baseline.
+
     Args:
         R_0: Major radius [m]
         a: Plasma minor radius [m]
@@ -3224,7 +3240,15 @@ def Winding_Pack_refined(R_0, a, b, sigma_max, J_max, B_max, omega, n,
         n: Geometric factor for gamma (steel area fraction) [dimensionless]
         grading: bool, optional
             If True, use radially graded α(R) model. Default: False.
-    
+        delta_port: float, optional
+            Additional radial margin between the blanket outer edge and the
+            TF outer-leg conductor [m]. Sized to satisfy a maximum toroidal
+            field ripple at the plasma edge and a minimum port-access width,
+            typically computed by Number_TF_coils(). Enters the F_z log
+            argument as ln((R_0 + a + b + delta_port) / (R_0 - a - b)),
+            increasing the predicted vertical tension. Default: 0.0
+            (matches Eq. 5 of the reference paper, slightly non-conservative).
+
     Returns:
         winding_pack_thickness: R_ext - R_sep [m]
         sigma_r: Radial stress at solution [Pa]
@@ -3232,7 +3256,7 @@ def Winding_Pack_refined(R_0, a, b, sigma_max, J_max, B_max, omega, n,
         sigma_theta: Hoop stress at solution [Pa]
         Steel_fraction: 1 - alpha (structural fraction) [-]
             For graded: area-weighted average ⟨1 - α⟩.
-    
+
     Limitations:
         The axial stress σ_z accounts for the vertical component of the
         in-plane Lorentz force (centering force), but does NOT include:
@@ -3246,7 +3270,7 @@ def Winding_Pack_refined(R_0, a, b, sigma_max, J_max, B_max, omega, n,
         These omissions make the present model slightly non-conservative
         for compact / low-A designs.
     """
-    
+
     R_ext = R_0 - a - b
 
     # Validate J_max before proceeding
@@ -3257,17 +3281,15 @@ def Winding_Pack_refined(R_0, a, b, sigma_max, J_max, B_max, omega, n,
         return np.nan, np.nan, np.nan, np.nan, np.nan
         # raise ValueError("R_ext must be positive. Check R_0, a, and b.")
 
-    ln_term = np.log((R_0 + a + b) / (R_ext))
+    ln_term = np.log((R_0 + a + b + delta_port) / (R_ext))
     if ln_term <= 0:
         return np.nan, np.nan, np.nan, np.nan, np.nan
         # raise ValueError("Invalid logarithmic term: ensure R_0 + a + b > R_0 - a - b")
 
-    # Graded branch: delegate to radial integration solver
-    if grading:
-        return _solve_graded_wp(R_ext, B_max, J_max, sigma_max,
-                                omega, n, ln_term)
-
-    # Ungraded branch: analytical α, brentq root-finding (original model)
+    # === Ungraded analytical solution ===
+    # Always computed: used directly when grading=False, and as the
+    # mandatory fallback baseline when grading=True to enforce the
+    # strict-refinement principle (see docstring).
     def alpha(R_sep):
         denom = R_ext**2 - R_sep**2
         if denom <= 0:
@@ -3302,8 +3324,6 @@ def Winding_Pack_refined(R_0, a, b, sigma_max, J_max, B_max, omega, n,
     # narrow valid islands at high field that pure log spacing can miss.
     # Typical call budget: ~35 evaluations (Pass 1 success) to ~85 (worst case).
 
-    R_sep_solution = None
-
     d_lo = 1e-3                # Minimum WP thickness [m]
     d_hi = R_ext - 1e-3        # Maximum WP thickness (nearly solid cylinder)
 
@@ -3320,32 +3340,60 @@ def Winding_Pack_refined(R_0, a, b, sigma_max, J_max, B_max, omega, n,
         select='smallest')
 
     if np.isnan(d_solution):
-        return np.nan, np.nan, np.nan, np.nan, np.nan
-
-    R_sep_solution = R_ext - d_solution
-
-    # === Final stress calculation ===
-    a_val = alpha(R_sep_solution)
-    g_val = gamma_func(a_val, n)
-
-    if np.isnan(a_val) or np.isnan(g_val):
-        return np.nan, np.nan, np.nan, np.nan, np.nan
-
-    try:
-        sigma_r = B_max**2 / (2 * μ0 * g_val)
-        sigma_z = (omega / (1 - a_val)) * B_max**2 * R_ext**2 / (2 * μ0 * (R_ext**2 - R_sep_solution**2)) * ln_term
-        sigma_theta = 0
-    except Exception:
-        return np.nan, np.nan, np.nan, np.nan, np.nan
-
-    winding_pack_thickness = R_ext - R_sep_solution
-    Steel_fraction = (1-a_val)
+        result_ungraded = (np.nan, np.nan, np.nan, np.nan, np.nan)
+    else:
+        R_sep_solution = R_ext - d_solution
 
-    return winding_pack_thickness, sigma_r, sigma_z, sigma_theta, Steel_fraction
+        # Final stress calculation for the ungraded solution
+        a_val = alpha(R_sep_solution)
+        g_val = gamma_func(a_val, n)
 
+        if np.isnan(a_val) or np.isnan(g_val):
+            result_ungraded = (np.nan, np.nan, np.nan, np.nan, np.nan)
+        else:
+            try:
+                sigma_r = B_max**2 / (2 * μ0 * g_val)
+                sigma_z = (omega / (1 - a_val)) * B_max**2 * R_ext**2 / (2 * μ0 * (R_ext**2 - R_sep_solution**2)) * ln_term
+                sigma_theta = 0
+                winding_pack_thickness = R_ext - R_sep_solution
+                Steel_fraction = (1 - a_val)
+                result_ungraded = (winding_pack_thickness, sigma_r, sigma_z,
+                                   sigma_theta, Steel_fraction)
+            except Exception:
+                result_ungraded = (np.nan, np.nan, np.nan, np.nan, np.nan)
+
+    # Ungraded path: return immediately.
+    if not grading:
+        return result_ungraded
+
+    # === Graded branch with strict-refinement guarantee ===
+    # The graded radial-integration solver _solve_graded_wp can in some
+    # regimes return a converged-but-unphysical result, where the inward
+    # integration of NI(R) consumes the available radial space before
+    # depleting the ampere-turns (R reaches the cylinder centre with
+    # NI > 0). This propagates as c_WP ≈ R_ext, effectively reporting a
+    # TF that occupies all the inboard space.
+    #
+    # To prevent the graded model from ever degrading the ungraded
+    # baseline, we compute both and return the smaller c_WP. The
+    # ungraded analytical solver is robust on the same domain and acts
+    # as a safety net. Where the graded model legitimately improves the
+    # result, the gain is preserved; otherwise, the ungraded result is
+    # returned unchanged.
+    result_graded = _solve_graded_wp(R_ext, B_max, J_max, sigma_max,
+                                     omega, n, ln_term)
+
+    c_ungraded = result_ungraded[0]
+    c_graded   = result_graded[0]
+
+    if not np.isfinite(c_graded):
+        return result_ungraded
+    if not np.isfinite(c_ungraded):
+        return result_graded
+    return result_graded if c_graded <= c_ungraded else result_ungraded
 
 def Nose_refined(R_ext_Nose, sigma_max, omega, B_max, R_0, a, b,
-               coef_inboard_tension):
+               coef_inboard_tension, delta_port=0.0):
     """
     Compute the inner radius of the TF nose (inner structural casing).
 
@@ -3376,6 +3424,11 @@ def Nose_refined(R_ext_Nose, sigma_max, omega, B_max, R_0, a, b,
     coef_inboard_tension : float
         Correction factor for inboard tension distribution [-].
         Accounts for non-uniform current distribution across the WP.
+    delta_port : float, optional
+        Additional radial margin between the blanket outer edge and the
+        TF outer-leg conductor [m], driven by toroidal-ripple and minimum
+        port-access constraints. Enters the F_z log argument as
+        ln((R_0 + a + b + delta_port) / (R_0 - a - b)). Default: 0.0.
 
     Returns
     -------
@@ -3390,8 +3443,10 @@ def Nose_refined(R_ext_Nose, sigma_max, omega, B_max, R_0, a, b,
     # at R_nose is amplified by the circumference ratio R_TF / R_nose.
     P = (B_max**2) / (2 * μ0) * (R_0 - a - b) / R_ext_Nose
     
-    # Compute the logarithmic term
-    log_term = np.log((R_0 + a + b) / (R_0 - a - b))
+    # Logarithmic term entering F_z. The numerator uses the actual TF outer-leg
+    # location (R_0 + a + b + delta_port), not just the blanket outer edge,
+    # to capture the ripple and port-access margin (see Number_TF_coils()).
+    log_term = np.log((R_0 + a + b + delta_port) / (R_0 - a - b))
     
     # Compute the full expression under the square root
     term_intermediate = (R_ext_Nose**2 / sigma_max) * (2 * P + (1 - omega) * (B_max**2 * coef_inboard_tension / μ0) * log_term)
@@ -3405,7 +3460,8 @@ def Nose_refined(R_ext_Nose, sigma_max, omega, B_max, R_0, a, b,
     return Ri
 
 def f_TF_refined(a, b, R0, σ_TF, J_max_TF, B_max_TF, Choice_Buck_Wedg, omega, n,
-               c_BP, coef_inboard_tension, F_CClamp, TF_grading=False):
+               c_BP, coef_inboard_tension, F_CClamp, TF_grading=False,
+               delta_port=0.0):
     
     """
     Calculate the thickness of the TF coil using a 2 layer thick cylinder model 
@@ -3425,6 +3481,14 @@ def f_TF_refined(a, b, R0, σ_TF, J_max_TF, B_max_TF, Choice_Buck_Wedg, omega, n
     F_CClamp : Clamping force [N]
     TF_grading : bool, optional
         If True, use radially graded α(R) in the WP. Default: False.
+    delta_port : float, optional
+        Additional radial margin between the blanket outer edge and the
+        TF outer-leg conductor [m], required to satisfy a target toroidal
+        field ripple and a minimum port-access width. Typically obtained
+        from Number_TF_coils(R0, a, b, ripple_adm, L_min). Propagated to
+        Winding_Pack_refined and Nose_refined so that F_z and σ_z are
+        evaluated with the actual outer-leg position rather than the
+        blanket outer edge. Default: 0.0 (paper convention).
 
     Returns:
     c : TF total inboard radial thickness [m]
@@ -3439,14 +3503,14 @@ def f_TF_refined(a, b, R0, σ_TF, J_max_TF, B_max_TF, Choice_Buck_Wedg, omega, n
     
     if Choice_Buck_Wedg == "Wedging":
         
-        c_WP, σ_r, σ_z, σ_theta, Steel_fraction  = Winding_Pack_refined( R0, a, b, σ_TF, J_max_TF, B_max_TF, omega, n, grading=TF_grading)
+        c_WP, σ_r, σ_z, σ_theta, Steel_fraction  = Winding_Pack_refined( R0, a, b, σ_TF, J_max_TF, B_max_TF, omega, n, grading=TF_grading, delta_port=delta_port)
         
         # Vérification que c_WP est valide
         if c_WP is None or np.isnan(c_WP) or c_WP < 0:
             return np.nan, np.nan, np.nan, np.nan, np.nan, np.nan, np.nan
         
         c_Nose = R0 - a - b - c_WP - Nose_refined(R0 - a - b - c_WP, σ_TF, omega, B_max_TF, R0, a, b,
-                                          coef_inboard_tension)
+                                          coef_inboard_tension, delta_port=delta_port)
 
         # Vérification que c_Nose est valide
         if c_Nose is None or np.isnan(c_Nose) or c_Nose < 0:
@@ -3467,7 +3531,7 @@ def f_TF_refined(a, b, R0, σ_TF, J_max_TF, B_max_TF, Choice_Buck_Wedg, omega, n
     
     elif Choice_Buck_Wedg == "Bucking" or Choice_Buck_Wedg == "Plug":
         
-        c_WP, σ_r, σ_z, σ_theta, Steel_fraction = Winding_Pack_refined(R0, a, b, σ_TF, J_max_TF, B_max_TF, omega, n, grading=TF_grading)
+        c_WP, σ_r, σ_z, σ_theta, Steel_fraction = Winding_Pack_refined(R0, a, b, σ_TF, J_max_TF, B_max_TF, omega, n, grading=TF_grading, delta_port=delta_port)
         
         c = c_WP
         c_Nose = 0

{d0fus-2.2.1 → d0fus-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: d0fus
-Version: 2.2.1
+Version: 2.2.2
 Summary: Design 0-dimensional for Fusion Systems - Tokamak power plant design and optimization tool
 Author-email: Timothé Auclair <timothe.auclair@gmail.com>
 Maintainer-email: Timothé Auclair <timothe.auclair@gmail.com>

{d0fus-2.2.1 → d0fus-2.2.2}/d0fus.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: d0fus
-Version: 2.2.1
+Version: 2.2.2
 Summary: Design 0-dimensional for Fusion Systems - Tokamak power plant design and optimization tool
 Author-email: Timothé Auclair <timothe.auclair@gmail.com>
 Maintainer-email: Timothé Auclair <timothe.auclair@gmail.com>

{d0fus-2.2.1 → d0fus-2.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "d0fus"
-version = "2.2.1"
+version = "2.2.2"
 description = "Design 0-dimensional for Fusion Systems - Tokamak power plant design and optimization tool"
 readme = "README.md"
 license = {text = "CeCILL-C"}