d0fus 2.2.2__tar.gz → 2.3.2__tar.gz

{d0fus-2.2.2 → d0fus-2.3.2}/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.2 → d0fus-2.3.2}/D0FUS_BIB/D0FUS_figures.py

@@ -49,6 +49,7 @@ if __name__ != "__main__":
         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,
@@ -59,6 +60,7 @@ if __name__ != "__main__":
         f_CS_ACAD, f_CS_refined, f_CS_CIRCE,
         F_CIRCE0D, compute_von_mises_stress,
         calculate_E_mag_TF,
+        Number_TF_coils,
     )
     from .D0FUS_parameterization import DEFAULT_CONFIG, E_ELEM
 
@@ -78,6 +80,7 @@ else:
         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,
@@ -88,6 +91,7 @@ else:
         f_CS_ACAD, f_CS_refined, f_CS_CIRCE,
         F_CIRCE0D, compute_von_mises_stress,
         calculate_E_mag_TF,
+        Number_TF_coils,
     )
     from D0FUS_BIB.D0FUS_parameterization import DEFAULT_CONFIG, E_ELEM
 
@@ -2214,6 +2218,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
 # ---------------------------------------------------------------------------
@@ -2998,23 +3081,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
     ----------
@@ -3023,7 +3107,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}")
@@ -3051,17 +3135,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.")
@@ -3308,11 +3395,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):
@@ -4193,6 +4280,193 @@ def plot_CICC_cross_section(
 # Stand-alone execution — smoke test
 # =============================================================================
 
+
+# =============================================================================
+# 7. TF coil number - ripple and port-access constraints
+# =============================================================================
+
+# D0FUS-consistent palette (matches the hex codes used elsewhere in this file)
+_RIP_C_PLASMA = "#f4a582"   # plasma fill
+_RIP_C_COIL   = "#2166ac"   # TF coil footprint
+_RIP_C_ACCESS = "#4dac26"   # maintenance / heating access sector
+
+
+def plot_tf_ripple(
+    R0: float = 6.2,
+    a: float = 2.0,
+    b: float = 1.2,
+    ripple_adm: float = 0.01,
+    L_min: float = 3.6,
+    grid: int = 460,
+    save_dir: str | None = None,
+) -> None:
+    """
+    Top-view map of the toroidal field magnitude produced by the discrete TF
+    coils, illustrating the field ripple.
+
+    The coil number, ripple and outboard standoff (N_coil, ripple, Delta_ext)
+    are taken from the package routine ``Number_TF_coils`` so the figure stays
+    consistent with the D0FUS sizing.  Each coil is modelled as a pair of
+    infinite straight filaments (inner leg at R0 - a - b carrying +I, outer leg
+    at R0 + a + b + Delta_ext carrying -I, at the same toroidal angle); the field
+    magnitude |B| is evaluated on a Cartesian grid in the toroidal mid-plane.
+    The prefactor mu0*I/(2*pi) is dropped, so |B| is in arbitrary units.  The
+    iso-|B| contours scallop near the coils: that scalloping is the ripple.
+
+    Parameters
+    ----------
+    R0, a    : float   Major and minor radius [m].
+    b        : float   Aggregated inboard build (FW + blanket + shield + gaps) [m].
+    ripple_adm : float Admissible ripple fraction (default 1 %).
+    L_min    : float   Minimum toroidal access per coil [m] (default 3.6 m, the
+                       ITER-reproducing value; the manuscript also uses 3.0 m).
+    grid     : int     Number of grid points per axis for the field map.
+    save_dir : str or None
+
+    References
+    ----------
+    Wesson, Tokamaks, 4th ed., p.169 - ripple model.
+    Goldston & Rutherford, Introduction to Plasma Physics, IOP (1995), ch.14.
+    """
+    n_coil, ripple_sel, Delta_ext = Number_TF_coils(R0, a, b, ripple_adm, L_min)
+    R_in   = R0 - a - b
+    R_out  = R0 + a + b + Delta_ext
+    theta  = 2.0 * np.pi * np.arange(n_coil) / n_coil
+
+    # filament positions (inner + outer legs) and signed currents
+    fx = np.concatenate([R_in * np.cos(theta),  R_out * np.cos(theta)])
+    fy = np.concatenate([R_in * np.sin(theta),  R_out * np.sin(theta)])
+    cur = np.concatenate([np.ones(n_coil),      -np.ones(n_coil)])
+
+    # |B| on a Cartesian grid (loop over filaments to limit memory)
+    L = R_out + 0.7
+    gx = np.linspace(-L, L, grid)
+    X, Y = np.meshgrid(gx, gx)
+    Bx = np.zeros_like(X)
+    By = np.zeros_like(X)
+    dmin = np.full(X.shape, np.inf)
+    for xi, yi, ci in zip(fx, fy, cur):
+        dx = X - xi
+        dy = Y - yi
+        d2 = dx * dx + dy * dy
+        Bx += ci * (-dy) / d2
+        By += ci * (dx) / d2
+        dmin = np.minimum(dmin, np.sqrt(d2))
+    rr = np.sqrt(X ** 2 + Y ** 2)
+    Bmag = np.sqrt(Bx ** 2 + By ** 2)
+    # cap the colour scale to the plasma-region field, then hide near-wire
+    # spikes and the central column for legibility
+    vmax = np.percentile(Bmag[(rr > R0 - a) & (rr < R0 + a) & (dmin > 0.22)], 99)
+    Bmag = np.ma.array(Bmag, mask=(dmin < 0.22) | (rr < R0 - a))
+
+    th = np.linspace(0, 2 * np.pi, 400)
+    fig, ax = plt.subplots(figsize=(6.4, 5.9))
+    ax.set_aspect("equal")
+    pcm = ax.pcolormesh(X, Y, Bmag, shading="auto", cmap="magma", vmin=0, vmax=vmax)
+    ax.contour(X, Y, Bmag, levels=np.linspace(0.35 * vmax, vmax, 7),
+               colors="white", linewidths=0.45, alpha=0.55)
+    ax.add_patch(mpatches.Circle((0, 0), R0 - a, facecolor="0.75",
+                                 edgecolor="0.5", lw=0.8, zorder=4))
+    ax.text(0, 0, "central\ncolumn", ha="center", va="center", fontsize=8,
+            color="0.25", zorder=5)
+    ax.plot((R0 + a) * np.cos(th), (R0 + a) * np.sin(th), color="cyan",
+            lw=1.3, ls="--", alpha=0.9, zorder=4)
+    ax.plot(R_out * np.cos(th), R_out * np.sin(th), color="white", lw=0.7,
+            ls=":", alpha=0.5, zorder=4)
+    ax.plot(R_out * np.cos(theta), R_out * np.sin(theta), "o", color="white",
+            ms=5, mec="k", mew=0.5, zorder=5)
+    ax.text(0, (R0 + a) + 0.15, "plasma edge", color="cyan", fontsize=8,
+            ha="center", va="bottom", zorder=6)
+    ax.text(-L + 0.3, L - 0.5,
+            rf"$\delta_\mathrm{{ripple}} = {ripple_sel * 100:.2f}\,\%$",
+            color="white", fontsize=11, va="top")
+    ax.set_xlim(-L, L)
+    ax.set_ylim(-L, L)
+    ax.set_xlabel("x [m]", fontsize=12)
+    ax.set_ylabel("y [m]", fontsize=12)
+    ax.set_title(rf"Toroidal field magnitude, top view ($N_\mathrm{{coil}} = {n_coil}$)",
+                 fontsize=11)
+    fig.colorbar(pcm, ax=ax, shrink=0.85, label=r"$|B|$ (arb. units)")
+    plt.tight_layout()
+    _save_or_show(fig, save_dir, "tf_ripple")
+
+
+def plot_port_access(
+    R0: float = 6.2,
+    a: float = 2.0,
+    b: float = 1.2,
+    ripple_adm: float = 0.01,
+    L_min: float = 3.6,
+    save_dir: str | None = None,
+) -> None:
+    """
+    Clean top view of the tokamak showing the TF coils and the angular sectors
+    left free between them for maintenance and heating access.
+
+    The coil number and outboard standoff come from ``Number_TF_coils`` (same
+    call as plot_tf_ripple), so the layout matches the D0FUS sizing.
+
+    Parameters
+    ----------
+    R0, a, b   : float   Plasma geometry and aggregated inboard build [m].
+    ripple_adm : float   Admissible ripple fraction (for the N_coil selection).
+    L_min      : float   Minimum toroidal pitch per coil for maintenance [m].
+    save_dir   : str or None
+    """
+    n_coil, ripple_sel, Delta_ext = Number_TF_coils(R0, a, b, ripple_adm, L_min)
+    R_out = R0 + a + b + Delta_ext
+    theta_deg = np.degrees(2.0 * np.pi * np.arange(n_coil) / n_coil)
+    pitch = 360.0 / n_coil
+    coil_hw = 0.30 * pitch                         # illustrative coil half-width
+    band = (R_out + 0.6) - (R0 + a)
+
+    fig, ax = plt.subplots(figsize=(6.2, 6.0))
+    ax.set_aspect("equal")
+
+    # plasma annulus + central column
+    ax.add_patch(mpatches.Wedge((0, 0), R0 + a, 0, 360, width=2 * a,
+                                facecolor=_RIP_C_PLASMA, alpha=0.45, lw=0, zorder=1))
+    ax.add_patch(mpatches.Circle((0, 0), R0 - a, facecolor="0.85",
+                                 edgecolor="0.6", lw=0.8, zorder=2))
+    ax.text(0, 0, "central\ncolumn", ha="center", va="center", fontsize=8.5,
+            color="0.3", zorder=3)
+    ax.text(0, -R0, "plasma", ha="center", va="center", fontsize=9,
+            color="#9c4a2f", zorder=3,
+            bbox=dict(boxstyle="round,pad=0.15", fc="white", ec="none", alpha=0.7))
+
+    # access corridors (gaps) and coil footprints
+    for t in theta_deg:
+        ax.add_patch(mpatches.Wedge((0, 0), R_out + 0.6, t + coil_hw,
+                                    t + pitch - coil_hw, width=band,
+                                    facecolor=_RIP_C_ACCESS, alpha=0.16, lw=0,
+                                    zorder=2))
+        ax.add_patch(mpatches.Wedge((0, 0), R_out + 0.6, t - coil_hw,
+                                    t + coil_hw, width=1.7,
+                                    facecolor=_RIP_C_COIL, edgecolor="none",
+                                    alpha=0.95, zorder=3))
+
+    # single neutral label on one access sector
+    tlab = theta_deg[0] + pitch / 2
+    r_lab = R0 + a + 0.9
+    ax.annotate("maintenance /\nheating access",
+                xy=(r_lab * np.cos(np.radians(tlab)), r_lab * np.sin(np.radians(tlab))),
+                xytext=(1.12 * R_out, 1.02 * R_out), fontsize=9, color="#2f6b16",
+                ha="left", arrowprops=dict(arrowstyle="->", color="#2f6b16", lw=1.0))
+
+    ax.plot([], [], color=_RIP_C_COIL, lw=6, label=rf"TF coils ($N = {n_coil}$)")
+    ax.plot([], [], color=_RIP_C_ACCESS, lw=6, alpha=0.4, label="access sectors")
+    lim = R_out + 1.6
+    ax.set_xlim(-lim, lim)
+    ax.set_ylim(-lim, lim)
+    ax.set_xlabel("x [m]", fontsize=12)
+    ax.set_ylabel("y [m]", fontsize=12)
+    ax.set_title(rf"TF coils and maintenance access, top view ($N_\mathrm{{coil}} = {n_coil}$)",
+                 fontsize=11)
+    ax.legend(fontsize=9, loc="upper left")
+    plt.tight_layout()
+    _save_or_show(fig, save_dir, "port_access")
+
+
 if __name__ == "__main__":
 
     parser = argparse.ArgumentParser(

{d0fus-2.2.2 → d0fus-2.3.2}/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

{d0fus-2.2.2 → d0fus-2.3.2}/D0FUS_BIB/D0FUS_parameterization.py

@@ -97,7 +97,10 @@ class GlobalConfig:
     Bmax_TF  : float = 12.0        # Peak magnetic field on TF conductor [T]
     Bmax_CS_adm  : float = 25.0    # Peak magnetic field allowed on the CS [T]
     P_fus : float = 2000.0         # Total fusion power [MW]
-    Tbar  : float = 14.0           # Volume-averaged ion temperature [keV]
+    Tbar  : float = 14.0           # Volume-averaged electron temperature T_e [keV]
+    tau_i_e : float = 1.0          # Ion-to-electron temperature ratio T_i/T_e [-]
+                                   # 1.0 -> single-temperature plasma (T_i = T_e).
+                                   # Prescribed: T_i(rho) = tau_i_e * T_e(rho),
     H     : float = 1.0            # Confinement enhancement factor (H-factor) [-]
 
     # ── 2. Physics and operation ─────────────────────────────────────────────
@@ -122,7 +125,7 @@ class GlobalConfig:
     #   'Sauter'    — uses LCFS values (κ_edge, δ_edge). Sauter, FED 112 (2016) Eq. 30.
     #   'ITER_1989' — uses ψ_N = 0.95 values (κ₉₅, δ₉₅). Uckan (1989), also Johner (2011).
     Option_q95         : str = 'Sauter'         # q₉₅ formula: 'Sauter' (default) or 'ITER_1989'
-    Option_Kappa       : str = 'Wenninger'    # Elongation model: 'Wenninger', 'Stambaugh', 'Freidberg', 'Manual'
+    Option_Kappa       : str = 'Wenninger'      # Elongation model: 'Wenninger', 'Stambaugh', 'Freidberg', 'Manual'
     κ_manual           : float = 1.9            # Elongation (Manual mode only) [-]
 
     # ── 2a. Safety factor and current density profiles ────────────────────────
@@ -169,11 +172,20 @@ class GlobalConfig:
     #   kink_parameter='q95'    → q_limit ≈ 3.0–3.5  (ITER/EU-DEMO practice)
     q_limit         : float = 3.0  # Kink safety factor threshold [-]
     Greenwald_limit : float = 1.0  # Greenwald density fraction limit [-]
+    Ip_limit        : float = None # Upper bound on plasma current [MA]; None = no ceiling (GA)
     ms              : float = 0.3  # Vertical stability margin parameter [-]
 
     # ── 4. Plasma composition ────────────────────────────────────────────────
     Atomic_mass : float = 2.5   # Volume-averaged ionic mass [AMU]  (D-T: 2.5)
-    Zeff        : float = 2.0   # Effective plasma charge [-]
+    Zeff        : float = None   # Effective plasma charge [-].
+                                 # None  -> computed self-consistently from the impurity
+                                 #          inventory (impurity_species + f_imp_core) and the
+                                 #          helium ash fraction (see _compute_Zeff_effective):
+                                 #              Z_eff = 1 + 2 f_He - sum_j <Z_j> c_j
+                                 #                                  + sum_j <Z_j>^2 c_j
+                                 #          An empty impurity inventory therefore yields a clean
+                                 #          D-T+He plasma with Z_eff ~ 1 + 2 f_He (~1.1).
+                                 # float -> manual override (legacy behaviour, e.g. Zeff = 2.0).
     r_synch     : float = 0.5   # Synchrotron radiation wall reflectivity [-]
     C_Alpha     : float = 7.0   # Helium ash dilution tuning parameter [-] (default taken from PROCESS)
     # Impurity line radiation (0D bulk-plasma estimate).
@@ -215,6 +227,26 @@ class GlobalConfig:
     Young_modul_Steel    : float = 200e9    # Steel Young's modulus [Pa] (only used in CIRCE model)
     Young_modul_GF       : float = 90e9     # S-glass fiber Young's modulus [Pa] (only used in CIRCE model)
     fatigue_CS           : float = 2.0      # CS fatigue knockdown factor (pulsed & wedging only) [-]
+    # ── Steel allowable safety factors ───────────────────────────────────────
+    # Dimensionless knockdown applied to the steel mechanical allowable inside
+    # the TF and CS thickness solvers: σ_eff = σ_allowable / SF.
+    # Captures effects not represented by the idealised CICC area model:
+    #   – Realistic winding-pack filling factor: round/square cables inside a
+    #     rectangular envelope leave 15–30% of the WP cross-section occupied
+    #     by ground insulation, inter-pancake plates, helium manifolds,
+    #     terminations and assembly clearances. The structural jacket carries
+    #     the electromagnetic load through a section reduced by this factor.
+    #   – Stress concentrations at jacket corners and transitions (K_t ≈ 1.2–1.5).
+    #   – Weld efficiency on jacket seams (η_w ≈ 0.85–0.90).
+    #   – Manufacturing thickness tolerances (≈ ±5%).
+    # Default 1.0 preserves backward compatibility (raw material allowable used
+    # directly). Realistic engineering value for both TF and CS large-magnet
+    # CICC designs is ≈ 1.5 (composition of the four contributions above).
+    # The CS fatigue knockdown (fatigue_CS) multiplies on top of SF_CS, since
+    # the two factors address disjoint phenomena: primary static stress (SF)
+    # versus cyclic damage accumulation (fatigue_CS).
+    SF_TF                : float = 1.0      # Safety factor on TF steel allowable [-] (suggested ≈ 1.5 for realistic CICC packing)
+    SF_CS                : float = 1.0      # Safety factor on CS steel allowable [-] (suggested ≈ 1.5 for realistic CICC packing)
 
     # ── 7. TF coil engineering ───────────────────────────────────────────────
     Radial_build_model   : str   = 'refined' # Stress model: 'academic', 'refined', 'CIRCE'
@@ -257,7 +289,11 @@ class GlobalConfig:
     f_void    : float = None    # Interstitial void fraction in strand bundle [-]
                                 # None = auto: 0.33 (LTS) / 0.00 (REBCO).
                                 # Set explicitly (e.g. 0.30) to override.
-    f_In      : float = 0.15    # Insulation area fraction [-]
+    f_In      : float = 0.05    # Insulation area fraction [-]
+    # Winding-pack overhead fraction in wost, treated exactly like the
+    # helium fraction: ground and inter-pancake insulation plus assembly
+    # clearances that occupy volume but carry neither current nor load.
+    f_gap     : float = 0.15    # WP insulation + clearance fraction in wost [-]
 
     # Temperature margins above T_helium defining T_operating [K]
     # Conservative baseline: Corato et al., "Common operating values for DEMO…" (2016)
@@ -297,7 +333,7 @@ class GlobalConfig:
     # P_CD_total = P_LH + P_ECRH + P_NBI + P_ICRH  (P_aux_input ignored).
     P_LH   : float = 0.0      # LHCD plasma power [MW]
     P_ECRH : float = 0.0      # ECRH plasma power [MW]
-    P_NBI  : float = 0.0      # NBI injected power [MW]  (5 % losses applied internally)
+    P_NBI  : float = 0.0      # NBI injected power[MW]
     P_ICRH : float = 0.0      # ICRH plasma power [MW]   (heating only, no current drive)
     # --- Steady-State mode: power fractions per source [-] ---
     # Used when Operation_mode = 'Steady-State' and CD_source = 'Multi'
@@ -325,6 +361,16 @@ class GlobalConfig:
     # ── 12. Plasma-facing components ─────────────────────────────────────────
     theta_deg : float = 2.7      # Divertor strike-point grazing angle [deg]
 
+    # Refined divertor exhaust (two-point model, Stangeby 2018). All used only
+    # in the post-convergence f_heat_two_point evaluation; they do not feed the
+    # core power balance.
+    f_n_sep       : float = 0.20  # n_sep / volume-average density n̄ [-].
+                                  # Groth value taken from https://arxiv.org/pdf/2406.15693
+    f_cooling_div : float = 0.0   # SOL volumetric power-loss fraction [-] (2PM input)
+    f_mom_div     : float = 0.0   # SOL volumetric momentum-loss fraction [-] (2PM input)
+    q_dep_limit   : float = 5.0   # Tolerable deposited target heat flux [MW/m²]
+    flux_expansion: float = 1.0   # Target/upstream flux expansion R_t/R_u [-]
+
     # ── 13. Maintenance constraints ──────────────────────────────────────────
     ripple_adm : float = 0.01    # Admissible toroidal field ripple [-]  (default 1%)
     L_min      : float = 3.00    # Minimum toroidal maintenance access width [m]