Skip to content

Refactor TF coil models to remove internal cross-section parameters a… #4371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
clmould merged 3 commits into from
Jul 17, 2026
Merged

Refactor TF coil models to remove internal cross-section parameters a… #4371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a74ac7
Refactor TF coil models to remove internal cross-section parameters a…
chris-ashe Jun 23, 2026
70de280
Post rebase fixes
chris-ashe Jun 30, 2026
541ae2d
Add keyword arguements to calls of stresscl
chris-ashe Jul 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 8 additions & 19 deletions process/models/tfcoil/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2217,8 +2217,6 @@ def stresscl(
i_tf_bucking,
r_tf_inboard_in,
dr_bore,
z_tf_inside_half,
f_z_cs_tf_internal,
dr_cs,
i_tf_inside_cs,
dr_tf_inboard,
Expand Down Expand Up @@ -2278,6 +2276,7 @@ def stresscl(
a_tf_coil_inboard_case,
vforce,
a_tf_turn_steel,
a_cs_poloidal: float,
):
"""TF coil stress routine

Expand All @@ -2299,10 +2298,6 @@ def stresscl(

dr_bore :

z_tf_inside_half :

f_z_cs_tf_internal :

dr_cs :

i_tf_inside_cs :
Expand Down Expand Up @@ -2421,6 +2416,9 @@ def stresscl(

a_tf_turn_steel :

a_cs_poloidal : float
Area of the CS poloidal cross-section [m²]

Raises
------
ProcessValueError
Expand Down Expand Up @@ -2544,21 +2542,12 @@ def stresscl(
# as the TF is called before CS in caller.f90
# -#

# CS vertical cross-section area [m2]
if i_tf_inside_cs == TFCSRadialConfiguration.TF_INSIDE_CS:
a_oh = (
2.0e0
* z_tf_inside_half
* f_z_cs_tf_internal
* (dr_bore - dr_tf_inboard)
)
else:
a_oh = 2.0e0 * z_tf_inside_half * f_z_cs_tf_internal * dr_cs

# Maximum current in Central Solenoid, at either BOP or EOF [MA-turns]
# Absolute value
curr_oh_max = (
1.0e-6 * np.maximum(j_cs_flat_top_end, j_cs_pulse_start) * a_oh
1.0e-6
* np.maximum(j_cs_flat_top_end, j_cs_pulse_start)
* a_cs_poloidal
)

# Number of turns
Expand All @@ -2569,7 +2558,7 @@ def stresscl(
)

# CS Turn vertical cross-sectionnal area
a_cs_turn = a_oh / n_oh_turns
a_cs_turn = a_cs_poloidal / n_oh_turns

# CS coil turn geometry calculation - stadium shape
# Literature: https://doi.org/10.1016/j.fusengdes.2017.04.052
Expand Down
133 changes: 66 additions & 67 deletions process/models/tfcoil/resistive.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,73 +140,72 @@ def run(self, output: bool = False):
insstrain,
sig_tf_wp_av_z,
) = self.stresscl(
int(self.data.tfcoil.n_tf_stress_layers),
int(self.data.tfcoil.n_rad_per_layer),
int(self.data.tfcoil.n_tf_wp_stress_layers),
int(self.data.tfcoil.i_tf_bucking),
float(self.data.build.r_tf_inboard_in),
self.data.build.dr_bore,
self.data.build.z_tf_inside_half,
self.data.pf_coil.f_z_cs_tf_internal,
self.data.build.dr_cs,
self.data.build.i_tf_inside_cs,
self.data.build.dr_tf_inboard,
self.data.build.dr_cs_tf_gap,
self.data.pf_coil.i_pf_conductor,
self.data.pf_coil.j_cs_flat_top_end,
self.data.pf_coil.j_cs_pulse_start,
self.data.pf_coil.c_pf_coil_turn_peak_input,
self.data.pf_coil.n_pf_coils_in_group,
self.data.pf_coil.f_dr_dz_cs_turn,
self.data.pf_coil.radius_cs_turn_corners,
self.data.pf_coil.f_a_cs_turn_steel,
self.data.tfcoil.eyoung_steel,
self.data.tfcoil.poisson_steel,
self.data.tfcoil.eyoung_cond_axial,
self.data.tfcoil.poisson_cond_axial,
self.data.tfcoil.eyoung_cond_trans,
self.data.tfcoil.poisson_cond_trans,
self.data.tfcoil.eyoung_ins,
self.data.tfcoil.poisson_ins,
self.data.tfcoil.dx_tf_turn_insulation,
self.data.tfcoil.eyoung_copper,
self.data.tfcoil.poisson_copper,
self.data.tfcoil.i_tf_sup,
self.data.tfcoil.eyoung_res_tf_buck,
self.data.superconducting_tfcoil.r_tf_wp_inboard_inner,
self.data.superconducting_tfcoil.tan_theta_coil,
self.data.superconducting_tfcoil.rad_tf_coil_inboard_toroidal_half,
self.data.superconducting_tfcoil.r_tf_wp_inboard_outer,
self.data.superconducting_tfcoil.a_tf_coil_inboard_steel,
self.data.superconducting_tfcoil.a_tf_plasma_case,
self.data.superconducting_tfcoil.a_tf_coil_nose_case,
self.data.tfcoil.dx_tf_wp_insertion_gap,
self.data.tfcoil.dx_tf_wp_insulation,
self.data.tfcoil.n_tf_coil_turns,
int(self.data.tfcoil.i_tf_turns_integer),
self.data.superconducting_tfcoil.dx_tf_turn_cable_space_average,
self.data.superconducting_tfcoil.dr_tf_turn_cable_space,
self.data.tfcoil.dia_tf_turn_coolant_channel,
self.data.tfcoil.f_a_tf_turn_cable_copper,
self.data.tfcoil.dx_tf_turn_steel,
self.data.superconducting_tfcoil.dx_tf_side_case_average,
self.data.superconducting_tfcoil.dx_tf_wp_toroidal_average,
self.data.superconducting_tfcoil.a_tf_coil_inboard_insulation,
self.data.tfcoil.a_tf_wp_steel,
self.data.tfcoil.a_tf_wp_conductor,
self.data.superconducting_tfcoil.a_tf_wp_with_insulation,
self.data.tfcoil.eyoung_al,
self.data.tfcoil.poisson_al,
self.data.tfcoil.fcoolcp,
self.data.tfcoil.n_tf_graded_layers,
self.data.tfcoil.c_tf_total,
self.data.tfcoil.dr_tf_plasma_case,
self.data.tfcoil.i_tf_stress_model,
self.data.superconducting_tfcoil.vforce_inboard_tot,
self.data.tfcoil.i_tf_tresca,
self.data.tfcoil.a_tf_coil_inboard_case,
self.data.tfcoil.vforce,
self.data.tfcoil.a_tf_turn_steel,
n_tf_layer=int(self.data.tfcoil.n_tf_stress_layers),
n_radial_array=int(self.data.tfcoil.n_rad_per_layer),
n_tf_wp_stress_layers=int(self.data.tfcoil.n_tf_wp_stress_layers),
i_tf_bucking=int(self.data.tfcoil.i_tf_bucking),
r_tf_inboard_in=float(self.data.build.r_tf_inboard_in),
dr_bore=self.data.build.dr_bore,
dr_cs=self.data.build.dr_cs,
i_tf_inside_cs=self.data.build.i_tf_inside_cs,
dr_tf_inboard=self.data.build.dr_tf_inboard,
dr_cs_tf_gap=self.data.build.dr_cs_tf_gap,
i_pf_conductor=self.data.pf_coil.i_pf_conductor,
j_cs_flat_top_end=self.data.pf_coil.j_cs_flat_top_end,
j_cs_pulse_start=self.data.pf_coil.j_cs_pulse_start,
c_pf_coil_turn_peak_input=self.data.pf_coil.c_pf_coil_turn_peak_input,
n_pf_coils_in_group=self.data.pf_coil.n_pf_coils_in_group,
f_dr_dz_cs_turn=self.data.pf_coil.f_dr_dz_cs_turn,
radius_cs_turn_corners=self.data.pf_coil.radius_cs_turn_corners,
f_a_cs_turn_steel=self.data.pf_coil.f_a_cs_turn_steel,
eyoung_steel=self.data.tfcoil.eyoung_steel,
poisson_steel=self.data.tfcoil.poisson_steel,
eyoung_cond_axial=self.data.tfcoil.eyoung_cond_axial,
poisson_cond_axial=self.data.tfcoil.poisson_cond_axial,
eyoung_cond_trans=self.data.tfcoil.eyoung_cond_trans,
poisson_cond_trans=self.data.tfcoil.poisson_cond_trans,
eyoung_ins=self.data.tfcoil.eyoung_ins,
poisson_ins=self.data.tfcoil.poisson_ins,
dx_tf_turn_insulation=self.data.tfcoil.dx_tf_turn_insulation,
eyoung_copper=self.data.tfcoil.eyoung_copper,
poisson_copper=self.data.tfcoil.poisson_copper,
i_tf_sup=self.data.tfcoil.i_tf_sup,
eyoung_res_tf_buck=self.data.tfcoil.eyoung_res_tf_buck,
r_tf_wp_inboard_inner=self.data.superconducting_tfcoil.r_tf_wp_inboard_inner,
tan_theta_coil=self.data.superconducting_tfcoil.tan_theta_coil,
rad_tf_coil_inboard_toroidal_half=self.data.superconducting_tfcoil.rad_tf_coil_inboard_toroidal_half,
r_tf_wp_inboard_outer=self.data.superconducting_tfcoil.r_tf_wp_inboard_outer,
a_tf_coil_inboard_steel=self.data.superconducting_tfcoil.a_tf_coil_inboard_steel,
a_tf_plasma_case=self.data.superconducting_tfcoil.a_tf_plasma_case,
a_tf_coil_nose_case=self.data.superconducting_tfcoil.a_tf_coil_nose_case,
dx_tf_wp_insertion_gap=self.data.tfcoil.dx_tf_wp_insertion_gap,
dx_tf_wp_insulation=self.data.tfcoil.dx_tf_wp_insulation,
n_tf_coil_turns=self.data.tfcoil.n_tf_coil_turns,
i_tf_turns_integer=int(self.data.tfcoil.i_tf_turns_integer),
dx_tf_turn_cable_space_average=self.data.superconducting_tfcoil.dx_tf_turn_cable_space_average,
dr_tf_turn_cable_space=self.data.superconducting_tfcoil.dr_tf_turn_cable_space,
dia_tf_turn_coolant_channel=self.data.tfcoil.dia_tf_turn_coolant_channel,
f_a_tf_turn_cable_copper=self.data.tfcoil.f_a_tf_turn_cable_copper,
dx_tf_turn_steel=self.data.tfcoil.dx_tf_turn_steel,
dx_tf_side_case_average=self.data.superconducting_tfcoil.dx_tf_side_case_average,
dx_tf_wp_toroidal_average=self.data.superconducting_tfcoil.dx_tf_wp_toroidal_average,
a_tf_coil_inboard_insulation=self.data.superconducting_tfcoil.a_tf_coil_inboard_insulation,
a_tf_wp_steel=self.data.tfcoil.a_tf_wp_steel,
a_tf_wp_conductor=self.data.tfcoil.a_tf_wp_conductor,
a_tf_wp_with_insulation=self.data.superconducting_tfcoil.a_tf_wp_with_insulation,
eyoung_al=self.data.tfcoil.eyoung_al,
poisson_al=self.data.tfcoil.poisson_al,
fcoolcp=self.data.tfcoil.fcoolcp,
n_tf_graded_layers=self.data.tfcoil.n_tf_graded_layers,
c_tf_total=self.data.tfcoil.c_tf_total,
dr_tf_plasma_case=self.data.tfcoil.dr_tf_plasma_case,
i_tf_stress_model=self.data.tfcoil.i_tf_stress_model,
vforce_inboard_tot=self.data.superconducting_tfcoil.vforce_inboard_tot,
i_tf_tresca=self.data.tfcoil.i_tf_tresca,
a_tf_coil_inboard_case=self.data.tfcoil.a_tf_coil_inboard_case,
vforce=self.data.tfcoil.vforce,
a_tf_turn_steel=self.data.tfcoil.a_tf_turn_steel,
a_cs_poloidal=self.data.pf_coil.a_cs_poloidal,
)

self.data.tfcoil.sig_tf_case = (
Expand Down
Loading
Loading