InnerLayer.SLAYER - NEW FEATURE - Add halfwidth and volume radial-label options to build_slayer_inputs

The cylindrical layer model needs a single minor radius; on a shaped
torus that label is ambiguous. Add rs_method options :halfwidth
(midplane half-chord, the shift-free stand-in for the circular-theory
flux label; reproduces it to ~1% on circular benchmarks) and :volume
(cylinder-equivalent √(V/2π²R₀), the Rutherford-literature convention)
alongside the existing :midplane default and :fsa. Every label feeds
S, the r-based shear, W_d, and k_ref together, so each choice is
self-consistent by construction. Programmatic API only — not exposed
via TOML; the default and all TOML-driven results are unchanged.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

Author: d-burg

src/InnerLayer/SLAYER/LayerInputs.jl

@@ -16,7 +16,7 @@
 using ..Utilities: KineticProfiles
 using ...Utilities.NeoclassicalResistivity: NeoResistivityModel, SpitzerModel,
     coulomb_log_e, nu_star_e
-using FastInterpolations: DerivOp
+using FastInterpolations: DerivOp, integrate
 
 """
     surface_minor_radius(equil, psi; theta=0.0) -> Float64
@@ -114,6 +114,20 @@ profiles, without an intermediate file round-trip.
     a prescribed value. (For `dc_type=:rfitzp` and `:lar`, dgeo_val is
     not consulted.)
   - `dc_type`   -- `:none` (default), `:lar`, `:rfitzp`, or `:toroidal`.
+  - `rs_method` -- radial label defining `r_s` for the whole layer stack
+    (S, r-based shear, W_d, and the Δ' reference-length factor `k_ref` all
+    follow it together, so every choice is self-consistent). `:midplane`
+    (default): outboard-midplane chord from the magnetic axis — natural for
+    comparison with midplane diagnostics. `:halfwidth`: midplane half-chord
+    `(R_out − R_in)/2` — shift-free, the closest stand-in for the circular
+    flux label the Fitzpatrick layer formulas are derived in (reproduces the
+    cylindrical-theory label to ~1% on circular benchmark equilibria).
+    `:fsa`: θ-mean surface radius. `:volume`: cylinder-equivalent label
+    `√(V(ψ)/(2π²R₀))`, the Rutherford-literature convention. On shaped
+    equilibria the labels agree at low-q surfaces (~±3% in growth rate at
+    q=2) and diverge strongly near the edge, where the slab-layer matching
+    is label-ambiguous regardless of choice. Not exposed via TOML —
+    programmatic use only.
   - `theta`     -- poloidal angle at which to measure minor radius (default
     `0.0`, outboard midplane).
   - `resistivity_model` -- `SauterNeoModel()` (default), `RedlNeoModel()`,
@@ -158,7 +172,9 @@ function build_slayer_inputs(equil, sings, profiles::KineticProfiles;
 
     # Minor-radius extractor: `:midplane` = outboard-midplane chord
     # (original behavior); `:fsa` = θ-mean of √rzphi_rsquared, the
-    # flux-surface-averaged minor radius.
+    # flux-surface-averaged minor radius; `:halfwidth` = midplane half-chord
+    # (R_out − R_in)/2, the shift-free circular flux label; `:volume` = the
+    # cylinder-equivalent label r_V = √(V(ψ)/(2π²R₀)).
     _rs_at(ψ) =
         if rs_method === :fsa
             integrand(θ) = sqrt(equil.rzphi_rsquared((Float64(ψ), Float64(θ))))
@@ -168,11 +184,18 @@ function build_slayer_inputs(equil, sings, profiles::KineticProfiles;
                 s += integrand((k - 0.5) / N)
             end
             s / N
+        elseif rs_method === :halfwidth
+            0.5 * (surface_minor_radius(equil, ψ; theta=0.0) +
+                   surface_minor_radius(equil, ψ; theta=0.5))
+        elseif rs_method === :volume
+            lo = 1e-4
+            V = integrate(equil.profiles.dVdpsi_spline, lo, Float64(ψ))
+            sqrt(max(V, 0.0) / (2π^2 * equil.ro))
         else
             surface_minor_radius(equil, ψ; theta=theta)
         end
     _da_dpsi_at(ψ) =
-        if rs_method === :fsa
+        if rs_method !== :midplane
             # central finite difference on _rs_at
             h = 1e-5
             lo = ψ - h

test/runtests_slayer_inputs.jl

@@ -130,6 +130,24 @@
         @test sl_var[1].P_perp ≈ sl_s[1].P_perp * 6.0 / 2.0 rtol = 1e-10
     end
 
+    @testset "build_slayer_inputs: rs_method radial labels are self-consistent" begin
+        sings = [_mk_sing(psi=0.5, q=2.4, q1=1.2, m=2, n=1)]
+        got = Dict{Symbol,Any}()
+        for rsm in (:midplane, :halfwidth, :fsa, :volume)
+            sl = build_slayer_inputs(equil, sings, profiles; bt=2.0, dr_val=0.0, rs_method=rsm)
+            got[rsm] = sl[1]
+            @test isfinite(sl[1].rs) && sl[1].rs > 0
+            @test isfinite(sl[1].k_ref) && sl[1].k_ref > 0
+            @test isfinite(sl[1].sval_r)
+        end
+        # The outboard-shifted axis compresses the outboard chord, so the shift-free
+        # half-chord is at least the outboard axis-to-edge distance.
+        @test got[:halfwidth].rs >= got[:midplane].rs
+        # Labels genuinely differ (each self-consistent set has its own rs, S, k_ref)
+        @test got[:fsa].rs != got[:midplane].rs
+        @test got[:volume].lu != got[:midplane].lu
+    end
+
     @testset "build_slayer_inputs: dc_type propagates and dr_val activates offset" begin
         sings = [_mk_sing(psi=0.5, q=2.4, q1=1.2, m=2, n=1)]