diff --git a/documentation/proc-pages/development/numba.md b/documentation/proc-pages/development/numba.md index 89c1b406..795a4f0e 100644 --- a/documentation/proc-pages/development/numba.md +++ b/documentation/proc-pages/development/numba.md @@ -50,7 +50,7 @@ from process.fortran import sctfcoil_variables as sctfv @njit def my_other_function(n): - return n + sctfv.n_tf + return n + sctfv.n_tf_coils ``` because Numba does not know what `sctfv` is. diff --git a/documentation/proc-pages/eng-models/tf-coil.md b/documentation/proc-pages/eng-models/tf-coil.md index 2f63e584..016c5a20 100644 --- a/documentation/proc-pages/eng-models/tf-coil.md +++ b/documentation/proc-pages/eng-models/tf-coil.md @@ -1245,7 +1245,7 @@ Another subroutine, `tfspcall` is called outside `stfcoil` to estimate to check | Parameter | description | Default | | - | - | - | -| `n_tf` | Number of TF coils | 16 | +| `n_tf_coils` | Number of TF coils | 16 | | `i_tf_sup` | Swich selecting the conductor technology:
- 0 : Water cooled copper (GLIDCOP)
- 1 : Superconducting TF magnets
- 2 : Helium cooled Aluminium magnets | 1 | | `i_tf_sc_mat` | Swich for superconducting material
1 : Nb$_3$Sn superconductor, ITER critical surface parameterization[^1], standard critical values
2 : Bi-2212 high temperature superconductor
3 : NbTi superconductor
4 : Nb$_3$Sn superconductor, ITER critical surface parameterization[^1], user-defined critical parameters
5 : WST Nb$_3$Sn parameterization
6 : REBCO HTS tape in CroCo strand
7 : Durham Ginzburg-Landau critical surface model for Nb-Ti
8 : Durham Ginzburg-Landau critical surface model for REBCO
9 : Hazelton experimental data combined with Zhai conceptual model for REBCO | 1 | diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index ac73645d..8a38c299 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -669,7 +669,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.1929E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4985E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (tfcth)_______________________ 8.6482E-01 ITV @@ -689,9 +689,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.7350E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2056E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2056E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 6.9487E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.6240E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.6240E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.9707E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.0816E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -705,7 +705,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.0896E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.9252E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.9252E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.2577E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.9412E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.2482E-01 @@ -732,7 +732,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 9.1497E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.4504E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.5475E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 6.5696E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.5696E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0511E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1646E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0251E+02 OP @@ -1788,7 +1788,7 @@ casths = 0.05 ripmax = 0.6 * Number of TF coils -n_tf = 16 +n_tf_coils = 16 * Groundwall insulation thickness [m] tinstf = 0.008 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index b27363af..9cd7c7de 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -666,7 +666,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.1673E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4985E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (tfcth)_______________________ 9.1597E-01 ITV @@ -686,9 +686,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.8229E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2853E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2853E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.0508E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.4752E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.4752E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.6493E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.6444E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -702,7 +702,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.0901E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.8217E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.8217E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.1550E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.7934E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.3656E-01 @@ -729,7 +729,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.9310E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.3777E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.5446E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 7.1402E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 7.1402E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.1424E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2178E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.1176E+02 OP @@ -1782,7 +1782,7 @@ casths = 0.05 ripmax = 0.6 * Number of TF coils -n_tf = 16 +n_tf_coils = 16 * Groundwall insulation thickness [m] tinstf = 0.008 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 422e223a..4751367e 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -666,7 +666,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.1673E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4985E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (tfcth)_______________________ 9.1597E-01 ITV @@ -686,9 +686,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.8229E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2853E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2853E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.0508E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.4752E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.4752E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.6493E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.6444E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -702,7 +702,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.0901E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.8217E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.8217E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.1550E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.7934E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.3656E-01 @@ -729,7 +729,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.9310E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.3777E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.5446E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 7.1402E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 7.1402E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.1424E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2178E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.1176E+02 OP @@ -1782,7 +1782,7 @@ casths = 0.05 ripmax = 0.6 * Number of TF coils -n_tf = 16 +n_tf_coils = 16 * Groundwall insulation thickness [m] tinstf = 0.008 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 53207efe..4609ca93 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -666,7 +666,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.1673E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4985E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (tfcth)_______________________ 9.1597E-01 ITV @@ -686,9 +686,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.8229E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2853E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2853E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.0508E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.4752E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.4752E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.6493E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.6444E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -702,7 +702,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.0901E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.8217E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.8217E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.1550E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.7934E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.3656E-01 @@ -729,7 +729,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.9310E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.3777E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.5446E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 7.1402E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 7.1402E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.1424E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2178E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.1176E+02 OP @@ -1782,7 +1782,7 @@ casths = 0.05 ripmax = 0.6 * Number of TF coils -n_tf = 16 +n_tf_coils = 16 * Groundwall insulation thickness [m] tinstf = 0.008 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index c2cb109c..5e668e19 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -666,7 +666,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.1673E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4985E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (tfcth)_______________________ 9.1597E-01 ITV @@ -686,9 +686,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.8229E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2853E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2853E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.0508E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.4752E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.4752E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.6493E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.6444E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -702,7 +702,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.0901E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.8217E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.8217E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.1550E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.7934E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.3656E-01 @@ -729,7 +729,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.9310E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.3777E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.5446E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 7.1402E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 7.1402E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.1424E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2178E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.1176E+02 OP @@ -1782,7 +1782,7 @@ casths = 0.05 ripmax = 0.6 * Number of TF coils -n_tf = 16 +n_tf_coils = 16 * Groundwall insulation thickness [m] tinstf = 0.008 diff --git a/examples/data/large_tokamak_IN.DAT b/examples/data/large_tokamak_IN.DAT index d686f0f0..e28a2f56 100644 --- a/examples/data/large_tokamak_IN.DAT +++ b/examples/data/large_tokamak_IN.DAT @@ -592,7 +592,7 @@ casths = 0.05 ripmax = 0.6 * Number of TF coils -n_tf = 16 +n_tf_coils = 16 * Groundwall insulation thickness [m] tinstf = 0.008 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 85850a9f..dbc2404a 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -513,7 +513,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 5 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.7793E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (tfcth)_______________________ 1.4000E+00 ITV @@ -533,9 +533,9 @@ TF_coil_arc_point_5_R_(m)_______________________________________________ (xarc(5))_____________________ 4.4793E+00 TF_coil_arc_point_5_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.5468E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 3.3244E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 2.4635E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 2.4635E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.4102E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 2.3627E+00 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 2.3627E+00 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 7.1070E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5346E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -548,7 +548,7 @@ Winding_pack_toroidal_width_(m)_________________________________________ (wwp1)________________________ 1.2723E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 9.3795E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 9.3795E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 5.2140E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 1.0145E-01 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 3.7714E-01 @@ -577,7 +577,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3757E+05 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 1.0668E+04 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4640E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 1.5629E+06 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP @@ -1508,7 +1508,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 5 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.7793E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (tfcth)_______________________ 1.4000E+00 ITV @@ -1528,9 +1528,9 @@ TF_coil_arc_point_5_R_(m)_______________________________________________ (xarc(5))_____________________ 4.4793E+00 TF_coil_arc_point_5_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.5468E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 3.3244E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 2.4635E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 2.4635E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.4102E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 2.3627E+00 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 2.3627E+00 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 7.1069E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5347E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -1543,7 +1543,7 @@ Winding_pack_toroidal_width_(m)_________________________________________ (wwp1)________________________ 1.2723E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 9.3792E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 9.3792E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 5.2139E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 1.0145E-01 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 3.7716E-01 @@ -1572,7 +1572,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3757E+05 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 1.0668E+04 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4640E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 1.5629E+06 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP @@ -2503,7 +2503,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 5 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.7793E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (tfcth)_______________________ 1.4000E+00 ITV @@ -2523,9 +2523,9 @@ TF_coil_arc_point_5_R_(m)_______________________________________________ (xarc(5))_____________________ 4.4793E+00 TF_coil_arc_point_5_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.5468E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 3.3244E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 2.4634E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 2.4634E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.4101E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 2.3626E+00 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 2.3626E+00 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 7.1069E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5347E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -2538,7 +2538,7 @@ Winding_pack_toroidal_width_(m)_________________________________________ (wwp1)________________________ 1.2723E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 9.3789E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 9.3789E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 5.2137E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 1.0145E-01 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 3.7717E-01 @@ -2567,7 +2567,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3756E+05 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 1.0668E+04 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4640E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 1.5629E+06 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP @@ -3498,7 +3498,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 5 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.7793E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (tfcth)_______________________ 1.4000E+00 ITV @@ -3518,9 +3518,9 @@ TF_coil_arc_point_5_R_(m)_______________________________________________ (xarc(5))_____________________ 4.4793E+00 TF_coil_arc_point_5_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.5468E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 3.3244E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 2.4634E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 2.4634E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.4101E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 2.3626E+00 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 2.3626E+00 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 7.1069E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5348E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -3533,7 +3533,7 @@ Winding_pack_toroidal_width_(m)_________________________________________ (wwp1)________________________ 1.2723E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 9.3786E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 9.3786E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 5.2136E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 1.0146E-01 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 3.7718E-01 @@ -3562,7 +3562,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3755E+05 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 1.0668E+04 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4639E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 1.5629E+06 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP @@ -4493,7 +4493,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 5 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.7793E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (tfcth)_______________________ 1.4000E+00 ITV @@ -4513,9 +4513,9 @@ TF_coil_arc_point_5_R_(m)_______________________________________________ (xarc(5))_____________________ 4.4793E+00 TF_coil_arc_point_5_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.5468E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 3.3244E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 2.4634E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 2.4634E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.4100E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 2.3626E+00 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 2.3626E+00 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 7.1069E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5349E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -4528,7 +4528,7 @@ Winding_pack_toroidal_width_(m)_________________________________________ (wwp1)________________________ 1.2723E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 9.3783E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 9.3783E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 5.2135E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 1.0146E-01 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 3.7719E-01 @@ -4557,7 +4557,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3755E+05 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 1.0668E+04 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4639E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 1.5629E+06 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP @@ -5488,7 +5488,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 5 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.7793E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (tfcth)_______________________ 1.4000E+00 ITV @@ -5508,9 +5508,9 @@ TF_coil_arc_point_5_R_(m)_______________________________________________ (xarc(5))_____________________ 4.4793E+00 TF_coil_arc_point_5_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.5468E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 3.3244E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 2.4634E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 2.4634E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.4100E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 2.3626E+00 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 2.3626E+00 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 7.1068E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5349E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -5523,7 +5523,7 @@ Winding_pack_toroidal_width_(m)_________________________________________ (wwp1)________________________ 1.2723E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 9.3781E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 9.3781E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 5.2134E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 1.0146E-01 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 3.7721E-01 @@ -5552,7 +5552,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3754E+05 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 1.0668E+04 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4639E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 1.5629E+06 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP @@ -6483,7 +6483,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 5 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.7793E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (tfcth)_______________________ 1.4000E+00 ITV @@ -6503,9 +6503,9 @@ TF_coil_arc_point_5_R_(m)_______________________________________________ (xarc(5))_____________________ 4.4793E+00 TF_coil_arc_point_5_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.5468E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 3.3244E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 2.4634E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 2.4634E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.4099E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 2.3626E+00 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 2.3626E+00 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 7.1068E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5350E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -6518,7 +6518,7 @@ Winding_pack_toroidal_width_(m)_________________________________________ (wwp1)________________________ 1.2723E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 9.3779E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 9.3779E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 5.2133E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 1.0146E-01 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 3.7722E-01 @@ -6547,7 +6547,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3753E+05 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 1.0668E+04 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4638E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 1.5629E+06 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP @@ -7478,7 +7478,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 5 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.7793E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (tfcth)_______________________ 1.4000E+00 ITV @@ -7498,9 +7498,9 @@ TF_coil_arc_point_5_R_(m)_______________________________________________ (xarc(5))_____________________ 4.4793E+00 TF_coil_arc_point_5_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.5468E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 3.3244E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 2.4634E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 2.4634E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.4099E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 2.3626E+00 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 2.3626E+00 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 7.1068E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5350E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -7513,7 +7513,7 @@ Winding_pack_toroidal_width_(m)_________________________________________ (wwp1)________________________ 1.2723E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 9.3776E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 9.3776E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 5.2132E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 1.0146E-01 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 3.7723E-01 @@ -7542,7 +7542,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3753E+05 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 1.0668E+04 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4638E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 1.5629E+06 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP @@ -8473,7 +8473,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 5 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.7793E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (tfcth)_______________________ 1.4000E+00 ITV @@ -8493,9 +8493,9 @@ TF_coil_arc_point_5_R_(m)_______________________________________________ (xarc(5))_____________________ 4.4793E+00 TF_coil_arc_point_5_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.5468E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 3.3244E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 2.4634E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 2.4634E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.4098E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 2.3626E+00 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 2.3626E+00 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 7.1068E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5351E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -8508,7 +8508,7 @@ Winding_pack_toroidal_width_(m)_________________________________________ (wwp1)________________________ 1.2723E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 9.3774E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 9.3774E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 5.2131E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 1.0146E-01 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 3.7723E-01 @@ -8537,7 +8537,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3752E+05 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 1.0668E+04 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4638E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 1.5629E+06 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP @@ -9285,7 +9285,7 @@ casths = 0.05 * Inboard tf coil sidewall case thickness (m) cpttf = 6.5e+04 * Tf coil current per turn (a); ripmax = 0.6 * Maximum allowable toroidal field ripple amplitude tdmptf = 30.0 * Dump time for tf coil (s) -n_tf = 16 * Number of tf coils (default = 50 for stellarators) +n_tf_coils = 16 * Number of tf coils (default = 50 for stellarators) sig_tf_case_max = 5.8E8 * Allowable maximum shear stress in TF coil case (Tresca criterion) (Pa) sig_tf_wp_max = 5.8E8 * Allowable maximum shear stress in TF coil conduit (Tresca criterion) (Pa) dhecoil = 0.010 * diameter of He coil in TF winding (m) diff --git a/examples/data/scan_example_file_IN.DAT b/examples/data/scan_example_file_IN.DAT index 9d42b647..c9811863 100644 --- a/examples/data/scan_example_file_IN.DAT +++ b/examples/data/scan_example_file_IN.DAT @@ -592,7 +592,7 @@ casths = 0.05 ripmax = 0.6 * Number of TF coils -n_tf = 16 +n_tf_coils = 16 * Groundwall insulation thickness [m] tinstf = 0.008 diff --git a/process/build.py b/process/build.py index ef258ebc..2468882d 100755 --- a/process/build.py +++ b/process/build.py @@ -42,7 +42,7 @@ def portsz(self): # Toroidal angle between adjacent TF coils - omega = constants.twopi / tfcoil_variables.n_tf + omega = constants.twopi / tfcoil_variables.n_tf_coils # Half-width of outboard TF coil in toroidal direction (m) a = 0.5e0 * tfcoil_variables.tftort # (previously used inboard leg width) @@ -1439,7 +1439,7 @@ def ripple_amplitude(self, ripmax: float, r_tf_outboard_mid: float) -> float: Activated when i_tf_shape == 2 (picture frame) """ - n = float(tfcoil_variables.n_tf) + n = float(tfcoil_variables.n_tf_coils) if tfcoil_variables.i_tf_sup == 1: # Minimal inboard WP radius [m] @@ -1545,7 +1545,7 @@ def ripple_amplitude(self, ripmax: float, r_tf_outboard_mid: float) -> float: flag = 0 if (x < 0.737e0) or (x > 2.95e0): flag = 1 - if (tfcoil_variables.n_tf < 16) or (tfcoil_variables.n_tf > 20): + if (tfcoil_variables.n_tf_coils < 16) or (tfcoil_variables.n_tf_coils > 20): flag = 2 if ( (physics_variables.rmajor + physics_variables.rminor) @@ -1642,7 +1642,7 @@ def calculate_radial_build(self, output: bool) -> None: + tfcoil_variables.casthi + tfcoil_variables.thkcas ) / np.cos( - np.pi / tfcoil_variables.n_tf + np.pi / tfcoil_variables.n_tf_coils ) - build_variables.r_tf_inboard_in # Rounded resistive TF geometry @@ -1670,7 +1670,7 @@ def calculate_radial_build(self, output: bool) -> None: # SC magnets if tfcoil_variables.i_tf_sup == 1: tfcoil_variables.dr_tf_wp = ( - np.cos(np.pi / tfcoil_variables.n_tf) + np.cos(np.pi / tfcoil_variables.n_tf_coils) * build_variables.r_tf_inboard_out - build_variables.r_tf_inboard_in - tfcoil_variables.casthi @@ -1871,7 +1871,7 @@ def calculate_radial_build(self, output: bool) -> None: build_variables.gapsto = build_variables.gapomin # Call tfcoil_variables.ripple calculation again with new build_variables.r_tf_outboard_mid/build_variables.gapsto value - # call rippl(tfcoil_variables.ripmax,rmajor,rminor,r_tf_outboard_mid,n_tf,ripple,r_tf_outboard_midl) + # call rippl(tfcoil_variables.ripmax,rmajor,rminor,r_tf_outboard_mid,n_tf_coils,ripple,r_tf_outboard_midl) ( tfcoil_variables.ripple, r_tf_outboard_midl, @@ -2017,13 +2017,13 @@ def calculate_radial_build(self, output: bool) -> None: if self.ripflag == 1: error_handling.fdiags[0] = ( tfcoil_variables.wwp1 - * tfcoil_variables.n_tf + * tfcoil_variables.n_tf_coils / physics_variables.rmajor ) error_handling.report_error(141) elif self.ripflag == 2: # Convert to integer as idiags is integer array - error_handling.idiags[0] = int(tfcoil_variables.n_tf) + error_handling.idiags[0] = int(tfcoil_variables.n_tf_coils) error_handling.report_error(142) else: error_handling.fdiags[0] = ( diff --git a/process/buildings.py b/process/buildings.py index 9eaadaf3..288931d2 100644 --- a/process/buildings.py +++ b/process/buildings.py @@ -46,7 +46,7 @@ def run(self, output: bool = False): tf_vertical_dim = 2.0e0 * (build_variables.hmax + build_variables.tfthko) # Find mass of each TF coil, in tonnes - tfmtn = 1.0e-3 * tfcoil_variables.whttf / tfcoil_variables.n_tf + tfmtn = 1.0e-3 * tfcoil_variables.whttf / tfcoil_variables.n_tf_coils # Calculate building areas and volumes @@ -71,7 +71,7 @@ def run(self, output: bool = False): tfri, tf_vertical_dim, tfmtn, - tfcoil_variables.n_tf, + tfcoil_variables.n_tf_coils, build_variables.rsldo, build_variables.rsldi, 2.0e0 * (build_variables.hmax - build_variables.vgap_vv_thermalshield) @@ -91,7 +91,7 @@ def bldgs( tfri, tfh, tfm, - n_tf, + n_tf_coils, shro, shri, shh, @@ -191,7 +191,7 @@ def bldgs( if buildings_variables.wgt > 1.0e0: wt = buildings_variables.wgt else: - wt = buildings_variables.shmf * shm / n_tf + wt = buildings_variables.shmf * shm / n_tf_coils wt = max(wt, 1.0e3 * pfm, 1.0e3 * tfm) # Crane height (m) @@ -259,7 +259,7 @@ def bldgs( if buildings_variables.wgt2 > 1.0e0: wgts = buildings_variables.wgt2 else: - wgts = buildings_variables.shmf * shm / n_tf + wgts = buildings_variables.shmf * shm / n_tf_coils cran = 9.41e-6 * wgts + 5.1e0 rmbh = ( @@ -518,7 +518,7 @@ def bldgs_sizes(self, output, tf_radial_dim, tf_vertical_dim): # Footprints and volumes required for storage include hot separation distance (buildings_variables.hot_sepdist). # Assumptions: - # tokomak is toroidally segmented based on number of TF coils (tfcoil_variables.n_tf); + # tokomak is toroidally segmented based on number of TF coils (tfcoil_variables.n_tf_coils); # component will be stored with the largest dimension oriented horizontally; # height is the largest dimension; # if a component lifetime == 0, that component is not in the current machine build. @@ -553,7 +553,7 @@ def bldgs_sizes(self, output, tf_radial_dim, tf_vertical_dim): + build_variables.shldith ) ) - ) / tfcoil_variables.n_tf + ) / tfcoil_variables.n_tf_coils # find footprint and volume for storing component hcomp_footprint = (hcomp_height + buildings_variables.hot_sepdist) * ( max(hcomp_rad_thk, hcomp_tor_thk) + buildings_variables.hot_sepdist @@ -564,7 +564,8 @@ def bldgs_sizes(self, output, tf_radial_dim, tf_vertical_dim): # required lifetime supply of components = # ( number in build * (plant lifetime / component lifetime) ) * quantity safety factor hcomp_req_supply = ( - tfcoil_variables.n_tf * (cost_variables.tlife / cost_variables.tlife) + tfcoil_variables.n_tf_coils + * (cost_variables.tlife / cost_variables.tlife) ) * buildings_variables.qnty_sfty_fac # total storage space for required supply of inboard shield-blanket-wall ib_hotcell_vol = hcomp_req_supply * hcomp_vol @@ -595,7 +596,7 @@ def bldgs_sizes(self, output, tf_radial_dim, tf_vertical_dim): + build_variables.blnkoth + build_variables.shldoth ) - ) / tfcoil_variables.n_tf + ) / tfcoil_variables.n_tf_coils hcomp_footprint = (hcomp_height + buildings_variables.hot_sepdist) * ( max(hcomp_rad_thk, hcomp_tor_thk) + buildings_variables.hot_sepdist ) @@ -603,7 +604,8 @@ def bldgs_sizes(self, output, tf_radial_dim, tf_vertical_dim): min(hcomp_rad_thk, hcomp_tor_thk) + buildings_variables.hot_sepdist ) hcomp_req_supply = ( - tfcoil_variables.n_tf * (cost_variables.tlife / cost_variables.tlife) + tfcoil_variables.n_tf_coils + * (cost_variables.tlife / cost_variables.tlife) ) * buildings_variables.qnty_sfty_fac # total storage space for required supply of outboard wall-blanket-shield ob_hotcell_vol = hcomp_req_supply * hcomp_vol @@ -624,7 +626,8 @@ def bldgs_sizes(self, output, tf_radial_dim, tf_vertical_dim): min(hcomp_rad_thk, hcomp_tor_thk) + buildings_variables.hot_sepdist ) hcomp_req_supply = ( - tfcoil_variables.n_tf * (cost_variables.tlife / cost_variables.divlife) + tfcoil_variables.n_tf_coils + * (cost_variables.tlife / cost_variables.divlife) ) * buildings_variables.qnty_sfty_fac # total storage space for required supply of divertor segments div_hotcell_vol = hcomp_req_supply * hcomp_vol diff --git a/process/costs.py b/process/costs.py index 8aa04fd0..df54d2d7 100644 --- a/process/costs.py +++ b/process/costs.py @@ -1477,7 +1477,7 @@ def acc2221(self): self.c22211 = ( 1.0e-6 * ctfconpm - * tfcoil_variables.n_tf + * tfcoil_variables.n_tf_coils * tfcoil_variables.tfleng * tfcoil_variables.n_tf_turn ) @@ -1490,7 +1490,7 @@ def acc2221(self): self.c22212 = ( 1.0e-6 * cost_variables.ucwindtf - * tfcoil_variables.n_tf + * tfcoil_variables.n_tf_coils * tfcoil_variables.tfleng * tfcoil_variables.n_tf_turn ) @@ -1503,7 +1503,7 @@ def acc2221(self): self.c22213 = ( 1.0e-6 * (tfcoil_variables.whtcas * cost_variables.uccase) - * tfcoil_variables.n_tf + * tfcoil_variables.n_tf_coils ) self.c22213 = ( cost_variables.fkind * self.c22213 * cmlsa[cost_variables.lsa - 1] @@ -1938,7 +1938,7 @@ def acc2251(self): if tfcoil_variables.i_tf_sup == 1: self.c22512 = 1.0e-6 * ( cost_variables.uctfbr - * tfcoil_variables.n_tf + * tfcoil_variables.n_tf_coils * (tfcoil_variables.cpttf * tfcoil_variables.vtfskv * 1.0e3) ** expel + cost_variables.uctfsw * tfcoil_variables.cpttf ) @@ -1951,13 +1951,15 @@ def acc2251(self): self.c22513 = 1.0e-6 * ( 1.0e9 * cost_variables.uctfdr * tfcoil_variables.estotftgj - + cost_variables.uctfgr * 0.5e0 * tfcoil_variables.n_tf + + cost_variables.uctfgr * 0.5e0 * tfcoil_variables.n_tf_coils ) self.c22513 = cost_variables.fkind * self.c22513 # Account 225.1.4 : TF coil instrumentation and control - self.c22514 = 1.0e-6 * cost_variables.uctfic * (30.0e0 * tfcoil_variables.n_tf) + self.c22514 = ( + 1.0e-6 * cost_variables.uctfic * (30.0e0 * tfcoil_variables.n_tf_coils) + ) self.c22514 = cost_variables.fkind * self.c22514 # Account 225.1.5 : TF coil bussing diff --git a/process/costs_2015.py b/process/costs_2015.py index 086a34e1..33fd9410 100644 --- a/process/costs_2015.py +++ b/process/costs_2015.py @@ -584,7 +584,7 @@ def calc_building_costs(self): self.s_label[5] = "Magnet power supplies and related buildings" self.s_cref[5] = 110000.0e0 * cost_variables.light_build_cost_per_vol # Scale with TF current per coil (MA) - self.s_k[5] = (tfcoil_variables.ritfc / tfcoil_variables.n_tf) / 1.0e6 + self.s_k[5] = (tfcoil_variables.ritfc / tfcoil_variables.n_tf_coils) / 1.0e6 self.s_kref[5] = 9.1e0 self.s_cost[5] = ( self.s_cost_factor[5] * self.s_cref[5] * (self.s_k[5] / self.s_kref[5]) @@ -707,7 +707,7 @@ def calc_tf_coil_costs(self): # ITER coil insertion and welding cost (2014 $) self.s_cref[13] = 258.0e6 # Scale with total TF coil length (m) - self.s_k[13] = tfcoil_variables.n_tf * tfcoil_variables.tfleng + self.s_k[13] = tfcoil_variables.n_tf_coils * tfcoil_variables.tfleng self.s_kref[13] = 18.0e0 * 34.1e0 self.s_cost[13] = ( self.s_cost_factor[13] @@ -721,7 +721,9 @@ def calc_tf_coil_costs(self): self.s_cref[15] = 414.0e6 # Scale with the total turn length (m) self.s_k[15] = ( - tfcoil_variables.n_tf * tfcoil_variables.tfleng * tfcoil_variables.n_tf_turn + tfcoil_variables.n_tf_coils + * tfcoil_variables.tfleng + * tfcoil_variables.n_tf_turn ) self.s_kref[15] = 82249.0e0 self.s_cost[15] = ( @@ -735,7 +737,7 @@ def calc_tf_coil_costs(self): # ITER Chromium plated Cu strand for TF SC cost (2014 $) self.s_cref[16] = 21.0e6 # Scale with total copper mass (kg) - self.s_k[16] = tfcoil_variables.whtconcu * tfcoil_variables.n_tf + self.s_k[16] = tfcoil_variables.whtconcu * tfcoil_variables.n_tf_coils self.s_kref[16] = 244.0e3 self.s_cost[16] = ( self.s_cost_factor[16] @@ -748,7 +750,7 @@ def calc_tf_coil_costs(self): # ITER Nb3Sn SC strands cost (2014 $) self.s_cref[17] = 526.0e6 # Scale with the total mass of Nb3Sn (kg) - self.s_k[17] = tfcoil_variables.whtconsc * tfcoil_variables.n_tf + self.s_k[17] = tfcoil_variables.whtconsc * tfcoil_variables.n_tf_coils self.s_kref[17] = 210.0e3 self.s_cost[17] = ( self.s_cost_factor[17] @@ -768,7 +770,9 @@ def calc_tf_coil_costs(self): self.s_cref[19] = 81.0e6 # Scale with total turn length. self.s_k[19] = ( - tfcoil_variables.n_tf * tfcoil_variables.tfleng * tfcoil_variables.n_tf_turn + tfcoil_variables.n_tf_coils + * tfcoil_variables.tfleng + * tfcoil_variables.n_tf_turn ) self.s_kref[19] = 82249.0e0 self.s_cost[19] = ( diff --git a/process/io/mfile_comparison.py b/process/io/mfile_comparison.py index f3b08b26..36a4919e 100755 --- a/process/io/mfile_comparison.py +++ b/process/io/mfile_comparison.py @@ -51,7 +51,7 @@ "fimp(14", "sarea", "plasma_volume", - "n_tf", + "n_tf_coils", "shldith", "shldoth", "blnkith", @@ -108,7 +108,7 @@ "triang95", "sarea", "plasma_volume", - "n_tf", + "n_tf_coils", "fusion_power", "plasma_current_MA", "bt", diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index 06568ead..7c07e3cb 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -14,7 +14,7 @@ OBS_VARS = { "snull": "i_single_null", - "tfno": "n_tf", + "tfno": "n_tf_coils", "itfsup": "i_tf_sup", "r_tf_inleg_mid": "r_tf_inboard_mid", "rtot": "r_tf_outboard_mid", diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index ee0bd73d..7c0b926f 100755 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -535,8 +535,8 @@ def toroidal_cross_section(axis, mfile_data, scan, demo_ranges, colour_scheme): # Segment the TF coil inboard # Calculate centrelines - n = int(n_tf / 4) + 1 - spacing = 2 * np.pi / n_tf + n = int(n_tf_coils / 4) + 1 + spacing = 2 * np.pi / n_tf_coils i = np.arange(0, n) ang = i * spacing @@ -564,7 +564,7 @@ def toroidal_cross_section(axis, mfile_data, scan, demo_ranges, colour_scheme): TF_outboard( axis, item, - n_tf=n_tf, + n_tf_coils=n_tf_coils, r3=r3, r4=r4, w=w + nbshield, @@ -574,7 +574,7 @@ def toroidal_cross_section(axis, mfile_data, scan, demo_ranges, colour_scheme): TF_outboard( axis, item, - n_tf=n_tf, + n_tf_coils=n_tf_coils, r3=r3, r4=r4, w=w, @@ -621,8 +621,8 @@ def toroidal_cross_section(axis, mfile_data, scan, demo_ranges, colour_scheme): # --- -def TF_outboard(axis, item, n_tf, r3, r4, w, facecolor): - spacing = 2 * np.pi / n_tf +def TF_outboard(axis, item, n_tf_coils, r3, r4, w, facecolor): + spacing = 2 * np.pi / n_tf_coils ang = item * spacing dx = w * np.sin(ang) dy = w * np.cos(ang) @@ -2350,7 +2350,7 @@ def plot_geometry_info(axis, mfile_data, scan): ("sarea", "Plasma surface area", "m$^2$"), ("xarea", "Plasma cross-sectional area", "m$^2$"), ("plasma_volume", "Plasma volume", "m$^3$"), - ("n_tf", "No. of TF coils", ""), + ("n_tf_coils", "No. of TF coils", ""), (in_blanket_thk, "Inboard blanket+shield", "m"), ("inboard_build", "Inboard build thickness", "m"), (out_blanket_thk, "Outboard blanket+shield", "m"), @@ -2529,11 +2529,11 @@ def plot_magnetics_info(axis, mfile_data, scan): ("tmargoh", "CS Temperature margin", "K"), (sig_cond, "TF Cond max TRESCA stress", "MPa"), (sig_case, "TF Case max TRESCA stress", "MPa"), - ("whttf/n_tf", "Mass per TF coil", "kg"), + ("whttf/n_tf_coils", "Mass per TF coil", "kg"), ] else: - n_tf = mfile_data.data["n_tf"].get_scan(scan) + n_tf_coils = mfile_data.data["n_tf_coils"].get_scan(scan) prescp = 1.0e-6 * mfile_data.data["prescp"].get_scan(scan) presleg = 1.0e-6 * mfile_data.data["presleg"].get_scan(scan) pres_joints = 1.0e-6 * mfile_data.data["pres_joints"].get_scan(scan) @@ -2557,7 +2557,7 @@ def plot_magnetics_info(axis, mfile_data, scan): (fcoolcp, "CP cooling fraction", "%"), ("vcool", "Maximum coolant flow speed", "ms$^{-1}$"), (prescp, "CP Resisitive heating", "MW"), - (presleg * n_tf, "legs Resisitive heating (all legs)", "MW"), + (presleg * n_tf_coils, "legs Resisitive heating (all legs)", "MW"), (pres_joints, "TF joints resisitive heating ", "MW"), ] @@ -3296,7 +3296,7 @@ def main(args=None): ddwex = m_file.data["ddwex"].get_scan(scan) # Magnets related - global n_tf + global n_tf_coils global wwp1 global wwp2 global dr_tf_wp @@ -3304,7 +3304,7 @@ def main(args=None): global thkcas global casthi - n_tf = m_file.data["n_tf"].get_scan(scan) + n_tf_coils = m_file.data["n_tf_coils"].get_scan(scan) if i_tf_sup == 1: # If superconducting magnets wwp1 = m_file.data["wwp1"].get_scan(scan) if i_tf_wp_geom == 1: diff --git a/process/power.py b/process/power.py index db4d0d4f..821478c5 100644 --- a/process/power.py +++ b/process/power.py @@ -793,7 +793,7 @@ def power1(self): pf_power_variables.ensxpfm, times_variables.tpulse, tfcoil_variables.cpttf, - tfcoil_variables.n_tf, + tfcoil_variables.n_tf_coils, ) # Use 13% of ideal Carnot efficiency to fit J. Miller estimate @@ -2253,7 +2253,7 @@ def power3(self, output: bool): # 40 format(t20,a20,t40,f8.2,t50,f8.2,t60,f8.2,t70,f8.2,t80,f8.2,t90,f8.2,t100,f8.2,t110,f8.2) def cryo( - self, i_tf_sup, tfcryoarea, coldmass, ptfnuc, ensxpfm, tpulse, cpttf, n_tf + self, i_tf_sup, tfcryoarea, coldmass, ptfnuc, ensxpfm, tpulse, cpttf, n_tf_coils ): """ Calculates cryogenic loads @@ -2287,7 +2287,7 @@ def cryo( # Current leads if i_tf_sup == 1: - self.qcl = 13.6e-3 * n_tf * cpttf + self.qcl = 13.6e-3 * n_tf_coils * cpttf else: self.qcl = 0.0e0 @@ -2489,7 +2489,7 @@ def tfpwr(self, output: bool): # Total maximum impedance MDK actually just fixed resistance ztot = ( - tfcoil_variables.n_tf * tfcoil_variables.tflegres + tfcoil_variables.n_tf_coils * tfcoil_variables.tflegres + (tfcoil_variables.prescp / tfcoil_variables.ritfc**2) + tfbusres ) @@ -2497,7 +2497,7 @@ def tfpwr(self, output: bool): # No reactive portion of the voltage is included here - assume long ramp times # MDK This is steady state voltage, not "peak" voltage tfcoil_variables.vtfkv = ( - 1.0e-3 * ztot * tfcoil_variables.cpttf / tfcoil_variables.n_tf + 1.0e-3 * ztot * tfcoil_variables.cpttf / tfcoil_variables.n_tf_coils ) # Resistive powers (MW): @@ -2517,7 +2517,7 @@ def tfpwr(self, output: bool): # The TF coil can be ramped up as slowly as you like # (although this will affect the time to recover from a magnet quench). # tfreacmw = 1.0e-6 * 1.0e9 * estotf/(tohs + tramp) - # estotf(=estotftgj/tfcoil_variables.n_tf) has been removed (#199 #847) + # estotf(=estotftgj/tfcoil_variables.n_tf_coils) has been removed (#199 #847) tfreacmw = 0.0e0 # Total power consumption (MW) @@ -2630,7 +2630,7 @@ def tfpwcall(self, output: bool): the power conversion requirements for superconducting TF coils. None """ - ettfmj = tfcoil_variables.estotftgj / tfcoil_variables.n_tf * 1.0e3 + ettfmj = tfcoil_variables.estotftgj / tfcoil_variables.n_tf_coils * 1.0e3 # TF coil current (kA) @@ -2646,7 +2646,7 @@ def tfpwcall(self, output: bool): output, itfka, physics_variables.rmajor, - tfcoil_variables.n_tf, + tfcoil_variables.n_tf_coils, tfcoil_variables.vtfskv, ettfmj, tfcoil_variables.tflegres, @@ -2831,7 +2831,7 @@ def tfcpwr(self, output: bool, itfka, rmajor, ntfc, vtfskv, ettfmj, rptfc): rcoils, "OP ", ) - # MDK Remove this as it leads to confusion between (a) total inductance/n_tf, or (b) + # MDK Remove this as it leads to confusion between (a) total inductance/n_tf_coils, or (b) # self-inductance of one single coil # po.ovarre(outfile,'Inductance per TF coil (H)','(lptfcs)',lptfcs, 'OP ') po.ovarre(self.outfile, "TF coil charging voltage (V)", "(tfcv)", tfcv) diff --git a/process/sctfcoil.py b/process/sctfcoil.py index 513bd222..01011325 100644 --- a/process/sctfcoil.py +++ b/process/sctfcoil.py @@ -39,10 +39,12 @@ def run(self, output: bool): """ Routine to call the superconductor module for the TF coils """ - tfes = sctfcoil_module.estotft / tfcoil_variables.n_tf + tfes = sctfcoil_module.estotft / tfcoil_variables.n_tf_coils # Cross-sectional area per turn aturn = tfcoil_variables.ritfc / ( - tfcoil_variables.jwptf * tfcoil_variables.n_tf * tfcoil_variables.n_tf_turn + tfcoil_variables.jwptf + * tfcoil_variables.n_tf_coils + * tfcoil_variables.n_tf_turn ) if tfcoil_variables.i_tf_sc_mat == 6: @@ -90,7 +92,7 @@ def croco_voltage(self) -> float: croco_voltage = ( 2.0e0 / sctfcoil_module.time2 - * (sctfcoil_module.estotft / tfcoil_variables.n_tf) + * (sctfcoil_module.estotft / tfcoil_variables.n_tf_coils) / tfcoil_variables.cpttf ) elif f2py_compatible_to_string(tfcoil_variables.quench_model) == "exponential": @@ -98,7 +100,7 @@ def croco_voltage(self) -> float: croco_voltage = ( 2.0e0 / sctfcoil_module.tau2 - * (sctfcoil_module.estotft / tfcoil_variables.n_tf) + * (sctfcoil_module.estotft / tfcoil_variables.n_tf_coils) / tfcoil_variables.cpttf ) else: @@ -1205,7 +1207,7 @@ def sctfcoil(self, output: bool): # Rem : as resistive magnets are axisymmetric, no inboard ripple is present if tfcoil_variables.i_tf_sup == 1: tfcoil_variables.bmaxtfrp, peaktfflag = self.peak_tf_with_ripple( - tfcoil_variables.n_tf, + tfcoil_variables.n_tf_coils, tfcoil_variables.wwp1, tfcoil_variables.dr_tf_wp - 2.0e0 * (tfcoil_variables.tinstf + tfcoil_variables.tfinsgap), @@ -1486,7 +1488,7 @@ def tf_global_geometry(self): - Winding Pack NOT included """ - sctfcoil_module.theta_coil = numpy.pi / tfcoil_variables.n_tf + sctfcoil_module.theta_coil = numpy.pi / tfcoil_variables.n_tf_coils sctfcoil_module.tan_theta_coil = numpy.tan(sctfcoil_module.theta_coil) # TF coil inboard legs mid-plane cross-section area (WP + casing ) [m2] @@ -1499,7 +1501,7 @@ def tf_global_geometry(self): else: # Straight front case tfcoil_variables.tfareain = ( - tfcoil_variables.n_tf + tfcoil_variables.n_tf_coils * numpy.sin(sctfcoil_module.theta_coil) * numpy.cos(sctfcoil_module.theta_coil) * build_variables.r_tf_inboard_out**2 @@ -1565,7 +1567,7 @@ def tf_current(self): tfcoil_variables.casths = ( tfcoil_variables.casths_fraction * (build_variables.r_tf_inboard_in + tfcoil_variables.thkcas) - * numpy.tan(numpy.pi / tfcoil_variables.n_tf) + * numpy.tan(numpy.pi / tfcoil_variables.n_tf_coils) ) # Radial position of peak toroidal field [m] @@ -1600,7 +1602,9 @@ def tf_current(self): ) # Current per TF coil [A] - sctfcoil_module.tfc_current = tfcoil_variables.ritfc / tfcoil_variables.n_tf + sctfcoil_module.tfc_current = ( + tfcoil_variables.ritfc / tfcoil_variables.n_tf_coils + ) # Global inboard leg average current in TF coils [A/m2] tfcoil_variables.oacdcp = tfcoil_variables.ritfc / tfcoil_variables.tfareain @@ -1844,7 +1848,7 @@ def tf_res_heating(self): tfcoil_variables.ritfc, tfcoil_variables.rhocp, tfcoil_variables.fcoolcp, - tfcoil_variables.n_tf, + tfcoil_variables.n_tf_coils, ) # Leg cross-section areas @@ -1885,7 +1889,7 @@ def tf_res_heating(self): tfcoil_variables.presleg = ( tfcoil_variables.tflegres * tfcoil_variables.ritfc**2 - / tfcoil_variables.n_tf + / tfcoil_variables.n_tf_coils ) # --- @@ -1896,7 +1900,7 @@ def tf_res_heating(self): n_contact_tot = ( tfcoil_variables.n_tf_joints_contact * numpy.round(tfcoil_variables.n_tf_turn) - * numpy.round(tfcoil_variables.n_tf) + * numpy.round(tfcoil_variables.n_tf_coils) ) # Area of joint contact (all legs) @@ -1927,7 +1931,7 @@ def tf_res_heating(self): tfcoil_variables.rhocp * tfcoil_variables.ritfc**2 * tfcoil_variables.tfleng - / (sctfcoil_module.a_leg_cond * tfcoil_variables.n_tf) + / (sctfcoil_module.a_leg_cond * tfcoil_variables.n_tf_coils) ) # tfcoil_variables.prescp containts the the total resistive power losses @@ -1952,7 +1956,7 @@ def cpost( curr, rho, fcool, - n_tf, + n_tf_coils, ): """ author: P J Knight, CCFE, Culham Science Centre @@ -2025,7 +2029,7 @@ def cpost( # Mid-plane area calculations # --------------------------- # Total number of CP turns - n_turns_tot = n_tf * n_tf_turn + n_turns_tot = n_tf_coils * n_tf_turn # Area of the innner TF central hole [m2] a_tfin_hole = numpy.pi * r_tfin_inleg**2 @@ -2038,7 +2042,7 @@ def cpost( # Mid-plane outter ground insulation thickness [m2] a_cp_gr_ins = ( numpy.pi * ((rmid + gr_ins_th) ** 2 - rmid**2) - + 2.0e0 * gr_ins_th * (rmid - r_tfin_inleg) * n_tf + + 2.0e0 * gr_ins_th * (rmid - r_tfin_inleg) * n_tf_coils ) # Mid-plane turn layer cross-section area [m2] @@ -2051,7 +2055,7 @@ def cpost( # Cooling pipes cross-section per coil [m2] a_cp_cool = fcool * ( - (numpy.pi * rmid**2 - a_tfin_hole - a_cp_ins) / n_tf + (numpy.pi * rmid**2 - a_tfin_hole - a_cp_ins) / n_tf_coils - 2.0e0 * gr_ins_th * (rmid - r_tfin_inleg) ) # Wedge ground insulation # --------------------------- @@ -2077,7 +2081,7 @@ def cpost( if numpy.abs(rmid - rtop) < EPS: # Exact conductor cross-section a_cond_midplane = ( - numpy.pi * rmid**2 - a_tfin_hole - n_tf * a_cp_cool - a_cp_ins + numpy.pi * rmid**2 - a_tfin_hole - n_tf_coils * a_cp_cool - a_cp_ins ) # Volumes and resisitive losses calculations @@ -2146,15 +2150,15 @@ def cpost( yy_cond[ii] = ( numpy.pi * r**2 - a_tfin_hole - - n_tf * a_cp_cool + - n_tf_coils * a_cp_cool - yy_ins[ii] - - 2.0e0 * n_tf * gr_ins_th * (r - r_tfin_inleg) + - 2.0e0 * n_tf_coils * gr_ins_th * (r - r_tfin_inleg) ) # Wedge ground insulation # Outer ground insulation area at z yy_gr_ins[ii] = numpy.pi * ( (r + gr_ins_th) ** 2 - r**2 - ) + 2.0e0 * n_tf * gr_ins_th * (r - r_tfin_inleg) + ) + 2.0e0 * n_tf_coils * gr_ins_th * (r - r_tfin_inleg) # Outer casing Cross-sectional area at z yy_casout[ii] = numpy.pi * ( @@ -2193,7 +2197,7 @@ def cpost( # Ground insulation layer cross-section at CP top [m2] a_cp_gr_ins = ( numpy.pi * ((rtop + gr_ins_th) ** 2 - rtop**2) - + 2.0e0 * gr_ins_th * (rtop - r_tfin_inleg) * n_tf + + 2.0e0 * gr_ins_th * (rtop - r_tfin_inleg) * n_tf_coils ) # Outer casing cross-section area at CP top [m2] @@ -2208,8 +2212,8 @@ def cpost( numpy.pi * rtop**2 - a_tfin_hole - a_cp_ins - - n_tf * a_cp_cool - - 2.0e0 * n_tf * gr_ins_th * (rtop - r_tfin_inleg) + - n_tf_coils * a_cp_cool + - 2.0e0 * n_tf_coils * gr_ins_th * (rtop - r_tfin_inleg) ) # subtracting ground insulation wedge separation # Resistive power losses in taped section (variable radius section) [W] @@ -2247,8 +2251,8 @@ def cpost( numpy.pi * rtop**2 - a_tfin_hole - a_cp_ins - - n_tf * a_cp_cool - - 2.0e0 * n_tf * gr_ins_th * (rtop - r_tfin_inleg) + - n_tf_coils * a_cp_cool + - 2.0e0 * n_tf_coils * gr_ins_th * (rtop - r_tfin_inleg) ) ) ) # ground insulation separation @@ -2326,7 +2330,7 @@ def vv_stress_on_quench(self): Rm_vv=Rm_vv, theta1_vv=tfcoil_variables.theta1_vv, # TF properties - n_tf=tfcoil_variables.n_tf, + n_tf_coils=tfcoil_variables.n_tf_coils, n_tf_turn=tfcoil_variables.n_tf_turn, # Area of the radial plate taken to be the area of steel in the WP # TODO: value clipped due to #1883 @@ -2373,7 +2377,7 @@ def tf_field_and_force(self): 0.5e0 * tfcoil_variables.bmaxtf * tfcoil_variables.ritfc - / tfcoil_variables.n_tf + / tfcoil_variables.n_tf_coils ) # Vertical force per coil [N] @@ -2401,7 +2405,7 @@ def tf_field_and_force(self): vforce_tot = ( 0.5e0 * (physics_variables.bt * physics_variables.rmajor * tfcoil_variables.ritfc) - / (tfcoil_variables.n_tf * dr_wp**2) + / (tfcoil_variables.n_tf_coils * dr_wp**2) * ( r_out_wp**2 * numpy.log(r_out_wp / r_in_wp) + r_in_outwp**2 * numpy.log((r_in_outwp + dr_wp) / r_in_outwp) @@ -2427,7 +2431,7 @@ def tf_field_and_force(self): * physics_variables.rmajor * tfcoil_variables.ritfc ) - / (tfcoil_variables.n_tf * dr_wp**2) + / (tfcoil_variables.n_tf_coils * dr_wp**2) * ( 2.0e0 * r_out_wp**2 * numpy.log(r_out_wp / r_in_wp) + 2.0e0 * dr_wp**2 * numpy.log(build_variables.r_cp_top / r_in_wp) @@ -2457,7 +2461,7 @@ def tf_field_and_force(self): # Total vertical force sctfcoil_module.vforce_inboard_tot = ( - tfcoil_variables.vforce * tfcoil_variables.n_tf + tfcoil_variables.vforce * tfcoil_variables.n_tf_coils ) @staticmethod @@ -2674,7 +2678,7 @@ def tf_coil_area_and_masses(self): tfcoil_variables.whtcas + tfcoil_variables.whtcon + tfcoil_variables.whtgw - ) * tfcoil_variables.n_tf + ) * tfcoil_variables.n_tf_coils # If spherical tokamak, distribute between centrepost and outboard legs # (in this case, total TF coil length = inboard `cplen` + outboard `tfleng`) @@ -2706,7 +2710,8 @@ def tf_coil_area_and_masses(self): # Total TF conductor volume [m3] vol_cond = ( - tfcoil_variables.vol_cond_cp + tfcoil_variables.n_tf * vol_cond_leg + tfcoil_variables.vol_cond_cp + + tfcoil_variables.n_tf_coils * vol_cond_leg ) # Outboard leg TF turn insulation layer volume (per leg) [m3] @@ -2714,7 +2719,8 @@ def tf_coil_area_and_masses(self): # Total turn insulation layer volume [m3] vol_ins = ( - sctfcoil_module.vol_ins_cp + tfcoil_variables.n_tf * vol_ins_leg + sctfcoil_module.vol_ins_cp + + tfcoil_variables.n_tf_coils * vol_ins_leg ) # Ouboard leg TF ground insulation layer volume (per leg) [m3] @@ -2723,7 +2729,7 @@ def tf_coil_area_and_masses(self): # Total ground insulation layer volume [m3] vol_gr_ins = ( sctfcoil_module.vol_gr_ins_cp - + tfcoil_variables.n_tf * vol_gr_ins_leg + + tfcoil_variables.n_tf_coils * vol_gr_ins_leg ) # Total volume of the CP casing [m3] @@ -2737,28 +2743,28 @@ def tf_coil_area_and_masses(self): vol_cond = ( tfcoil_variables.tfleng * sctfcoil_module.a_leg_cond - * tfcoil_variables.n_tf + * tfcoil_variables.n_tf_coils ) # Total turn insulation layer volume [m3] vol_ins = ( tfcoil_variables.tfleng * sctfcoil_module.a_leg_ins - * tfcoil_variables.n_tf + * tfcoil_variables.n_tf_coils ) # Total ground insulation volume [m3] vol_gr_ins = ( tfcoil_variables.tfleng * sctfcoil_module.a_leg_gr_ins - * tfcoil_variables.n_tf + * tfcoil_variables.n_tf_coils ) # Total case volume [m3] vol_case = ( tfcoil_variables.tfleng * tfcoil_variables.acasetf - * tfcoil_variables.n_tf + * tfcoil_variables.n_tf_coils ) # --- @@ -2767,17 +2773,17 @@ def tf_coil_area_and_masses(self): # Copper magnets casing/conductor weights per coil [kg] if tfcoil_variables.i_tf_sup == 0: tfcoil_variables.whtcas = ( - fwbs_variables.denstl * vol_case / tfcoil_variables.n_tf + fwbs_variables.denstl * vol_case / tfcoil_variables.n_tf_coils ) # Per TF leg, no casing for outer leg tfcoil_variables.whtconcu = ( - constants.dcopper * vol_cond / tfcoil_variables.n_tf + constants.dcopper * vol_cond / tfcoil_variables.n_tf_coils ) tfcoil_variables.whtconal = 0.0e0 # Outer legs/CP weights if physics_variables.itart == 1: # Weight of all the TF legs - tfcoil_variables.whttflgs = tfcoil_variables.n_tf * ( + tfcoil_variables.whttflgs = tfcoil_variables.n_tf_coils * ( constants.dcopper * vol_cond_leg + tfcoil_variables.dcondins * (vol_ins_leg + vol_gr_ins_leg) ) @@ -2795,17 +2801,17 @@ def tf_coil_area_and_masses(self): elif tfcoil_variables.i_tf_sup == 2: # Casing weight (CP only if physics_variables.itart = 1)bper leg/coil tfcoil_variables.whtcas = ( - constants.dalu * vol_case / tfcoil_variables.n_tf + constants.dalu * vol_case / tfcoil_variables.n_tf_coils ) tfcoil_variables.whtconcu = 0.0e0 tfcoil_variables.whtconal = ( - constants.dalu * vol_cond / tfcoil_variables.n_tf + constants.dalu * vol_cond / tfcoil_variables.n_tf_coils ) # Outer legs/CP weights if physics_variables.itart == 1: # Weight of all the TF legs - tfcoil_variables.whttflgs = tfcoil_variables.n_tf * ( + tfcoil_variables.whttflgs = tfcoil_variables.n_tf_coils * ( constants.dalu * vol_cond_leg + tfcoil_variables.dcondins * (vol_ins_leg + vol_gr_ins_leg) ) @@ -2820,12 +2826,12 @@ def tf_coil_area_and_masses(self): # Turn insulation mass [kg] tfcoil_variables.whtconin = ( - tfcoil_variables.dcondins * vol_ins / tfcoil_variables.n_tf + tfcoil_variables.dcondins * vol_ins / tfcoil_variables.n_tf_coils ) # Ground wall insulation layer weight tfcoil_variables.whtgw = ( - tfcoil_variables.dcondins * vol_gr_ins / tfcoil_variables.n_tf + tfcoil_variables.dcondins * vol_gr_ins / tfcoil_variables.n_tf_coils ) # Total weight @@ -2835,9 +2841,9 @@ def tf_coil_area_and_masses(self): + tfcoil_variables.whtconal + tfcoil_variables.whtconin + tfcoil_variables.whtgw - ) * tfcoil_variables.n_tf + ) * tfcoil_variables.n_tf_coils - def peak_tf_with_ripple(self, n_tf, wwp1, dr_tf_wp, tfin, bmaxtf): + def peak_tf_with_ripple(self, n_tf_coils, wwp1, dr_tf_wp, tfin, bmaxtf): """Peak toroidal field on the conductor author: P J Knight, CCFE, Culham Science Centre This subroutine calculates the peak toroidal field at the @@ -2851,8 +2857,8 @@ def peak_tf_with_ripple(self, n_tf, wwp1, dr_tf_wp, tfin, bmaxtf): M. Kovari, Toroidal Field Coils - Maximum Field and Ripple - Parametric Calculation, July 2014 - :param n_tf: number of TF coils - :type n_tf: float + :param n_tf_coils: number of TF coils + :type n_tf_coils: float :param wwp1: width of plasma-facing face of winding pack (m) :type wwp1: float :param dr_tf_wp: radial thickness of winding pack (m) @@ -2874,7 +2880,7 @@ def peak_tf_with_ripple(self, n_tf, wwp1, dr_tf_wp, tfin, bmaxtf): # Set fitting coefficients for different numbers of TF coils - int_n_tf = numpy.round(n_tf) + int_n_tf = numpy.round(n_tf_coils) if int_n_tf == 16: a[0] = 0.28101e0 @@ -2899,7 +2905,7 @@ def peak_tf_with_ripple(self, n_tf, wwp1, dr_tf_wp, tfin, bmaxtf): # Maximum winding pack width before adjacent packs touch # (ignoring the external case and ground wall thicknesses) - wmax = (2.0e0 * tfin + dr_tf_wp) * numpy.tan(numpy.pi / n_tf) + wmax = (2.0e0 * tfin + dr_tf_wp) * numpy.tan(numpy.pi / n_tf_coils) # Dimensionless winding pack width @@ -2963,7 +2969,7 @@ def res_tf_internal_geom(self): sctfcoil_module.awpc = ( numpy.pi * (sctfcoil_module.r_wp_outer**2 - sctfcoil_module.r_wp_inner**2) - / tfcoil_variables.n_tf + / tfcoil_variables.n_tf_coils ) # Area of the front case, the plasma-facing case of the inner TF coil [m2] @@ -2973,14 +2979,14 @@ def res_tf_internal_geom(self): (sctfcoil_module.r_wp_outer + tfcoil_variables.casthi) ** 2 - sctfcoil_module.r_wp_outer**2 ) - / tfcoil_variables.n_tf + / tfcoil_variables.n_tf_coils ) # WP mid-plane cross-section excluding ground insulation per coil [m2] sctfcoil_module.awptf = numpy.pi * ( (sctfcoil_module.r_wp_outer - tfcoil_variables.tinstf) ** 2 - (sctfcoil_module.r_wp_inner + tfcoil_variables.tinstf) ** 2 - ) / tfcoil_variables.n_tf - 2.0e0 * tfcoil_variables.tinstf * ( + ) / tfcoil_variables.n_tf_coils - 2.0e0 * tfcoil_variables.tinstf * ( tfcoil_variables.dr_tf_wp - 2.0e0 * tfcoil_variables.tinstf ) @@ -3001,7 +3007,7 @@ def res_tf_internal_geom(self): + tfcoil_variables.thicndut ) ** 2 - ) / tfcoil_variables.n_tf - ( + ) / tfcoil_variables.n_tf_coils - ( tfcoil_variables.dr_tf_wp - 2.0e0 * (tfcoil_variables.tinstf + tfcoil_variables.thicndut) ) * 2.0e0 * ( @@ -3020,19 +3026,21 @@ def res_tf_internal_geom(self): # Insulation fraction [-] sctfcoil_module.f_tf_ins = ( - tfcoil_variables.n_tf * sctfcoil_module.a_tf_ins / tfcoil_variables.tfareain + tfcoil_variables.n_tf_coils + * sctfcoil_module.a_tf_ins + / tfcoil_variables.tfareain ) # Total cross-sectional area of the bucking cylindre and the outer support # support structure per coil [m2] # physics_variables.itart = 1 : Only valid at mid-plane tfcoil_variables.acasetf = ( - tfcoil_variables.tfareain / tfcoil_variables.n_tf + tfcoil_variables.tfareain / tfcoil_variables.n_tf_coils ) - sctfcoil_module.awpc # Current per turn tfcoil_variables.cpttf = tfcoil_variables.ritfc / ( - tfcoil_variables.n_tf_turn * tfcoil_variables.n_tf + tfcoil_variables.n_tf_turn * tfcoil_variables.n_tf_coils ) # Exact current density on TF oubard legs @@ -3148,7 +3156,7 @@ def sc_tf_internal_geom(self, i_tf_wp_geom, i_tf_case_geom, i_tf_turns_integer): # Inboard coil steel fraction [-] sctfcoil_module.f_tf_steel = ( - tfcoil_variables.n_tf + tfcoil_variables.n_tf_coils * sctfcoil_module.a_tf_steel / tfcoil_variables.tfareain ) @@ -3158,7 +3166,9 @@ def sc_tf_internal_geom(self, i_tf_wp_geom, i_tf_case_geom, i_tf_turns_integer): # Inboard coil insulation fraction [-] sctfcoil_module.f_tf_ins = ( - tfcoil_variables.n_tf * sctfcoil_module.a_tf_ins / tfcoil_variables.tfareain + tfcoil_variables.n_tf_coils + * sctfcoil_module.a_tf_ins + / tfcoil_variables.tfareain ) # Negative areas or fractions error reporting @@ -3349,7 +3359,7 @@ def tf_case_geom(self, i_tf_wp_geom, i_tf_case_geom): Setting the case geometry and area for SC magnets """ tfcoil_variables.acasetf = ( - tfcoil_variables.tfareain / tfcoil_variables.n_tf + tfcoil_variables.tfareain / tfcoil_variables.n_tf_coils ) - sctfcoil_module.awpc # Outboard leg cross-sectional area of surrounding case [m2] @@ -3519,7 +3529,8 @@ def tf_wp_currents(self): """ tfcoil_variables.jwptf = max( 1.0e0, - tfcoil_variables.ritfc / (tfcoil_variables.n_tf * sctfcoil_module.awptf), + tfcoil_variables.ritfc + / (tfcoil_variables.n_tf_coils * sctfcoil_module.awptf), ) @staticmethod @@ -4529,7 +4540,10 @@ def outtf(self, peaktfflag): # TF coil geometry po.osubhd(self.outfile, "TF coil Geometry :") po.ovarin( - self.outfile, "Number of TF coils", "(n_tf)", int(tfcoil_variables.n_tf) + self.outfile, + "Number of TF coils", + "(n_tf_coils)", + int(tfcoil_variables.n_tf_coils), ) po.ovarre( self.outfile, @@ -4718,8 +4732,8 @@ def outtf(self, peaktfflag): po.ovarre( self.outfile, "Total steel cross-section (m2)", - "(a_tf_steel*n_tf)", - sctfcoil_module.a_tf_steel * tfcoil_variables.n_tf, + "(a_tf_steel*n_tf_coils)", + sctfcoil_module.a_tf_steel * tfcoil_variables.n_tf_coils, ) po.ovarre( self.outfile, @@ -4730,8 +4744,8 @@ def outtf(self, peaktfflag): po.ovarre( self.outfile, "Total Insulation cross-section (total) (m2)", - "(a_tf_ins*n_tf)", - sctfcoil_module.a_tf_ins * tfcoil_variables.n_tf, + "(a_tf_ins*n_tf_coils)", + sctfcoil_module.a_tf_ins * tfcoil_variables.n_tf_coils, ) po.ovarre( self.outfile, @@ -4837,8 +4851,8 @@ def outtf(self, peaktfflag): po.ovarre( self.outfile, "Steel WP cross-section (total) (m2)", - "(aswp*n_tf)", - tfcoil_variables.aswp * tfcoil_variables.n_tf, + "(aswp*n_tf_coils)", + tfcoil_variables.aswp * tfcoil_variables.n_tf_coils, ) po.ovarre( self.outfile, @@ -5224,8 +5238,8 @@ def outtf(self, peaktfflag): po.ovarre( self.outfile, "Mass of each TF coil (kg)", - "(whttf/n_tf)", - tfcoil_variables.whttf / tfcoil_variables.n_tf, + "(whttf/n_tf_coils)", + tfcoil_variables.whttf / tfcoil_variables.n_tf_coils, "OP ", ) po.ovarre( @@ -5600,7 +5614,7 @@ def outtf(self, peaktfflag): "(casthi)", ) - radius = radius / numpy.cos(numpy.pi / tfcoil_variables.n_tf) + radius = radius / numpy.cos(numpy.pi / tfcoil_variables.n_tf_coils) po.obuild( self.outfile, "Plasma side case max radius", @@ -7197,7 +7211,7 @@ def vv_stress_on_quench( Rm_vv, theta1_vv, # TF properties - n_tf, + n_tf_coils, n_tf_turn, S_rp, S_cc, @@ -7238,7 +7252,7 @@ def vv_stress_on_quench( joined to another circular arc in the approximation to the VV CCL, using an arbitrary origin of coordinates (Rc2, Zc2). - :param n_tf: the number of TF coils + :param n_tf_coils: the number of TF coils :param n_tf_turn: the number of turns per TF coil :param S_rp: the cross-sectional area of the radial plates of the TF coil :param S_cc: the cross-sectional area of the TF coil case @@ -7264,7 +7278,7 @@ def vv_stress_on_quench( Plasma and Fusion Research. 15. 1405078-1405078. 10.1585/pfr.15.1405078. """ # Poloidal loop resistance (PLR) in ohms - plr_coil = ((0.5 * ccl_length_coil) / (n_tf * (S_cc + S_rp))) * 1e-6 + plr_coil = ((0.5 * ccl_length_coil) / (n_tf_coils * (S_cc + S_rp))) * 1e-6 plr_vv = ((0.84 / d_vv) * 0.94) * 1e-6 # relevant self-inductances in henry (H) @@ -7290,7 +7304,7 @@ def vv_stress_on_quench( I0 = I_op * numpy.exp(-lambda0 * tmaxforce) I1 = ( lambda0 - * n_tf + * n_tf_coils * n_tf_turn * I_op * ( @@ -7301,7 +7315,7 @@ def vv_stress_on_quench( I2 = (lambda1 / lambda2) * I1 A_vv = (Ro_vv + Ri_vv) / (Ro_vv - Ri_vv) - B_vvi = (constants.rmu0 * (n_tf * n_tf_turn * I0 + I1 + (I2 / 2))) / ( + B_vvi = (constants.rmu0 * (n_tf_coils * n_tf_turn * I0 + I1 + (I2 / 2))) / ( 2 * numpy.pi * Ri_vv ) J_vvi = I2 / (2 * numpy.pi * d_vv * Ri_vv) diff --git a/process/stellarator.py b/process/stellarator.py index b63de942..125bb49b 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -267,10 +267,10 @@ def stnewconfig(self): physics_variables.rminor = physics_variables.rmajor / physics_variables.aspect physics_variables.eps = 1.0e0 / physics_variables.aspect - tfcoil_variables.n_tf = ( + tfcoil_variables.n_tf_coils = ( stellarator_configuration.stella_config_coilspermodule * stellarator_configuration.stella_config_symmetry - ) # This overwrites tfcoil_variables.n_tf in input file. + ) # This overwrites tfcoil_variables.n_tf_coils in input file. # Factors used to scale the reference point. st.f_r = ( @@ -286,7 +286,7 @@ def stnewconfig(self): physics_variables.aspect / stellarator_configuration.stella_config_aspect_ref ) - st.f_n = tfcoil_variables.n_tf / ( + st.f_n = tfcoil_variables.n_tf_coils / ( stellarator_configuration.stella_config_coilspermodule * stellarator_configuration.stella_config_symmetry ) # Coil number factor @@ -1073,7 +1073,7 @@ def blanket_neutronics(self): + 0.75 * tfcoil_variables.tfleng * tfcoil_variables.arealeg - * tfcoil_variables.n_tf + * tfcoil_variables.n_tf_coils ) fwbs_variables.ptfnucpm3 = fwbs_variables.ptfnuc / tf_volume @@ -2519,7 +2519,7 @@ def stcoil(self, output: bool): b_max_k[k] = self.bmax_from_awp( wp_width_r[k], coilcurrent, - tfcoil_variables.n_tf, + tfcoil_variables.n_tf_coils, r_coil_major, r_coil_minor, ) @@ -2574,7 +2574,7 @@ def stcoil(self, output: bool): tfcoil_variables.bmaxtf = self.bmax_from_awp( wp_width_r_min, coilcurrent, - tfcoil_variables.n_tf, + tfcoil_variables.n_tf_coils, r_coil_major, r_coil_minor, ) @@ -2728,7 +2728,7 @@ def stcoil(self, output: bool): # [m^2] Total surface area of coil side facing plasma: inboard region tfcoil_variables.tfsai = ( - tfcoil_variables.n_tf + tfcoil_variables.n_tf_coils * tfcoil_variables.tftort * 0.5e0 * tfcoil_variables.tfleng @@ -2753,10 +2753,10 @@ def stcoil(self, output: bool): # Variables for ALL coils. tfcoil_variables.tfareain = ( - tfcoil_variables.n_tf * tfcoil_variables.arealeg + tfcoil_variables.n_tf_coils * tfcoil_variables.arealeg ) # [m^2] Total area of all coil legs (midplane) tfcoil_variables.ritfc = ( - tfcoil_variables.n_tf * coilcurrent * 1.0e6 + tfcoil_variables.n_tf_coils * coilcurrent * 1.0e6 ) # [A] Total current in ALL coils tfcoil_variables.oacdcp = ( tfcoil_variables.ritfc / tfcoil_variables.tfareain @@ -2783,7 +2783,7 @@ def stcoil(self, output: bool): ** 2 * st.f_n**2 ) - * (tfcoil_variables.ritfc / tfcoil_variables.n_tf) ** 2 + * (tfcoil_variables.ritfc / tfcoil_variables.n_tf_coils) ** 2 * 1.0e-9 ) # [GJ] Total magnetic energy @@ -2807,7 +2807,7 @@ def stcoil(self, output: bool): tfcoil_variables.tfleng = ( stellarator_configuration.stella_config_coillength * (r_coil_minor / stellarator_configuration.stella_config_coil_rminor) - / tfcoil_variables.n_tf + / tfcoil_variables.n_tf_coils ) # [m] estimated average length of a coil # [m^2] Total surface area of toroidal shells covering coils @@ -2885,7 +2885,7 @@ def stcoil(self, output: bool): # [kg] Total coil mass tfcoil_variables.whttf = ( tfcoil_variables.whtcas + tfcoil_variables.whtcon + tfcoil_variables.whtgw - ) * tfcoil_variables.n_tf + ) * tfcoil_variables.n_tf_coils # End of general coil geometry values ####################################################################################### @@ -2947,10 +2947,10 @@ def stcoil(self, output: bool): # the conductor fraction is meant of the cable space# # This is the old routine which is being replaced for now by the new one below # protect(aio, tfes, acs, aturn, tdump, fcond, fcu, tba, tmax ,ajwpro, vd) - # call protect(cpttf,estotftgj/tfcoil_variables.n_tf*1.0e9,acstf, tfcoil_variables.t_turn_tf**2 ,tdmptf,1-vftf,fcutfsu,tftmp,tmaxpro,jwdgpro2,vd) + # call protect(cpttf,estotftgj/tfcoil_variables.n_tf_coils*1.0e9,acstf, tfcoil_variables.t_turn_tf**2 ,tdmptf,1-vftf,fcutfsu,tftmp,tmaxpro,jwdgpro2,vd) vd = self.u_max_protect_v( - tfcoil_variables.estotftgj / tfcoil_variables.n_tf * 1.0e9, + tfcoil_variables.estotftgj / tfcoil_variables.n_tf_coils * 1.0e9, tfcoil_variables.tdmptf, tfcoil_variables.cpttf, ) @@ -3029,7 +3029,7 @@ def stcoil(self, output: bool): * tfcoil_variables.bmaxtf / stellarator_configuration.stella_config_wp_bmax * stellarator_configuration.stella_config_coillength - / tfcoil_variables.n_tf + / tfcoil_variables.n_tf_coils / tfcoil_variables.tfleng ) centering_force_min_mn = ( @@ -3039,7 +3039,7 @@ def stcoil(self, output: bool): * tfcoil_variables.bmaxtf / stellarator_configuration.stella_config_wp_bmax * stellarator_configuration.stella_config_coillength - / tfcoil_variables.n_tf + / tfcoil_variables.n_tf_coils / tfcoil_variables.tfleng ) centering_force_avg_mn = ( @@ -3049,7 +3049,7 @@ def stcoil(self, output: bool): * tfcoil_variables.bmaxtf / stellarator_configuration.stella_config_wp_bmax * stellarator_configuration.stella_config_coillength - / tfcoil_variables.n_tf + / tfcoil_variables.n_tf_coils / tfcoil_variables.tfleng ) # @@ -3274,7 +3274,9 @@ def jcrit_frommaterial( return j_crit_sc * 1e-6 - def bmax_from_awp(self, wp_width_radial, current, n_tf, r_coil_major, r_coil_minor): + def bmax_from_awp( + self, wp_width_radial, current, n_tf_coils, r_coil_major, r_coil_minor + ): """Returns a fitted function for bmax for stellarators author: J Lion, IPP Greifswald @@ -3286,7 +3288,7 @@ def bmax_from_awp(self, wp_width_radial, current, n_tf, r_coil_major, r_coil_min return ( 2e-1 * current - * n_tf + * n_tf_coils / (r_coil_major - r_coil_minor) * ( stellarator_configuration.stella_config_a1 @@ -3583,7 +3585,10 @@ def stcoil_output( po.osubhd(self.outfile, "General Coil Parameters :") po.ovarre( - self.outfile, "Number of modular coils", "(n_tf)", tfcoil_variables.n_tf + self.outfile, + "Number of modular coils", + "(n_tf_coils)", + tfcoil_variables.n_tf_coils, ) po.ovarre(self.outfile, "Av. coil major radius", "(coil_r)", r_coil_major) po.ovarre(self.outfile, "Av. coil minor radius", "(coil_a)", r_coil_minor) @@ -3597,8 +3602,8 @@ def stcoil_output( po.ovarre( self.outfile, "Cross-sectional area per coil (m2)", - "(tfarea/n_tf)", - tfcoil_variables.tfareain / tfcoil_variables.n_tf, + "(tfarea/n_tf_coils)", + tfcoil_variables.tfareain / tfcoil_variables.n_tf_coils, ) po.ovarre( self.outfile, @@ -3660,8 +3665,8 @@ def stcoil_output( po.ovarre( self.outfile, "Current per coil(MA)", - "(ritfc/n_tf)", - 1.0e-6 * tfcoil_variables.ritfc / tfcoil_variables.n_tf, + "(ritfc/n_tf_coils)", + 1.0e-6 * tfcoil_variables.ritfc / tfcoil_variables.n_tf_coils, ) po.ovarre( self.outfile, @@ -3850,14 +3855,14 @@ def stcoil_output( "(ritfc/acond)", 1.0e-6 * tfcoil_variables.ritfc - / tfcoil_variables.n_tf + / tfcoil_variables.n_tf_coils / tfcoil_variables.acond, ) po.ovarre( self.outfile, "Current density in SC area (A/m2)", "(ritfc/acond/f_scu)", - 1.0e-6 * tfcoil_variables.ritfc / tfcoil_variables.n_tf / ap / f_scu, + 1.0e-6 * tfcoil_variables.ritfc / tfcoil_variables.n_tf_coils / ap / f_scu, ) po.ovarre(self.outfile, "Superconductor faction of WP (1)", "(f_scu)", f_scu) diff --git a/process/tfcoil.py b/process/tfcoil.py index e9a77c1c..8e5f78c6 100644 --- a/process/tfcoil.py +++ b/process/tfcoil.py @@ -66,7 +66,7 @@ def cntrpst(self): n_tcool_it = 20 # Coolant channels: - acool = tfv.a_cp_cool * tfv.n_tf # Cooling cross-sectional area + acool = tfv.a_cp_cool * tfv.n_tf_coils # Cooling cross-sectional area dcool = 2.0e0 * tfv.rcool # Diameter lcool = 2.0e0 * (bv.hmax + bv.tfthko) # Length tfv.ncool = acool / (constants.pi * tfv.rcool**2) # Number diff --git a/process/vacuum.py b/process/vacuum.py index 77da8101..c4b3bb33 100644 --- a/process/vacuum.py +++ b/process/vacuum.py @@ -62,7 +62,7 @@ def run(self, output: bool) -> None: buv.shldith, buv.tfcth, buv.rsldi - buv.gapds - buv.d_vv_in, - tfv.n_tf, + tfv.n_tf_coils, tv.tdwell, pv.dene, pv.idivrt, @@ -104,7 +104,7 @@ def vacuum_simple(self, output) -> float: * vacv.pumpareafraction * vacv.pumpspeedfactor * pv.sarea - / tfv.n_tf + / tfv.n_tf_coils ) wallarea = (pv.sarea / 1084.0e0) * 2000.0e0 @@ -185,7 +185,7 @@ def vacuum( thshldi, thtf, ritf, - n_tf, + n_tf_coils, tdwell, nplasma, ndiv, @@ -271,7 +271,7 @@ def vacuum( # (9.0 for N2, 5.0 for He and 25. for DT) pfus = pfusmw * 1.0e6 # Fusion power (W) - ntf = int(n_tf) + ntf = int(n_tf_coils) # Feed rate (gas load) of D-T into chamber (pellets + gas puffing + # NBI + ...) = load from fueller + load from NBI diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index 8860d4a1..f279ca5e 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -2490,7 +2490,7 @@ subroutine constraint_eqn_063(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! tfno : input real : number of TF coils (default = 50 for stellarators) !! niterpump : input real : number of high vacuum pumps (real number), each with the throughput use constraint_variables, only: fniterpump - use tfcoil_variables, only: n_tf + use tfcoil_variables, only: n_tf_coils use vacuum_variables, only: niterpump implicit none real(dp), intent(out) :: tmp_cc @@ -2499,9 +2499,9 @@ subroutine constraint_eqn_063(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) character(len=1), intent(out) :: tmp_symbol character(len=10), intent(out) :: tmp_units - tmp_cc = 1.0D0 - fniterpump * n_tf / niterpump - tmp_con = n_tf - tmp_err = n_tf * tmp_cc + tmp_cc = 1.0D0 - fniterpump * n_tf_coils / niterpump + tmp_con = n_tf_coils + tmp_err = n_tf_coils * tmp_cc tmp_symbol = '<' tmp_units = '' diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 780ed262..b75fb086 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -330,7 +330,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) casthi, n_pancake, bcritsc, i_tf_sup, str_pf_con_res, thwcndut, & thicndut, tftmp, oacdcp, tmax_croco, ptempalw, tmargmin_tf, tmpcry, & sig_tf_case_max, dztop, dcond, str_cs_con_res, etapump, drtop, vcool, dcondins, & - i_tf_tresca, dhecoil, tmaxpro, n_tf, tcpav, fcutfsu, jbus, & + i_tf_tresca, dhecoil, tmaxpro, n_tf_coils, tcpav, fcutfsu, jbus, & casthi_fraction, tmargmin_cs, vdalw, dcase, t_turn_tf,& cpttf_max, tdmptf, casths, i_tf_turns_integer, quench_model, & tcritsc, layer_ins, tinstf, n_layer, tcoolin, ripmax, frhocp, & @@ -1732,8 +1732,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('rho_tf_bus') call parse_real_variable('rho_tf_bus', rho_tf_bus, 0.0D0, 1.0D-5, & 'TF coil bus (feeders) resistivity (ohm-m)') - case ('n_tf') - call parse_real_variable('n_tf', n_tf, 0.0D0, 100.0D0, & + case ('n_tf_coils') + call parse_real_variable('n_tf_coils', n_tf_coils, 0.0D0, 100.0D0, & 'Number of TF coils') case ('n_tf_turn') call parse_real_variable('n_tf_turn', n_tf_turn, 0.0D0, 100.0D0, & @@ -1808,7 +1808,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) 'Coolant fraction of TF coil leg') case ('len_tf_bus') call parse_real_variable('len_tf_bus', len_tf_bus, 0.01D0, 1.0D3, & - 'TF coil bus length (m)') + 'TF coil bus length (m)') ! PF coil settings diff --git a/source/fortran/scan.f90 b/source/fortran/scan.f90 index 66829d01..215d7036 100644 --- a/source/fortran/scan.f90 +++ b/source/fortran/scan.f90 @@ -192,7 +192,7 @@ subroutine scan_1d_store_output(iscan, ifail, noutvars_, ipnscns_, outvar) use process_output, only: oblnkl use numerics, only: sqsumsq use tfcoil_variables, only: tfareain, wwp2, sig_tf_wp, tfcmw, tcpmax, oacdcp, & - tfcpmw, fcutfsu, acond, fcoolcp, rcool, whttf, ppump, vcool, wwp1, n_tf, & + tfcpmw, fcutfsu, acond, fcoolcp, rcool, whttf, ppump, vcool, wwp1, n_tf_coils, & dr_tf_wp, b_crit_upper_nbti use fwbs_variables, only: tpeak use physics_variables, only: q, aspect, pradmw, dene, fusion_power, btot, tesep, & @@ -273,7 +273,7 @@ subroutine scan_1d_store_output(iscan, ifail, noutvars_, ipnscns_, outvar) outvar(54,iscan) = fcutfsu outvar(55,iscan) = (wwp1+wwp2)*dr_tf_wp outvar(56,iscan) = acond - outvar(57,iscan) = tfareain/n_tf + outvar(57,iscan) = tfareain/n_tf_coils outvar(58,iscan) = taulimit outvar(66,iscan) = ralpne outvar(69,iscan) = fimp(1) diff --git a/source/fortran/stellarator.f90 b/source/fortran/stellarator.f90 index c3e37d1e..1e79f1dc 100644 --- a/source/fortran/stellarator.f90 +++ b/source/fortran/stellarator.f90 @@ -58,7 +58,7 @@ subroutine stinit triang, hfac, tauscl use numerics, only: boundl, boundu use stellarator_variables, only: istell - use tfcoil_variables, only: n_tf + use tfcoil_variables, only: n_tf_coils use times_variables, only: tburn, tcycle, tdown, tdwell, t_fusion_ramp, tohs, & tpulse, tqnch, tramp use global_variables, only: icase diff --git a/source/fortran/tfcoil_variables.f90 b/source/fortran/tfcoil_variables.f90 index de5aad26..6978e7ae 100644 --- a/source/fortran/tfcoil_variables.f90 +++ b/source/fortran/tfcoil_variables.f90 @@ -586,7 +586,7 @@ module tfcoil_variables !! - i_tf_sup = 1 : SC magnet, eff_tf_cryo = 0.13 (ITER design) !! - i_tf_sup = 2 : Cryo-aluminium, eff_tf_cryo = 0.4 - real(dp) :: n_tf + real(dp) :: n_tf_coils !! Number of TF coils (default = 50 for stellarators). Number of TF coils outer legs for ST real(dp) :: tfocrn @@ -686,15 +686,15 @@ module tfcoil_variables real(dp) :: whtcon !! TF coil conductor mass per coil (kg/coil). - !! For `itart=1`, coil is return limb plus centrepost/n_tf + !! For `itart=1`, coil is return limb plus centrepost/n_tf_coils real(dp) :: whtconcu !! copper mass in TF coil conductor (kg/coil). - !! For `itart=1`, coil is return limb plus centrepost/n_tf + !! For `itart=1`, coil is return limb plus centrepost/n_tf_coils real(dp) :: whtconal !! Aluminium mass in TF coil conductor (kg/coil). - !! For `itart=1`, coil is return limb plus centrepost/n_tf + !! For `itart=1`, coil is return limb plus centrepost/n_tf_coils real(dp) :: whtconin !! conduit insulation mass in TF coil conductor (kg/coil) @@ -979,7 +979,7 @@ subroutine init_tfcoil_variables pres_joints = 0.0D0 tfleng = 0.0D0 eff_tf_cryo = -1.0D0 - n_tf = 16.0D0 + n_tf_coils = 16.0D0 tfocrn = 0.0D0 tfsai = 0.0D0 tfsao = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 856fb8ac..470297d4 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -665,7 +665,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.1673E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4985E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (tfcth)_______________________ 9.1597E-01 ITV @@ -685,9 +685,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.8229E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2853E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2853E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.0508E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.4752E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.4752E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.6493E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.6444E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -701,7 +701,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.0901E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.8217E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.8217E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.1550E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.7934E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.3656E-01 @@ -728,7 +728,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.9310E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.3777E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.5446E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 7.1402E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 7.1402E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.1424E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2178E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.1176E+02 OP @@ -1781,7 +1781,7 @@ casths = 0.05 ripmax = 0.6 * Number of TF coils -n_tf = 16 +n_tf_coils = 16 * Groundwall insulation thickness [m] tinstf = 0.008 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 36687fab..725a0350 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -666,7 +666,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.1673E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4985E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (tfcth)_______________________ 9.1597E-01 ITV @@ -686,9 +686,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.8229E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2853E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2853E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.0508E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.4752E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.4752E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.6493E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.6444E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -702,7 +702,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.0901E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.8217E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.8217E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.1550E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.7934E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.3656E-01 @@ -729,7 +729,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.9310E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.3777E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.5446E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 7.1402E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 7.1402E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.1424E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2178E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.1176E+02 OP @@ -1782,7 +1782,7 @@ casths = 0.05 ripmax = 0.6 * Number of TF coils -n_tf = 16 +n_tf_coils = 16 * Groundwall insulation thickness [m] tinstf = 0.008 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 7c111b45..7b4b0e41 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -666,7 +666,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.1673E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4985E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (tfcth)_______________________ 9.1597E-01 ITV @@ -686,9 +686,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.8229E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2853E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2853E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.0508E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.4752E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.4752E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.6493E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.6444E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -702,7 +702,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.0901E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.8217E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.8217E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.1550E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.7934E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.3656E-01 @@ -729,7 +729,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.9310E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.3777E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.5446E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 7.1402E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 7.1402E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.1424E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2178E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.1176E+02 OP @@ -1782,7 +1782,7 @@ casths = 0.05 ripmax = 0.6 * Number of TF coils -n_tf = 16 +n_tf_coils = 16 * Groundwall insulation thickness [m] tinstf = 0.008 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 72f5c0c3..792e2c0a 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -666,7 +666,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.1673E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4985E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (tfcth)_______________________ 9.1597E-01 ITV @@ -686,9 +686,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.8229E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2853E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2853E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.0508E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.4752E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.4752E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.6493E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.6444E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -702,7 +702,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.0901E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.8217E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.8217E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.1550E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.7934E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.3656E-01 @@ -729,7 +729,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.9310E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.3777E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.5446E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 7.1402E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 7.1402E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.1424E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2178E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.1176E+02 OP @@ -1782,7 +1782,7 @@ casths = 0.05 ripmax = 0.6 * Number of TF coils -n_tf = 16 +n_tf_coils = 16 * Groundwall insulation thickness [m] tinstf = 0.008 diff --git a/tests/integration/data/large_tokamak_IN.DAT b/tests/integration/data/large_tokamak_IN.DAT index d686f0f0..e28a2f56 100644 --- a/tests/integration/data/large_tokamak_IN.DAT +++ b/tests/integration/data/large_tokamak_IN.DAT @@ -592,7 +592,7 @@ casths = 0.05 ripmax = 0.6 * Number of TF coils -n_tf = 16 +n_tf_coils = 16 * Groundwall insulation thickness [m] tinstf = 0.008 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 18531c0c..1427851f 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -664,7 +664,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.1606E+00 OP Inboard_leg_inner_radius_(m)____________________________________________ (r_tf_inboard_in)_____________ 2.6958E+00 OP Inboard_leg_outer_radius_(m)____________________________________________ (r_tf_inboard_out)____________ 3.6253E+00 OP @@ -689,9 +689,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.8459E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.3045E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.3045E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.0671E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.5858E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.5858E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.6514E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.7164E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -705,7 +705,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.0872E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.8986E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.8986E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.1865E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.8392E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.3296E-01 @@ -732,7 +732,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 9.1170E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.4319E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.5648E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 7.2486E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 7.2486E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.1598E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2296E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.1381E+02 OP @@ -1783,7 +1783,7 @@ casths = 0.05 ripmax = 0.6 * Number of TF coils -n_tf = 16 +n_tf_coils = 16 * Groundwall insulation thickness [m] tinstf = 0.008 diff --git a/tests/integration/data/large_tokamak_once_through.IN.DAT b/tests/integration/data/large_tokamak_once_through.IN.DAT index 3d379dcd..7d7b2100 100644 --- a/tests/integration/data/large_tokamak_once_through.IN.DAT +++ b/tests/integration/data/large_tokamak_once_through.IN.DAT @@ -416,7 +416,7 @@ fcutfsu = 0.8231999768826475 * copper fraction of cable conductor (TF coils) i_tf_sc_mat = 1 * Switch for superconductor material in TF coils; ripmax = 0.6 * aximum allowable toroidal field ripple amplitude at plasma edge (%) tdmptf = 17.97282589344206 * fast discharge time for TF coil in event of quench (s) (`iteration variable 56`) -n_tf = 16 * Number of TF coils (default = 50 for stellarators); Number of TF coils outer legs for ST +n_tf_coils = 16 * Number of TF coils (default = 50 for stellarators); Number of TF coils outer legs for ST tftmp = 4.75 * peak helium coolant temperature in TF coils and PF coils (K) thkcas = 0.2816873221155309 * inboard TF coil case outer (non-plasma side) thickness (m) (`iteration variable 57`) dr_tf_wp = 0.5153787768966674 * radial thickness of winding pack (m) (`iteration variable 140`) (issue #514) diff --git a/tests/integration/data/ref_IN.DAT b/tests/integration/data/ref_IN.DAT index a6c75e36..7eefd683 100644 --- a/tests/integration/data/ref_IN.DAT +++ b/tests/integration/data/ref_IN.DAT @@ -306,7 +306,7 @@ casths = 0.05 * Inboard tf coil sidewall case thickness (m) cpttf = 6.5e+04 * Tf coil current per turn (a); ripmax = 0.6 * Maximum allowable toroidal field ripple amplitude tdmptf = 30.0 * Dump time for tf coil (s) -n_tf = 16 * Number of tf coils (default = 50 for stellarators) +n_tf_coils = 16 * Number of tf coils (default = 50 for stellarators) alstrtf = 5.8E8 * allowable stress in TF coil (Pa) dhecoil = 0.010 * diameter of He coil in TF winding (m) tftmp = 4.750 * Peak helium coolant temperature in tf coils and pf coils (k) diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 595198c0..6cce0e59 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -667,7 +667,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.1879E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (tfcth)_______________________ 8.7479E-01 ITV @@ -687,9 +687,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.7522E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2447E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2447E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.1032E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.3156E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.3156E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.7457E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.4632E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -703,7 +703,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.1005E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.7055E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.7055E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.2197E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.8925E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.2910E-01 @@ -730,7 +730,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.6415E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.3121E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4642E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 6.8257E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.8257E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0921E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1962E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0800E+02 OP @@ -1830,7 +1830,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.1962E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (tfcth)_______________________ 8.5817E-01 ITV @@ -1850,9 +1850,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.7234E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2248E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2248E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.1070E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.2321E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.2321E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.7766E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.3536E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -1866,7 +1866,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.1033E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.6827E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.6827E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.2483E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.8742E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.2643E-01 @@ -1893,7 +1893,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.5813E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.2720E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4464E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 6.6839E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.6839E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0694E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1732E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0400E+02 OP @@ -2993,7 +2993,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.2030E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (tfcth)_______________________ 8.4468E-01 ITV @@ -3013,9 +3013,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.6999E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2093E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2093E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.1139E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.1642E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.1642E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.8027E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.2777E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -3029,7 +3029,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.1061E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.6486E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.6486E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.2651E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.8744E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.2475E-01 @@ -3056,7 +3056,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.4962E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.2408E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4272E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 6.5756E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.5756E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0521E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1502E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0000E+02 OP @@ -4156,7 +4156,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.2023E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (tfcth)_______________________ 8.4602E-01 ITV @@ -4176,9 +4176,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.7023E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2109E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2109E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.1136E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.1709E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.1709E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.8000E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.2827E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -4192,7 +4192,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.1057E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.6570E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.6570E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.2670E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.8713E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.2458E-01 @@ -4219,7 +4219,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.5162E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.2436E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4304E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 6.5855E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.5855E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0537E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1502E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0000E+02 OP @@ -5319,7 +5319,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.1962E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (tfcth)_______________________ 8.5817E-01 ITV @@ -5339,9 +5339,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.7234E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2244E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2244E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.1042E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.2348E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.2348E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.7782E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.3358E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -5355,7 +5355,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.1026E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.7063E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.7063E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.2616E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.8578E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.2526E-01 @@ -5382,7 +5382,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.6364E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.2718E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4530E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 6.6756E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.6756E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0681E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1732E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0400E+02 OP @@ -6482,7 +6482,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.1876E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (tfcth)_______________________ 8.7538E-01 ITV @@ -6502,9 +6502,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.7533E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2448E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2448E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.0998E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.3058E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.3058E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.7373E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.4242E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -6518,7 +6518,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.0987E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.7690E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.7690E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.2569E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.8321E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.2599E-01 @@ -6545,7 +6545,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.7899E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.3025E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4821E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 6.8120E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.8120E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0899E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1962E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0800E+02 OP @@ -7645,7 +7645,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.1868E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (tfcth)_______________________ 8.7704E-01 ITV @@ -7665,9 +7665,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.7561E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2467E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2467E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.0990E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.3152E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.3152E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.7350E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.4300E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -7681,7 +7681,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.0982E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.7788E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.7788E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.2586E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.8296E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.2584E-01 @@ -7708,7 +7708,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.8136E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.3066E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4861E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 6.8240E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.8240E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0918E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1962E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0800E+02 OP @@ -8808,7 +8808,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.1942E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (tfcth)_______________________ 8.6229E-01 ITV @@ -8828,9 +8828,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.7306E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2293E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2293E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.1031E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.2402E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.2402E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.7615E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.3537E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -8844,7 +8844,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.1015E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.7266E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.7266E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.2639E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.8345E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.2527E-01 @@ -8871,7 +8871,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.6855E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.2726E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4625E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 6.7080E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.7080E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0733E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1732E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0400E+02 OP @@ -9971,7 +9971,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.2012E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (tfcth)_______________________ 8.4832E-01 ITV @@ -9991,9 +9991,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.7063E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2127E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2127E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.1075E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.1680E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.1680E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.7870E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.2844E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -10007,7 +10007,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.1048E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.6723E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.6723E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.2663E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.8421E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.2495E-01 @@ -10034,7 +10034,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.5529E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.2401E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4388E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 6.5997E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.5997E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0560E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1502E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0000E+02 OP @@ -11134,7 +11134,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.2008E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (tfcth)_______________________ 8.4911E-01 ITV @@ -11154,9 +11154,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.7077E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2137E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2137E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.1073E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.1713E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.1713E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.7851E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.2875E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -11170,7 +11170,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.1045E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.6770E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.6770E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.2673E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.8397E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.2487E-01 @@ -11197,7 +11197,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.5641E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.2414E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4407E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 6.6056E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.6056E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0569E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1502E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0000E+02 OP @@ -12297,7 +12297,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.1937E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (tfcth)_______________________ 8.6318E-01 ITV @@ -12317,9 +12317,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.7321E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2302E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2302E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.1023E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.2448E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.2448E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.7599E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.3536E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -12333,7 +12333,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.1011E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.7364E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.7364E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.2674E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.8292E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.2496E-01 @@ -12360,7 +12360,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.7086E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.2742E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4659E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 6.7129E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.7129E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0741E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1732E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0400E+02 OP @@ -13460,7 +13460,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.1865E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (tfcth)_______________________ 8.7762E-01 ITV @@ -13480,9 +13480,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.7571E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2466E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2466E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.0947E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.3158E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.3158E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.7326E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.4262E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -13496,7 +13496,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.0978E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.7844E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.7844E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.2573E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.8196E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.2608E-01 @@ -13523,7 +13523,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.8270E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.3061E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4895E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 6.8254E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.8254E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0921E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1962E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0800E+02 OP @@ -14623,7 +14623,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.1860E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (tfcth)_______________________ 8.7862E-01 ITV @@ -14643,9 +14643,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.7588E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2478E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2478E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.0945E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.3202E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.3202E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.7305E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.4299E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -14659,7 +14659,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.0975E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.7903E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.7903E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.2585E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.8170E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.2598E-01 @@ -14686,7 +14686,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.8412E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.3079E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4918E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 6.8328E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.8328E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0933E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1962E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0800E+02 OP @@ -15786,7 +15786,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.1935E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (tfcth)_______________________ 8.6375E-01 ITV @@ -15806,9 +15806,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.7331E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2304E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2304E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.0994E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.2421E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.2421E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.7556E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.3582E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -15822,7 +15822,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.1011E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.7308E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.7308E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.2599E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.8245E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.2576E-01 @@ -15849,7 +15849,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.6959E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.2727E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4662E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 6.7183E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.7183E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0749E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1732E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0400E+02 OP @@ -16949,7 +16949,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.2009E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (tfcth)_______________________ 8.4888E-01 ITV @@ -16969,9 +16969,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.7073E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2128E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2128E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.1039E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.1641E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.1641E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.7820E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.2861E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -16985,7 +16985,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.1046E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.6704E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.6704E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.2606E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.8326E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.2561E-01 @@ -17012,7 +17012,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.5488E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.2376E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4403E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 6.6037E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.6037E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0566E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1502E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0000E+02 OP @@ -18068,7 +18068,7 @@ casths = 0.05 ripmax = 0.6 * Number of TF coils -n_tf = 16 +n_tf_coils = 16 * Groundwall insulation thickness [m] tinstf = 0.008 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 834f784f..923dcf06 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -513,7 +513,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 5 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.7793E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (tfcth)_______________________ 1.4000E+00 ITV @@ -533,9 +533,9 @@ TF_coil_arc_point_5_R_(m)_______________________________________________ (xarc(5))_____________________ 4.4793E+00 TF_coil_arc_point_5_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.5468E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 3.3244E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 2.4635E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 2.4635E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.4102E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 2.3627E+00 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 2.3627E+00 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 7.1070E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5346E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -548,7 +548,7 @@ Winding_pack_toroidal_width_(m)_________________________________________ (wwp1)________________________ 1.2723E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 9.3795E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 9.3795E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 5.2140E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 1.0145E-01 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 3.7714E-01 @@ -577,7 +577,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3757E+05 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 1.0668E+04 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4640E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 1.5629E+06 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP @@ -1508,7 +1508,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 5 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.7793E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (tfcth)_______________________ 1.4000E+00 ITV @@ -1528,9 +1528,9 @@ TF_coil_arc_point_5_R_(m)_______________________________________________ (xarc(5))_____________________ 4.4793E+00 TF_coil_arc_point_5_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.5468E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 3.3244E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 2.4635E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 2.4635E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.4102E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 2.3627E+00 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 2.3627E+00 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 7.1069E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5347E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -1543,7 +1543,7 @@ Winding_pack_toroidal_width_(m)_________________________________________ (wwp1)________________________ 1.2723E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 9.3792E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 9.3792E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 5.2139E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 1.0145E-01 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 3.7716E-01 @@ -1572,7 +1572,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3757E+05 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 1.0668E+04 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4640E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 1.5629E+06 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP @@ -2503,7 +2503,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 5 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.7793E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (tfcth)_______________________ 1.4000E+00 ITV @@ -2523,9 +2523,9 @@ TF_coil_arc_point_5_R_(m)_______________________________________________ (xarc(5))_____________________ 4.4793E+00 TF_coil_arc_point_5_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.5468E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 3.3244E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 2.4634E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 2.4634E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.4101E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 2.3626E+00 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 2.3626E+00 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 7.1069E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5347E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -2538,7 +2538,7 @@ Winding_pack_toroidal_width_(m)_________________________________________ (wwp1)________________________ 1.2723E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 9.3789E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 9.3789E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 5.2137E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 1.0145E-01 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 3.7717E-01 @@ -2567,7 +2567,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3756E+05 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 1.0668E+04 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4640E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 1.5629E+06 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP @@ -3498,7 +3498,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 5 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.7793E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (tfcth)_______________________ 1.4000E+00 ITV @@ -3518,9 +3518,9 @@ TF_coil_arc_point_5_R_(m)_______________________________________________ (xarc(5))_____________________ 4.4793E+00 TF_coil_arc_point_5_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.5468E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 3.3244E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 2.4634E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 2.4634E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.4101E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 2.3626E+00 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 2.3626E+00 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 7.1069E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5348E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -3533,7 +3533,7 @@ Winding_pack_toroidal_width_(m)_________________________________________ (wwp1)________________________ 1.2723E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 9.3786E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 9.3786E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 5.2136E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 1.0146E-01 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 3.7718E-01 @@ -3562,7 +3562,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3755E+05 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 1.0668E+04 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4639E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 1.5629E+06 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP @@ -4493,7 +4493,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 5 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.7793E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (tfcth)_______________________ 1.4000E+00 ITV @@ -4513,9 +4513,9 @@ TF_coil_arc_point_5_R_(m)_______________________________________________ (xarc(5))_____________________ 4.4793E+00 TF_coil_arc_point_5_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.5468E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 3.3244E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 2.4634E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 2.4634E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.4100E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 2.3626E+00 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 2.3626E+00 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 7.1069E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5349E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -4528,7 +4528,7 @@ Winding_pack_toroidal_width_(m)_________________________________________ (wwp1)________________________ 1.2723E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 9.3783E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 9.3783E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 5.2135E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 1.0146E-01 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 3.7719E-01 @@ -4557,7 +4557,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3755E+05 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 1.0668E+04 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4639E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 1.5629E+06 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP @@ -5488,7 +5488,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 5 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.7793E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (tfcth)_______________________ 1.4000E+00 ITV @@ -5508,9 +5508,9 @@ TF_coil_arc_point_5_R_(m)_______________________________________________ (xarc(5))_____________________ 4.4793E+00 TF_coil_arc_point_5_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.5468E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 3.3244E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 2.4634E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 2.4634E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.4100E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 2.3626E+00 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 2.3626E+00 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 7.1068E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5349E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -5523,7 +5523,7 @@ Winding_pack_toroidal_width_(m)_________________________________________ (wwp1)________________________ 1.2723E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 9.3781E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 9.3781E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 5.2134E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 1.0146E-01 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 3.7721E-01 @@ -5552,7 +5552,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3754E+05 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 1.0668E+04 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4639E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 1.5629E+06 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP @@ -6483,7 +6483,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 5 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.7793E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (tfcth)_______________________ 1.4000E+00 ITV @@ -6503,9 +6503,9 @@ TF_coil_arc_point_5_R_(m)_______________________________________________ (xarc(5))_____________________ 4.4793E+00 TF_coil_arc_point_5_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.5468E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 3.3244E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 2.4634E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 2.4634E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.4099E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 2.3626E+00 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 2.3626E+00 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 7.1068E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5350E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -6518,7 +6518,7 @@ Winding_pack_toroidal_width_(m)_________________________________________ (wwp1)________________________ 1.2723E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 9.3779E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 9.3779E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 5.2133E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 1.0146E-01 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 3.7722E-01 @@ -6547,7 +6547,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3753E+05 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 1.0668E+04 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4638E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 1.5629E+06 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP @@ -7478,7 +7478,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 5 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.7793E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (tfcth)_______________________ 1.4000E+00 ITV @@ -7498,9 +7498,9 @@ TF_coil_arc_point_5_R_(m)_______________________________________________ (xarc(5))_____________________ 4.4793E+00 TF_coil_arc_point_5_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.5468E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 3.3244E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 2.4634E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 2.4634E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.4099E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 2.3626E+00 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 2.3626E+00 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 7.1068E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5350E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -7513,7 +7513,7 @@ Winding_pack_toroidal_width_(m)_________________________________________ (wwp1)________________________ 1.2723E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 9.3776E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 9.3776E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 5.2132E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 1.0146E-01 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 3.7723E-01 @@ -7542,7 +7542,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3753E+05 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 1.0668E+04 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4638E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 1.5629E+06 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP @@ -8473,7 +8473,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 5 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.7793E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (tfcth)_______________________ 1.4000E+00 ITV @@ -8493,9 +8493,9 @@ TF_coil_arc_point_5_R_(m)_______________________________________________ (xarc(5))_____________________ 4.4793E+00 TF_coil_arc_point_5_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.5468E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 3.3244E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 2.4634E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 2.4634E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.4098E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 2.3626E+00 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 2.3626E+00 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 7.1068E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5351E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -8508,7 +8508,7 @@ Winding_pack_toroidal_width_(m)_________________________________________ (wwp1)________________________ 1.2723E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 9.3774E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 9.3774E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 5.2131E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 1.0146E-01 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 3.7723E-01 @@ -8537,7 +8537,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3752E+05 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 1.0668E+04 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4638E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 1.5629E+06 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP @@ -9285,7 +9285,7 @@ casths = 0.05 * Inboard tf coil sidewall case thickness (m) cpttf = 6.5e+04 * Tf coil current per turn (a); ripmax = 0.6 * Maximum allowable toroidal field ripple amplitude tdmptf = 30.0 * Dump time for tf coil (s) -n_tf = 16 * Number of tf coils (default = 50 for stellarators) +n_tf_coils = 16 * Number of tf coils (default = 50 for stellarators) sig_tf_case_max = 5.8E8 * Allowable maximum shear stress in TF coil case (Tresca criterion) (Pa) sig_tf_wp_max = 5.8E8 * Allowable maximum shear stress in TF coil conduit (Tresca criterion) (Pa) dhecoil = 0.010 * diameter of He coil in TF winding (m) diff --git a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT index 346e31e0..87fc5024 100644 --- a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT +++ b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT @@ -306,7 +306,7 @@ casths = 0.05 * Inboard tf coil sidewall case thickness (m) cpttf = 6.5e+04 * Tf coil current per turn (a); ripmax = 0.6 * Maximum allowable toroidal field ripple amplitude tdmptf = 30.0 * Dump time for tf coil (s) -n_tf = 16 * Number of tf coils (default = 50 for stellarators) +n_tf_coils = 16 * Number of tf coils (default = 50 for stellarators) alstrtf = 5.8E8 * allowable stress in TF coil (Pa) dhecoil = 0.010 * diameter of He coil in TF winding (m) tftmp = 4.750 * Peak helium coolant temperature in tf coils and pf coils (k) diff --git a/tests/integration/data/uncertainties_ref_IN.DAT b/tests/integration/data/uncertainties_ref_IN.DAT index 6acaad0d..cf925319 100644 --- a/tests/integration/data/uncertainties_ref_IN.DAT +++ b/tests/integration/data/uncertainties_ref_IN.DAT @@ -306,7 +306,7 @@ casths = 0.05 * Inboard tf coil sidewall case thickness (m) cpttf = 6.5e+04 * Tf coil current per turn (a); ripmax = 0.6 * Maximum allowable toroidal field ripple amplitude tdmptf = 30.0 * Dump time for tf coil (s) -n_tf = 16 * Number of tf coils (default = 50 for stellarators) +n_tf_coils = 16 * Number of tf coils (default = 50 for stellarators) alstrtf = 5.8E8 * allowable stress in TF coil (Pa) dhecoil = 0.010 * diameter of He coil in TF winding (m) tftmp = 4.750 * Peak helium coolant temperature in tf coils and pf coils (k) diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 8e305edd..96b77a19 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3335,7 +3335,7 @@ "n_rad_per_layer": 100.0, "n_radial_array": 50.0, "n_res": 5.0, - "n_tf": 16.0, + "n_tf_coils": 16.0, "n_tf_graded_layers": 1.0, "n_tf_joints": 4.0, "n_tf_joints_contact": 6.0, @@ -10111,7 +10111,7 @@ "n_rad_per_layer": "Size of the arrays per layers storing the radial dependent stress\n quantities (stresses, strain displacement etc..)", "n_radial_array": "Size of the radial distribution arrays per layers\n used for stress, strain and displacement distibution", "n_res": "toroidal resonance number (1)", - "n_tf": "Number of TF coils (default = 50 for stellarators). Number of TF coils outer legs for ST", + "n_tf_coils": "Number of TF coils (default = 50 for stellarators). Number of TF coils outer legs for ST", "n_tf_graded_layers": "Number of layers of different stress properties in the WP. If `n_tf_graded_layers > 1`,\n a graded coil is condidered", "n_tf_joints": "Number of joints\n Ex: n_tf_joints = 2 for top and bottom CP joints", "n_tf_joints_contact": "Number of contact per turn", @@ -11166,9 +11166,9 @@ "whtbltibe12": "mass of titanium beryllide in blanket (kg) (`iblanket=1,3` (CCFE HCPB))", "whtblvd": "mass of blanket - vanadium part (kg)", "whtcas": "mass per coil of external case (kg)", - "whtcon": "TF coil conductor mass per coil (kg/coil).\n For `itart=1`, coil is return limb plus centrepost/n_tf", - "whtconal": "Aluminium mass in TF coil conductor (kg/coil).\n For `itart=1`, coil is return limb plus centrepost/n_tf", - "whtconcu": "copper mass in TF coil conductor (kg/coil).\n For `itart=1`, coil is return limb plus centrepost/n_tf", + "whtcon": "TF coil conductor mass per coil (kg/coil).\n For `itart=1`, coil is return limb plus centrepost/n_tf_coils", + "whtconal": "Aluminium mass in TF coil conductor (kg/coil).\n For `itart=1`, coil is return limb plus centrepost/n_tf_coils", + "whtconcu": "copper mass in TF coil conductor (kg/coil).\n For `itart=1`, coil is return limb plus centrepost/n_tf_coils", "whtconin": "conduit insulation mass in TF coil conductor (kg/coil)", "whtconsc": "superconductor mass in TF coil cable (kg/coil)", "whtconsh": "steel conduit mass in TF coil conductor (kg/coil)", @@ -13736,7 +13736,7 @@ "lb": 3, "ub": 6 }, - "n_tf": { + "n_tf_coils": { "lb": 0.0, "ub": 100.0 }, @@ -19662,7 +19662,7 @@ "pres_joints", "tfleng", "eff_tf_cryo", - "n_tf", + "n_tf_coils", "tfocrn", "tfsai", "tfsao", @@ -20569,7 +20569,7 @@ "n_pancake": "int_variable", "n_rad_per_layer": "int_variable", "n_res": "int_variable", - "n_tf": "real_variable", + "n_tf_coils": "real_variable", "n_tf_graded_layers": "int_variable", "n_tf_joints": "int_variable", "n_tf_joints_contact": "int_variable", diff --git a/tests/regression/input_files/large_tokamak.IN.DAT b/tests/regression/input_files/large_tokamak.IN.DAT index c5282122..66da24a5 100644 --- a/tests/regression/input_files/large_tokamak.IN.DAT +++ b/tests/regression/input_files/large_tokamak.IN.DAT @@ -595,7 +595,7 @@ casths = 0.05 ripmax = 0.6 * Number of TF coils -n_tf = 16 +n_tf_coils = 16 * Groundwall insulation thickness [m] tinstf = 0.008 diff --git a/tests/regression/input_files/large_tokamak_nof.IN.DAT b/tests/regression/input_files/large_tokamak_nof.IN.DAT index 7b040218..5afbc4d6 100644 --- a/tests/regression/input_files/large_tokamak_nof.IN.DAT +++ b/tests/regression/input_files/large_tokamak_nof.IN.DAT @@ -574,7 +574,7 @@ casths = 0.05 ripmax = 0.6 * Number of TF coils -n_tf = 16 +n_tf_coils = 16 * Groundwall insulation thickness [m] tinstf = 0.008 diff --git a/tests/regression/input_files/large_tokamak_once_through.IN.DAT b/tests/regression/input_files/large_tokamak_once_through.IN.DAT index 27f3598b..6cef1c3c 100644 --- a/tests/regression/input_files/large_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/large_tokamak_once_through.IN.DAT @@ -416,7 +416,7 @@ fcutfsu = 0.8231999768826475 * copper fraction of cable conductor (TF coils) i_tf_sc_mat = 1 * Switch for superconductor material in TF coils; ripmax = 0.6 * aximum allowable toroidal field ripple amplitude at plasma edge (%) tdmptf = 17.97282589344206 * fast discharge time for TF coil in event of quench (s) (`iteration variable 56`) -n_tf = 16 * Number of TF coils (default = 50 for stellarators); Number of TF coils outer legs for ST +n_tf_coils = 16 * Number of TF coils (default = 50 for stellarators); Number of TF coils outer legs for ST tftmp = 4.75 * peak helium coolant temperature in TF coils and PF coils (K) thkcas = 0.2816873221155309 * inboard TF coil case outer (non-plasma side) thickness (m) (`iteration variable 57`) dr_tf_wp = 0.5153787768966674 * radial thickness of winding pack (m) (`iteration variable 140`) (issue #514) diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 56384f79..fb8fd3d0 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -906,7 +906,7 @@ boundu(97) = 1.0 *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ General settings ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ -n_tf = 12 +n_tf_coils = 12 * DESCRIPTION: Number of TF Coils * JUSTIFICATION: diff --git a/tests/unit/data/large_tokamak_IN.DAT b/tests/unit/data/large_tokamak_IN.DAT index cac0303b..af46032b 100644 --- a/tests/unit/data/large_tokamak_IN.DAT +++ b/tests/unit/data/large_tokamak_IN.DAT @@ -592,7 +592,7 @@ casths = 0.05 ripmax = 0.6 * Number of TF coils -n_tf = 16 +n_tf_coils = 16 * Groundwall insulation thickness [m] tinstf = 0.008 diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 0cb43790..b1e2029f 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -664,7 +664,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.1606E+00 OP Inboard_leg_inner_radius_(m)____________________________________________ (r_tf_inboard_in)_____________ 2.6958E+00 OP Inboard_leg_outer_radius_(m)____________________________________________ (r_tf_inboard_out)____________ 3.6253E+00 OP @@ -689,9 +689,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.8459E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.3045E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.3045E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.0671E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.5858E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.5858E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.6514E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.7164E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -705,7 +705,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.0872E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.8986E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.8986E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.1865E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.8392E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.3296E-01 @@ -732,7 +732,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 9.1170E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.4319E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.5648E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 7.2486E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 7.2486E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.1598E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2296E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.1381E+02 OP @@ -1783,7 +1783,7 @@ casths = 0.05 ripmax = 0.6 * Number of TF coils -n_tf = 16 +n_tf_coils = 16 * Groundwall insulation thickness [m] tinstf = 0.008 diff --git a/tests/unit/test_build.py b/tests/unit/test_build.py index ced5a7d0..c86d80c9 100755 --- a/tests/unit/test_build.py +++ b/tests/unit/test_build.py @@ -69,7 +69,7 @@ class RippleAmplitudeParam(NamedTuple): tinstf: Any = None - n_tf: Any = None + n_tf_coils: Any = None tftort: Any = None @@ -201,7 +201,7 @@ def test_divgeom(divgeomparam, monkeypatch, build): rminor=2.8677741935483869, rmajor=8.8901000000000003, tinstf=0.0080000000000000019, - n_tf=16, + n_tf_coils=16, tftort=1, casths=0.05000000000000001, dr_tf_wp=0.54261087836601019, @@ -222,7 +222,7 @@ def test_divgeom(divgeomparam, monkeypatch, build): rminor=2.8677741935483869, rmajor=8.8901000000000003, tinstf=0.0080000000000000019, - n_tf=16, + n_tf_coils=16, tftort=1, casths=0.05000000000000001, dr_tf_wp=0.54261087836601019, @@ -263,7 +263,7 @@ def test_ripple_amplitude(rippleamplitudeparam, monkeypatch, build): monkeypatch.setattr(tfcoil_variables, "tinstf", rippleamplitudeparam.tinstf) - monkeypatch.setattr(tfcoil_variables, "n_tf", rippleamplitudeparam.n_tf) + monkeypatch.setattr(tfcoil_variables, "n_tf_coils", rippleamplitudeparam.n_tf_coils) monkeypatch.setattr(tfcoil_variables, "tftort", rippleamplitudeparam.tftort) @@ -329,7 +329,7 @@ class PortszParam(NamedTuple): tftort: Any = None - n_tf: Any = None + n_tf_coils: Any = None expected_rtanbeam: Any = None @@ -349,7 +349,7 @@ class PortszParam(NamedTuple): frbeam=1.05, rmajor=8.8901000000000003, tftort=1.6395161177915356, - n_tf=16, + n_tf_coils=16, expected_rtanbeam=9.3346050000000016, expected_rtanmax=14.735821603386416, ), @@ -363,7 +363,7 @@ class PortszParam(NamedTuple): frbeam=1.05, rmajor=8.8901000000000003, tftort=1.6395161177915356, - n_tf=16, + n_tf_coils=16, expected_rtanbeam=9.3346050000000016, expected_rtanmax=14.735821603386416, ), @@ -405,7 +405,7 @@ def test_portsz(portszparam, monkeypatch, build): monkeypatch.setattr(tfcoil_variables, "tftort", portszparam.tftort) - monkeypatch.setattr(tfcoil_variables, "n_tf", portszparam.n_tf) + monkeypatch.setattr(tfcoil_variables, "n_tf_coils", portszparam.n_tf_coils) build.portsz() diff --git a/tests/unit/test_buildings.py b/tests/unit/test_buildings.py index 00c144bf..a2088e79 100644 --- a/tests/unit/test_buildings.py +++ b/tests/unit/test_buildings.py @@ -127,7 +127,7 @@ class BldgsSizesParam(NamedTuple): hotcell_h: Any hot_sepdist: Any iefrf: Any - n_tf: Any + n_tf_coils: Any i_tf_sup: Any pfrmax: Any tlife: Any @@ -270,7 +270,7 @@ class BldgsSizesParam(NamedTuple): hotcell_h=12, hot_sepdist=2, iefrf=10, - n_tf=16, + n_tf_coils=16, i_tf_sup=1, pfrmax=18.98258241468535, tlife=40, @@ -409,7 +409,7 @@ class BldgsSizesParam(NamedTuple): hotcell_h=12, hot_sepdist=2, iefrf=10, - n_tf=16, + n_tf_coils=16, i_tf_sup=1, pfrmax=18.982980877139834, tlife=40, @@ -668,7 +668,7 @@ def test_bldgs_sizes(buildings, bldgssizesparam, monkeypatch): monkeypatch.setattr(buildings_variables, "hotcell_h", bldgssizesparam.hotcell_h) monkeypatch.setattr(buildings_variables, "hot_sepdist", bldgssizesparam.hot_sepdist) monkeypatch.setattr(current_drive_variables, "iefrf", bldgssizesparam.iefrf) - monkeypatch.setattr(tfcoil_variables, "n_tf", bldgssizesparam.n_tf) + monkeypatch.setattr(tfcoil_variables, "n_tf_coils", bldgssizesparam.n_tf_coils) monkeypatch.setattr(tfcoil_variables, "i_tf_sup", bldgssizesparam.i_tf_sup) monkeypatch.setattr(pfcoil_variables, "pfrmax", bldgssizesparam.pfrmax) monkeypatch.setattr(cost_variables, "tlife", bldgssizesparam.tlife) @@ -752,7 +752,7 @@ class BldgsParam(NamedTuple): tfri: Any tfh: Any tfm: Any - n_tf: Any + n_tf_coils: Any shro: Any shri: Any shh: Any @@ -816,7 +816,7 @@ class BldgsParam(NamedTuple): tfri=2.9939411851091102, tfh=20.562180043124066, tfm=1327.1818597762153, - n_tf=16, + n_tf_coils=16, shro=13.764874193548387, shri=4.7423258064516141, shh=17.446180043124063, @@ -876,7 +876,7 @@ class BldgsParam(NamedTuple): tfri=2.9939411851091102, tfh=20.562180043124066, tfm=1327.9750836697808, - n_tf=16, + n_tf_coils=16, shro=13.782874193548388, shri=4.7243258064516143, shh=17.446180043124063, @@ -939,7 +939,7 @@ def test_bldgs(buildings, bldgsparam, monkeypatch): tfri=bldgsparam.tfri, tfh=bldgsparam.tfh, tfm=bldgsparam.tfm, - n_tf=bldgsparam.n_tf, + n_tf_coils=bldgsparam.n_tf_coils, shro=bldgsparam.shro, shri=bldgsparam.shri, shh=bldgsparam.shh, diff --git a/tests/unit/test_costs_1990.py b/tests/unit/test_costs_1990.py index 5f58ebfb..75e7529c 100644 --- a/tests/unit/test_costs_1990.py +++ b/tests/unit/test_costs_1990.py @@ -1759,7 +1759,7 @@ class Acc2221Param(NamedTuple): whtcas: Any = None - n_tf: Any = None + n_tf_coils: Any = None whttflgs: Any = None @@ -1821,7 +1821,7 @@ class Acc2221Param(NamedTuple): whtconcu=58744.465423173802, whtconsc=5802.5700395134345, whtcas=1034021.9996272125, - n_tf=16, + n_tf_coils=16, whttflgs=0, whtcp=0, i_tf_sup=1, @@ -1862,7 +1862,7 @@ class Acc2221Param(NamedTuple): whtconcu=58779.575542593491, whtconsc=5806.038092640837, whtcas=1034699.2182961091, - n_tf=16, + n_tf_coils=16, whttflgs=0, whtcp=0, i_tf_sup=1, @@ -1903,7 +1903,7 @@ class Acc2221Param(NamedTuple): whtconcu=58779.575542593491, whtconsc=5806.038092640837, whtcas=1034699.2182961091, - n_tf=16, + n_tf_coils=16, whttflgs=0, whtcp=0, i_tf_sup=1, @@ -1973,7 +1973,7 @@ def test_acc2221(acc2221param, monkeypatch, costs): monkeypatch.setattr(tfcoil_variables, "whtcas", acc2221param.whtcas) - monkeypatch.setattr(tfcoil_variables, "n_tf", acc2221param.n_tf) + monkeypatch.setattr(tfcoil_variables, "n_tf_coils", acc2221param.n_tf_coils) monkeypatch.setattr(tfcoil_variables, "whttflgs", acc2221param.whttflgs) @@ -3261,7 +3261,7 @@ class Acc2251Param(NamedTuple): tfckw: Any = None - n_tf: Any = None + n_tf_coils: Any = None cpttf: Any = None @@ -3311,7 +3311,7 @@ class Acc2251Param(NamedTuple): i_tf_sup=1, m_tf_bus=0, tfckw=32474.753636211804, - n_tf=16, + n_tf_coils=16, cpttf=74026.751437500003, c22=0, c225=0, @@ -3342,7 +3342,7 @@ class Acc2251Param(NamedTuple): i_tf_sup=1, m_tf_bus=0, tfckw=32505.257577809778, - n_tf=16, + n_tf_coils=16, cpttf=74026.751437500003, c22=3474.7391916096453, c225=185.05656643685359, @@ -3400,7 +3400,7 @@ def test_acc2251(acc2251param, monkeypatch, costs): monkeypatch.setattr(tfcoil_variables, "tfckw", acc2251param.tfckw) - monkeypatch.setattr(tfcoil_variables, "n_tf", acc2251param.n_tf) + monkeypatch.setattr(tfcoil_variables, "n_tf_coils", acc2251param.n_tf_coils) monkeypatch.setattr(tfcoil_variables, "cpttf", acc2251param.cpttf) diff --git a/tests/unit/test_costs_2015.py b/tests/unit/test_costs_2015.py index 85c0bce6..4c6f6c6a 100644 --- a/tests/unit/test_costs_2015.py +++ b/tests/unit/test_costs_2015.py @@ -39,7 +39,7 @@ class CalcBuildingCostsParam(NamedTuple): ritfc: Any = None - n_tf: Any = None + n_tf_coils: Any = None estotftgj: Any = None @@ -84,7 +84,7 @@ class CalcBuildingCostsParam(NamedTuple): psechtmw=311.54038043019023, helpow=142703.41458500578, ritfc=234156150, - n_tf=18, + n_tf_coils=18, estotftgj=130.10721529398921, rdewex=18.314040399601147, zdewex=15.118436894660423, @@ -1184,7 +1184,7 @@ class CalcBuildingCostsParam(NamedTuple): psechtmw=640.27066522894324, helpow=823308.59959198488, ritfc=234156150, - n_tf=18, + n_tf_coils=18, estotftgj=129.99240835373195, rdewex=18.31462428923539, zdewex=15.165858901796364, @@ -2305,7 +2305,9 @@ def test_calc_building_costs(calcbuildingcostsparam, monkeypatch, costs2015): monkeypatch.setattr(tfcoil_variables, "ritfc", calcbuildingcostsparam.ritfc) - monkeypatch.setattr(tfcoil_variables, "n_tf", calcbuildingcostsparam.n_tf) + monkeypatch.setattr( + tfcoil_variables, "n_tf_coils", calcbuildingcostsparam.n_tf_coils + ) monkeypatch.setattr(tfcoil_variables, "estotftgj", calcbuildingcostsparam.estotftgj) @@ -4630,7 +4632,7 @@ def test_calc_land_costs(calclandcostsparam, monkeypatch, costs2015): class CalcTfCoilCostsParam(NamedTuple): - n_tf: Any = None + n_tf_coils: Any = None tfleng: Any = None @@ -4669,7 +4671,7 @@ class CalcTfCoilCostsParam(NamedTuple): "calctfcoilcostsparam", ( CalcTfCoilCostsParam( - n_tf=18, + n_tf_coils=18, tfleng=46.64605032553105, n_tf_turn=200.13346153846152, whtconcu=31746.02769109578, @@ -5758,7 +5760,7 @@ class CalcTfCoilCostsParam(NamedTuple): ).transpose(), ), CalcTfCoilCostsParam( - n_tf=18, + n_tf_coils=18, tfleng=46.6270502920285, n_tf_turn=200.13346153846155, whtconcu=24895.07929687943, @@ -6861,7 +6863,7 @@ def test_calc_tf_coil_costs(calctfcoilcostsparam, monkeypatch, costs2015): :type monkeypatch: _pytest.monkeypatch.monkeypatch """ - monkeypatch.setattr(tfcoil_variables, "n_tf", calctfcoilcostsparam.n_tf) + monkeypatch.setattr(tfcoil_variables, "n_tf_coils", calctfcoilcostsparam.n_tf_coils) monkeypatch.setattr(tfcoil_variables, "tfleng", calctfcoilcostsparam.tfleng) diff --git a/tests/unit/test_power.py b/tests/unit/test_power.py index 3db0fc69..5f713837 100644 --- a/tests/unit/test_power.py +++ b/tests/unit/test_power.py @@ -54,7 +54,7 @@ class CryoParam(NamedTuple): ptfnuc: Any = None - n_tf: Any = None + n_tf_coils: Any = None tfcryoarea: Any = None @@ -86,7 +86,7 @@ class CryoParam(NamedTuple): cpttf=74026.751437500003, ensxpfm=37429.525515086898, ptfnuc=0.044178296011112193, - n_tf=16, + n_tf_coils=16, tfcryoarea=0, tpulse=10364.426139387357, expected_qss=20361.633927097802, @@ -107,7 +107,7 @@ class CryoParam(NamedTuple): cpttf=74026.751437500003, ensxpfm=37427.228965055205, ptfnuc=0.045535131445547841, - n_tf=16, + n_tf_coils=16, tfcryoarea=0, tpulse=364.42613938735633, expected_qss=20342.863776957758, @@ -149,7 +149,7 @@ def test_cryo(cryoparam, monkeypatch, power): cpttf=cryoparam.cpttf, ensxpfm=cryoparam.ensxpfm, ptfnuc=cryoparam.ptfnuc, - n_tf=cryoparam.n_tf, + n_tf_coils=cryoparam.n_tf_coils, tfcryoarea=cryoparam.tfcryoarea, tpulse=cryoparam.tpulse, ) diff --git a/tests/unit/test_sctfcoil.py b/tests/unit/test_sctfcoil.py index 0a6e8006..4f2909d9 100644 --- a/tests/unit/test_sctfcoil.py +++ b/tests/unit/test_sctfcoil.py @@ -98,7 +98,7 @@ def test_protect(protectparam, sctfcoil): class SuperconParam(NamedTuple): tmargmin_tf: Any = None - n_tf: Any = None + n_tf_coils: Any = None temp_margin: Any = None @@ -178,7 +178,7 @@ class SuperconParam(NamedTuple): ( SuperconParam( tmargmin_tf=1.5, - n_tf=16, + n_tf_coils=16, temp_margin=0, jwdgpro=0, dhecoil=0.010000000000000002, @@ -218,7 +218,7 @@ class SuperconParam(NamedTuple): ), SuperconParam( tmargmin_tf=1.5, - n_tf=16, + n_tf_coils=16, temp_margin=2.3431632224075836, jwdgpro=17475706.393616617, dhecoil=0.010000000000000002, @@ -258,7 +258,7 @@ class SuperconParam(NamedTuple): ), SuperconParam( tmargmin_tf=1.5, - n_tf=16, + n_tf_coils=16, temp_margin=2.3431632224075836, jwdgpro=17475706.393616617, dhecoil=0.010000000000000002, @@ -316,7 +316,7 @@ def test_supercon(superconparam, monkeypatch, sctfcoil): monkeypatch.setattr(tfcoil_variables, "tmargmin_tf", superconparam.tmargmin_tf) - monkeypatch.setattr(tfcoil_variables, "n_tf", superconparam.n_tf) + monkeypatch.setattr(tfcoil_variables, "n_tf_coils", superconparam.n_tf_coils) monkeypatch.setattr(tfcoil_variables, "temp_margin", superconparam.temp_margin) @@ -409,7 +409,7 @@ class TfCurrentParam(NamedTuple): casthi_fraction: Any = None - n_tf: Any = None + n_tf_coils: Any = None thicndut: Any = None @@ -461,7 +461,7 @@ class TfCurrentParam(NamedTuple): casths=0.05000000000000001, casthi_is_fraction=False, casthi_fraction=0.050000000000000003, - n_tf=16, + n_tf_coils=16, thicndut=0.002, thkcas=0.52465000000000006, oacdcp=8673900, @@ -533,7 +533,7 @@ def test_tf_current(tfcurrentparam, monkeypatch, sctfcoil): tfcoil_variables, "casthi_fraction", tfcurrentparam.casthi_fraction ) - monkeypatch.setattr(tfcoil_variables, "n_tf", tfcurrentparam.n_tf) + monkeypatch.setattr(tfcoil_variables, "n_tf_coils", tfcurrentparam.n_tf_coils) monkeypatch.setattr(tfcoil_variables, "thicndut", tfcurrentparam.thicndut) @@ -593,7 +593,7 @@ class TfGlobalGeometryParam(NamedTuple): tftort: Any = None - n_tf: Any = None + n_tf_coils: Any = None arealeg: Any = None @@ -646,7 +646,7 @@ class TfGlobalGeometryParam(NamedTuple): tfareain=0, ritfc=0, tftort=1, - n_tf=16, + n_tf_coils=16, arealeg=0, i_tf_sup=1, dztop=0, @@ -676,7 +676,7 @@ class TfGlobalGeometryParam(NamedTuple): tfareain=35.703669036223495, ritfc=241812532.66279837, tftort=1.7488698442633552, - n_tf=16, + n_tf_coils=16, arealeg=2.6728635794409041, i_tf_sup=1, dztop=0, @@ -737,7 +737,9 @@ def test_tf_global_geometry(tfglobalgeometryparam, monkeypatch, sctfcoil): monkeypatch.setattr(tfcoil_variables, "tftort", tfglobalgeometryparam.tftort) - monkeypatch.setattr(tfcoil_variables, "n_tf", tfglobalgeometryparam.n_tf) + monkeypatch.setattr( + tfcoil_variables, "n_tf_coils", tfglobalgeometryparam.n_tf_coils + ) monkeypatch.setattr(tfcoil_variables, "arealeg", tfglobalgeometryparam.arealeg) @@ -861,7 +863,7 @@ class ResTfInternalGeomParam(NamedTuple): tinstf: Any = None - n_tf: Any = None + n_tf_coils: Any = None tfthko: Any = None @@ -905,7 +907,7 @@ class TfResHeatingParam(NamedTuple): pres_joints: Any = None n_tf_joints_contact: Any = None n_tf_joints: Any = None - n_tf: Any = None + n_tf_coils: Any = None i_tf_sup: Any = None frholeg: Any = None frhocp: Any = None @@ -953,7 +955,7 @@ class TfResHeatingParam(NamedTuple): aiwp=0, acasetf=0, tinstf=0, - n_tf=12, + n_tf_coils=12, tfthko=0.15483000000000002, r_tf_inboard_in=0, r_tf_inboard_out=0.15483000000000002, @@ -980,7 +982,7 @@ class TfResHeatingParam(NamedTuple): aiwp=0.00030678028680367151, acasetf=0.00061190425043863676, tinstf=0, - n_tf=12, + n_tf_coils=12, tfthko=0.15483000000000002, r_tf_inboard_in=0, r_tf_inboard_out=0.15483000000000002, @@ -1038,7 +1040,9 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): monkeypatch.setattr(tfcoil_variables, "tinstf", restfinternalgeomparam.tinstf) - monkeypatch.setattr(tfcoil_variables, "n_tf", restfinternalgeomparam.n_tf) + monkeypatch.setattr( + tfcoil_variables, "n_tf_coils", restfinternalgeomparam.n_tf_coils + ) monkeypatch.setattr(build_variables, "tfthko", restfinternalgeomparam.tfthko) @@ -1117,7 +1121,7 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): pres_joints=0, n_tf_joints_contact=6, n_tf_joints=4, - n_tf=12, + n_tf_coils=12, i_tf_sup=0, frholeg=1, frhocp=1, @@ -1167,7 +1171,7 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): pres_joints=1944336.7995005273, n_tf_joints_contact=6, n_tf_joints=4, - n_tf=12, + n_tf_coils=12, i_tf_sup=0, frholeg=1, frhocp=1, @@ -1257,7 +1261,7 @@ def test_tf_res_heating(tfresheatingparam, monkeypatch, sctfcoil): monkeypatch.setattr(tfcoil_variables, "n_tf_joints", tfresheatingparam.n_tf_joints) - monkeypatch.setattr(tfcoil_variables, "n_tf", tfresheatingparam.n_tf) + monkeypatch.setattr(tfcoil_variables, "n_tf_coils", tfresheatingparam.n_tf_coils) monkeypatch.setattr(tfcoil_variables, "i_tf_sup", tfresheatingparam.i_tf_sup) @@ -1335,7 +1339,7 @@ def test_tf_res_heating(tfresheatingparam, monkeypatch, sctfcoil): class CpostParam(NamedTuple): - n_tf: Any = None + n_tf_coils: Any = None hmax: Any = None @@ -1382,7 +1386,7 @@ class CpostParam(NamedTuple): "cpostparam", ( CpostParam( - n_tf=12, + n_tf_coils=12, hmax=4.4214285714285717, r_tf_inboard_in=0, r_tf_inboard_out=0.15483000000000002, @@ -1405,7 +1409,7 @@ class CpostParam(NamedTuple): expected_a_cp_cool=0.00068328705812121333, ), CpostParam( - n_tf=12, + n_tf_coils=12, hmax=4.4214285714285717, r_tf_inboard_in=0, r_tf_inboard_out=0.15483000000000002, @@ -1465,7 +1469,7 @@ def test_cpost(cpostparam, monkeypatch, sctfcoil): curr=cpostparam.curr, rho=cpostparam.rho, fcool=cpostparam.fcool, - n_tf=cpostparam.n_tf, + n_tf_coils=cpostparam.n_tf_coils, ) assert vol_ins_cp == pytest.approx(cpostparam.expected_vol_ins_cp) @@ -1500,7 +1504,7 @@ class TfFieldAndForceParam(NamedTuple): vforce: Any = None - n_tf: Any = None + n_tf_coils: Any = None taucq: Any = None @@ -1562,7 +1566,7 @@ class TfFieldAndForceParam(NamedTuple): r_tf_inboard_mid=0.077415000000000012, r_cp_top=0.87643571428571443, vforce=0, - n_tf=12, + n_tf_coils=12, taucq=30, sigvvall=93000000, cforce=0, @@ -1597,7 +1601,7 @@ class TfFieldAndForceParam(NamedTuple): r_tf_inboard_mid=0.077415000000000012, r_cp_top=0.85843571428571441, vforce=12380916.66459452, - n_tf=12, + n_tf_coils=12, taucq=30, sigvvall=93000000, cforce=37041530.947408713, @@ -1661,7 +1665,7 @@ def test_tf_field_and_force(tffieldandforceparam, monkeypatch, sctfcoil): monkeypatch.setattr(tfcoil_variables, "vforce", tffieldandforceparam.vforce) - monkeypatch.setattr(tfcoil_variables, "n_tf", tffieldandforceparam.n_tf) + monkeypatch.setattr(tfcoil_variables, "n_tf_coils", tffieldandforceparam.n_tf_coils) monkeypatch.setattr(tfcoil_variables, "cforce", tffieldandforceparam.cforce) @@ -1874,7 +1878,7 @@ class TfCoilAreaAndMassesParam(NamedTuple): n_tf_turn: Any = None - n_tf: Any = None + n_tf_coils: Any = None aiwp: Any = None @@ -1988,7 +1992,7 @@ class TfCoilAreaAndMassesParam(NamedTuple): dcase=8000, acndttf=0.0014685061538103825, n_tf_turn=200, - n_tf=16, + n_tf_coils=16, aiwp=0.087880174466980876, acasetfo=1.2752592893394648, acasetf=1.0015169239205168, @@ -2060,7 +2064,7 @@ class TfCoilAreaAndMassesParam(NamedTuple): dcase=8000, acndttf=0.0014685061538103825, n_tf_turn=200, - n_tf=16, + n_tf_coils=16, aiwp=0.087880174466980876, acasetfo=1.2752592893394648, acasetf=1.0015169239205168, @@ -2183,7 +2187,9 @@ def test_tf_coil_area_and_masses(tfcoilareaandmassesparam, monkeypatch, sctfcoil tfcoil_variables, "n_tf_turn", tfcoilareaandmassesparam.n_tf_turn ) - monkeypatch.setattr(tfcoil_variables, "n_tf", tfcoilareaandmassesparam.n_tf) + monkeypatch.setattr( + tfcoil_variables, "n_tf_coils", tfcoilareaandmassesparam.n_tf_coils + ) monkeypatch.setattr(tfcoil_variables, "aiwp", tfcoilareaandmassesparam.aiwp) @@ -2313,7 +2319,7 @@ class PeakTfWithRippleParam(NamedTuple): tf_fit_y: Any = None - n_tf: Any = None + n_tf_coils: Any = None wwp1: Any = None @@ -2341,7 +2347,7 @@ class PeakTfWithRippleParam(NamedTuple): tf_fit_t=0, tf_fit_z=0, tf_fit_y=0, - n_tf=16, + n_tf_coils=16, wwp1=1.299782604942499, dr_tf_wp=0.50661087836601015, tfin=3.789896624292115, @@ -2356,7 +2362,7 @@ class PeakTfWithRippleParam(NamedTuple): tf_fit_t=0.80807838916035957, tf_fit_z=0.3149613642807837, tf_fit_y=1.0658869305062604, - n_tf=16, + n_tf_coils=16, wwp1=1.299782604942499, dr_tf_wp=0.50661087836601015, tfin=3.789896624292115, @@ -2389,7 +2395,7 @@ def test_peak_tf_with_ripple(peaktfwithrippleparam, monkeypatch, sctfcoil): monkeypatch.setattr(sctfcoil_module, "tf_fit_y", peaktfwithrippleparam.tf_fit_y) bmaxtfrp, flag = sctfcoil.peak_tf_with_ripple( - n_tf=peaktfwithrippleparam.n_tf, + n_tf_coils=peaktfwithrippleparam.n_tf_coils, wwp1=peaktfwithrippleparam.wwp1, dr_tf_wp=peaktfwithrippleparam.dr_tf_wp, tfin=peaktfwithrippleparam.tfin, @@ -2651,7 +2657,7 @@ class TfCaseGeomParam(NamedTuple): tfareain: Any = None - n_tf: Any = None + n_tf_coils: Any = None casths: Any = None @@ -2702,7 +2708,7 @@ class TfCaseGeomParam(NamedTuple): acasetfo=0, arealeg=1.9805354702921749, tfareain=27.308689677971632, - n_tf=16, + n_tf_coils=16, casths=0.05000000000000001, casthi=0.060000000000000012, dr_tf_wp=0.54261087836601019, @@ -2729,7 +2735,7 @@ class TfCaseGeomParam(NamedTuple): acasetfo=1.2752592893394648, arealeg=1.9805354702921749, tfareain=27.308689677971632, - n_tf=16, + n_tf_coils=16, casths=0.05000000000000001, casthi=0.060000000000000012, dr_tf_wp=0.54261087836601019, @@ -2774,7 +2780,7 @@ def test_tf_case_geom(tfcasegeomparam, monkeypatch, sctfcoil): monkeypatch.setattr(tfcoil_variables, "tfareain", tfcasegeomparam.tfareain) - monkeypatch.setattr(tfcoil_variables, "n_tf", tfcasegeomparam.n_tf) + monkeypatch.setattr(tfcoil_variables, "n_tf_coils", tfcasegeomparam.n_tf_coils) monkeypatch.setattr(tfcoil_variables, "casths", tfcasegeomparam.casths) @@ -3347,7 +3353,7 @@ def test_tf_averaged_turn_geom(tfaveragedturngeomparam, monkeypatch, sctfcoil): class TfWpCurrentsParam(NamedTuple): ritfc: Any = None - n_tf: Any = None + n_tf_coils: Any = None jwptf: Any = None @@ -3361,14 +3367,14 @@ class TfWpCurrentsParam(NamedTuple): ( TfWpCurrentsParam( ritfc=256500000.00000003, - n_tf=16, + n_tf_coils=16, jwptf=0, awptf=0.60510952642236249, expected_jwptf=26493137.688284047, ), TfWpCurrentsParam( ritfc=256500000.00000003, - n_tf=16, + n_tf_coils=16, jwptf=26493137.688284047, awptf=0.60510952642236249, expected_jwptf=26493137.688284047, @@ -3390,7 +3396,7 @@ def test_tf_wp_currents(tfwpcurrentsparam, monkeypatch, sctfcoil): monkeypatch.setattr(tfcoil_variables, "ritfc", tfwpcurrentsparam.ritfc) - monkeypatch.setattr(tfcoil_variables, "n_tf", tfwpcurrentsparam.n_tf) + monkeypatch.setattr(tfcoil_variables, "n_tf_coils", tfwpcurrentsparam.n_tf_coils) monkeypatch.setattr(tfcoil_variables, "jwptf", tfwpcurrentsparam.jwptf) @@ -3488,7 +3494,7 @@ class StressclParam(NamedTuple): cpttf: Any = None - n_tf: Any = None + n_tf_coils: Any = None i_tf_stress_model: Any = None @@ -3630,7 +3636,7 @@ class StressclParam(NamedTuple): aiwp=0.087880174466980876, aswp=0.29370123076207649, cpttf=74026.751437500003, - n_tf=16, + n_tf_coils=16, i_tf_stress_model=1, sig_tf_wp_max=580000000, i_tf_turns_integer=1, @@ -3753,7 +3759,7 @@ class StressclParam(NamedTuple): aiwp=0.087880174466980876, aswp=0.29370123076207649, cpttf=74026.751437500003, - n_tf=16, + n_tf_coils=16, i_tf_stress_model=1, sig_tf_wp_max=580000000, i_tf_turns_integer=1, @@ -14021,7 +14027,7 @@ def test_vv_stress_on_quench(): Rm_vv=7.88, theta1_vv=1, # TF properties - n_tf=18, + n_tf_coils=18, n_tf_turn=192, S_rp=0.55, S_cc=0.94, @@ -14083,7 +14089,7 @@ def test_vv_stress_on_quench_integration(sctfcoil, monkeypatch): monkeypatch.setattr( tfcoil_variables, "tfa", [3.41, 7.77, 7.77, 3.41] ) # chosen to achieve Rm_coil in Table 2 - monkeypatch.setattr(tfcoil_variables, "n_tf", 18) # Section 3 + monkeypatch.setattr(tfcoil_variables, "n_tf_coils", 18) # Section 3 monkeypatch.setattr(tfcoil_variables, "n_tf_turn", 192) # Section 3 monkeypatch.setattr(tfcoil_variables, "tdmptf", 30) # Figure 6 monkeypatch.setattr(sctfcoil_module, "tfc_current", 83200 * 192) # Section 3 diff --git a/tests/unit/test_stellarator.py b/tests/unit/test_stellarator.py index a642d7b9..da33a214 100644 --- a/tests/unit/test_stellarator.py +++ b/tests/unit/test_stellarator.py @@ -822,7 +822,7 @@ def test_bmax_from_awp(stellarator, monkeypatch): assert stellarator.bmax_from_awp( wp_width_radial=0.11792792792792792, current=12.711229086229087, - n_tf=50, + n_tf_coils=50, r_coil_major=22.237837837837837, r_coil_minor=4.7171171171171169, ) == pytest.approx(39.193416982177489) diff --git a/tests/unit/test_tfcoil.py b/tests/unit/test_tfcoil.py index 3eacf385..7a33f7c1 100644 --- a/tests/unit/test_tfcoil.py +++ b/tests/unit/test_tfcoil.py @@ -210,7 +210,7 @@ def test_cntrpst(cntrpst_asset, monkeypatch, reinitialise_error_module, tfcoil): :type tfcoil: tests.unit.test_tfcoil.tfcoil (functional fixture) """ monkeypatch.setattr(tfv, "a_cp_cool", 1) - monkeypatch.setattr(tfv, "n_tf", 16) + monkeypatch.setattr(tfv, "n_tf_coils", 16) monkeypatch.setattr(tfv, "rcool", 0.005) monkeypatch.setattr(tfv, "vcool", 20.0) monkeypatch.setattr(tfv, "vol_cond_cp", 2) diff --git a/tests/unit/test_vacuum.py b/tests/unit/test_vacuum.py index 0e0e72b4..ad3b4380 100644 --- a/tests/unit/test_vacuum.py +++ b/tests/unit/test_vacuum.py @@ -31,7 +31,7 @@ def test_simple_model(self, monkeypatch, vacuum): """ monkeypatch.setattr(pv, "qfuel", 7.5745668997694112e22) monkeypatch.setattr(pv, "sarea", 1500.3146527709359) - monkeypatch.setattr(tfv, "n_tf", 18) + monkeypatch.setattr(tfv, "n_tf_coils", 18) monkeypatch.setattr(tv, "tdwell", 500) monkeypatch.setattr(vacv, "outgasfactor", 0.0235) monkeypatch.setattr(vacv, "outgasindex", 1) @@ -71,7 +71,7 @@ def test_old_model(self, monkeypatch, vacuum): thshldi = 0.12000000000000001 thtf = 0.63812000000000002 ritf = 3.6371848450794664 - n_tf = 18 + n_tf_coils = 18 tdwell = 1800 nplasma = 7.2834e19 qtorus = 0 @@ -93,7 +93,7 @@ def test_old_model(self, monkeypatch, vacuum): thshldi, thtf, ritf, - n_tf, + n_tf_coils, tdwell, nplasma, ndiv, diff --git a/tracking/tracking_data.py b/tracking/tracking_data.py index 380f53ef..884a6da9 100644 --- a/tracking/tracking_data.py +++ b/tracking/tracking_data.py @@ -145,7 +145,7 @@ class ProcessTracker: "etath", "pgrossmw", "tftmp", - "n_tf", + "n_tf_coils", "bmaxtf", "vstot", "dnitot",