diff --git a/documentation/proc-pages/eng-models/central-solenoid.md b/documentation/proc-pages/eng-models/central-solenoid.md
index 87964276cc..ed4536b50d 100644
--- a/documentation/proc-pages/eng-models/central-solenoid.md
+++ b/documentation/proc-pages/eng-models/central-solenoid.md
@@ -97,9 +97,9 @@ An example output follows. Note that in this example the cycle life is *not* su
Initial vertical crack size (m) (t_crack_vertical) 8.900E-04
Initial radial crack size (m) (t_crack_radial) 2.670E-03
CS turn area (m) (a_cs_turn) 1.904E-03
- CS turn length (m) (l_cond_cst) 7.557E-02
- CS turn internal cable space radius (m) (r_in_cst) 6.732E-03
- CS turn width (m) (d_cond_cst) 2.519E-02
+ CS turn length (m) (dr_cs_turn) 7.557E-02
+ CS turn internal cable space radius (m) (radius_cs_turn_cable_space) 6.732E-03
+ CS turn width (m) (dz_cs_turn) 2.519E-02
CS structural vertical thickness (m) (t_structural_vertical) 5.863E-03
CS structural radial thickness (m) (t_structural_radial) 5.863E-03
Allowable number of cycles till CS fracture (n_cycle) 7.529E+02 OP
diff --git a/documentation/proc-pages/images/plot_proc_10.PNG b/documentation/proc-pages/images/plot_proc_10.PNG
new file mode 100644
index 0000000000..7ce99f4f29
Binary files /dev/null and b/documentation/proc-pages/images/plot_proc_10.PNG differ
diff --git a/documentation/proc-pages/images/plot_proc_9.PNG b/documentation/proc-pages/images/plot_proc_9.PNG
index 7ce99f4f29..c6a882da6f 100644
Binary files a/documentation/proc-pages/images/plot_proc_9.PNG and b/documentation/proc-pages/images/plot_proc_9.PNG differ
diff --git a/documentation/proc-pages/io/utilities.md b/documentation/proc-pages/io/utilities.md
index 005bcf65e8..ac6b9f1d7f 100644
--- a/documentation/proc-pages/io/utilities.md
+++ b/documentation/proc-pages/io/utilities.md
@@ -65,7 +65,7 @@ A `.csv` file will be saved to the directory of the input file.
-## PROCESS 9-Page PDF Summary
+## PROCESS 10-Page PDF Summary
> `process/io/plot_proc.py`
diff --git a/documentation/proc-pages/usage/plotting.md b/documentation/proc-pages/usage/plotting.md
index c13aa7a4bd..1fa63f30a3 100644
--- a/documentation/proc-pages/usage/plotting.md
+++ b/documentation/proc-pages/usage/plotting.md
@@ -62,7 +62,12 @@ process -i path/to/IN.DAT --plot --mfile path/to/MFILE.DAT
{ width="100%"}
-Figure 9: plot_proc first wall comparison page
+Figure 9: plot_proc central solenoid and turn cross-section page
+
+
+
+{ width="100%"}
+Figure 10: plot_proc first wall comparison page
----------------
diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT
index 0192bb0f9b..daf937063f 100644
--- a/examples/data/csv_output_large_tokamak_MFILE.DAT
+++ b/examples/data/csv_output_large_tokamak_MFILE.DAT
@@ -810,9 +810,9 @@
Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04
Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03
CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.9935E-03
- CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.7333E-02
- CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.3195E-03
- CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.5778E-02
+ CS_turn_length_(m)______________________________________________________ (dr_cs_turn)__________________ 7.7333E-02
+ CS_turn_internal_cable_space_radius_(m)_________________________________ (radius_cs_turn_cable_space)____________________ 7.3195E-03
+ CS_turn_width_(m)_______________________________________________________ (dz_cs_turn)__________________ 2.5778E-02
CS_structural_vertical_thickness_(m)____________________________________ (t_structural_vertical)_______ 5.5693E-03
CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 5.5693E-03
Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 4.2524E+02 OP
diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT
index 315d68e052..031278e0ca 100644
--- a/examples/data/large_tokamak_1_MFILE.DAT
+++ b/examples/data/large_tokamak_1_MFILE.DAT
@@ -805,9 +805,9 @@
Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04
Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03
CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.9739E-03
- CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.6953E-02
- CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.4740E-03
- CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.5651E-02
+ CS_turn_length_(m)______________________________________________________ (dr_cs_turn)__________________ 7.6953E-02
+ CS_turn_internal_cable_space_radius_(m)_________________________________ (radius_cs_turn_cable_space)____________________ 7.4740E-03
+ CS_turn_width_(m)_______________________________________________________ (dz_cs_turn)__________________ 2.5651E-02
CS_structural_vertical_thickness_(m)____________________________________ (t_structural_vertical)_______ 5.3514E-03
CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 5.3514E-03
Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 1.3378E+02 OP
diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT
index 6e2130f3ac..677f2afe52 100644
--- a/examples/data/large_tokamak_2_MFILE.DAT
+++ b/examples/data/large_tokamak_2_MFILE.DAT
@@ -805,9 +805,9 @@
Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04
Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03
CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.9739E-03
- CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.6953E-02
- CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.4740E-03
- CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.5651E-02
+ CS_turn_length_(m)______________________________________________________ (dr_cs_turn)__________________ 7.6953E-02
+ CS_turn_internal_cable_space_radius_(m)_________________________________ (radius_cs_turn_cable_space)____________________ 7.4740E-03
+ CS_turn_width_(m)_______________________________________________________ (dz_cs_turn)__________________ 2.5651E-02
CS_structural_vertical_thickness_(m)____________________________________ (t_structural_vertical)_______ 5.3514E-03
CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 5.3514E-03
Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 1.3378E+02 OP
diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT
index 1b6e095253..d776e9df8d 100644
--- a/examples/data/large_tokamak_3_MFILE.DAT
+++ b/examples/data/large_tokamak_3_MFILE.DAT
@@ -805,9 +805,9 @@
Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04
Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03
CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.9739E-03
- CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.6953E-02
- CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.4740E-03
- CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.5651E-02
+ CS_turn_length_(m)______________________________________________________ (dr_cs_turn)__________________ 7.6953E-02
+ CS_turn_internal_cable_space_radius_(m)_________________________________ (radius_cs_turn_cable_space)____________________ 7.4740E-03
+ CS_turn_width_(m)_______________________________________________________ (dz_cs_turn)__________________ 2.5651E-02
CS_structural_vertical_thickness_(m)____________________________________ (t_structural_vertical)_______ 5.3514E-03
CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 5.3514E-03
Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 1.3378E+02 OP
diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT
index 93f7c38ff0..a3ed2b1c21 100644
--- a/examples/data/large_tokamak_4_MFILE.DAT
+++ b/examples/data/large_tokamak_4_MFILE.DAT
@@ -805,9 +805,9 @@
Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04
Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03
CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.9739E-03
- CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.6953E-02
- CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.4740E-03
- CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.5651E-02
+ CS_turn_length_(m)______________________________________________________ (dr_cs_turn)__________________ 7.6953E-02
+ CS_turn_internal_cable_space_radius_(m)_________________________________ (radius_cs_turn_cable_space)____________________ 7.4740E-03
+ CS_turn_width_(m)_______________________________________________________ (dz_cs_turn)__________________ 2.5651E-02
CS_structural_vertical_thickness_(m)____________________________________ (t_structural_vertical)_______ 5.3514E-03
CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 5.3514E-03
Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 1.3378E+02 OP
diff --git a/examples/data/large_tokamak_nof_2_MFILE.DAT b/examples/data/large_tokamak_nof_2_MFILE.DAT
index 3ba3d71a8c..6bed24e088 100644
--- a/examples/data/large_tokamak_nof_2_MFILE.DAT
+++ b/examples/data/large_tokamak_nof_2_MFILE.DAT
@@ -767,9 +767,9 @@
Initial_vertical_crack_size_(m)__________________________________________ (t_crack_vertical)_____________ 8.89999999999999949e-04
Initial_radial_crack_size_(m)____________________________________________ (t_crack_radial)_______________ 2.66999999999999963e-03
CS_turn_area_(m)_________________________________________________________ (a_oh_turn)____________________ 1.86535883128814976e-03
- CS_turn_length_(m)_______________________________________________________ (l_cond_cst)___________________ 7.48069281140754244e-02
- CS_turn_internal_cable_space_radius_(m)__________________________________ (r_in_cst)_____________________ 7.68214749060300642e-03
- CS_turn_width_(m)________________________________________________________ (d_cond_cst)___________________ 2.49356427046918093e-02
+ CS_turn_length_(m)_______________________________________________________ (dr_cs_turn)___________________ 7.48069281140754244e-02
+ CS_turn_internal_cable_space_radius_(m)__________________________________ (radius_cs_turn_cable_space)_____________________ 7.68214749060300642e-03
+ CS_turn_width_(m)________________________________________________________ (dz_cs_turn)___________________ 2.49356427046918093e-02
CS_structural_vertical_thickness_(m)_____________________________________ (t_structural_vertical)________ 4.78567386174289823e-03
CS_structural_radial_thickness_(m)_______________________________________ (t_structural_radial)__________ 4.78567386174289823e-03
Allowable_number_of_cycles_till_CS_fracture______________________________ (n_cycle)______________________ 0.00000000000000000e+00 OP
diff --git a/examples/data/large_tokamak_nof_MFILE.DAT b/examples/data/large_tokamak_nof_MFILE.DAT
index 1f0a7fe9c0..0622f0ad9b 100644
--- a/examples/data/large_tokamak_nof_MFILE.DAT
+++ b/examples/data/large_tokamak_nof_MFILE.DAT
@@ -841,9 +841,9 @@
Initial_vertical_crack_size_(m)__________________________________________ (t_crack_vertical)_____________ 8.89999999999999949e-04
Initial_radial_crack_size_(m)____________________________________________ (t_crack_radial)_______________ 2.66999999999999963e-03
CS_turn_area_(m)_________________________________________________________ (a_oh_turn)____________________ 2.03407534401044230e-03
- CS_turn_length_(m)_______________________________________________________ (l_cond_cst)___________________ 7.81167461689958459e-02
- CS_turn_internal_cable_space_radius_(m)__________________________________ (r_in_cst)_____________________ 7.90457985893884552e-03
- CS_turn_width_(m)________________________________________________________ (d_cond_cst)___________________ 2.60389153896652820e-02
+ CS_turn_length_(m)_______________________________________________________ (dr_cs_turn)___________________ 7.81167461689958459e-02
+ CS_turn_internal_cable_space_radius_(m)__________________________________ (radius_cs_turn_cable_space)_____________________ 7.90457985893884552e-03
+ CS_turn_width_(m)________________________________________________________ (dz_cs_turn)___________________ 2.60389153896652820e-02
CS_structural_vertical_thickness_(m)_____________________________________ (t_structural_vertical)________ 5.11487783589379547e-03
CS_structural_radial_thickness_(m)_______________________________________ (t_structural_radial)__________ 5.11487783589379547e-03
Allowable_number_of_cycles_till_CS_fracture______________________________ (n_cycle)______________________ 0.00000000000000000e+00 OP
diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py
index 4e56ce1a97..308ab8df49 100644
--- a/process/io/plot_proc.py
+++ b/process/io/plot_proc.py
@@ -4344,6 +4344,237 @@ def plot_density_limit_comparison(
axis.set_facecolor("#f0f0f0")
+def plot_cs_coil_structure(axis, fig, mfile_data, scan, colour_scheme=1):
+ """Function to plot the coil structure of the CS.
+
+ Arguments:
+ axis --> axis object to plot to
+ mfile_data --> MFILE.DAT object
+ scan --> scan number to use
+ demo_ranges --> whether to use demo ranges for the plot
+ colour_scheme --> colour scheme to use for the plot
+ """
+ # Get CS coil parameters
+ dr_cs = mfile_data.data["dr_cs"].get_scan(scan)
+ dz_cs = mfile_data.data["ohdz"].get_scan(scan)
+ dr_bore = mfile_data.data["dr_bore"].get_scan(scan)
+
+ # Plot the right side of the CS
+ right_cs = patches.Rectangle(
+ (dr_bore, -dz_cs / 2),
+ dr_cs,
+ dz_cs,
+ edgecolor="black",
+ facecolor=SOLENOID_COLOUR[colour_scheme - 1],
+ lw=1.5,
+ label="CS Coil",
+ )
+ axis.add_patch(right_cs)
+
+ # Plot the bore of the machine
+ bore_rect = patches.Rectangle(
+ (-dr_bore, -dz_cs / 2),
+ dr_bore * 2,
+ dz_cs,
+ edgecolor="black",
+ facecolor="lightgrey",
+ lw=1.0,
+ label="Bore",
+ )
+ axis.add_patch(bore_rect)
+
+ left_cs = patches.Rectangle(
+ (-dr_bore - dr_cs, -dz_cs / 2),
+ dr_cs,
+ dz_cs,
+ edgecolor="black",
+ facecolor=SOLENOID_COLOUR[colour_scheme - 1],
+ lw=1.5,
+ label="CS Coil",
+ )
+ axis.add_patch(left_cs)
+
+ # Draw vertical lines to represent CS turns
+ # Get the turn width (radial thickness of each turn)
+ dr_cs_turn = mfile_data.data["dr_cs_turn"].get_scan(scan)
+ dz_cs_turn = mfile_data.data["dz_cs_turn"].get_scan(scan)
+ # Number of vertical lines (number of turns)
+ if dr_cs_turn > 0:
+ n_lines = int(dr_cs / dr_cs_turn)
+ for i in range(1, n_lines):
+ x = dr_bore + i * dr_cs_turn
+ axis.plot(
+ [x, x],
+ [-dz_cs / 2, dz_cs / 2],
+ color="black",
+ linestyle="--",
+ linewidth=0.2,
+ )
+ x_left = -dr_bore - dr_cs + i * dr_cs_turn
+ axis.plot(
+ [x_left, x_left],
+ [-dz_cs / 2, dz_cs / 2],
+ color="black",
+ linestyle="--",
+ linewidth=0.2,
+ )
+ # Plot horizontal lines (along Z) for each turn
+ if dz_cs_turn > 0:
+ n_hlines = int(dz_cs / dz_cs_turn)
+ for j in range(1, n_hlines):
+ y = -dz_cs / 2 + j * dz_cs_turn
+ # Right CS
+ axis.plot(
+ [dr_bore, dr_bore + dr_cs],
+ [y, y],
+ color="black",
+ linestyle="--",
+ linewidth=0.2,
+ )
+ # Left CS
+ axis.plot(
+ [-dr_bore - dr_cs, -dr_bore],
+ [y, y],
+ color="black",
+ linestyle="--",
+ linewidth=0.2,
+ )
+
+ textstr_cs = (
+ f"$\\mathbf{{Coil \\ parameters:}}$\n \n"
+ f"CS height vs TF internal height: {mfile_data.data['f_z_cs_tf_internal'].get_scan(scan):.2f}\n"
+ f"$N_{{\\text{{turns}}}}:$ {mfile_data.data['n_pf_coil_turns[n_cs_pf_coils-1]'].get_scan(scan):.2f}\n"
+ f"$I_{{\\text{{peak}}}}:$ {mfile_data.data['c_pf_cs_coils_peak_ma[n_cs_pf_coils-1]'].get_scan(scan):.3f}$ \\ MA$\n"
+ f"$B_{{\\text{{peak}}}}:$ {mfile_data.data['b_pf_coil_peak[n_cs_pf_coils-1]'].get_scan(scan):.3f}$ \\ T$\n"
+ )
+
+ axis.text(
+ 0.6,
+ 0.825,
+ textstr_cs,
+ fontsize=9,
+ verticalalignment="bottom",
+ horizontalalignment="left",
+ transform=fig.transFigure,
+ bbox={
+ "boxstyle": "round",
+ "facecolor": "lightyellow",
+ "alpha": 1.0,
+ "linewidth": 2,
+ },
+ )
+
+ axis.set_xlabel("R [m]")
+ axis.set_ylabel("Z [m]")
+ axis.set_title("Central Solenoid Cross-Section")
+ axis.grid(True, linestyle="--", alpha=0.3)
+ axis.set_xlim(-(dr_bore + dr_cs + 0.1), (dr_bore + dr_cs + 0.1))
+ axis.set_ylim(-dz_cs / 2 - 0.1, dz_cs / 2 + 0.1)
+
+
+def plot_cs_turn_structure(axis, fig, mfile_data, scan):
+ a_cs_turn = mfile_data.data["a_cs_turn"].get_scan(scan)
+ dz_cs_turn = mfile_data.data["dz_cs_turn"].get_scan(scan)
+ dr_cs_turn = mfile_data.data["dr_cs_turn"].get_scan(scan)
+
+ ld_ratio_cst = mfile_data.data["ld_ratio_cst"].get_scan(scan)
+ radius_cs_turn_cable_space = mfile_data.data["radius_cs_turn_cable_space"].get_scan(
+ scan
+ )
+ t_structural_vertical = mfile_data.data["t_structural_vertical"].get_scan(scan)
+ t_structural_radial = mfile_data.data["t_structural_radial"].get_scan(scan)
+ r_out_cst = mfile_data.data["r_out_cst"].get_scan(scan)
+
+ # Plot the CS turn as a rectangle representing the conductor cross-section
+ # Assume dz_cs_turn is the diameter and dr_cs_turn is the length of the conductor cross-section
+
+ # Draw the conductor cross-section as a rectangle
+ axis.add_patch(
+ patches.FancyBboxPatch(
+ (0, 0),
+ dr_cs_turn,
+ dz_cs_turn,
+ boxstyle=patches.BoxStyle("Round", pad=0, rounding_size=r_out_cst),
+ edgecolor="black",
+ facecolor="grey",
+ lw=1.5,
+ label="CS Turn Steel conduit",
+ )
+ )
+
+ # Draw the conductor cross-section as a rectangle
+ axis.add_patch(
+ patches.Rectangle(
+ (t_structural_radial + radius_cs_turn_cable_space, t_structural_vertical),
+ dr_cs_turn - ((2 * t_structural_radial) + (2 * radius_cs_turn_cable_space)),
+ 2 * radius_cs_turn_cable_space,
+ facecolor="white",
+ lw=1.5,
+ label="CS Turn Cable Space",
+ zorder=2,
+ )
+ )
+ # Plot the right hand circle for the CS turn cable space
+ axis.add_patch(
+ patches.Circle(
+ (
+ (dr_cs_turn - t_structural_radial - radius_cs_turn_cable_space),
+ dz_cs_turn / 2,
+ ),
+ radius_cs_turn_cable_space,
+ facecolor="white",
+ lw=1.5,
+ zorder=3,
+ )
+ )
+ # Plot the left hand circle for the CS turn cable space
+ axis.add_patch(
+ patches.Circle(
+ ((t_structural_radial + radius_cs_turn_cable_space), dz_cs_turn / 2),
+ radius_cs_turn_cable_space,
+ facecolor="white",
+ lw=1.5,
+ zorder=3,
+ )
+ )
+
+ # Add plasma volume, areas and shaping information
+ textstr_turn = (
+ f"$\\mathbf{{Turn \\ structure:}}$\n\n$A:$ {a_cs_turn:.4e}$ \\ \\text{{m}}^2$\n"
+ f"Turn width: {dr_cs_turn:.4e}$ \\ \\text{{m}}$\n"
+ f"Turn height: {dz_cs_turn:.4e}$ \\ \\text{{m}}$\n"
+ f"Turn width to height ratio: {ld_ratio_cst:.3f}\n"
+ f"Steel conduit width: {t_structural_radial:.4e}$ \\ \\text{{m}}$\n"
+ f"Radius of turn cable space: {radius_cs_turn_cable_space:.4e}$ \\ \\text{{m}}$\n"
+ f"Radius of turn corner: {r_out_cst:.4e}$ \\ \\text{{m}}$\n"
+ )
+
+ axis.text(
+ 0.6,
+ 0.5,
+ textstr_turn,
+ fontsize=9,
+ verticalalignment="bottom",
+ horizontalalignment="left",
+ transform=fig.transFigure,
+ bbox={
+ "boxstyle": "round",
+ "facecolor": "lightyellow",
+ "alpha": 1.0,
+ "linewidth": 2,
+ },
+ )
+
+ axis.set_xlim(-dr_cs_turn * 0.2, dr_cs_turn * 1.2)
+ axis.set_ylim(-dz_cs_turn * 0.3, dz_cs_turn * 1.3)
+ axis.set_aspect("equal")
+ axis.set_xlabel("Length [m]")
+ axis.set_ylabel("Height [m]")
+ axis.set_title("CS Turn Conductor Cross-Section")
+ axis.legend()
+ axis.grid(True, linestyle="--", alpha=0.3)
+
+
def main_plot(
fig1,
fig2,
@@ -4354,6 +4585,7 @@ def main_plot(
fig7,
fig8,
fig9,
+ fig10,
m_file_data,
scan,
imp="../data/lz_non_corona_14_elements/",
@@ -4481,11 +4713,17 @@ def main_plot(
plot_21 = fig8.add_subplot(111)
plot_current_profiles_over_time(plot_21, m_file_data, scan)
- plot_22 = fig9.add_subplot(221, aspect="equal")
- plot_first_wall_top_down_cross_section(plot_22, m_file_data, scan)
+ plot_22 = fig9.add_subplot(121, aspect="equal")
+ plot_cs_coil_structure(plot_22, fig9, m_file_data, scan)
+
+ plot_23 = fig9.add_subplot(224, aspect="equal")
+ plot_cs_turn_structure(plot_23, fig9, m_file_data, scan)
+
+ plot_24 = fig10.add_subplot(221, aspect="equal")
+ plot_first_wall_top_down_cross_section(plot_24, m_file_data, scan)
- plot_23 = fig9.add_subplot(122)
- plot_first_wall_poloidal_cross_section(plot_23, m_file_data, scan)
+ plot_25 = fig10.add_subplot(122)
+ plot_first_wall_poloidal_cross_section(plot_25, m_file_data, scan)
def main(args=None):
@@ -4758,6 +4996,7 @@ def main(args=None):
page7 = plt.figure(figsize=(12, 9), dpi=80)
page8 = plt.figure(figsize=(12, 9), dpi=80)
page9 = plt.figure(figsize=(12, 9), dpi=80)
+ page10 = plt.figure(figsize=(12, 9), dpi=80)
# run main_plot
main_plot(
@@ -4770,6 +5009,7 @@ def main(args=None):
page7,
page8,
page9,
+ page10,
m_file,
scan=scan,
demo_ranges=demo_ranges,
@@ -4787,6 +5027,7 @@ def main(args=None):
pdf.savefig(page7)
pdf.savefig(page8)
pdf.savefig(page9)
+ pdf.savefig(page10)
# show fig if option used
if args.show:
@@ -4801,6 +5042,7 @@ def main(args=None):
plt.close(page7)
plt.close(page8)
plt.close(page9)
+ plt.close(page10)
if __name__ == "__main__":
diff --git a/process/pfcoil.py b/process/pfcoil.py
index dd7d90c9d3..ef0cd0a9b0 100644
--- a/process/pfcoil.py
+++ b/process/pfcoil.py
@@ -52,6 +52,7 @@ def run(self):
def output(self):
"""Output results to output file."""
+ self.output_cs_structure()
self.outpf()
self.outvolt()
@@ -1132,27 +1133,37 @@ def ohcalc(self):
pfv.a_cs_turn = pfv.a_cs_poloidal / pfv.n_pf_coil_turns[pfv.n_cs_pf_coils - 1]
# Depth/width of cs turn conduit
- pfv.d_cond_cst = (pfv.a_cs_turn / pfv.ld_ratio_cst) ** 0.5
+ pfv.dz_cs_turn = (pfv.a_cs_turn / pfv.ld_ratio_cst) ** 0.5
+
# length of cs turn conduit
- pfv.l_cond_cst = pfv.ld_ratio_cst * pfv.d_cond_cst
- # Radius of turn space = pfv.r_in_cst
+ pfv.dr_cs_turn = pfv.ld_ratio_cst * pfv.dz_cs_turn
+
+ # Radius of turn space = pfv.radius_cs_turn_cable_space
# Radius of curved outer corrner pfv.r_out_cst = 3mm from literature
# pfv.ld_ratio_cst = 70 / 22 from literature
- p1_cst = ((pfv.l_cond_cst - pfv.d_cond_cst) / constants.pi) ** 2
- p2_cst = (
- (pfv.l_cond_cst * pfv.d_cond_cst)
- - (4 - constants.pi) * (pfv.r_out_cst**2)
- - (pfv.a_cs_turn * pfv.f_a_cs_steel)
- ) / constants.pi
+
# CS coil turn geometry calculation - stadium shape
# Literature: https://doi.org/10.1016/j.fusengdes.2017.04.052
- pfv.r_in_cst = -((pfv.l_cond_cst - pfv.d_cond_cst) / constants.pi) + math.sqrt(
- p1_cst + p2_cst
+ pfv.radius_cs_turn_cable_space = -(
+ (pfv.dr_cs_turn - pfv.dz_cs_turn) / constants.pi
+ ) + math.sqrt(
+ (((pfv.dr_cs_turn - pfv.dz_cs_turn) / constants.pi) ** 2)
+ + (
+ (
+ (pfv.dr_cs_turn * pfv.dz_cs_turn)
+ - (4 - constants.pi) * (pfv.r_out_cst**2)
+ - (pfv.a_cs_turn * pfv.f_a_cs_steel)
+ )
+ / constants.pi
+ )
)
+
# Thickness of steel conduit in cs turn
- csfv.t_structural_radial = (pfv.d_cond_cst / 2) - pfv.r_in_cst
+ csfv.t_structural_vertical = (
+ pfv.dz_cs_turn / 2
+ ) - pfv.radius_cs_turn_cable_space
# In this model the vertical and radial have the same thickness
- csfv.t_structural_vertical = csfv.t_structural_radial
+ csfv.t_structural_radial = csfv.t_structural_vertical
# add a check for negative conduit thickness
if csfv.t_structural_radial < 1.0e-3:
csfv.t_structural_radial = 1.0e-3
@@ -2050,6 +2061,69 @@ def induct(self, output):
f"Plasma\t{pfv.ind_pf_cs_plasma_mutual[: pfv.n_pf_cs_plasma_circuits, pfv.n_pf_cs_plasma_circuits - 1]}",
)
+ def output_cs_structure(self):
+ op.oheadr(self.outfile, "Central Solenoid Structure")
+
+ op.ocmmnt(self.outfile, "CS turn structure")
+ op.oblnkl(self.outfile)
+
+ op.ovarre(
+ self.outfile,
+ "Poloidal area of a CS turn [m^2]",
+ "(a_cs_turn)",
+ pfv.a_cs_turn,
+ "OP ",
+ )
+ op.ovarre(
+ self.outfile,
+ "Radial width a CS turn [m^2]",
+ "(dz_cs_turn)",
+ pfv.dz_cs_turn,
+ "OP ",
+ )
+ op.ovarre(
+ self.outfile,
+ "Length of a CS turn [m]",
+ "(dr_cs_turn)",
+ pfv.dr_cs_turn,
+ "OP ",
+ )
+ op.ovarre(
+ self.outfile,
+ "Length to diameter ratio of a CS turn",
+ "(ld_ratio_cst)",
+ pfv.ld_ratio_cst,
+ "OP ",
+ )
+ op.ovarre(
+ self.outfile,
+ "Radius of CS turn cable space [m]",
+ "(radius_cs_turn_cable_space)",
+ pfv.radius_cs_turn_cable_space,
+ "OP ",
+ )
+ op.ovarre(
+ self.outfile,
+ "Radial thickness of steel conduit to cable space [m]",
+ "(t_structural_radial)",
+ csfv.t_structural_radial,
+ "OP ",
+ )
+ op.ovarre(
+ self.outfile,
+ "Vertical thickness of steel conduit to cable space [m]",
+ "(t_structural_vertical)",
+ csfv.t_structural_vertical,
+ "OP ",
+ )
+ op.ovarre(
+ self.outfile,
+ "Corner radius of CS turn [m]",
+ "(r_out_cst)",
+ pfv.r_out_cst,
+ "OP ",
+ )
+
def outpf(self):
"""Routine to write output from PF coil module to file.
@@ -2364,20 +2438,20 @@ def outpf(self):
op.ovarre(
self.outfile,
"CS turn length (m)",
- "(l_cond_cst)",
- pfv.l_cond_cst,
+ "(dr_cs_turn)",
+ pfv.dr_cs_turn,
)
op.ovarre(
self.outfile,
"CS turn internal cable space radius (m)",
- "(r_in_cst)",
- pfv.r_in_cst,
+ "(radius_cs_turn_cable_space)",
+ pfv.radius_cs_turn_cable_space,
)
op.ovarre(
self.outfile,
"CS turn width (m)",
- "(d_cond_cst)",
- pfv.d_cond_cst,
+ "(dz_cs_turn)",
+ pfv.dz_cs_turn,
)
op.ovarre(
self.outfile,
@@ -3619,7 +3693,7 @@ def init_pfcoil_variables():
pfv.b_cs_limit_max = 13.0
pfv.fb_cs_limit_max = 1.0
pfv.ld_ratio_cst = 70.0 / 22.0
- pfv.l_cond_cst = 0.0
- pfv.d_cond_cst = 0.0
- pfv.r_in_cst = 0.0
+ pfv.dr_cs_turn = 0.0
+ pfv.dz_cs_turn = 0.0
+ pfv.radius_cs_turn_cable_space = 0.0
pfv.r_out_cst = 3.0e-3
diff --git a/process/tf_coil.py b/process/tf_coil.py
index 0e040a31c9..aec420cae0 100644
--- a/process/tf_coil.py
+++ b/process/tf_coil.py
@@ -3308,29 +3308,31 @@ def stresscl(
# CS coil turn geometry calculation - stadium shape
# Literature: https://doi.org/10.1016/j.fusengdes.2017.04.052
- d_cond_cst = (
+ dz_cs_turn = (
a_cs_turn / ld_ratio_cst
) ** 0.5 # width of cs turn conduit
- l_cond_cst = ld_ratio_cst * d_cond_cst # length of cs turn conduit
- # Radius of turn space = r_in_cst
+ dr_cs_turn = ld_ratio_cst * dz_cs_turn # length of cs turn conduit
+ # Radius of turn space = radius_cs_turn_cable_space
# Radius of curved outer corrner r_out_cst = 3mm from literature
# ld_ratio_cst = 70 / 22 from literature
- p1 = ((l_cond_cst - d_cond_cst) / np.pi) ** 2
+ p1 = ((dr_cs_turn - dz_cs_turn) / np.pi) ** 2
p2 = (
- (l_cond_cst * d_cond_cst)
+ (dr_cs_turn * dz_cs_turn)
- (4 - np.pi) * (r_out_cst**2)
- (a_cs_turn * f_a_cs_steel)
) / np.pi
- r_in_cst = -((l_cond_cst - d_cond_cst) / np.pi) + np.sqrt(p1 + p2)
+ radius_cs_turn_cable_space = -(
+ (dr_cs_turn - dz_cs_turn) / np.pi
+ ) + np.sqrt(p1 + p2)
t_cond_oh = (
- d_cond_cst / 2
- ) - r_in_cst # thickness of steel conduit in cs turn
+ dz_cs_turn / 2
+ ) - radius_cs_turn_cable_space # thickness of steel conduit in cs turn
# OH/CS conduit thickness calculated assuming square conduit [m]
# The CS insulation layer is assumed to the same as the TF one
# CS turn cable space thickness
- t_cable_oh = r_in_cst * 2
+ t_cable_oh = radius_cs_turn_cable_space * 2
# -#
# Smeared elastic properties of the CS
diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90
index 8f37449e87..90f723409a 100644
--- a/source/fortran/pfcoil_variables.f90
+++ b/source/fortran/pfcoil_variables.f90
@@ -396,15 +396,15 @@ module pfcoil_variables
real(dp) :: ld_ratio_cst
!! Ratio of CS coil turn conduit length to depth
- real(dp) :: l_cond_cst
+ real(dp) :: dr_cs_turn
!! Length of CS of CS coil turn conduit
- real(dp) :: d_cond_cst
+ real(dp) :: dz_cs_turn
!! Depth/width of CS of CS coil turn conduit
real(dp) :: r_out_cst
!! Length of CS of CS coil turn conduit length
- real(dp) :: r_in_cst
+ real(dp) :: radius_cs_turn_cable_space
!! Length of CS of CS coil turn conduit length
end module pfcoil_variables
diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT
index 9ed407a6f3..46e0f30c46 100644
--- a/tests/integration/data/large_tokamak_1_MFILE.DAT
+++ b/tests/integration/data/large_tokamak_1_MFILE.DAT
@@ -804,9 +804,9 @@
Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04
Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03
CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.9739E-03
- CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.6953E-02
- CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.4740E-03
- CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.5651E-02
+ CS_turn_length_(m)______________________________________________________ (dr_cs_turn)__________________ 7.6953E-02
+ CS_turn_internal_cable_space_radius_(m)_________________________________ (radius_cs_turn_cable_space)____________________ 7.4740E-03
+ CS_turn_width_(m)_______________________________________________________ (dz_cs_turn)__________________ 2.5651E-02
CS_structural_vertical_thickness_(m)____________________________________ (t_structural_vertical)_______ 5.3514E-03
CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 5.3514E-03
Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 1.3378E+02 OP
diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT
index a7013d1321..c0420d66de 100644
--- a/tests/integration/data/large_tokamak_2_MFILE.DAT
+++ b/tests/integration/data/large_tokamak_2_MFILE.DAT
@@ -805,9 +805,9 @@
Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04
Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03
CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.9739E-03
- CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.6953E-02
- CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.4740E-03
- CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.5651E-02
+ CS_turn_length_(m)______________________________________________________ (dr_cs_turn)__________________ 7.6953E-02
+ CS_turn_internal_cable_space_radius_(m)_________________________________ (radius_cs_turn_cable_space)____________________ 7.4740E-03
+ CS_turn_width_(m)_______________________________________________________ (dz_cs_turn)__________________ 2.5651E-02
CS_structural_vertical_thickness_(m)____________________________________ (t_structural_vertical)_______ 5.3514E-03
CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 5.3514E-03
Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 1.3378E+02 OP
diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT
index a2966c55f2..503e79a8e6 100644
--- a/tests/integration/data/large_tokamak_3_MFILE.DAT
+++ b/tests/integration/data/large_tokamak_3_MFILE.DAT
@@ -805,9 +805,9 @@
Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04
Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03
CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.9739E-03
- CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.6953E-02
- CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.4740E-03
- CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.5651E-02
+ CS_turn_length_(m)______________________________________________________ (dr_cs_turn)__________________ 7.6953E-02
+ CS_turn_internal_cable_space_radius_(m)_________________________________ (radius_cs_turn_cable_space)____________________ 7.4740E-03
+ CS_turn_width_(m)_______________________________________________________ (dz_cs_turn)__________________ 2.5651E-02
CS_structural_vertical_thickness_(m)____________________________________ (t_structural_vertical)_______ 5.3514E-03
CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 5.3514E-03
Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 1.3378E+02 OP
diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT
index 488ad1e1f3..ed0bc6ce3a 100644
--- a/tests/integration/data/large_tokamak_4_MFILE.DAT
+++ b/tests/integration/data/large_tokamak_4_MFILE.DAT
@@ -805,9 +805,9 @@
Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04
Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03
CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.9739E-03
- CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.6953E-02
- CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.4740E-03
- CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.5651E-02
+ CS_turn_length_(m)______________________________________________________ (dr_cs_turn)__________________ 7.6953E-02
+ CS_turn_internal_cable_space_radius_(m)_________________________________ (radius_cs_turn_cable_space)____________________ 7.4740E-03
+ CS_turn_width_(m)_______________________________________________________ (dz_cs_turn)__________________ 2.5651E-02
CS_structural_vertical_thickness_(m)____________________________________ (t_structural_vertical)_______ 5.3514E-03
CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 5.3514E-03
Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 1.3378E+02 OP
diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT
index 804cbb33ae..089c2c8c58 100644
--- a/tests/integration/data/large_tokamak_MFILE.DAT
+++ b/tests/integration/data/large_tokamak_MFILE.DAT
@@ -808,9 +808,9 @@
Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04
Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03
CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.9813E-03
- CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.7097E-02
- CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.4684E-03
- CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.5699E-02
+ CS_turn_length_(m)______________________________________________________ (dr_cs_turn)__________________ 7.7097E-02
+ CS_turn_internal_cable_space_radius_(m)_________________________________ (radius_cs_turn_cable_space)____________________ 7.4684E-03
+ CS_turn_width_(m)_______________________________________________________ (dz_cs_turn)__________________ 2.5699E-02
CS_structural_vertical_thickness_(m)____________________________________ (t_structural_vertical)_______ 5.3812E-03
CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 5.3812E-03
Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 1.3795E+02 OP
diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT
index 7a2392e4d8..be6df9fa1d 100644
--- a/tests/integration/data/scan_2D_MFILE.DAT
+++ b/tests/integration/data/scan_2D_MFILE.DAT
@@ -806,9 +806,9 @@
Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04
Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03
CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.8842E-03
- CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.5184E-02
- CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.6208E-03
- CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.5061E-02
+ CS_turn_length_(m)______________________________________________________ (dr_cs_turn)__________________ 7.5184E-02
+ CS_turn_internal_cable_space_radius_(m)_________________________________ (radius_cs_turn_cable_space)____________________ 7.6208E-03
+ CS_turn_width_(m)_______________________________________________________ (dz_cs_turn)__________________ 2.5061E-02
CS_structural_vertical_thickness_(m)____________________________________ (t_structural_vertical)_______ 4.9098E-03
CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 4.9098E-03
Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 0.0000E+00 OP
@@ -1969,9 +1969,9 @@
Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04
Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03
CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.8791E-03
- CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.5083E-02
- CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.5657E-03
- CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.5028E-02
+ CS_turn_length_(m)______________________________________________________ (dr_cs_turn)__________________ 7.5083E-02
+ CS_turn_internal_cable_space_radius_(m)_________________________________ (radius_cs_turn_cable_space)____________________ 7.5657E-03
+ CS_turn_width_(m)_______________________________________________________ (dz_cs_turn)__________________ 2.5028E-02
CS_structural_vertical_thickness_(m)____________________________________ (t_structural_vertical)_______ 4.9481E-03
CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 4.9481E-03
Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 0.0000E+00 OP
@@ -3132,9 +3132,9 @@
Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04
Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03
CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.8833E-03
- CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.5166E-02
- CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.5551E-03
- CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.5055E-02
+ CS_turn_length_(m)______________________________________________________ (dr_cs_turn)__________________ 7.5166E-02
+ CS_turn_internal_cable_space_radius_(m)_________________________________ (radius_cs_turn_cable_space)____________________ 7.5551E-03
+ CS_turn_width_(m)_______________________________________________________ (dz_cs_turn)__________________ 2.5055E-02
CS_structural_vertical_thickness_(m)____________________________________ (t_structural_vertical)_______ 4.9725E-03
CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 4.9725E-03
Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 0.0000E+00 OP
@@ -4295,9 +4295,9 @@
Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04
Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03
CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.8846E-03
- CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.5192E-02
- CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.5540E-03
- CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.5064E-02
+ CS_turn_length_(m)______________________________________________________ (dr_cs_turn)__________________ 7.5192E-02
+ CS_turn_internal_cable_space_radius_(m)_________________________________ (radius_cs_turn_cable_space)____________________ 7.5540E-03
+ CS_turn_width_(m)_______________________________________________________ (dz_cs_turn)__________________ 2.5064E-02
CS_structural_vertical_thickness_(m)____________________________________ (t_structural_vertical)_______ 4.9779E-03
CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 4.9779E-03
Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 0.0000E+00 OP
@@ -5458,9 +5458,9 @@
Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04
Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03
CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.8772E-03
- CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.5043E-02
- CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.5701E-03
- CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.5014E-02
+ CS_turn_length_(m)______________________________________________________ (dr_cs_turn)__________________ 7.5043E-02
+ CS_turn_internal_cable_space_radius_(m)_________________________________ (radius_cs_turn_cable_space)____________________ 7.5701E-03
+ CS_turn_width_(m)_______________________________________________________ (dz_cs_turn)__________________ 2.5014E-02
CS_structural_vertical_thickness_(m)____________________________________ (t_structural_vertical)_______ 4.9371E-03
CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 4.9371E-03
Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 0.0000E+00 OP
@@ -6621,9 +6621,9 @@
Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04
Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03
CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.8583E-03
- CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.4666E-02
- CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.5465E-03
- CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.4889E-02
+ CS_turn_length_(m)______________________________________________________ (dr_cs_turn)__________________ 7.4666E-02
+ CS_turn_internal_cable_space_radius_(m)_________________________________ (radius_cs_turn_cable_space)____________________ 7.5465E-03
+ CS_turn_width_(m)_______________________________________________________ (dz_cs_turn)__________________ 2.4889E-02
CS_structural_vertical_thickness_(m)____________________________________ (t_structural_vertical)_______ 4.8979E-03
CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 4.8979E-03
Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 0.0000E+00 OP
@@ -7784,9 +7784,9 @@
Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04
Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03
CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.8554E-03
- CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.4607E-02
- CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.5344E-03
- CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.4869E-02
+ CS_turn_length_(m)______________________________________________________ (dr_cs_turn)__________________ 7.4607E-02
+ CS_turn_internal_cable_space_radius_(m)_________________________________ (radius_cs_turn_cable_space)____________________ 7.5344E-03
+ CS_turn_width_(m)_______________________________________________________ (dz_cs_turn)__________________ 2.4869E-02
CS_structural_vertical_thickness_(m)____________________________________ (t_structural_vertical)_______ 4.9001E-03
CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 4.9001E-03
Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 0.0000E+00 OP
@@ -8947,9 +8947,9 @@
Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04
Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03
CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.8597E-03
- CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.4693E-02
- CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.5265E-03
- CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.4898E-02
+ CS_turn_length_(m)______________________________________________________ (dr_cs_turn)__________________ 7.4693E-02
+ CS_turn_internal_cable_space_radius_(m)_________________________________ (radius_cs_turn_cable_space)____________________ 7.5265E-03
+ CS_turn_width_(m)_______________________________________________________ (dz_cs_turn)__________________ 2.4898E-02
CS_structural_vertical_thickness_(m)____________________________________ (t_structural_vertical)_______ 4.9224E-03
CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 4.9224E-03
Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 0.0000E+00 OP
@@ -10110,9 +10110,9 @@
Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04
Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03
CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.8634E-03
- CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.4767E-02
- CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.5155E-03
- CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.4922E-02
+ CS_turn_length_(m)______________________________________________________ (dr_cs_turn)__________________ 7.4767E-02
+ CS_turn_internal_cable_space_radius_(m)_________________________________ (radius_cs_turn_cable_space)____________________ 7.5155E-03
+ CS_turn_width_(m)_______________________________________________________ (dz_cs_turn)__________________ 2.4922E-02
CS_structural_vertical_thickness_(m)____________________________________ (t_structural_vertical)_______ 4.9457E-03
CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 4.9457E-03
Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 0.0000E+00 OP
@@ -11273,9 +11273,9 @@
Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04
Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03
CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.8638E-03
- CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.4776E-02
- CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.5148E-03
- CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.4925E-02
+ CS_turn_length_(m)______________________________________________________ (dr_cs_turn)__________________ 7.4776E-02
+ CS_turn_internal_cable_space_radius_(m)_________________________________ (radius_cs_turn_cable_space)____________________ 7.5148E-03
+ CS_turn_width_(m)_______________________________________________________ (dz_cs_turn)__________________ 2.4925E-02
CS_structural_vertical_thickness_(m)____________________________________ (t_structural_vertical)_______ 4.9479E-03
CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 4.9479E-03
Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 0.0000E+00 OP
@@ -12436,9 +12436,9 @@
Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04
Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03
CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.8627E-03
- CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.4754E-02
- CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.5297E-03
- CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.4918E-02
+ CS_turn_length_(m)______________________________________________________ (dr_cs_turn)__________________ 7.4754E-02
+ CS_turn_internal_cable_space_radius_(m)_________________________________ (radius_cs_turn_cable_space)____________________ 7.5297E-03
+ CS_turn_width_(m)_______________________________________________________ (dz_cs_turn)__________________ 2.4918E-02
CS_structural_vertical_thickness_(m)____________________________________ (t_structural_vertical)_______ 4.9294E-03
CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 4.9294E-03
Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 0.0000E+00 OP
@@ -13599,9 +13599,9 @@
Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04
Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03
CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.8605E-03
- CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.4710E-02
- CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.5285E-03
- CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.4903E-02
+ CS_turn_length_(m)______________________________________________________ (dr_cs_turn)__________________ 7.4710E-02
+ CS_turn_internal_cable_space_radius_(m)_________________________________ (radius_cs_turn_cable_space)____________________ 7.5285E-03
+ CS_turn_width_(m)_______________________________________________________ (dz_cs_turn)__________________ 2.4903E-02
CS_structural_vertical_thickness_(m)____________________________________ (t_structural_vertical)_______ 4.9232E-03
CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 4.9232E-03
Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 0.0000E+00 OP
@@ -14762,9 +14762,9 @@
Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04
Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03
CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.8613E-03
- CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.4725E-02
- CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.5277E-03
- CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.4908E-02
+ CS_turn_length_(m)______________________________________________________ (dr_cs_turn)__________________ 7.4725E-02
+ CS_turn_internal_cable_space_radius_(m)_________________________________ (radius_cs_turn_cable_space)____________________ 7.5277E-03
+ CS_turn_width_(m)_______________________________________________________ (dz_cs_turn)__________________ 2.4908E-02
CS_structural_vertical_thickness_(m)____________________________________ (t_structural_vertical)_______ 4.9265E-03
CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 4.9265E-03
Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 0.0000E+00 OP
@@ -15925,9 +15925,9 @@
Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04
Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03
CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.8640E-03
- CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.4780E-02
- CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.5206E-03
- CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.4927E-02
+ CS_turn_length_(m)______________________________________________________ (dr_cs_turn)__________________ 7.4780E-02
+ CS_turn_internal_cable_space_radius_(m)_________________________________ (radius_cs_turn_cable_space)____________________ 7.5206E-03
+ CS_turn_width_(m)_______________________________________________________ (dz_cs_turn)__________________ 2.4927E-02
CS_structural_vertical_thickness_(m)____________________________________ (t_structural_vertical)_______ 4.9428E-03
CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 4.9428E-03
Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 0.0000E+00 OP
@@ -17088,9 +17088,9 @@
Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04
Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03
CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.8669E-03
- CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.4837E-02
- CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.5116E-03
- CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.4946E-02
+ CS_turn_length_(m)______________________________________________________ (dr_cs_turn)__________________ 7.4837E-02
+ CS_turn_internal_cable_space_radius_(m)_________________________________ (radius_cs_turn_cable_space)____________________ 7.5116E-03
+ CS_turn_width_(m)_______________________________________________________ (dz_cs_turn)__________________ 2.4946E-02
CS_structural_vertical_thickness_(m)____________________________________ (t_structural_vertical)_______ 4.9612E-03
CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 4.9612E-03
Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 0.0000E+00 OP
diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT
index 5d6429c6b7..3647168eb4 100644
--- a/tests/unit/data/large_tokamak_MFILE.DAT
+++ b/tests/unit/data/large_tokamak_MFILE.DAT
@@ -808,9 +808,9 @@
Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04
Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03
CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.9813E-03
- CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.7097E-02
- CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.4684E-03
- CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.5699E-02
+ CS_turn_length_(m)______________________________________________________ (dr_cs_turn)__________________ 7.7097E-02
+ CS_turn_internal_cable_space_radius_(m)_________________________________ (radius_cs_turn_cable_space)____________________ 7.4684E-03
+ CS_turn_width_(m)_______________________________________________________ (dz_cs_turn)__________________ 2.5699E-02
CS_structural_vertical_thickness_(m)____________________________________ (t_structural_vertical)_______ 5.3812E-03
CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 5.3812E-03
Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 1.3795E+02 OP