From 8444a8f987366570b64a69d43bd4b2c15d307d9f Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 28 Mar 2025 13:46:47 +0000 Subject: [PATCH 01/21] =?UTF-8?q?=F0=9F=94=84=20Rename=20whttf=20to=20m=5F?= =?UTF-8?q?tf=5Fcoils=5Ftotal=20for=20clarity=20and=20consistency;=20updat?= =?UTF-8?q?e=20references=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 6 +- examples/data/large_tokamak_1_MFILE.DAT | 6 +- examples/data/large_tokamak_2_MFILE.DAT | 6 +- examples/data/large_tokamak_3_MFILE.DAT | 6 +- examples/data/large_tokamak_4_MFILE.DAT | 6 +- examples/data/scan_MFILE.DAT | 36 ++++---- process/buildings.py | 2 +- process/hcpb.py | 6 +- process/io/plot_proc.py | 2 +- process/stellarator.py | 9 +- process/structure.py | 2 +- process/superconducting_tf_coil.py | 8 +- process/tf_coil.py | 8 +- source/fortran/tfcoil_variables.f90 | 2 +- .../data/large_tokamak_1_MFILE.DAT | 6 +- .../data/large_tokamak_2_MFILE.DAT | 6 +- .../data/large_tokamak_3_MFILE.DAT | 6 +- .../data/large_tokamak_4_MFILE.DAT | 6 +- .../integration/data/large_tokamak_MFILE.DAT | 6 +- tests/integration/data/scan_2D_MFILE.DAT | 90 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 36 ++++---- tests/integration/ref_dicts.json | 6 +- tests/unit/data/large_tokamak_MFILE.DAT | 6 +- tests/unit/test_ccfe_hcpb.py | 12 ++- tests/unit/test_stellarator.py | 10 ++- tests/unit/test_tfcoil.py | 10 ++- 26 files changed, 158 insertions(+), 147 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 4942c2dc0a..51641a3c79 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -732,8 +732,8 @@ 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_coils)__________________ 6.5696E+05 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0511E+07 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.5696E+05 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.0511E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1646E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0251E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0251E+08 @@ -942,7 +942,7 @@ Unit_nuclear_heating_in_TF_coil_(W/GW)__________________________________ (tfc_nuc_heating)_____________ 1.3678E+04 Total_nuclear_heating_in_TF_coil_(MW)___________________________________ (ptfnuc.)_____________________ 2.1784E-02 powfmw__________________________________________________________________ (powfmw.)_____________________ 1.5926E+03 - total_mass_of_the_TF_coils_(kg)_________________________________________ (whttf)_______________________ 1.0511E+07 + total_mass_of_the_TF_coils_(kg)_________________________________________ (m_tf_coils_total)_______________________ 1.0511E+07 # Pumping for primary coolant (helium) # Pressure_drop_in_FW_and_blanket_coolant_incl._hx_and_pipes_(Pa)_________ (dp_he)_______________________ 5.5000E+05 Fraction_of_FW_and_blanket_thermal_power_required_for_pumping___________ (fpump)_______________________ 8.9463E-02 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 1fb37f3690..303bd32bff 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -729,8 +729,8 @@ 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_coils)__________________ 7.1402E+05 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.1424E+07 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 7.1402E+05 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.1424E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2178E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.1176E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.1176E+08 @@ -937,7 +937,7 @@ Unit_nuclear_heating_in_TF_coil_(W/GW)__________________________________ (tfc_nuc_heating)_____________ 1.4866E+04 Total_nuclear_heating_in_TF_coil_(MW)___________________________________ (ptfnuc.)_____________________ 2.4085E-02 powfmw__________________________________________________________________ (powfmw.)_____________________ 1.6202E+03 - total_mass_of_the_TF_coils_(kg)_________________________________________ (whttf)_______________________ 1.1424E+07 + total_mass_of_the_TF_coils_(kg)_________________________________________ (m_tf_coils_total)_______________________ 1.1424E+07 # Pumping for primary coolant (helium) # Pressure_drop_in_FW_and_blanket_coolant_incl._hx_and_pipes_(Pa)_________ (dp_he)_______________________ 5.5000E+05 Fraction_of_FW_and_blanket_thermal_power_required_for_pumping___________ (fpump)_______________________ 8.9463E-02 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 91fa5ca477..5aef6c5d51 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -729,8 +729,8 @@ 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_coils)__________________ 7.1402E+05 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.1424E+07 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 7.1402E+05 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.1424E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2178E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.1176E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.1176E+08 @@ -937,7 +937,7 @@ Unit_nuclear_heating_in_TF_coil_(W/GW)__________________________________ (tfc_nuc_heating)_____________ 1.4866E+04 Total_nuclear_heating_in_TF_coil_(MW)___________________________________ (ptfnuc.)_____________________ 2.4085E-02 powfmw__________________________________________________________________ (powfmw.)_____________________ 1.6202E+03 - total_mass_of_the_TF_coils_(kg)_________________________________________ (whttf)_______________________ 1.1424E+07 + total_mass_of_the_TF_coils_(kg)_________________________________________ (m_tf_coils_total)_______________________ 1.1424E+07 # Pumping for primary coolant (helium) # Pressure_drop_in_FW_and_blanket_coolant_incl._hx_and_pipes_(Pa)_________ (dp_he)_______________________ 5.5000E+05 Fraction_of_FW_and_blanket_thermal_power_required_for_pumping___________ (fpump)_______________________ 8.9463E-02 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index ea0f09bb4b..6fde911ce2 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -729,8 +729,8 @@ 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_coils)__________________ 7.1402E+05 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.1424E+07 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 7.1402E+05 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.1424E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2178E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.1176E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.1176E+08 @@ -937,7 +937,7 @@ Unit_nuclear_heating_in_TF_coil_(W/GW)__________________________________ (tfc_nuc_heating)_____________ 1.4866E+04 Total_nuclear_heating_in_TF_coil_(MW)___________________________________ (ptfnuc.)_____________________ 2.4085E-02 powfmw__________________________________________________________________ (powfmw.)_____________________ 1.6202E+03 - total_mass_of_the_TF_coils_(kg)_________________________________________ (whttf)_______________________ 1.1424E+07 + total_mass_of_the_TF_coils_(kg)_________________________________________ (m_tf_coils_total)_______________________ 1.1424E+07 # Pumping for primary coolant (helium) # Pressure_drop_in_FW_and_blanket_coolant_incl._hx_and_pipes_(Pa)_________ (dp_he)_______________________ 5.5000E+05 Fraction_of_FW_and_blanket_thermal_power_required_for_pumping___________ (fpump)_______________________ 8.9463E-02 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 6a58c239e5..441198c9af 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -729,8 +729,8 @@ 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_coils)__________________ 7.1402E+05 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.1424E+07 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 7.1402E+05 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.1424E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2178E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.1176E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.1176E+08 @@ -937,7 +937,7 @@ Unit_nuclear_heating_in_TF_coil_(W/GW)__________________________________ (tfc_nuc_heating)_____________ 1.4866E+04 Total_nuclear_heating_in_TF_coil_(MW)___________________________________ (ptfnuc.)_____________________ 2.4085E-02 powfmw__________________________________________________________________ (powfmw.)_____________________ 1.6202E+03 - total_mass_of_the_TF_coils_(kg)_________________________________________ (whttf)_______________________ 1.1424E+07 + total_mass_of_the_TF_coils_(kg)_________________________________________ (m_tf_coils_total)_______________________ 1.1424E+07 # Pumping for primary coolant (helium) # Pressure_drop_in_FW_and_blanket_coolant_incl._hx_and_pipes_(Pa)_________ (dp_he)_______________________ 5.5000E+05 Fraction_of_FW_and_blanket_thermal_power_required_for_pumping___________ (fpump)_______________________ 8.9463E-02 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index eb3564dfa4..f289287bda 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -577,8 +577,8 @@ 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_coils)__________________ 1.5629E+06 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 @@ -1572,8 +1572,8 @@ 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_coils)__________________ 1.5629E+06 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 @@ -2567,8 +2567,8 @@ 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_coils)__________________ 1.5629E+06 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 @@ -3562,8 +3562,8 @@ 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_coils)__________________ 1.5629E+06 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 @@ -4557,8 +4557,8 @@ 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_coils)__________________ 1.5629E+06 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 @@ -5552,8 +5552,8 @@ 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_coils)__________________ 1.5629E+06 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 @@ -6547,8 +6547,8 @@ 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_coils)__________________ 1.5629E+06 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 @@ -7542,8 +7542,8 @@ 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_coils)__________________ 1.5629E+06 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 @@ -8537,8 +8537,8 @@ 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_coils)__________________ 1.5629E+06 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 diff --git a/process/buildings.py b/process/buildings.py index bab47fc980..a6632e95c4 100644 --- a/process/buildings.py +++ b/process/buildings.py @@ -55,7 +55,7 @@ def run(self, output: bool = False): ) # Find mass of each TF coil, in tonnes - tfmtn = 1.0e-3 * tfcoil_variables.whttf / tfcoil_variables.n_tf_coils + tfmtn = 1.0e-3 * tfcoil_variables.m_tf_coils_total / tfcoil_variables.n_tf_coils # Calculate building areas and volumes diff --git a/process/hcpb.py b/process/hcpb.py index 6c24187791..a7c20db746 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -483,7 +483,7 @@ def nuclear_heating_magnets(self, output: bool): e * np.exp(-a * ccfe_hcpb_module.x_blanket) * np.exp(-b * ccfe_hcpb_module.x_shield) - * tfcoil_variables.whttf + * tfcoil_variables.m_tf_coils_total ) # Total heating (MW) @@ -528,8 +528,8 @@ def nuclear_heating_magnets(self, output: bool): po.ovarre( self.outfile, "total mass of the TF coils (kg)", - "(whttf)", - tfcoil_variables.whttf, + "(m_tf_coils_total)", + tfcoil_variables.m_tf_coils_total, ) def nuclear_heating_fw(self): diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index 5f054266fb..50b5ce1851 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -2882,7 +2882,7 @@ def plot_magnetics_info(axis, mfile_data, scan): ("temp_cs_margin", "CS Temperature margin", "K"), (sig_cond, "TF Cond max TRESCA stress", "MPa"), (sig_case, "TF Case max TRESCA stress", "MPa"), - ("whttf/n_tf_coils", "Mass per TF coil", "kg"), + ("m_tf_coils_total/n_tf_coils", "Mass per TF coil", "kg"), ] else: diff --git a/process/stellarator.py b/process/stellarator.py index c0bbc2af93..0282924935 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -801,7 +801,7 @@ def ststrc(self, output): # Total mass of cooled components structure_variables.coldmass = ( - tfcoil_variables.whttf + tfcoil_variables.m_tf_coils_total + structure_variables.aintmass + fwbs_variables.dewmkg ) @@ -2928,7 +2928,7 @@ def stcoil(self, output: bool): + tfcoil_variables.whtconin ) # [kg] Total coil mass - tfcoil_variables.whttf = ( + tfcoil_variables.m_tf_coils_total = ( tfcoil_variables.whtcas + tfcoil_variables.whtcon + tfcoil_variables.whtgw ) * tfcoil_variables.n_tf_coils # End of general coil geometry values @@ -3747,7 +3747,10 @@ def stcoil_output( self.outfile, "Inductance of TF Coils (H)", "(inductance)", inductance ) po.ovarre( - self.outfile, "Total mass of coils (kg)", "(whttf)", tfcoil_variables.whttf + self.outfile, + "Total mass of coils (kg)", + "(m_tf_coils_total)", + tfcoil_variables.m_tf_coils_total, ) po.osubhd(self.outfile, "Coil Geometry :") diff --git a/process/structure.py b/process/structure.py index 751f7fb56b..49060ba38c 100644 --- a/process/structure.py +++ b/process/structure.py @@ -60,7 +60,7 @@ def run(self, output: bool = False) -> None: fwbsv.whtshld, divv.divmas, total_weight_pf, - tfv.whttf, + tfv.m_tf_coils_total, fwbsv.m_fw_total, fwbsv.m_blkt_total, fwbsv.m_fw_blkt_div_coolant_total, diff --git a/process/superconducting_tf_coil.py b/process/superconducting_tf_coil.py index 240b40b311..50a45b354b 100644 --- a/process/superconducting_tf_coil.py +++ b/process/superconducting_tf_coil.py @@ -2912,15 +2912,15 @@ def outtf(self, peaktfflag): po.ovarre( self.outfile, "Mass of each TF coil (kg)", - "(whttf/n_tf_coils)", - tfcoil_variables.whttf / tfcoil_variables.n_tf_coils, + "(m_tf_coils_total/n_tf_coils)", + tfcoil_variables.m_tf_coils_total / tfcoil_variables.n_tf_coils, "OP ", ) po.ovarre( self.outfile, "Total TF coil mass (kg)", - "(whttf)", - tfcoil_variables.whttf, + "(m_tf_coils_total)", + tfcoil_variables.m_tf_coils_total, "OP ", ) diff --git a/process/tf_coil.py b/process/tf_coil.py index df3f6a0be7..b8e127687f 100644 --- a/process/tf_coil.py +++ b/process/tf_coil.py @@ -1405,7 +1405,7 @@ def tf_coil_area_and_masses(self): # --------------------------------- # Total TF coil mass [kg] (all coils) - tfcoil_variables.whttf = ( + tfcoil_variables.m_tf_coils_total = ( tfcoil_variables.whtcas + tfcoil_variables.whtcon + tfcoil_variables.whtgw @@ -1415,10 +1415,10 @@ def tf_coil_area_and_masses(self): # (in this case, total TF coil length = inboard `cplen` + outboard `len_tf_coil`) if physics_variables.itart == 1: tfleng_sph = tfcoil_variables.cplen + tfcoil_variables.len_tf_coil - tfcoil_variables.whtcp = tfcoil_variables.whttf * ( + tfcoil_variables.whtcp = tfcoil_variables.m_tf_coils_total * ( tfcoil_variables.cplen / tfleng_sph ) - tfcoil_variables.whttflgs = tfcoil_variables.whttf * ( + tfcoil_variables.whttflgs = tfcoil_variables.m_tf_coils_total * ( tfcoil_variables.len_tf_coil / tfleng_sph ) @@ -1568,7 +1568,7 @@ def tf_coil_area_and_masses(self): ) # Total weight - tfcoil_variables.whttf = ( + tfcoil_variables.m_tf_coils_total = ( tfcoil_variables.whtcas + tfcoil_variables.whtconcu + tfcoil_variables.whtconal diff --git a/source/fortran/tfcoil_variables.f90 b/source/fortran/tfcoil_variables.f90 index 0073c5155b..bf2c2e5cdc 100644 --- a/source/fortran/tfcoil_variables.f90 +++ b/source/fortran/tfcoil_variables.f90 @@ -708,7 +708,7 @@ module tfcoil_variables real(dp) :: whtgw !! mass of ground-wall insulation layer per coil (kg/coil) - real(dp) :: whttf + real(dp) :: m_tf_coils_total !! total mass of the TF coils (kg) real(dp) :: wwp1 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 6dcf14a86a..94be983d9e 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -728,8 +728,8 @@ 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_coils)__________________ 7.1402E+05 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.1424E+07 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 7.1402E+05 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.1424E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2178E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.1176E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.1176E+08 @@ -936,7 +936,7 @@ Unit_nuclear_heating_in_TF_coil_(W/GW)__________________________________ (tfc_nuc_heating)_____________ 1.4866E+04 Total_nuclear_heating_in_TF_coil_(MW)___________________________________ (ptfnuc.)_____________________ 2.4085E-02 fusion_power__________________________________________________________________ (fusion_power.)_____________________ 1.6202E+03 - total_mass_of_the_TF_coils_(kg)_________________________________________ (whttf)_______________________ 1.1424E+07 + total_mass_of_the_TF_coils_(kg)_________________________________________ (m_tf_coils_total)_______________________ 1.1424E+07 # Pumping for primary coolant (helium) # Pressure_drop_in_FW_and_blanket_coolant_incl._hx_and_pipes_(Pa)_________ (dp_he)_______________________ 5.5000E+05 Fraction_of_FW_and_blanket_thermal_power_required_for_pumping___________ (fpump)_______________________ 8.9463E-02 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 5ec61ea4f0..e14f5b8c6b 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -729,8 +729,8 @@ 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_coils)__________________ 7.1402E+05 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.1424E+07 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 7.1402E+05 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.1424E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2178E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.1176E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.1176E+08 @@ -937,7 +937,7 @@ Unit_nuclear_heating_in_TF_coil_(W/GW)__________________________________ (tfc_nuc_heating)_____________ 1.4866E+04 Total_nuclear_heating_in_TF_coil_(MW)___________________________________ (ptfnuc.)_____________________ 2.4085E-02 fusion_power__________________________________________________________________ (fusion_power.)_____________________ 1.6202E+03 - total_mass_of_the_TF_coils_(kg)_________________________________________ (whttf)_______________________ 1.1424E+07 + total_mass_of_the_TF_coils_(kg)_________________________________________ (m_tf_coils_total)_______________________ 1.1424E+07 # Pumping for primary coolant (helium) # Pressure_drop_in_FW_and_blanket_coolant_incl._hx_and_pipes_(Pa)_________ (dp_he)_______________________ 5.5000E+05 Fraction_of_FW_and_blanket_thermal_power_required_for_pumping___________ (fpump)_______________________ 8.9463E-02 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 32602809ae..f0215fad0a 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -729,8 +729,8 @@ 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_coils)__________________ 7.1402E+05 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.1424E+07 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 7.1402E+05 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.1424E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2178E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.1176E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.1176E+08 @@ -937,7 +937,7 @@ Unit_nuclear_heating_in_TF_coil_(W/GW)__________________________________ (tfc_nuc_heating)_____________ 1.4866E+04 Total_nuclear_heating_in_TF_coil_(MW)___________________________________ (ptfnuc.)_____________________ 2.4085E-02 fusion_power__________________________________________________________________ (fusion_power.)_____________________ 1.6202E+03 - total_mass_of_the_TF_coils_(kg)_________________________________________ (whttf)_______________________ 1.1424E+07 + total_mass_of_the_TF_coils_(kg)_________________________________________ (m_tf_coils_total)_______________________ 1.1424E+07 # Pumping for primary coolant (helium) # Pressure_drop_in_FW_and_blanket_coolant_incl._hx_and_pipes_(Pa)_________ (dp_he)_______________________ 5.5000E+05 Fraction_of_FW_and_blanket_thermal_power_required_for_pumping___________ (fpump)_______________________ 8.9463E-02 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 247974b715..985140c261 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -729,8 +729,8 @@ 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_coils)__________________ 7.1402E+05 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.1424E+07 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 7.1402E+05 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.1424E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2178E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.1176E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.1176E+08 @@ -937,7 +937,7 @@ Unit_nuclear_heating_in_TF_coil_(W/GW)__________________________________ (tfc_nuc_heating)_____________ 1.4866E+04 Total_nuclear_heating_in_TF_coil_(MW)___________________________________ (ptfnuc.)_____________________ 2.4085E-02 fusion_power__________________________________________________________________ (fusion_power.)_____________________ 1.6202E+03 - total_mass_of_the_TF_coils_(kg)_________________________________________ (whttf)_______________________ 1.1424E+07 + total_mass_of_the_TF_coils_(kg)_________________________________________ (m_tf_coils_total)_______________________ 1.1424E+07 # Pumping for primary coolant (helium) # Pressure_drop_in_FW_and_blanket_coolant_incl._hx_and_pipes_(Pa)_________ (dp_he)_______________________ 5.5000E+05 Fraction_of_FW_and_blanket_thermal_power_required_for_pumping___________ (fpump)_______________________ 8.9463E-02 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index ed3b8847e3..6587edecd5 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -732,8 +732,8 @@ 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_coils)__________________ 7.2486E+05 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.1598E+07 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 7.2486E+05 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.1598E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2296E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.1381E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.1381E+08 @@ -940,7 +940,7 @@ Unit_nuclear_heating_in_TF_coil_(W/GW)__________________________________ (tfc_nuc_heating)_____________ 1.5092E+04 Total_nuclear_heating_in_TF_coil_(MW)___________________________________ (ptfnuc.)_____________________ 2.4413E-02 fusion_power__________________________________________________________________ (fusion_power.)_____________________ 1.6176E+03 - total_mass_of_the_TF_coils_(kg)_________________________________________ (whttf)_______________________ 1.1598E+07 + total_mass_of_the_TF_coils_(kg)_________________________________________ (m_tf_coils_total)_______________________ 1.1598E+07 # Pumping for primary coolant (helium) # Pressure_drop_in_FW_and_blanket_coolant_incl._hx_and_pipes_(Pa)_________ (dp_he)_______________________ 5.5000E+05 Fraction_of_FW_and_blanket_thermal_power_required_for_pumping___________ (fpump)_______________________ 8.9463E-02 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 189bd0bd4c..ed888ddc28 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -730,8 +730,8 @@ 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_coils)__________________ 6.8257E+05 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0921E+07 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.8257E+05 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.0921E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1962E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0800E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0800E+08 @@ -938,7 +938,7 @@ Unit_nuclear_heating_in_TF_coil_(W/GW)__________________________________ (tfc_nuc_heating)_____________ 1.4211E+04 Total_nuclear_heating_in_TF_coil_(MW)___________________________________ (ptfnuc.)_____________________ 2.2725E-02 powfmw__________________________________________________________________ (powfmw.)_____________________ 1.5991E+03 - total_mass_of_the_TF_coils_(kg)_________________________________________ (whttf)_______________________ 1.0921E+07 + total_mass_of_the_TF_coils_(kg)_________________________________________ (m_tf_coils_total)_______________________ 1.0921E+07 # Pumping for primary coolant (helium) # Pressure_drop_in_FW_and_blanket_coolant_incl._hx_and_pipes_(Pa)_________ (dp_he)_______________________ 5.5000E+05 Fraction_of_FW_and_blanket_thermal_power_required_for_pumping___________ (fpump)_______________________ 8.9463E-02 OP @@ -1893,8 +1893,8 @@ 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_coils)__________________ 6.6839E+05 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0694E+07 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.6839E+05 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.0694E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1732E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0400E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0400E+08 @@ -2101,7 +2101,7 @@ Unit_nuclear_heating_in_TF_coil_(W/GW)__________________________________ (tfc_nuc_heating)_____________ 1.3916E+04 Total_nuclear_heating_in_TF_coil_(MW)___________________________________ (ptfnuc.)_____________________ 2.2457E-02 powfmw__________________________________________________________________ (powfmw.)_____________________ 1.6138E+03 - total_mass_of_the_TF_coils_(kg)_________________________________________ (whttf)_______________________ 1.0694E+07 + total_mass_of_the_TF_coils_(kg)_________________________________________ (m_tf_coils_total)_______________________ 1.0694E+07 # Pumping for primary coolant (helium) # Pressure_drop_in_FW_and_blanket_coolant_incl._hx_and_pipes_(Pa)_________ (dp_he)_______________________ 5.5000E+05 Fraction_of_FW_and_blanket_thermal_power_required_for_pumping___________ (fpump)_______________________ 8.9463E-02 OP @@ -3056,8 +3056,8 @@ 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_coils)__________________ 6.5756E+05 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0521E+07 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.5756E+05 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.0521E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1502E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0000E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0000E+08 @@ -3264,7 +3264,7 @@ Unit_nuclear_heating_in_TF_coil_(W/GW)__________________________________ (tfc_nuc_heating)_____________ 1.3690E+04 Total_nuclear_heating_in_TF_coil_(MW)___________________________________ (ptfnuc.)_____________________ 2.2200E-02 powfmw__________________________________________________________________ (powfmw.)_____________________ 1.6215E+03 - total_mass_of_the_TF_coils_(kg)_________________________________________ (whttf)_______________________ 1.0521E+07 + total_mass_of_the_TF_coils_(kg)_________________________________________ (m_tf_coils_total)_______________________ 1.0521E+07 # Pumping for primary coolant (helium) # Pressure_drop_in_FW_and_blanket_coolant_incl._hx_and_pipes_(Pa)_________ (dp_he)_______________________ 5.5000E+05 Fraction_of_FW_and_blanket_thermal_power_required_for_pumping___________ (fpump)_______________________ 8.9463E-02 OP @@ -4219,8 +4219,8 @@ 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_coils)__________________ 6.5855E+05 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0537E+07 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.5855E+05 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.0537E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1502E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0000E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0000E+08 @@ -4427,7 +4427,7 @@ Unit_nuclear_heating_in_TF_coil_(W/GW)__________________________________ (tfc_nuc_heating)_____________ 1.3711E+04 Total_nuclear_heating_in_TF_coil_(MW)___________________________________ (ptfnuc.)_____________________ 2.2271E-02 powfmw__________________________________________________________________ (powfmw.)_____________________ 1.6243E+03 - total_mass_of_the_TF_coils_(kg)_________________________________________ (whttf)_______________________ 1.0537E+07 + total_mass_of_the_TF_coils_(kg)_________________________________________ (m_tf_coils_total)_______________________ 1.0537E+07 # Pumping for primary coolant (helium) # Pressure_drop_in_FW_and_blanket_coolant_incl._hx_and_pipes_(Pa)_________ (dp_he)_______________________ 5.5000E+05 Fraction_of_FW_and_blanket_thermal_power_required_for_pumping___________ (fpump)_______________________ 8.9463E-02 OP @@ -5382,8 +5382,8 @@ 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_coils)__________________ 6.6756E+05 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0681E+07 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.6756E+05 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.0681E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1732E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0400E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0400E+08 @@ -5590,7 +5590,7 @@ Unit_nuclear_heating_in_TF_coil_(W/GW)__________________________________ (tfc_nuc_heating)_____________ 1.3899E+04 Total_nuclear_heating_in_TF_coil_(MW)___________________________________ (ptfnuc.)_____________________ 2.2612E-02 powfmw__________________________________________________________________ (powfmw.)_____________________ 1.6269E+03 - total_mass_of_the_TF_coils_(kg)_________________________________________ (whttf)_______________________ 1.0681E+07 + total_mass_of_the_TF_coils_(kg)_________________________________________ (m_tf_coils_total)_______________________ 1.0681E+07 # Pumping for primary coolant (helium) # Pressure_drop_in_FW_and_blanket_coolant_incl._hx_and_pipes_(Pa)_________ (dp_he)_______________________ 5.5000E+05 Fraction_of_FW_and_blanket_thermal_power_required_for_pumping___________ (fpump)_______________________ 8.9463E-02 OP @@ -6545,8 +6545,8 @@ 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_coils)__________________ 6.8120E+05 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0899E+07 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.8120E+05 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.0899E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1962E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0800E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0800E+08 @@ -6753,7 +6753,7 @@ Unit_nuclear_heating_in_TF_coil_(W/GW)__________________________________ (tfc_nuc_heating)_____________ 1.4183E+04 Total_nuclear_heating_in_TF_coil_(MW)___________________________________ (ptfnuc.)_____________________ 2.3001E-02 powfmw__________________________________________________________________ (powfmw.)_____________________ 1.6218E+03 - total_mass_of_the_TF_coils_(kg)_________________________________________ (whttf)_______________________ 1.0899E+07 + total_mass_of_the_TF_coils_(kg)_________________________________________ (m_tf_coils_total)_______________________ 1.0899E+07 # Pumping for primary coolant (helium) # Pressure_drop_in_FW_and_blanket_coolant_incl._hx_and_pipes_(Pa)_________ (dp_he)_______________________ 5.5000E+05 Fraction_of_FW_and_blanket_thermal_power_required_for_pumping___________ (fpump)_______________________ 8.9463E-02 OP @@ -7708,8 +7708,8 @@ 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_coils)__________________ 6.8240E+05 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0918E+07 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.8240E+05 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.0918E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1962E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0800E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0800E+08 @@ -7916,7 +7916,7 @@ Unit_nuclear_heating_in_TF_coil_(W/GW)__________________________________ (tfc_nuc_heating)_____________ 1.4208E+04 Total_nuclear_heating_in_TF_coil_(MW)___________________________________ (ptfnuc.)_____________________ 2.3088E-02 powfmw__________________________________________________________________ (powfmw.)_____________________ 1.6251E+03 - total_mass_of_the_TF_coils_(kg)_________________________________________ (whttf)_______________________ 1.0918E+07 + total_mass_of_the_TF_coils_(kg)_________________________________________ (m_tf_coils_total)_______________________ 1.0918E+07 # Pumping for primary coolant (helium) # Pressure_drop_in_FW_and_blanket_coolant_incl._hx_and_pipes_(Pa)_________ (dp_he)_______________________ 5.5000E+05 Fraction_of_FW_and_blanket_thermal_power_required_for_pumping___________ (fpump)_______________________ 8.9463E-02 OP @@ -8871,8 +8871,8 @@ 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_coils)__________________ 6.7080E+05 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0733E+07 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.7080E+05 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.0733E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1732E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0400E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0400E+08 @@ -9079,7 +9079,7 @@ Unit_nuclear_heating_in_TF_coil_(W/GW)__________________________________ (tfc_nuc_heating)_____________ 1.3966E+04 Total_nuclear_heating_in_TF_coil_(MW)___________________________________ (ptfnuc.)_____________________ 2.2727E-02 powfmw__________________________________________________________________ (powfmw.)_____________________ 1.6273E+03 - total_mass_of_the_TF_coils_(kg)_________________________________________ (whttf)_______________________ 1.0733E+07 + total_mass_of_the_TF_coils_(kg)_________________________________________ (m_tf_coils_total)_______________________ 1.0733E+07 # Pumping for primary coolant (helium) # Pressure_drop_in_FW_and_blanket_coolant_incl._hx_and_pipes_(Pa)_________ (dp_he)_______________________ 5.5000E+05 Fraction_of_FW_and_blanket_thermal_power_required_for_pumping___________ (fpump)_______________________ 8.9463E-02 OP @@ -10034,8 +10034,8 @@ 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_coils)__________________ 6.5997E+05 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0560E+07 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.5997E+05 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.0560E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1502E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0000E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0000E+08 @@ -10242,7 +10242,7 @@ Unit_nuclear_heating_in_TF_coil_(W/GW)__________________________________ (tfc_nuc_heating)_____________ 1.3741E+04 Total_nuclear_heating_in_TF_coil_(MW)___________________________________ (ptfnuc.)_____________________ 2.2277E-02 powfmw__________________________________________________________________ (powfmw.)_____________________ 1.6212E+03 - total_mass_of_the_TF_coils_(kg)_________________________________________ (whttf)_______________________ 1.0560E+07 + total_mass_of_the_TF_coils_(kg)_________________________________________ (m_tf_coils_total)_______________________ 1.0560E+07 # Pumping for primary coolant (helium) # Pressure_drop_in_FW_and_blanket_coolant_incl._hx_and_pipes_(Pa)_________ (dp_he)_______________________ 5.5000E+05 Fraction_of_FW_and_blanket_thermal_power_required_for_pumping___________ (fpump)_______________________ 8.9463E-02 OP @@ -11197,8 +11197,8 @@ 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_coils)__________________ 6.6056E+05 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0569E+07 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.6056E+05 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.0569E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1502E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0000E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0000E+08 @@ -11405,7 +11405,7 @@ Unit_nuclear_heating_in_TF_coil_(W/GW)__________________________________ (tfc_nuc_heating)_____________ 1.3753E+04 Total_nuclear_heating_in_TF_coil_(MW)___________________________________ (ptfnuc.)_____________________ 2.2441E-02 powfmw__________________________________________________________________ (powfmw.)_____________________ 1.6318E+03 - total_mass_of_the_TF_coils_(kg)_________________________________________ (whttf)_______________________ 1.0569E+07 + total_mass_of_the_TF_coils_(kg)_________________________________________ (m_tf_coils_total)_______________________ 1.0569E+07 # Pumping for primary coolant (helium) # Pressure_drop_in_FW_and_blanket_coolant_incl._hx_and_pipes_(Pa)_________ (dp_he)_______________________ 5.5000E+05 Fraction_of_FW_and_blanket_thermal_power_required_for_pumping___________ (fpump)_______________________ 8.9463E-02 OP @@ -12360,8 +12360,8 @@ 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_coils)__________________ 6.7129E+05 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0741E+07 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.7129E+05 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.0741E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1732E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0400E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0400E+08 @@ -12568,7 +12568,7 @@ Unit_nuclear_heating_in_TF_coil_(W/GW)__________________________________ (tfc_nuc_heating)_____________ 1.3976E+04 Total_nuclear_heating_in_TF_coil_(MW)___________________________________ (ptfnuc.)_____________________ 2.2941E-02 powfmw__________________________________________________________________ (powfmw.)_____________________ 1.6414E+03 - total_mass_of_the_TF_coils_(kg)_________________________________________ (whttf)_______________________ 1.0741E+07 + total_mass_of_the_TF_coils_(kg)_________________________________________ (m_tf_coils_total)_______________________ 1.0741E+07 # Pumping for primary coolant (helium) # Pressure_drop_in_FW_and_blanket_coolant_incl._hx_and_pipes_(Pa)_________ (dp_he)_______________________ 5.5000E+05 Fraction_of_FW_and_blanket_thermal_power_required_for_pumping___________ (fpump)_______________________ 8.9463E-02 OP @@ -13523,8 +13523,8 @@ 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_coils)__________________ 6.8254E+05 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0921E+07 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.8254E+05 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.0921E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1962E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0800E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0800E+08 @@ -13731,7 +13731,7 @@ Unit_nuclear_heating_in_TF_coil_(W/GW)__________________________________ (tfc_nuc_heating)_____________ 1.4211E+04 Total_nuclear_heating_in_TF_coil_(MW)___________________________________ (ptfnuc.)_____________________ 2.3316E-02 powfmw__________________________________________________________________ (powfmw.)_____________________ 1.6408E+03 - total_mass_of_the_TF_coils_(kg)_________________________________________ (whttf)_______________________ 1.0921E+07 + total_mass_of_the_TF_coils_(kg)_________________________________________ (m_tf_coils_total)_______________________ 1.0921E+07 # Pumping for primary coolant (helium) # Pressure_drop_in_FW_and_blanket_coolant_incl._hx_and_pipes_(Pa)_________ (dp_he)_______________________ 5.5000E+05 Fraction_of_FW_and_blanket_thermal_power_required_for_pumping___________ (fpump)_______________________ 8.9463E-02 OP @@ -14686,8 +14686,8 @@ 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_coils)__________________ 6.8328E+05 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0933E+07 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.8328E+05 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.0933E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1962E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0800E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0800E+08 @@ -14894,7 +14894,7 @@ Unit_nuclear_heating_in_TF_coil_(W/GW)__________________________________ (tfc_nuc_heating)_____________ 1.4226E+04 Total_nuclear_heating_in_TF_coil_(MW)___________________________________ (ptfnuc.)_____________________ 2.3467E-02 powfmw__________________________________________________________________ (powfmw.)_____________________ 1.6496E+03 - total_mass_of_the_TF_coils_(kg)_________________________________________ (whttf)_______________________ 1.0933E+07 + total_mass_of_the_TF_coils_(kg)_________________________________________ (m_tf_coils_total)_______________________ 1.0933E+07 # Pumping for primary coolant (helium) # Pressure_drop_in_FW_and_blanket_coolant_incl._hx_and_pipes_(Pa)_________ (dp_he)_______________________ 5.5000E+05 Fraction_of_FW_and_blanket_thermal_power_required_for_pumping___________ (fpump)_______________________ 8.9463E-02 OP @@ -15849,8 +15849,8 @@ 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_coils)__________________ 6.7183E+05 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0749E+07 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.7183E+05 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.0749E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1732E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0400E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0400E+08 @@ -16057,7 +16057,7 @@ Unit_nuclear_heating_in_TF_coil_(W/GW)__________________________________ (tfc_nuc_heating)_____________ 1.3988E+04 Total_nuclear_heating_in_TF_coil_(MW)___________________________________ (ptfnuc.)_____________________ 2.3195E-02 powfmw__________________________________________________________________ (powfmw.)_____________________ 1.6583E+03 - total_mass_of_the_TF_coils_(kg)_________________________________________ (whttf)_______________________ 1.0749E+07 + total_mass_of_the_TF_coils_(kg)_________________________________________ (m_tf_coils_total)_______________________ 1.0749E+07 # Pumping for primary coolant (helium) # Pressure_drop_in_FW_and_blanket_coolant_incl._hx_and_pipes_(Pa)_________ (dp_he)_______________________ 5.5000E+05 Fraction_of_FW_and_blanket_thermal_power_required_for_pumping___________ (fpump)_______________________ 8.9463E-02 OP @@ -17012,8 +17012,8 @@ 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_coils)__________________ 6.6037E+05 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0566E+07 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.6037E+05 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.0566E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1502E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0000E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0000E+08 @@ -17220,7 +17220,7 @@ Unit_nuclear_heating_in_TF_coil_(W/GW)__________________________________ (tfc_nuc_heating)_____________ 1.3749E+04 Total_nuclear_heating_in_TF_coil_(MW)___________________________________ (ptfnuc.)_____________________ 2.2925E-02 powfmw__________________________________________________________________ (powfmw.)_____________________ 1.6674E+03 - total_mass_of_the_TF_coils_(kg)_________________________________________ (whttf)_______________________ 1.0566E+07 + total_mass_of_the_TF_coils_(kg)_________________________________________ (m_tf_coils_total)_______________________ 1.0566E+07 # Pumping for primary coolant (helium) # Pressure_drop_in_FW_and_blanket_coolant_incl._hx_and_pipes_(Pa)_________ (dp_he)_______________________ 5.5000E+05 Fraction_of_FW_and_blanket_thermal_power_required_for_pumping___________ (fpump)_______________________ 8.9463E-02 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index bfc24b7742..190815481e 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -577,8 +577,8 @@ 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_coils)__________________ 1.5629E+06 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 @@ -1572,8 +1572,8 @@ 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_coils)__________________ 1.5629E+06 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 @@ -2567,8 +2567,8 @@ 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_coils)__________________ 1.5629E+06 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 @@ -3562,8 +3562,8 @@ 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_coils)__________________ 1.5629E+06 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 @@ -4557,8 +4557,8 @@ 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_coils)__________________ 1.5629E+06 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 @@ -5552,8 +5552,8 @@ 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_coils)__________________ 1.5629E+06 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 @@ -6547,8 +6547,8 @@ 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_coils)__________________ 1.5629E+06 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 @@ -7542,8 +7542,8 @@ 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_coils)__________________ 1.5629E+06 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 @@ -8537,8 +8537,8 @@ 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_coils)__________________ 1.5629E+06 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index ef037bbfab..fa308e1ba4 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -8028,7 +8028,7 @@ "m_pf_coil_conductor_total": 0.0, "m_pf_coil_structure_total": 0.0, "whtshld": 0.0, - "whttf": 0.0, + "m_tf_coils_total": 0.0, "whttflgs": 0.0, "width": 110.0, "windspeed": 4.0, @@ -11102,7 +11102,7 @@ "m_pf_coil_conductor_total": "total mass of the PF coil conductor (kg)", "m_pf_coil_structure_total": "total mass of the PF coil structure (kg)", "whtshld": "mass of shield (kg)", - "whttf": "total mass of the TF coils (kg)", + "m_tf_coils_total": "total mass of the TF coils (kg)", "whttflgs": "mass of the TF coil legs (kg)", "width": "", "windspeed": "wind speed (m/s)", @@ -19492,7 +19492,7 @@ "whtconsc", "whtconsh", "whtgw", - "whttf", + "m_tf_coils_total", "wwp1", "wwp2", "dthet", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index e1be256272..42ea6e408a 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -732,8 +732,8 @@ 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_coils)__________________ 7.2486E+05 OP - Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.1598E+07 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 7.2486E+05 OP + Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.1598E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2296E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.1381E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.1381E+08 @@ -940,7 +940,7 @@ Unit_nuclear_heating_in_TF_coil_(W/GW)__________________________________ (tfc_nuc_heating)_____________ 1.5092E+04 Total_nuclear_heating_in_TF_coil_(MW)___________________________________ (ptfnuc.)_____________________ 2.4413E-02 powfmw__________________________________________________________________ (powfmw.)_____________________ 1.6176E+03 - total_mass_of_the_TF_coils_(kg)_________________________________________ (whttf)_______________________ 1.1598E+07 + total_mass_of_the_TF_coils_(kg)_________________________________________ (m_tf_coils_total)_______________________ 1.1598E+07 # Pumping for primary coolant (helium) # Pressure_drop_in_FW_and_blanket_coolant_incl._hx_and_pipes_(Pa)_________ (dp_he)_______________________ 5.5000E+05 Fraction_of_FW_and_blanket_thermal_power_required_for_pumping___________ (fpump)_______________________ 8.9463E-02 OP diff --git a/tests/unit/test_ccfe_hcpb.py b/tests/unit/test_ccfe_hcpb.py index 7d6f6cf80d..f3cac1a70c 100644 --- a/tests/unit/test_ccfe_hcpb.py +++ b/tests/unit/test_ccfe_hcpb.py @@ -76,7 +76,7 @@ class NuclearHeatingMagnetsParam(NamedTuple): itart: Any = None - whttf: Any = None + m_tf_coils_total: Any = None whttflgs: Any = None @@ -148,7 +148,7 @@ class NuclearHeatingMagnetsParam(NamedTuple): f_a_fw_coolant_outboard=0, fusion_power=1986.0623241661431, itart=0, - whttf=19649856.627845347, + m_tf_coils_total=19649856.627845347, whttflgs=0, verbose=0, armour_density=0, @@ -195,7 +195,7 @@ class NuclearHeatingMagnetsParam(NamedTuple): f_a_fw_coolant_outboard=0.31415926535897931, fusion_power=1985.4423932312809, itart=0, - whttf=19662548.210142396, + m_tf_coils_total=19662548.210142396, whttflgs=0, verbose=0, armour_density=13202.434141839649, @@ -319,7 +319,11 @@ def test_nuclear_heating_magnets(nuclearheatingmagnetsparam, monkeypatch, ccfe_h monkeypatch.setattr(physics_variables, "itart", nuclearheatingmagnetsparam.itart) - monkeypatch.setattr(tfcoil_variables, "whttf", nuclearheatingmagnetsparam.whttf) + monkeypatch.setattr( + tfcoil_variables, + "m_tf_coils_total", + nuclearheatingmagnetsparam.m_tf_coils_total, + ) monkeypatch.setattr( tfcoil_variables, "whttflgs", nuclearheatingmagnetsparam.whttflgs diff --git a/tests/unit/test_stellarator.py b/tests/unit/test_stellarator.py index eed3d301ef..4479325755 100644 --- a/tests/unit/test_stellarator.py +++ b/tests/unit/test_stellarator.py @@ -694,7 +694,7 @@ class StstrcParam(NamedTuple): gsmass: Any = None - whttf: Any = None + m_tf_coils_total: Any = None tcritsc: Any = None @@ -736,7 +736,7 @@ class StstrcParam(NamedTuple): coldmass=0, fncmass=0, gsmass=0, - whttf=5204872.8206625767, + m_tf_coils_total=5204872.8206625767, tcritsc=16, estotftgj=132.55990646265246, vtfskv=4.3242392290600487, @@ -760,7 +760,7 @@ class StstrcParam(NamedTuple): coldmass=10087177.087209985, fncmass=0, gsmass=0, - whttf=5204872.8206625767, + m_tf_coils_total=5204872.8206625767, tcritsc=16, estotftgj=132.55990646265246, vtfskv=4.3242392290600487, @@ -805,7 +805,9 @@ def test_ststrc(ststrcparam, monkeypatch, stellarator): monkeypatch.setattr(structure_variables, "gsmass", ststrcparam.gsmass) - monkeypatch.setattr(tfcoil_variables, "whttf", ststrcparam.whttf) + monkeypatch.setattr( + tfcoil_variables, "m_tf_coils_total", ststrcparam.m_tf_coils_total + ) monkeypatch.setattr(tfcoil_variables, "tcritsc", ststrcparam.tcritsc) diff --git a/tests/unit/test_tfcoil.py b/tests/unit/test_tfcoil.py index b7105ad8f0..7f1e3af83c 100644 --- a/tests/unit/test_tfcoil.py +++ b/tests/unit/test_tfcoil.py @@ -1057,7 +1057,7 @@ class TfCoilAreaAndMassesParam(NamedTuple): whtconsh: Any = None - whttf: Any = None + m_tf_coils_total: Any = None whtcas: Any = None @@ -1183,7 +1183,7 @@ class TfCoilAreaAndMassesParam(NamedTuple): hmax=9.0730900215620327, denstl=7800, whtconsh=0, - whttf=0, + m_tf_coils_total=0, whtcas=0, tficrn=0, tfcryoarea=0, @@ -1255,7 +1255,7 @@ class TfCoilAreaAndMassesParam(NamedTuple): hmax=9.0730900215620327, denstl=7800, whtconsh=115651.90127937049, - whttf=19649856.627845347, + m_tf_coils_total=19649856.627845347, whtcas=1034021.9996272125, tficrn=0.8197580588957678, tfcryoarea=6381.2092203414386, @@ -1360,7 +1360,9 @@ def test_tf_coil_area_and_masses(tfcoilareaandmassesparam, monkeypatch, tfcoil): monkeypatch.setattr(tfcoil_variables, "whtconsh", tfcoilareaandmassesparam.whtconsh) - monkeypatch.setattr(tfcoil_variables, "whttf", tfcoilareaandmassesparam.whttf) + monkeypatch.setattr( + tfcoil_variables, "m_tf_coils_total", tfcoilareaandmassesparam.m_tf_coils_total + ) monkeypatch.setattr(tfcoil_variables, "whtcas", tfcoilareaandmassesparam.whtcas) From 32b83ad2d575ae463d5497faa4a7d27af0116a4c Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 28 Mar 2025 13:57:32 +0000 Subject: [PATCH 02/21] =?UTF-8?q?=F0=9F=94=84=20Rename=20aiwp=20to=20a=5Ft?= =?UTF-8?q?f=5Fcoil=5Fwp=5Fturn=5Finsulation=20for=20clarity=20and=20consi?= =?UTF-8?q?stency;=20update=20references=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 4 +- examples/data/large_tokamak_1_MFILE.DAT | 4 +- examples/data/large_tokamak_2_MFILE.DAT | 4 +- examples/data/large_tokamak_3_MFILE.DAT | 4 +- examples/data/large_tokamak_4_MFILE.DAT | 4 +- examples/data/scan_MFILE.DAT | 36 +++++------ process/resistive_tf_coil.py | 8 ++- process/stellarator.py | 10 ++-- process/superconducting_tf_coil.py | 28 +++++---- process/tf_coil.py | 4 +- source/fortran/tfcoil_variables.f90 | 2 +- .../data/large_tokamak_1_MFILE.DAT | 4 +- .../data/large_tokamak_2_MFILE.DAT | 4 +- .../data/large_tokamak_3_MFILE.DAT | 4 +- .../data/large_tokamak_4_MFILE.DAT | 4 +- .../integration/data/large_tokamak_MFILE.DAT | 4 +- tests/integration/data/scan_2D_MFILE.DAT | 60 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 36 +++++------ tests/integration/ref_dicts.json | 6 +- tests/unit/data/large_tokamak_MFILE.DAT | 4 +- tests/unit/test_resistive_tf_coil.py | 26 +++++--- tests/unit/test_tfcoil.py | 18 +++--- 22 files changed, 149 insertions(+), 129 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 51641a3c79..27528fcdaf 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -707,8 +707,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 4.9412E-02 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 5.2482E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 0 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 1.5709E+02 OP Width_of_turn_including_inter-turn_insulation_(m)_______________________ (t_turn_tf)___________________ 5.7439E-02 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 303bd32bff..d91f269bba 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -704,8 +704,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 4.7934E-02 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 5.3656E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 0 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 1.4739E+02 OP Width_of_turn_including_inter-turn_insulation_(m)_______________________ (t_turn_tf)___________________ 5.9223E-02 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 5aef6c5d51..80fd5c1e27 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -704,8 +704,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 4.7934E-02 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 5.3656E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 0 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 1.4739E+02 OP Width_of_turn_including_inter-turn_insulation_(m)_______________________ (t_turn_tf)___________________ 5.9223E-02 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 6fde911ce2..dcaccdd561 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -704,8 +704,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 4.7934E-02 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 5.3656E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 0 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 1.4739E+02 OP Width_of_turn_including_inter-turn_insulation_(m)_______________________ (t_turn_tf)___________________ 5.9223E-02 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 441198c9af..182246ec6d 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -704,8 +704,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 4.7934E-02 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 5.3656E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 0 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 1.4739E+02 OP Width_of_turn_including_inter-turn_insulation_(m)_______________________ (t_turn_tf)___________________ 5.9223E-02 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index f289287bda..7ed7cc2c8b 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -550,8 +550,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 1.0145E-01 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 3.7714E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 1 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 2.0000E+02 OP Number_of_TF_pancakes___________________________________________________ (n_pancake)___________________ 20 @@ -1545,8 +1545,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 1.0145E-01 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 3.7716E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 1 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 2.0000E+02 OP Number_of_TF_pancakes___________________________________________________ (n_pancake)___________________ 20 @@ -2540,8 +2540,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 1.0145E-01 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 3.7717E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 1 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 2.0000E+02 OP Number_of_TF_pancakes___________________________________________________ (n_pancake)___________________ 20 @@ -3535,8 +3535,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 1.0146E-01 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 3.7718E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 1 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 2.0000E+02 OP Number_of_TF_pancakes___________________________________________________ (n_pancake)___________________ 20 @@ -4530,8 +4530,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 1.0146E-01 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 3.7719E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 1 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 2.0000E+02 OP Number_of_TF_pancakes___________________________________________________ (n_pancake)___________________ 20 @@ -5525,8 +5525,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 1.0146E-01 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 3.7721E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 1 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 2.0000E+02 OP Number_of_TF_pancakes___________________________________________________ (n_pancake)___________________ 20 @@ -6520,8 +6520,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 1.0146E-01 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 3.7722E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 1 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 2.0000E+02 OP Number_of_TF_pancakes___________________________________________________ (n_pancake)___________________ 20 @@ -7515,8 +7515,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 1.0146E-01 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 3.7723E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 1 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 2.0000E+02 OP Number_of_TF_pancakes___________________________________________________ (n_pancake)___________________ 20 @@ -8510,8 +8510,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 1.0146E-01 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 3.7723E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 1 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 2.0000E+02 OP Number_of_TF_pancakes___________________________________________________ (n_pancake)___________________ 20 diff --git a/process/resistive_tf_coil.py b/process/resistive_tf_coil.py index a643bef834..4d173b387c 100644 --- a/process/resistive_tf_coil.py +++ b/process/resistive_tf_coil.py @@ -320,12 +320,14 @@ def res_tf_internal_geom(self): a_tf_cond = a_tf_cond * (1.0e0 - tfcoil_variables.fcoolcp) # Inter turn insulation area per coil [m2] - tfcoil_variables.aiwp = sctfcoil_module.awptf - a_tf_cond / ( - 1.0e0 - tfcoil_variables.fcoolcp + tfcoil_variables.a_tf_coil_wp_turn_insulation = ( + sctfcoil_module.awptf - a_tf_cond / (1.0e0 - tfcoil_variables.fcoolcp) ) # Total insulation cross-section per coil [m2] - sctfcoil_module.a_tf_ins = tfcoil_variables.aiwp + sctfcoil_module.a_ground_ins + sctfcoil_module.a_tf_ins = ( + tfcoil_variables.a_tf_coil_wp_turn_insulation + sctfcoil_module.a_ground_ins + ) # Insulation fraction [-] sctfcoil_module.f_tf_ins = ( diff --git a/process/stellarator.py b/process/stellarator.py index 0282924935..3230ad9ef1 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -2658,7 +2658,7 @@ def stcoil(self, output: bool): tfcoil_variables.acstf * tfcoil_variables.n_tf_turn * tfcoil_variables.vftf ) # [m^2] Insulation area (not including ground-wall) - tfcoil_variables.aiwp = tfcoil_variables.n_tf_turn * ( + tfcoil_variables.a_tf_coil_wp_turn_insulation = tfcoil_variables.n_tf_turn * ( tfcoil_variables.t_turn_tf**2 - tfcoil_variables.acndttf - tfcoil_variables.acstf @@ -2914,10 +2914,10 @@ def stcoil(self, output: bool): ) # if (i_tf_sc_mat==6) tfcoil_variables.whtconsh = fcondsteel * awptf *tfcoil_variables.len_tf_coil* fwbs_variables.denstl # Conduit insulation mass [kg] - # (tfcoil_variables.aiwp already contains tfcoil_variables.n_tf_turn) + # (tfcoil_variables.a_tf_coil_wp_turn_insulation already contains tfcoil_variables.n_tf_turn) tfcoil_variables.whtconin = ( tfcoil_variables.len_tf_coil - * tfcoil_variables.aiwp + * tfcoil_variables.a_tf_coil_wp_turn_insulation * tfcoil_variables.dcondins ) # [kg] Total conductor mass @@ -3854,8 +3854,8 @@ def stcoil_output( po.ovarre( self.outfile, "Insulator fraction of winding pack", - "(aiwp/ap)", - tfcoil_variables.aiwp / ap, + "(a_tf_coil_wp_turn_insulation/ap)", + tfcoil_variables.a_tf_coil_wp_turn_insulation / ap, ) po.ovarre( self.outfile, diff --git a/process/superconducting_tf_coil.py b/process/superconducting_tf_coil.py index 50a45b354b..b500fd9023 100644 --- a/process/superconducting_tf_coil.py +++ b/process/superconducting_tf_coil.py @@ -1696,7 +1696,7 @@ def sc_tf_internal_geom(self, i_tf_wp_geom, i_tf_case_geom, i_tf_turns_integer): ) # Area of inter-turn insulation: total [m2] - tfcoil_variables.aiwp = ( + tfcoil_variables.a_tf_coil_wp_turn_insulation = ( tfcoil_variables.n_tf_turn * tfcoil_variables.insulation_area ) @@ -1714,7 +1714,9 @@ def sc_tf_internal_geom(self, i_tf_wp_geom, i_tf_case_geom, i_tf_turns_integer): ) # Inboard coil insulation cross-section [m2] - sctfcoil_module.a_tf_ins = tfcoil_variables.aiwp + sctfcoil_module.a_ground_ins + sctfcoil_module.a_tf_ins = ( + tfcoil_variables.a_tf_coil_wp_turn_insulation + sctfcoil_module.a_ground_ins + ) # Inboard coil insulation fraction [-] sctfcoil_module.f_tf_ins = ( @@ -1727,7 +1729,7 @@ def sc_tf_internal_geom(self, i_tf_wp_geom, i_tf_case_geom, i_tf_turns_integer): if ( tfcoil_variables.acond <= 0.0e0 or tfcoil_variables.avwp <= 0.0e0 - or tfcoil_variables.aiwp <= 0.0e0 + or tfcoil_variables.a_tf_coil_wp_turn_insulation <= 0.0e0 or tfcoil_variables.aswp <= 0.0e0 or sctfcoil_module.a_tf_steel <= 0.0e0 or sctfcoil_module.f_tf_steel <= 0.0e0 @@ -1736,7 +1738,7 @@ def sc_tf_internal_geom(self, i_tf_wp_geom, i_tf_case_geom, i_tf_turns_integer): ): error_handling.fdiags[0] = tfcoil_variables.acond error_handling.fdiags[1] = tfcoil_variables.avwp - error_handling.fdiags[2] = tfcoil_variables.aiwp + error_handling.fdiags[2] = tfcoil_variables.a_tf_coil_wp_turn_insulation error_handling.fdiags[3] = tfcoil_variables.aswp error_handling.fdiags[4] = sctfcoil_module.a_tf_steel error_handling.fdiags[5] = sctfcoil_module.f_tf_steel @@ -2537,14 +2539,18 @@ def outtf(self, peaktfflag): po.ovarre( self.outfile, "Insulation WP fraction", - "(aiwp/awpc)", - tfcoil_variables.aiwp / sctfcoil_module.awpc, + "(a_tf_coil_wp_turn_insulation/awpc)", + tfcoil_variables.a_tf_coil_wp_turn_insulation / sctfcoil_module.awpc, ) po.ovarre( self.outfile, "Cable WP fraction", - "((awpc-aswp-aiwp)/awpc)", - (sctfcoil_module.awpc - tfcoil_variables.aswp - tfcoil_variables.aiwp) + "((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)", + ( + sctfcoil_module.awpc + - tfcoil_variables.aswp + - tfcoil_variables.a_tf_coil_wp_turn_insulation + ) / sctfcoil_module.awpc, ) @@ -2695,13 +2701,13 @@ def outtf(self, peaktfflag): # TODO # po.ovarre(self.outfile,'Conductor fraction of winding pack','(tfcoil_variables.acond/ap)',acond/ap, 'OP ') # po.ovarre(self.outfile,'Conduit fraction of winding pack','(tfcoil_variables.n_tf_turn*tfcoil_variables.acndttf/ap)',n_tf_turn*tfcoil_variables.acndttf/ap, 'OP ') - # po.ovarre(self.outfile,'Insulator fraction of winding pack','(tfcoil_variables.aiwp/ap)',aiwp/ap, 'OP ') + # po.ovarre(self.outfile,'Insulator fraction of winding pack','(tfcoil_variables.a_tf_coil_wp_turn_insulation/ap)',a_tf_coil_wp_turn_insulation/ap, 'OP ') # po.ovarre(self.outfile,'Helium area fraction of winding pack excluding central channel','(tfcoil_variables.avwp/ap)',avwp/ap, 'OP ') # po.ovarre(self.outfile,'Central helium channel area as fraction of winding pack','(tfcoil_variables.awphec/ap)',awphec/ap, 'OP ') ap = ( tfcoil_variables.acond + tfcoil_variables.n_tf_turn * tfcoil_variables.acndttf - + tfcoil_variables.aiwp + + tfcoil_variables.a_tf_coil_wp_turn_insulation + tfcoil_variables.avwp + tfcoil_variables.awphec ) @@ -2712,7 +2718,7 @@ def outtf(self, peaktfflag): ( tfcoil_variables.acond + tfcoil_variables.n_tf_turn * tfcoil_variables.acndttf - + tfcoil_variables.aiwp + + tfcoil_variables.a_tf_coil_wp_turn_insulation + tfcoil_variables.avwp + tfcoil_variables.awphec ) diff --git a/process/tf_coil.py b/process/tf_coil.py index b8e127687f..aa17b63b73 100644 --- a/process/tf_coil.py +++ b/process/tf_coil.py @@ -1388,10 +1388,10 @@ def tf_coil_area_and_masses(self): ) # Conduit insulation mass [kg] - # (tfcoil_variables.aiwp already contains tfcoil_variables.n_tf_turn) + # (tfcoil_variables.a_tf_coil_wp_turn_insulation already contains tfcoil_variables.n_tf_turn) tfcoil_variables.whtconin = ( tfcoil_variables.len_tf_coil - * tfcoil_variables.aiwp + * tfcoil_variables.a_tf_coil_wp_turn_insulation * tfcoil_variables.dcondins ) diff --git a/source/fortran/tfcoil_variables.f90 b/source/fortran/tfcoil_variables.f90 index bf2c2e5cdc..e6cefc76a6 100644 --- a/source/fortran/tfcoil_variables.f90 +++ b/source/fortran/tfcoil_variables.f90 @@ -35,7 +35,7 @@ module tfcoil_variables real(dp) :: insulation_area !! single turn insulation area (m2) - real(dp) :: aiwp + real(dp) :: a_tf_coil_wp_turn_insulation !! winding pack turn insulation area per coil (m2) real(dp) :: sig_tf_case_max diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 94be983d9e..8adcd26073 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -703,8 +703,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 4.7934E-02 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 5.3656E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 0 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 1.4739E+02 OP Width_of_turn_including_inter-turn_insulation_(m)_______________________ (t_turn_tf)___________________ 5.9223E-02 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index e14f5b8c6b..506b101cd4 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -704,8 +704,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 4.7934E-02 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 5.3656E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 0 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 1.4739E+02 OP Width_of_turn_including_inter-turn_insulation_(m)_______________________ (t_turn_tf)___________________ 5.9223E-02 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index f0215fad0a..a2b0177b91 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -704,8 +704,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 4.7934E-02 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 5.3656E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 0 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 1.4739E+02 OP Width_of_turn_including_inter-turn_insulation_(m)_______________________ (t_turn_tf)___________________ 5.9223E-02 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 985140c261..ec6f85b420 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -704,8 +704,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 4.7934E-02 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 5.3656E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 0 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 1.4739E+02 OP Width_of_turn_including_inter-turn_insulation_(m)_______________________ (t_turn_tf)___________________ 5.9223E-02 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 6587edecd5..125fd78c94 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -707,8 +707,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 4.8392E-02 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 5.3296E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 0 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 1.5197E+02 OP Width_of_turn_including_inter-turn_insulation_(m)_______________________ (t_turn_tf)___________________ 5.8716E-02 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index ed888ddc28..5e6909b46f 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -705,8 +705,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 4.8925E-02 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 5.2910E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 0 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 1.4728E+02 OP Width_of_turn_including_inter-turn_insulation_(m)_______________________ (t_turn_tf)___________________ 5.7774E-02 OP @@ -1868,8 +1868,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 4.8742E-02 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 5.2643E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 0 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 1.4446E+02 OP Width_of_turn_including_inter-turn_insulation_(m)_______________________ (t_turn_tf)___________________ 5.7926E-02 OP @@ -3031,8 +3031,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 4.8744E-02 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 5.2475E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 0 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 1.4275E+02 OP Width_of_turn_including_inter-turn_insulation_(m)_______________________ (t_turn_tf)___________________ 5.7852E-02 OP @@ -4194,8 +4194,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 4.8713E-02 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 5.2458E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 0 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 1.4281E+02 OP Width_of_turn_including_inter-turn_insulation_(m)_______________________ (t_turn_tf)___________________ 5.7899E-02 OP @@ -5357,8 +5357,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 4.8578E-02 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 5.2526E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 0 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 1.4390E+02 OP Width_of_turn_including_inter-turn_insulation_(m)_______________________ (t_turn_tf)___________________ 5.8141E-02 OP @@ -6520,8 +6520,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 4.8321E-02 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 5.2599E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 0 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 1.4469E+02 OP Width_of_turn_including_inter-turn_insulation_(m)_______________________ (t_turn_tf)___________________ 5.8549E-02 OP @@ -7683,8 +7683,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 4.8296E-02 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 5.2584E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 0 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 1.4484E+02 OP Width_of_turn_including_inter-turn_insulation_(m)_______________________ (t_turn_tf)___________________ 5.8590E-02 OP @@ -8846,8 +8846,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 4.8345E-02 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 5.2527E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 0 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 1.4315E+02 OP Width_of_turn_including_inter-turn_insulation_(m)_______________________ (t_turn_tf)___________________ 5.8451E-02 OP @@ -10009,8 +10009,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 4.8421E-02 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 5.2495E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 0 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 1.4163E+02 OP Width_of_turn_including_inter-turn_insulation_(m)_______________________ (t_turn_tf)___________________ 5.8278E-02 OP @@ -11172,8 +11172,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 4.8397E-02 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 5.2487E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 0 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 1.4162E+02 OP Width_of_turn_including_inter-turn_insulation_(m)_______________________ (t_turn_tf)___________________ 5.8312E-02 OP @@ -12335,8 +12335,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 4.8292E-02 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 5.2496E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 0 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 1.4306E+02 OP Width_of_turn_including_inter-turn_insulation_(m)_______________________ (t_turn_tf)___________________ 5.8526E-02 OP @@ -13498,8 +13498,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 4.8196E-02 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 5.2608E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 0 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 1.4446E+02 OP Width_of_turn_including_inter-turn_insulation_(m)_______________________ (t_turn_tf)___________________ 5.8724E-02 OP @@ -14661,8 +14661,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 4.8170E-02 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 5.2598E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 0 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 1.4447E+02 OP Width_of_turn_including_inter-turn_insulation_(m)_______________________ (t_turn_tf)___________________ 5.8762E-02 OP @@ -15824,8 +15824,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 4.8245E-02 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 5.2576E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 0 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 1.4281E+02 OP Width_of_turn_including_inter-turn_insulation_(m)_______________________ (t_turn_tf)___________________ 5.8585E-02 OP @@ -16987,8 +16987,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 4.8326E-02 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 5.2561E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 0 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 1.4117E+02 OP Width_of_turn_including_inter-turn_insulation_(m)_______________________ (t_turn_tf)___________________ 5.8398E-02 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 190815481e..dd74c241a9 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -550,8 +550,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 1.0145E-01 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 3.7714E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 1 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 2.0000E+02 OP Number_of_TF_pancakes___________________________________________________ (n_pancake)___________________ 20 @@ -1545,8 +1545,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 1.0145E-01 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 3.7716E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 1 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 2.0000E+02 OP Number_of_TF_pancakes___________________________________________________ (n_pancake)___________________ 20 @@ -2540,8 +2540,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 1.0145E-01 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 3.7717E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 1 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 2.0000E+02 OP Number_of_TF_pancakes___________________________________________________ (n_pancake)___________________ 20 @@ -3535,8 +3535,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 1.0146E-01 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 3.7718E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 1 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 2.0000E+02 OP Number_of_TF_pancakes___________________________________________________ (n_pancake)___________________ 20 @@ -4530,8 +4530,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 1.0146E-01 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 3.7719E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 1 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 2.0000E+02 OP Number_of_TF_pancakes___________________________________________________ (n_pancake)___________________ 20 @@ -5525,8 +5525,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 1.0146E-01 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 3.7721E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 1 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 2.0000E+02 OP Number_of_TF_pancakes___________________________________________________ (n_pancake)___________________ 20 @@ -6520,8 +6520,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 1.0146E-01 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 3.7722E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 1 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 2.0000E+02 OP Number_of_TF_pancakes___________________________________________________ (n_pancake)___________________ 20 @@ -7515,8 +7515,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 1.0146E-01 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 3.7723E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 1 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 2.0000E+02 OP Number_of_TF_pancakes___________________________________________________ (n_pancake)___________________ 20 @@ -8510,8 +8510,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 1.0146E-01 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 3.7723E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 1 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 2.0000E+02 OP Number_of_TF_pancakes___________________________________________________ (n_pancake)___________________ 20 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index fa308e1ba4..bb9911536f 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -225,7 +225,7 @@ "aintmass": 0.0, "m_ions_total_amu": 0.0, "airtemp": 15.0, - "aiwp": 0.0, + "a_tf_coil_wp_turn_insulation": 0.0, "alam": null, "alfapf": 5e-10, "all_array_hotfix_len": 100.0, @@ -8760,7 +8760,7 @@ "aintmass": "intercoil structure mass (kg)", "m_ions_total_amu": "average mass of all ions (amu)", "airtemp": "ambient air temperature (degrees Celsius)", - "aiwp": "winding pack turn insulation area per coil (m2)", + "a_tf_coil_wp_turn_insulation": "winding pack turn insulation area per coil (m2)", "alam": "", "alfapf": "smoothing parameter used in PF coil current calculation at the beginning of pulse (BoP)", "all_array_hotfix_len": "", @@ -19323,7 +19323,7 @@ "acond", "acstf", "insulation_area", - "aiwp", + "a_tf_coil_wp_turn_insulation", "sig_tf_case_max", "sig_tf_wp_max", "a_tf_leg_outboard", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 42ea6e408a..0510c2d404 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -707,8 +707,8 @@ Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 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 + Insulation_WP_fraction__________________________________________________ (a_tf_coil_wp_turn_insulation/awpc)___________________ 4.8392E-02 + Cable_WP_fraction_______________________________________________________ ((awpc-aswp-a_tf_coil_wp_turn_insulation)/awpc)_______ 5.3296E-01 Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________ 0 Number_of_turns_per_TF_coil_____________________________________________ (n_tf_turn)___________________ 1.5197E+02 OP Width_of_turn_including_inter-turn_insulation_(m)_______________________ (t_turn_tf)___________________ 5.8716E-02 OP diff --git a/tests/unit/test_resistive_tf_coil.py b/tests/unit/test_resistive_tf_coil.py index ea396d7496..bb6c19fee7 100644 --- a/tests/unit/test_resistive_tf_coil.py +++ b/tests/unit/test_resistive_tf_coil.py @@ -44,7 +44,7 @@ class ResTfInternalGeomParam(NamedTuple): casthi: Any = None - aiwp: Any = None + a_tf_coil_wp_turn_insulation: Any = None acasetf: Any = None @@ -68,7 +68,7 @@ class ResTfInternalGeomParam(NamedTuple): expected_cdtfleg: Any = None - expected_aiwp: Any = None + expected_a_tf_coil_wp_turn_insulation: Any = None expected_acasetf: Any = None @@ -88,7 +88,7 @@ class ResTfInternalGeomParam(NamedTuple): cpttf=70000, cdtfleg=0, casthi=0.0077415000000000019, - aiwp=0, + a_tf_coil_wp_turn_insulation=0, acasetf=0, tinstf=0, n_tf_coils=12, @@ -100,7 +100,7 @@ class ResTfInternalGeomParam(NamedTuple): expected_n_tf_turn=1, expected_cpttf=2125000, expected_cdtfleg=421788350.27812088, - expected_aiwp=0.00030678028680367151, + expected_a_tf_coil_wp_turn_insulation=0.00030678028680367151, expected_acasetf=0.00061190425043863676, ), ResTfInternalGeomParam( @@ -115,7 +115,7 @@ class ResTfInternalGeomParam(NamedTuple): cpttf=2125000, cdtfleg=421788350.27812088, casthi=0.0077415000000000019, - aiwp=0.00030678028680367151, + a_tf_coil_wp_turn_insulation=0.00030678028680367151, acasetf=0.00061190425043863676, tinstf=0, n_tf_coils=12, @@ -127,7 +127,7 @@ class ResTfInternalGeomParam(NamedTuple): expected_n_tf_turn=1, expected_cpttf=2125000, expected_cdtfleg=430664525.98439038, - expected_aiwp=0.00029439388680367086, + expected_a_tf_coil_wp_turn_insulation=0.00029439388680367086, expected_acasetf=0.00061190425043863676, ), ), @@ -172,7 +172,11 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, resistive_tf_ monkeypatch.setattr(tfcoil_variables, "casthi", restfinternalgeomparam.casthi) - monkeypatch.setattr(tfcoil_variables, "aiwp", restfinternalgeomparam.aiwp) + monkeypatch.setattr( + tfcoil_variables, + "a_tf_coil_wp_turn_insulation", + restfinternalgeomparam.a_tf_coil_wp_turn_insulation, + ) monkeypatch.setattr(tfcoil_variables, "acasetf", restfinternalgeomparam.acasetf) @@ -212,7 +216,9 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, resistive_tf_ restfinternalgeomparam.expected_cdtfleg ) - assert tfcoil_variables.aiwp == pytest.approx(restfinternalgeomparam.expected_aiwp) + assert tfcoil_variables.a_tf_coil_wp_turn_insulation == pytest.approx( + restfinternalgeomparam.expected_a_tf_coil_wp_turn_insulation + ) assert tfcoil_variables.acasetf == pytest.approx( restfinternalgeomparam.expected_acasetf @@ -230,7 +236,9 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, resistive_tf_ restfinternalgeomparam.expected_cdtfleg ) - assert tfcoil_variables.aiwp == pytest.approx(restfinternalgeomparam.expected_aiwp) + assert tfcoil_variables.a_tf_coil_wp_turn_insulation == pytest.approx( + restfinternalgeomparam.expected_a_tf_coil_wp_turn_insulation + ) assert tfcoil_variables.acasetf == pytest.approx( restfinternalgeomparam.expected_acasetf diff --git a/tests/unit/test_tfcoil.py b/tests/unit/test_tfcoil.py index 7f1e3af83c..4e48608482 100644 --- a/tests/unit/test_tfcoil.py +++ b/tests/unit/test_tfcoil.py @@ -1093,7 +1093,7 @@ class TfCoilAreaAndMassesParam(NamedTuple): n_tf_coils: Any = None - aiwp: Any = None + a_tf_coil_wp_turn_insulation: Any = None acasetfo: Any = None @@ -1206,7 +1206,7 @@ class TfCoilAreaAndMassesParam(NamedTuple): acndttf=0.0014685061538103825, n_tf_turn=200, n_tf_coils=16, - aiwp=0.087880174466980876, + a_tf_coil_wp_turn_insulation=0.087880174466980876, acasetfo=1.2752592893394648, acasetf=1.0015169239205168, fcutfsu=0.80884, @@ -1278,7 +1278,7 @@ class TfCoilAreaAndMassesParam(NamedTuple): acndttf=0.0014685061538103825, n_tf_turn=200, n_tf_coils=16, - aiwp=0.087880174466980876, + a_tf_coil_wp_turn_insulation=0.087880174466980876, acasetfo=1.2752592893394648, acasetf=1.0015169239205168, fcutfsu=0.80884, @@ -1410,7 +1410,11 @@ def test_tf_coil_area_and_masses(tfcoilareaandmassesparam, monkeypatch, tfcoil): tfcoil_variables, "n_tf_coils", tfcoilareaandmassesparam.n_tf_coils ) - monkeypatch.setattr(tfcoil_variables, "aiwp", tfcoilareaandmassesparam.aiwp) + monkeypatch.setattr( + tfcoil_variables, + "a_tf_coil_wp_turn_insulation", + tfcoilareaandmassesparam.a_tf_coil_wp_turn_insulation, + ) monkeypatch.setattr(tfcoil_variables, "acasetfo", tfcoilareaandmassesparam.acasetfo) @@ -1616,7 +1620,7 @@ class StressclParam(NamedTuple): eyoung_copper: Any = None - aiwp: Any = None + a_tf_coil_wp_turn_insulation: Any = None aswp: Any = None @@ -1761,7 +1765,7 @@ class StressclParam(NamedTuple): eyoung_ins=20000000000, eyoung_al=np.array(69000000000.0), eyoung_copper=np.array(117000000000.0), - aiwp=0.087880174466980876, + a_tf_coil_wp_turn_insulation=0.087880174466980876, aswp=0.29370123076207649, cpttf=74026.751437500003, n_tf_coils=16, @@ -1884,7 +1888,7 @@ class StressclParam(NamedTuple): eyoung_ins=20000000000, eyoung_al=np.array(69000000000.0), eyoung_copper=np.array(117000000000.0), - aiwp=0.087880174466980876, + a_tf_coil_wp_turn_insulation=0.087880174466980876, aswp=0.29370123076207649, cpttf=74026.751437500003, n_tf_coils=16, From 862d6ad9fe3651e33d9c08de78e4e4580ec8daf6 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 28 Mar 2025 14:02:39 +0000 Subject: [PATCH 03/21] =?UTF-8?q?=F0=9F=94=84=20Rename=20bmaxtf=20to=20b?= =?UTF-8?q?=5Ftf=5Finboard=5Fpeak=20for=20clarity=20and=20consistency;=20u?= =?UTF-8?q?pdate=20references=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- documentation/proc-pages/io/utilities.md | 2 +- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/io/mfile_comparison.py | 2 +- process/io/plot_proc.py | 2 +- process/io/plot_radial_build.py | 2 +- process/io/plot_scans.py | 2 +- process/io/variable_metadata.py | 2 +- process/stellarator.py | 22 +++++++------- process/superconducting_tf_coil.py | 16 +++++----- process/tf_coil.py | 6 ++-- source/fortran/constraint_equations.f90 | 10 +++---- source/fortran/tfcoil_variables.f90 | 2 +- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 6 ++-- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_sctfcoil.py | 8 ++--- tests/unit/test_tfcoil.py | 26 +++++++++------- tracking/tracking_data.py | 2 +- 30 files changed, 103 insertions(+), 97 deletions(-) diff --git a/documentation/proc-pages/io/utilities.md b/documentation/proc-pages/io/utilities.md index 646071abfb..7ad0b94654 100644 --- a/documentation/proc-pages/io/utilities.md +++ b/documentation/proc-pages/io/utilities.md @@ -309,7 +309,7 @@ This utility plots the output of a PROCESS scan. PROCESS must be run on a scan-e **Input**: `MFILE.DAT` -**Output** `scan_var1_vs_var2.pdf` (var1 by default is `bmaxtf`, var2 specified by user) +**Output** `scan_var1_vs_var2.pdf` (var1 by default is `b_tf_inboard_peak`, var2 specified by user) ### Usage diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 27528fcdaf..12cdb80236 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -734,7 +734,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.5475E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.5696E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.0511E+07 OP - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1646E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.1646E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0251E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0251E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.2085E+01 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index d91f269bba..e9abcd252e 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -731,7 +731,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.5446E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 7.1402E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.1424E+07 OP - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2178E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.2178E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.1176E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.1176E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.2636E+01 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 80fd5c1e27..4d35d7e842 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -731,7 +731,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.5446E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 7.1402E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.1424E+07 OP - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2178E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.2178E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.1176E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.1176E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.2636E+01 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index dcaccdd561..f0a2533387 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -731,7 +731,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.5446E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 7.1402E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.1424E+07 OP - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2178E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.2178E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.1176E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.1176E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.2636E+01 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 182246ec6d..a3d4c946dc 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -731,7 +731,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.5446E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 7.1402E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.1424E+07 OP - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2178E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.2178E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.1176E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.1176E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.2636E+01 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 7ed7cc2c8b..01d23fae3d 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -579,7 +579,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4640E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 2.5007E+07 - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1982E+01 OP @@ -1574,7 +1574,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4640E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 2.5007E+07 - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1982E+01 OP @@ -2569,7 +2569,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4640E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 2.5007E+07 - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1982E+01 OP @@ -3564,7 +3564,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4639E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 2.5007E+07 - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1982E+01 OP @@ -4559,7 +4559,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4639E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 2.5007E+07 - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1982E+01 OP @@ -5554,7 +5554,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4639E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 2.5007E+07 - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1982E+01 OP @@ -6549,7 +6549,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4638E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 2.5007E+07 - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1982E+01 OP @@ -7544,7 +7544,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4638E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 2.5007E+07 - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1982E+01 OP @@ -8539,7 +8539,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4638E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 2.5007E+07 - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1982E+01 OP diff --git a/process/io/mfile_comparison.py b/process/io/mfile_comparison.py index c99fe35613..0fb27f9025 100644 --- a/process/io/mfile_comparison.py +++ b/process/io/mfile_comparison.py @@ -184,7 +184,7 @@ "vssoft", "vs_cs_pf_total_pulse", "t_burn", - "bmaxtf", + "b_tf_inboard_peak", "iooic", "tmarg", "tftmp", diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index 50b5ce1851..cd4593dfd5 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -2902,7 +2902,7 @@ def plot_magnetics_info(axis, mfile_data, scan): (t_burn, "Burn time", "hrs"), ("", "", ""), (f"#TF coil type is {tftype}", "", ""), - ("bmaxtf", "Peak field at conductor (w. rip.)", "T"), + ("b_tf_inboard_peak", "Peak field at conductor (w. rip.)", "T"), ("c_tf_total", "TF coil currents sum", "A"), ("", "", ""), ("#TF coil forces/stresses", "", ""), diff --git a/process/io/plot_radial_build.py b/process/io/plot_radial_build.py index e61dd3ec54..145f3a7adf 100644 --- a/process/io/plot_radial_build.py +++ b/process/io/plot_radial_build.py @@ -164,7 +164,7 @@ def main(args=None): "fiooic", "fjprot", "rmajor", - "bmaxtf", # bmxlim the maximum T field upper limit is the scan variable + "b_tf_inboard_peak", # bmxlim the maximum T field upper limit is the scan variable "gammax", "boundl(16)", "cnstv.t_burn_min", diff --git a/process/io/plot_scans.py b/process/io/plot_scans.py index de7a962208..c3174acb57 100644 --- a/process/io/plot_scans.py +++ b/process/io/plot_scans.py @@ -306,7 +306,7 @@ def main(args=None): 14: "fiooic", 15: "fjprot", 16: "rmajor", - 17: "bmaxtf", # bmxlim the maximum T field upper limit is the scan variable + 17: "b_tf_inboard_peak", # bmxlim the maximum T field upper limit is the scan variable 18: "gammax", 19: "boundl(16)", 20: "cnstv.t_burn_min", diff --git a/process/io/variable_metadata.py b/process/io/variable_metadata.py index 33015d752d..5d6fe627b7 100644 --- a/process/io/variable_metadata.py +++ b/process/io/variable_metadata.py @@ -79,7 +79,7 @@ class VariableMetadata: description="Inboard TF coil case outer (non-plasma side) thickness", units="m", ), - "bmaxtf": VariableMetadata( + "b_tf_inboard_peak": VariableMetadata( latex=r"$B_\mathrm{TF}^\mathrm{max}$ [$T$]", description="Mean peak field at TF coil", units="T", diff --git a/process/stellarator.py b/process/stellarator.py index 3230ad9ef1..849010c2a0 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -2611,8 +2611,8 @@ def stcoil(self, output: bool): # Maximum field at superconductor surface (T) wp_width_r_min = max(tfcoil_variables.t_turn_tf**2, wp_width_r_min) - # Recalculate tfcoil_variables.bmaxtf at the found awp_min: - tfcoil_variables.bmaxtf = self.bmax_from_awp( + # Recalculate tfcoil_variables.b_tf_inboard_peak at the found awp_min: + tfcoil_variables.b_tf_inboard_peak = self.bmax_from_awp( wp_width_r_min, coilcurrent, tfcoil_variables.n_tf_coils, @@ -3027,7 +3027,7 @@ def stcoil(self, output: bool): stellarator_configuration.stella_config_max_force_density * st.f_i / st.f_n - * tfcoil_variables.bmaxtf + * tfcoil_variables.b_tf_inboard_peak / stellarator_configuration.stella_config_wp_bmax * stellarator_configuration.stella_config_wp_area / awptf @@ -3043,7 +3043,7 @@ def stcoil(self, output: bool): stellarator_configuration.stella_config_max_force_density_mnm * st.f_i / st.f_n - * tfcoil_variables.bmaxtf + * tfcoil_variables.b_tf_inboard_peak / stellarator_configuration.stella_config_wp_bmax ) # @@ -3051,7 +3051,7 @@ def stcoil(self, output: bool): stellarator_configuration.stella_config_max_lateral_force_density * st.f_i / st.f_n - * tfcoil_variables.bmaxtf + * tfcoil_variables.b_tf_inboard_peak / stellarator_configuration.stella_config_wp_bmax * stellarator_configuration.stella_config_wp_area / awptf @@ -3060,7 +3060,7 @@ def stcoil(self, output: bool): stellarator_configuration.stella_config_max_radial_force_density * st.f_i / st.f_n - * tfcoil_variables.bmaxtf + * tfcoil_variables.b_tf_inboard_peak / stellarator_configuration.stella_config_wp_bmax * stellarator_configuration.stella_config_wp_area / awptf @@ -3071,7 +3071,7 @@ def stcoil(self, output: bool): stellarator_configuration.stella_config_centering_force_max_mn * st.f_i / st.f_n - * tfcoil_variables.bmaxtf + * tfcoil_variables.b_tf_inboard_peak / stellarator_configuration.stella_config_wp_bmax * stellarator_configuration.stella_config_coillength / tfcoil_variables.n_tf_coils @@ -3081,7 +3081,7 @@ def stcoil(self, output: bool): stellarator_configuration.stella_config_centering_force_min_mn * st.f_i / st.f_n - * tfcoil_variables.bmaxtf + * tfcoil_variables.b_tf_inboard_peak / stellarator_configuration.stella_config_wp_bmax * stellarator_configuration.stella_config_coillength / tfcoil_variables.n_tf_coils @@ -3091,7 +3091,7 @@ def stcoil(self, output: bool): stellarator_configuration.stella_config_centering_force_avg_mn * st.f_i / st.f_n - * tfcoil_variables.bmaxtf + * tfcoil_variables.b_tf_inboard_peak / stellarator_configuration.stella_config_wp_bmax * stellarator_configuration.stella_config_coillength / tfcoil_variables.n_tf_coils @@ -3734,8 +3734,8 @@ def stcoil_output( po.ovarre( self.outfile, "Maximum field on superconductor (T)", - "(bmaxtf)", - tfcoil_variables.bmaxtf, + "(b_tf_inboard_peak)", + tfcoil_variables.b_tf_inboard_peak, ) po.ovarre( self.outfile, diff --git a/process/superconducting_tf_coil.py b/process/superconducting_tf_coil.py index b500fd9023..5770b38533 100644 --- a/process/superconducting_tf_coil.py +++ b/process/superconducting_tf_coil.py @@ -273,7 +273,7 @@ def run(self, output: bool): tfcoil_variables.dr_tf_wp - 2.0e0 * (tfcoil_variables.tinstf + tfcoil_variables.tfinsgap), sctfcoil_module.r_wp_centre, - tfcoil_variables.bmaxtf, + tfcoil_variables.b_tf_inboard_peak, ) tfes = sctfcoil_module.estotft / tfcoil_variables.n_tf_coils @@ -1534,7 +1534,7 @@ def vv_stress_on_quench(self): d_vv=build_variables.dr_vv_shells, ) - def peak_tf_with_ripple(self, n_tf_coils, wwp1, dr_tf_wp, tfin, bmaxtf): + def peak_tf_with_ripple(self, n_tf_coils, wwp1, dr_tf_wp, tfin, b_tf_inboard_peak): """Peak toroidal field on the conductor author: P J Knight, CCFE, Culham Science Centre This subroutine calculates the peak toroidal field at the @@ -1556,8 +1556,8 @@ def peak_tf_with_ripple(self, n_tf_coils, wwp1, dr_tf_wp, tfin, bmaxtf): :type dr_tf_wp: float :param tfin: major radius of centre of winding pack (m) :type tfin: float - :param bmaxtf: nominal (axisymmetric) peak toroidal field (T) - :type bmaxtf: float + :param b_tf_inboard_peak: nominal (axisymmetric) peak toroidal field (T) + :type b_tf_inboard_peak: float :returns: (bmaxtfrp, flag) * bmaxtfrp: peak toroidal field including ripple (T) @@ -1590,7 +1590,7 @@ def peak_tf_with_ripple(self, n_tf_coils, wwp1, dr_tf_wp, tfin, bmaxtf): a[3] = 0.89808e0 else: - bmaxtfrp = 1.09e0 * bmaxtf + bmaxtfrp = 1.09e0 * b_tf_inboard_peak return bmaxtfrp, flag # Maximum winding pack width before adjacent packs touch @@ -1621,7 +1621,7 @@ def peak_tf_with_ripple(self, n_tf_coils, wwp1, dr_tf_wp, tfin, bmaxtf): + a[3] * sctfcoil_module.tf_fit_z * sctfcoil_module.tf_fit_t ) - bmaxtfrp = sctfcoil_module.tf_fit_y * bmaxtf + bmaxtfrp = sctfcoil_module.tf_fit_y * b_tf_inboard_peak return bmaxtfrp, flag @@ -2935,8 +2935,8 @@ def outtf(self, peaktfflag): po.ovarre( self.outfile, "Nominal peak field assuming toroidal symmetry (T)", - "(bmaxtf)", - tfcoil_variables.bmaxtf, + "(b_tf_inboard_peak)", + tfcoil_variables.b_tf_inboard_peak, "OP ", ) po.ovarre( diff --git a/process/tf_coil.py b/process/tf_coil.py index aa17b63b73..88a8368cdf 100644 --- a/process/tf_coil.py +++ b/process/tf_coil.py @@ -365,14 +365,14 @@ def tf_current(self): ) # Calculation of the maximum B field on the magnet [T] - tfcoil_variables.bmaxtf = ( + tfcoil_variables.b_tf_inboard_peak = ( physics_variables.bt * physics_variables.rmajor / tfcoil_variables.rbmax ) # Total current in TF coils [A] # rem SK : ritcf is no longer an input tfcoil_variables.c_tf_total = ( - tfcoil_variables.bmaxtf * tfcoil_variables.rbmax * 5.0e6 + tfcoil_variables.b_tf_inboard_peak * tfcoil_variables.rbmax * 5.0e6 ) # Current per TF coil [A] @@ -891,7 +891,7 @@ def tf_field_and_force(self): # Centering force = net inwards radial force per meters per TF coil [N/m] tfcoil_variables.cforce = ( 0.5e0 - * tfcoil_variables.bmaxtf + * tfcoil_variables.b_tf_inboard_peak * tfcoil_variables.c_tf_total / tfcoil_variables.n_tf_coils ) diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index e9032293e8..e231d880f6 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -808,7 +808,7 @@ subroutine constraint_eqn_010(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! rmajor | plasma major radius (m) !! bt | toroidal field on axis (T) !! rbmax | radius of maximum toroidal field (m) - !! bmaxtf | peak field at toroidal field coil (T) + !! b_tf_inboard_peak | peak field at toroidal field coil (T) !! This constraint is depreciated @@ -1331,9 +1331,9 @@ subroutine constraint_eqn_025(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! Logic change during pre-factoring: err, symbol, units will be assigned only if present. !! fpeakb : input real : f-value for maximum toroidal field !! bmxlim : input real : maximum peak toroidal field (T) - !! bmaxtf : input real : mean peak field at TF coil (T) + !! b_tf_inboard_peak : input real : mean peak field at TF coil (T) use constraint_variables, only: fpeakb, bmxlim - use tfcoil_variables, only: bmaxtf + use tfcoil_variables, only: b_tf_inboard_peak implicit none real(dp), intent(out) :: tmp_cc real(dp), intent(out) :: tmp_con @@ -1341,9 +1341,9 @@ subroutine constraint_eqn_025(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 = bmaxtf/bmxlim - 1.0D0 * fpeakb + tmp_cc = b_tf_inboard_peak/bmxlim - 1.0D0 * fpeakb tmp_con = bmxlim * (1.0D0 - tmp_cc) - tmp_err = bmaxtf * tmp_cc + tmp_err = b_tf_inboard_peak * tmp_cc tmp_symbol = '<' tmp_units = 'T' diff --git a/source/fortran/tfcoil_variables.f90 b/source/fortran/tfcoil_variables.f90 index e6cefc76a6..7e0d4c1f6e 100644 --- a/source/fortran/tfcoil_variables.f90 +++ b/source/fortran/tfcoil_variables.f90 @@ -64,7 +64,7 @@ module tfcoil_variables !! upper critical field (T) for Nb3Sn superconductor at zero temperature and !! strain (`i_tf_sc_mat=4, =bc20m`) - real(dp) :: bmaxtf + real(dp) :: b_tf_inboard_peak !! mean peak field at TF coil (T) real(dp) :: bmaxtfrp diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 8adcd26073..be2b59ce9a 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -730,7 +730,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.5446E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 7.1402E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.1424E+07 OP - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2178E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.2178E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.1176E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.1176E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.2636E+01 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 506b101cd4..2378885561 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -731,7 +731,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.5446E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 7.1402E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.1424E+07 OP - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2178E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.2178E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.1176E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.1176E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.2636E+01 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index a2b0177b91..16c4d3f681 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -731,7 +731,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.5446E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 7.1402E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.1424E+07 OP - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2178E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.2178E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.1176E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.1176E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.2636E+01 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index ec6f85b420..23d97a7d49 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -731,7 +731,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.5446E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 7.1402E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.1424E+07 OP - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2178E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.2178E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.1176E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.1176E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.2636E+01 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 125fd78c94..cfd534be56 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -734,7 +734,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.5648E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 7.2486E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.1598E+07 OP - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2296E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.2296E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.1381E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.1381E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.2760E+01 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 5e6909b46f..4ba120d6fe 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -732,7 +732,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4642E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.8257E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.0921E+07 OP - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1962E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.1962E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0800E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0800E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.2407E+01 OP @@ -1895,7 +1895,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4464E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.6839E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.0694E+07 OP - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1732E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.1732E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0400E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0400E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.2167E+01 OP @@ -3058,7 +3058,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4272E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.5756E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.0521E+07 OP - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1502E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.1502E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0000E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0000E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1927E+01 OP @@ -4221,7 +4221,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4304E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.5855E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.0537E+07 OP - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1502E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.1502E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0000E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0000E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1927E+01 OP @@ -5384,7 +5384,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4530E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.6756E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.0681E+07 OP - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1732E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.1732E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0400E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0400E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.2167E+01 OP @@ -6547,7 +6547,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4821E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.8120E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.0899E+07 OP - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1962E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.1962E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0800E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0800E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.2408E+01 OP @@ -7710,7 +7710,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4861E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.8240E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.0918E+07 OP - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1962E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.1962E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0800E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0800E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.2408E+01 OP @@ -8873,7 +8873,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4625E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.7080E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.0733E+07 OP - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1732E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.1732E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0400E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0400E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.2168E+01 OP @@ -10036,7 +10036,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4388E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.5997E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.0560E+07 OP - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1502E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.1502E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0000E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0000E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1928E+01 OP @@ -11199,7 +11199,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4407E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.6056E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.0569E+07 OP - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1502E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.1502E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0000E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0000E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1928E+01 OP @@ -12362,7 +12362,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4659E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.7129E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.0741E+07 OP - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1732E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.1732E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0400E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0400E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.2168E+01 OP @@ -13525,7 +13525,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4895E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.8254E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.0921E+07 OP - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1962E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.1962E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0800E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0800E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.2409E+01 OP @@ -14688,7 +14688,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4918E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.8328E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.0933E+07 OP - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1962E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.1962E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0800E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0800E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.2409E+01 OP @@ -15851,7 +15851,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4662E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.7183E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.0749E+07 OP - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1732E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.1732E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0400E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0400E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.2168E+01 OP @@ -17014,7 +17014,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4403E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.6037E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.0566E+07 OP - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1502E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.1502E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0000E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0000E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1928E+01 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index dd74c241a9..c6758dab77 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -579,7 +579,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4640E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 2.5007E+07 - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1982E+01 OP @@ -1574,7 +1574,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4640E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 2.5007E+07 - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1982E+01 OP @@ -2569,7 +2569,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4640E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 2.5007E+07 - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1982E+01 OP @@ -3564,7 +3564,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4639E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 2.5007E+07 - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1982E+01 OP @@ -4559,7 +4559,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4639E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 2.5007E+07 - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1982E+01 OP @@ -5554,7 +5554,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4639E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 2.5007E+07 - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1982E+01 OP @@ -6549,7 +6549,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4638E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 2.5007E+07 - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1982E+01 OP @@ -7544,7 +7544,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4638E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 2.5007E+07 - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1982E+01 OP @@ -8539,7 +8539,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4638E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 2.5007E+07 - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1982E+01 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index bb9911536f..10559dcf9a 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -407,7 +407,7 @@ "b_cs_limit_max": 13.0, "b_cs_peak_flat_top_end": 0.0, "b_cs_peak_pulse_start": 0.0, - "bmaxtf": 0.0, + "b_tf_inboard_peak": 0.0, "bmaxtfrp": 0.0, "bmn": 0.001, "bmxlim": 12.0, @@ -8886,7 +8886,7 @@ "b_cs_limit_max": "Central solenoid max field limit [T]", "b_cs_peak_flat_top_end": "maximum field in central solenoid at end of flat-top (EoF) (T)", "b_cs_peak_pulse_start": "maximum field in central solenoid at beginning of pulse (T)", - "bmaxtf": "mean peak field at TF coil (T)", + "b_tf_inboard_peak": "mean peak field at TF coil (T)", "bmaxtfrp": "peak field at TF conductor with ripple (T)", "bmn": "relative radial field perturbation", "bmxlim": "maximum peak toroidal field (T) (`constraint equation 25`)", @@ -19331,7 +19331,7 @@ "avwp", "awphec", "bcritsc", - "bmaxtf", + "b_tf_inboard_peak", "bmaxtfrp", "casestr", "casthi", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index dcc2ae1fa0..daff628b26 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -1374,7 +1374,7 @@ boundu(49) = 1.0 *icc = 25 * DESCRIPTION: Constraint equation for peak toroidal field upper limit * JUSTIFICATION: Turned off, dont care toridal field limit -* VARIABLES: bmaxtf calculated in-situ +* VARIABLES: b_tf_inboard_peak calculated in-situ * bmxlim = * DESCRIPTION: Maximum peak toroidal field (T) (`constraint equation 25`) (default = 12) diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 0510c2d404..792edf43cb 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -734,7 +734,7 @@ Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.5648E+05 OP Mass_of_each_TF_coil_(kg)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 7.2486E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (m_tf_coils_total)_______________________ 1.1598E+07 OP - Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2296E+01 OP + Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (b_tf_inboard_peak)______________________ 1.2296E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.1381E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.1381E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.2760E+01 OP diff --git a/tests/unit/test_sctfcoil.py b/tests/unit/test_sctfcoil.py index 5db5ffe0ae..69fb23f632 100644 --- a/tests/unit/test_sctfcoil.py +++ b/tests/unit/test_sctfcoil.py @@ -397,7 +397,7 @@ class PeakTfWithRippleParam(NamedTuple): tfin: Any = None - bmaxtf: Any = None + b_tf_inboard_peak: Any = None expected_tf_fit_t: Any = None @@ -421,7 +421,7 @@ class PeakTfWithRippleParam(NamedTuple): wwp1=1.299782604942499, dr_tf_wp=0.50661087836601015, tfin=3.789896624292115, - bmaxtf=11.717722779177526, + b_tf_inboard_peak=11.717722779177526, expected_tf_fit_t=0.80807838916035957, expected_tf_fit_z=0.3149613642807837, expected_tf_fit_y=1.0658869305062604, @@ -436,7 +436,7 @@ class PeakTfWithRippleParam(NamedTuple): wwp1=1.299782604942499, dr_tf_wp=0.50661087836601015, tfin=3.789896624292115, - bmaxtf=11.717722779177526, + b_tf_inboard_peak=11.717722779177526, expected_tf_fit_t=0.80807838916035957, expected_tf_fit_z=0.3149613642807837, expected_tf_fit_y=1.0658869305062604, @@ -469,7 +469,7 @@ def test_peak_tf_with_ripple(peaktfwithrippleparam, monkeypatch, sctfcoil): wwp1=peaktfwithrippleparam.wwp1, dr_tf_wp=peaktfwithrippleparam.dr_tf_wp, tfin=peaktfwithrippleparam.tfin, - bmaxtf=peaktfwithrippleparam.bmaxtf, + b_tf_inboard_peak=peaktfwithrippleparam.b_tf_inboard_peak, ) assert sctfcoil_module.tf_fit_t == pytest.approx( diff --git a/tests/unit/test_tfcoil.py b/tests/unit/test_tfcoil.py index 4e48608482..1ddf8bb554 100644 --- a/tests/unit/test_tfcoil.py +++ b/tests/unit/test_tfcoil.py @@ -489,7 +489,7 @@ class TfCurrentParam(NamedTuple): tftort: Any = None - bmaxtf: Any = None + b_tf_inboard_peak: Any = None tfinsgap: Any = None @@ -529,7 +529,7 @@ class TfCurrentParam(NamedTuple): expected_rbmax: Any = None - expected_bmaxtf: Any = None + expected_b_tf_inboard_peak: Any = None expected_oacdcp: Any = None @@ -547,7 +547,7 @@ class TfCurrentParam(NamedTuple): casths_fraction=0.059999999999999998, tinstf=0.0080000000000000019, tftort=1.6395161177915356, - bmaxtf=0, + b_tf_inboard_peak=0, tfinsgap=0.01, tfc_sidewall_is_fraction=False, casths=0.05000000000000001, @@ -567,7 +567,7 @@ class TfCurrentParam(NamedTuple): theta_coil=0.19634954084936207, expected_c_tf_total=236885604.60000002, expected_rbmax=4.0432020634751211, - expected_bmaxtf=11.717722779177526, + expected_b_tf_inboard_peak=11.717722779177526, expected_oacdcp=8674367.2945641987, expected_tfc_current=14805350.287500001, ), @@ -605,7 +605,9 @@ def test_tf_current(tfcurrentparam, monkeypatch, tfcoil): monkeypatch.setattr(tfcoil_variables, "tftort", tfcurrentparam.tftort) - monkeypatch.setattr(tfcoil_variables, "bmaxtf", tfcurrentparam.bmaxtf) + monkeypatch.setattr( + tfcoil_variables, "b_tf_inboard_peak", tfcurrentparam.b_tf_inboard_peak + ) monkeypatch.setattr(tfcoil_variables, "tfinsgap", tfcurrentparam.tfinsgap) @@ -661,7 +663,9 @@ def test_tf_current(tfcurrentparam, monkeypatch, tfcoil): assert tfcoil_variables.rbmax == pytest.approx(tfcurrentparam.expected_rbmax) - assert tfcoil_variables.bmaxtf == pytest.approx(tfcurrentparam.expected_bmaxtf) + assert tfcoil_variables.b_tf_inboard_peak == pytest.approx( + tfcurrentparam.expected_b_tf_inboard_peak + ) assert tfcoil_variables.oacdcp == pytest.approx(tfcurrentparam.expected_oacdcp) @@ -729,7 +733,7 @@ class TfFieldAndForceParam(NamedTuple): c_tf_total: Any = None - bmaxtf: Any = None + b_tf_inboard_peak: Any = None i_tf_sup: Any = None @@ -786,7 +790,7 @@ class TfFieldAndForceParam(NamedTuple): sigvvall=93000000, cforce=0, c_tf_total=25500000, - bmaxtf=34.862617362267024, + b_tf_inboard_peak=34.862617362267024, i_tf_sup=0, f_vforce_inboard=0.5, vforce_outboard=0, @@ -821,7 +825,7 @@ class TfFieldAndForceParam(NamedTuple): sigvvall=93000000, cforce=37041530.947408713, c_tf_total=25500000, - bmaxtf=34.862617362267024, + b_tf_inboard_peak=34.862617362267024, i_tf_sup=0, f_vforce_inboard=0.59539634897566385, vforce_outboard=8413494.7991220243, @@ -886,7 +890,9 @@ def test_tf_field_and_force(tffieldandforceparam, monkeypatch, tfcoil): monkeypatch.setattr(tfcoil_variables, "c_tf_total", tffieldandforceparam.c_tf_total) - monkeypatch.setattr(tfcoil_variables, "bmaxtf", tffieldandforceparam.bmaxtf) + monkeypatch.setattr( + tfcoil_variables, "b_tf_inboard_peak", tffieldandforceparam.b_tf_inboard_peak + ) monkeypatch.setattr(tfcoil_variables, "i_tf_sup", tffieldandforceparam.i_tf_sup) diff --git a/tracking/tracking_data.py b/tracking/tracking_data.py index 0af82f6d72..031ddf410a 100644 --- a/tracking/tracking_data.py +++ b/tracking/tracking_data.py @@ -152,7 +152,7 @@ class ProcessTracker: "pgrossmw", "tftmp", "n_tf_coils", - "bmaxtf", + "b_tf_inboard_peak", "vs_cs_pf_total_pulse", "nd_ions_total", "t_burn", From 15716a08fc3e3998da00a75e208e03daaf034bd7 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 28 Mar 2025 14:10:23 +0000 Subject: [PATCH 04/21] =?UTF-8?q?=F0=9F=94=84=20Rename=20theta=5Fcoil=20to?= =?UTF-8?q?=20rad=5Ftf=5Fcoil=5Ftoroidal=20for=20clarity=20and=20consisten?= =?UTF-8?q?cy;=20update=20references=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/resistive_tf_coil.py | 2 +- process/superconducting_tf_coil.py | 7 +++--- process/tf_coil.py | 36 +++++++++++++++------------ source/fortran/sctfcoil.f90 | 2 +- tests/integration/ref_dicts.json | 6 ++--- tests/unit/test_sctfcoil.py | 20 +++++++++------ tests/unit/test_tfcoil.py | 40 ++++++++++++++++++------------ 7 files changed, 65 insertions(+), 48 deletions(-) diff --git a/process/resistive_tf_coil.py b/process/resistive_tf_coil.py index 4d173b387c..1eb41ab838 100644 --- a/process/resistive_tf_coil.py +++ b/process/resistive_tf_coil.py @@ -138,7 +138,7 @@ def run(self, output: bool): tfcoil_variables.eyoung_res_tf_buck, sctfcoil_module.r_wp_inner, sctfcoil_module.tan_theta_coil, - sctfcoil_module.theta_coil, + sctfcoil_module.rad_tf_coil_toroidal, sctfcoil_module.r_wp_outer, sctfcoil_module.a_tf_steel, sctfcoil_module.a_case_front, diff --git a/process/superconducting_tf_coil.py b/process/superconducting_tf_coil.py index 5770b38533..2693357fca 100644 --- a/process/superconducting_tf_coil.py +++ b/process/superconducting_tf_coil.py @@ -164,7 +164,7 @@ def run(self, output: bool): tfcoil_variables.eyoung_res_tf_buck, sctfcoil_module.r_wp_inner, sctfcoil_module.tan_theta_coil, - sctfcoil_module.theta_coil, + sctfcoil_module.rad_tf_coil_toroidal, sctfcoil_module.r_wp_outer, sctfcoil_module.a_tf_steel, sctfcoil_module.a_case_front, @@ -1925,7 +1925,8 @@ def tf_case_geom(self, i_tf_wp_geom, i_tf_case_geom): if i_tf_case_geom == 0: # Circular front case sctfcoil_module.a_case_front = ( - sctfcoil_module.theta_coil * build_variables.r_tf_inboard_out**2 + sctfcoil_module.rad_tf_coil_toroidal + * build_variables.r_tf_inboard_out**2 - sctfcoil_module.tan_theta_coil * sctfcoil_module.r_wp_outer**2 ) else: @@ -1938,7 +1939,7 @@ def tf_case_geom(self, i_tf_wp_geom, i_tf_case_geom): # Nose casing area [m2] sctfcoil_module.a_case_nose = ( sctfcoil_module.tan_theta_coil * sctfcoil_module.r_wp_inner**2 - - sctfcoil_module.theta_coil * build_variables.r_tf_inboard_in**2 + - sctfcoil_module.rad_tf_coil_toroidal * build_variables.r_tf_inboard_in**2 ) # Report error if the casing area is negative diff --git a/process/tf_coil.py b/process/tf_coil.py index 88a8368cdf..62ed59f154 100644 --- a/process/tf_coil.py +++ b/process/tf_coil.py @@ -151,7 +151,7 @@ def run(self, output): tfcoil_variables.eyoung_res_tf_buck, sctfcoil_module.r_wp_inner, sctfcoil_module.tan_theta_coil, - sctfcoil_module.theta_coil, + sctfcoil_module.rad_tf_coil_toroidal, sctfcoil_module.r_wp_outer, sctfcoil_module.a_tf_steel, sctfcoil_module.a_case_front, @@ -262,8 +262,8 @@ def tf_global_geometry(self): - Winding Pack NOT included """ - sctfcoil_module.theta_coil = np.pi / tfcoil_variables.n_tf_coils - sctfcoil_module.tan_theta_coil = np.tan(sctfcoil_module.theta_coil) + sctfcoil_module.rad_tf_coil_toroidal = np.pi / tfcoil_variables.n_tf_coils + sctfcoil_module.tan_theta_coil = np.tan(sctfcoil_module.rad_tf_coil_toroidal) # TF coil inboard legs mid-plane cross-section area (WP + casing ) [m2] if tfcoil_variables.i_tf_case_geom == 0: @@ -275,8 +275,8 @@ def tf_global_geometry(self): # Straight front case tfcoil_variables.tfareain = ( tfcoil_variables.n_tf_coils - * np.sin(sctfcoil_module.theta_coil) - * np.cos(sctfcoil_module.theta_coil) + * np.sin(sctfcoil_module.rad_tf_coil_toroidal) + * np.cos(sctfcoil_module.rad_tf_coil_toroidal) * build_variables.r_tf_inboard_out**2 - np.pi * build_variables.r_tf_inboard_in**2 ) @@ -304,7 +304,9 @@ def tf_global_geometry(self): # Sliding joints geometry if physics_variables.itart == 1 and tfcoil_variables.i_tf_sup != 1: tfcoil_variables.tftort = ( - 2.0e0 * build_variables.r_cp_top * np.sin(sctfcoil_module.theta_coil) + 2.0e0 + * build_variables.r_cp_top + * np.sin(sctfcoil_module.rad_tf_coil_toroidal) ) # Default thickness, initially written for DEMO SC magnets @@ -312,13 +314,13 @@ def tf_global_geometry(self): tfcoil_variables.tftort = ( 2.0e0 * build_variables.r_tf_inboard_out - * np.sin(sctfcoil_module.theta_coil) + * np.sin(sctfcoil_module.rad_tf_coil_toroidal) ) else: tfcoil_variables.tftort = ( 2.0e0 * build_variables.r_tf_inboard_out - * np.sin(sctfcoil_module.theta_coil) + * np.sin(sctfcoil_module.rad_tf_coil_toroidal) ) # Area of rectangular cross-section TF outboard leg [m2] @@ -349,7 +351,8 @@ def tf_current(self): # SC : conservative assumption as the radius is calculated with the # WP radial distances defined at the TF middle (cos) tfcoil_variables.rbmax = ( - build_variables.r_tf_inboard_out * np.cos(sctfcoil_module.theta_coil) + build_variables.r_tf_inboard_out + * np.cos(sctfcoil_module.rad_tf_coil_toroidal) - tfcoil_variables.casthi - tfcoil_variables.tinstf - tfcoil_variables.tfinsgap @@ -1290,7 +1293,8 @@ def tf_coil_area_and_masses(self): # Surface areas (for cryo system) [m2] wbtf = ( - build_variables.r_tf_inboard_out * np.sin(sctfcoil_module.theta_coil) + build_variables.r_tf_inboard_out + * np.sin(sctfcoil_module.rad_tf_coil_toroidal) - build_variables.r_tf_inboard_in * sctfcoil_module.tan_theta_coil ) tfcoil_variables.tfocrn = ( @@ -1614,7 +1618,7 @@ def stresscl( eyoung_res_tf_buck, r_wp_inner, tan_theta_coil, - theta_coil, + rad_tf_coil_toroidal, r_wp_outer, a_tf_steel, a_case_front, @@ -1937,11 +1941,11 @@ def stresscl( if i_tf_sup == 1: # Inner/outer radii of the layer representing the WP in stress calculations [m] # These radii are chosen to preserve the true WP area; see Issue #1048 - r_wp_inner_eff = r_wp_inner * np.sqrt(tan_theta_coil / theta_coil) - r_wp_outer_eff = r_wp_outer * np.sqrt(tan_theta_coil / theta_coil) + r_wp_inner_eff = r_wp_inner * np.sqrt(tan_theta_coil / rad_tf_coil_toroidal) + r_wp_outer_eff = r_wp_outer * np.sqrt(tan_theta_coil / rad_tf_coil_toroidal) # Area of the cylinder representing the WP in stress calculations [m2] - a_wp_eff = (r_wp_outer_eff**2 - r_wp_inner_eff**2) * theta_coil + a_wp_eff = (r_wp_outer_eff**2 - r_wp_inner_eff**2) * rad_tf_coil_toroidal # Steel cross-section under the area representing the WP in stress calculations [m2] a_wp_steel_eff = a_tf_steel - a_case_front - a_case_nose @@ -2075,7 +2079,7 @@ def stresscl( poisson_wp_trans = np.double(poisson_cond) # WP area using the stress model circular geometry (per coil) [m2] - a_wp_eff = (r_wp_outer**2 - r_wp_inner**2) * theta_coil + a_wp_eff = (r_wp_outer**2 - r_wp_inner**2) * rad_tf_coil_toroidal # Effective conductor region young modulus in the vertical direction [Pa] # Parallel-composite conductor and insulator @@ -2144,7 +2148,7 @@ def stresscl( # front case, and that considered by the plane strain solver f_tf_stress_front_case = ( a_case_front - / theta_coil + / rad_tf_coil_toroidal / (radtf[n_tf_layer] ** 2 - radtf[n_tf_layer - 1] ** 2) ) diff --git a/source/fortran/sctfcoil.f90 b/source/fortran/sctfcoil.f90 index 9dbf89823b..7e0432f2af 100755 --- a/source/fortran/sctfcoil.f90 +++ b/source/fortran/sctfcoil.f90 @@ -112,7 +112,7 @@ module sctfcoil_module real(dp) :: a_leg_cond !! Exact TF ouboard leg conductor area [m2] - real(dp) :: theta_coil + real(dp) :: rad_tf_coil_toroidal !! Half toroidal angular extent of a single TF coil inboard leg real(dp) :: tan_theta_coil diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 10559dcf9a..da9fc3ca64 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -7532,7 +7532,7 @@ "thcomp": null, "t_fusion_ramp": 10.0, "theta": null, - "theta_coil": 0.0, + "rad_tf_coil_toroidal": 0.0, "thick_bp_ib": 0.0, "thick_bp_ob": 0.0, "thick_bss_ib": 0.111, @@ -10742,7 +10742,7 @@ "thcomp": "", "t_fusion_ramp": "heating time, after current ramp up (s)", "theta": "", - "theta_coil": "Half toroidal angular extent of a single TF coil inboard leg", + "rad_tf_coil_toroidal": "Half toroidal angular extent of a single TF coil inboard leg", "thick_bp_ib": "", "thick_bp_ob": "", "thick_bss_ib": "", @@ -19235,7 +19235,7 @@ "a_leg_ins", "a_leg_gr_ins", "a_leg_cond", - "theta_coil", + "rad_tf_coil_toroidal", "tan_theta_coil", "t_conductor_radial", "t_conductor_toroidal", diff --git a/tests/unit/test_sctfcoil.py b/tests/unit/test_sctfcoil.py index 69fb23f632..67a7f4b43d 100644 --- a/tests/unit/test_sctfcoil.py +++ b/tests/unit/test_sctfcoil.py @@ -528,7 +528,7 @@ class TfWpGeomParam(NamedTuple): a_ground_ins: Any = None - theta_coil: Any = None + rad_tf_coil_toroidal: Any = None tan_theta_coil: Any = None @@ -576,7 +576,7 @@ class TfWpGeomParam(NamedTuple): t_wp_toroidal=0, t_wp_toroidal_av=0, a_ground_ins=0, - theta_coil=0.19634954084936207, + rad_tf_coil_toroidal=0.19634954084936207, tan_theta_coil=0.19891236737965801, i_tf_wp_geom=0, expected_wwp1=1.299782604942499, @@ -609,7 +609,7 @@ class TfWpGeomParam(NamedTuple): t_wp_toroidal=1.299782604942499, t_wp_toroidal_av=1.299782604942499, a_ground_ins=0.028582295732936136, - theta_coil=0.19634954084936207, + rad_tf_coil_toroidal=0.19634954084936207, tan_theta_coil=0.19891236737965801, i_tf_wp_geom=0, expected_wwp1=1.299782604942499, @@ -681,7 +681,9 @@ def test_tf_wp_geom(tfwpgeomparam, monkeypatch, sctfcoil): monkeypatch.setattr(sctfcoil_module, "a_ground_ins", tfwpgeomparam.a_ground_ins) - monkeypatch.setattr(sctfcoil_module, "theta_coil", tfwpgeomparam.theta_coil) + monkeypatch.setattr( + sctfcoil_module, "rad_tf_coil_toroidal", tfwpgeomparam.rad_tf_coil_toroidal + ) monkeypatch.setattr(sctfcoil_module, "tan_theta_coil", tfwpgeomparam.tan_theta_coil) @@ -751,7 +753,7 @@ class TfCaseGeomParam(NamedTuple): a_case_nose: Any = None - theta_coil: Any = None + rad_tf_coil_toroidal: Any = None tan_theta_coil: Any = None @@ -790,7 +792,7 @@ class TfCaseGeomParam(NamedTuple): t_lat_case_av=0, a_case_front=0, a_case_nose=0, - theta_coil=0.19634954084936207, + rad_tf_coil_toroidal=0.19634954084936207, tan_theta_coil=0.19891236737965801, i_tf_wp_geom=0, i_tf_case_geom=0, @@ -817,7 +819,7 @@ class TfCaseGeomParam(NamedTuple): t_lat_case_av=0.10396600719086938, a_case_front=0.18607458590131154, a_case_nose=0.70261616505511615, - theta_coil=0.19634954084936207, + rad_tf_coil_toroidal=0.19634954084936207, tan_theta_coil=0.19891236737965801, i_tf_wp_geom=0, i_tf_case_geom=0, @@ -880,7 +882,9 @@ def test_tf_case_geom(tfcasegeomparam, monkeypatch, sctfcoil): monkeypatch.setattr(sctfcoil_module, "a_case_nose", tfcasegeomparam.a_case_nose) - monkeypatch.setattr(sctfcoil_module, "theta_coil", tfcasegeomparam.theta_coil) + monkeypatch.setattr( + sctfcoil_module, "rad_tf_coil_toroidal", tfcasegeomparam.rad_tf_coil_toroidal + ) monkeypatch.setattr( sctfcoil_module, "tan_theta_coil", tfcasegeomparam.tan_theta_coil diff --git a/tests/unit/test_tfcoil.py b/tests/unit/test_tfcoil.py index 1ddf8bb554..928b322c28 100644 --- a/tests/unit/test_tfcoil.py +++ b/tests/unit/test_tfcoil.py @@ -279,7 +279,7 @@ class TfGlobalGeometryParam(NamedTuple): r_tf_outboard_out: Any = None - theta_coil: Any = None + rad_tf_coil_toroidal: Any = None tan_theta_coil: Any = None @@ -321,7 +321,7 @@ class TfGlobalGeometryParam(NamedTuple): h_cp_top=0, r_tf_outboard_in=0, r_tf_outboard_out=0, - theta_coil=0, + rad_tf_coil_toroidal=0, tan_theta_coil=0, expected_tfareain=27.308689677971632, expected_tftort=1.6395161177915356, @@ -351,7 +351,7 @@ class TfGlobalGeometryParam(NamedTuple): h_cp_top=0, r_tf_outboard_in=16.299182480677967, r_tf_outboard_out=17.827520102947819, - theta_coil=0.19634954084936207, + rad_tf_coil_toroidal=0.19634954084936207, tan_theta_coil=0.19891236737965801, expected_tfareain=35.703669036223495, expected_tftort=1.7488698442633552, @@ -437,7 +437,11 @@ def test_tf_global_geometry(tfglobalgeometryparam, monkeypatch, tfcoil): sctfcoil_module, "r_tf_outboard_out", tfglobalgeometryparam.r_tf_outboard_out ) - monkeypatch.setattr(sctfcoil_module, "theta_coil", tfglobalgeometryparam.theta_coil) + monkeypatch.setattr( + sctfcoil_module, + "rad_tf_coil_toroidal", + tfglobalgeometryparam.rad_tf_coil_toroidal, + ) monkeypatch.setattr( sctfcoil_module, "tan_theta_coil", tfglobalgeometryparam.tan_theta_coil @@ -465,7 +469,7 @@ def test_tf_global_geometry(tfglobalgeometryparam, monkeypatch, tfcoil): tfglobalgeometryparam.expected_r_tf_outboard_out ) - assert sctfcoil_module.theta_coil == pytest.approx( + assert sctfcoil_module.rad_tf_coil_toroidal == pytest.approx( tfglobalgeometryparam.expected_theta_coil ) @@ -523,7 +527,7 @@ class TfCurrentParam(NamedTuple): tfc_current: Any = None - theta_coil: Any = None + rad_tf_coil_toroidal: Any = None expected_c_tf_total: Any = None @@ -564,7 +568,7 @@ class TfCurrentParam(NamedTuple): bt=5.3292000000000002, rmajor=8.8901000000000003, tfc_current=0, - theta_coil=0.19634954084936207, + rad_tf_coil_toroidal=0.19634954084936207, expected_c_tf_total=236885604.60000002, expected_rbmax=4.0432020634751211, expected_b_tf_inboard_peak=11.717722779177526, @@ -653,7 +657,9 @@ def test_tf_current(tfcurrentparam, monkeypatch, tfcoil): monkeypatch.setattr(sctfcoil_module, "tfc_current", tfcurrentparam.tfc_current) - monkeypatch.setattr(sctfcoil_module, "theta_coil", tfcurrentparam.theta_coil) + monkeypatch.setattr( + sctfcoil_module, "rad_tf_coil_toroidal", tfcurrentparam.rad_tf_coil_toroidal + ) tfcoil.tf_current() @@ -1149,7 +1155,7 @@ class TfCoilAreaAndMassesParam(NamedTuple): a_leg_cond: Any = None - theta_coil: Any = None + rad_tf_coil_toroidal: Any = None tan_theta_coil: Any = None @@ -1237,7 +1243,7 @@ class TfCoilAreaAndMassesParam(NamedTuple): a_leg_ins=0, a_leg_gr_ins=0, a_leg_cond=0, - theta_coil=0.19634954084936207, + rad_tf_coil_toroidal=0.19634954084936207, tan_theta_coil=0.19891236737965801, expected_whtconsh=115651.90127937049, expected_whtcas=1034021.9996272125, @@ -1309,7 +1315,7 @@ class TfCoilAreaAndMassesParam(NamedTuple): a_leg_ins=0, a_leg_gr_ins=0, a_leg_cond=0, - theta_coil=0.19634954084936207, + rad_tf_coil_toroidal=0.19634954084936207, tan_theta_coil=0.19891236737965801, expected_whtconsh=115721.02357090525, expected_whtcas=1034699.2182961091, @@ -1491,7 +1497,9 @@ def test_tf_coil_area_and_masses(tfcoilareaandmassesparam, monkeypatch, tfcoil): ) monkeypatch.setattr( - sctfcoil_module, "theta_coil", tfcoilareaandmassesparam.theta_coil + sctfcoil_module, + "rad_tf_coil_toroidal", + tfcoilareaandmassesparam.rad_tf_coil_toroidal, ) monkeypatch.setattr( @@ -1698,7 +1706,7 @@ class StressclParam(NamedTuple): a_case_nose: Any = None - theta_coil: Any = None + rad_tf_coil_toroidal: Any = None tan_theta_coil: Any = None @@ -1838,7 +1846,7 @@ class StressclParam(NamedTuple): t_lat_case_av=0.10396600719086938, a_case_front=0.18607458590131154, a_case_nose=0.70261616505511615, - theta_coil=0.19634954084936207, + rad_tf_coil_toroidal=0.19634954084936207, tan_theta_coil=0.19891236737965801, t_cable_radial=0.030661087836601014, t_cable=0.036389912284773368, @@ -1961,7 +1969,7 @@ class StressclParam(NamedTuple): t_lat_case_av=0.10396600719086938, a_case_front=0.18607458590131154, a_case_nose=0.70261616505511615, - theta_coil=0.19634954084936207, + rad_tf_coil_toroidal=0.19634954084936207, tan_theta_coil=0.19891236737965801, t_cable_radial=0.030661087836601014, t_cable=0.036389912284773368, @@ -2062,7 +2070,7 @@ def test_stresscl(stressclparam, monkeypatch, tfcoil): stressclparam.eyoung_res_tf_buck, stressclparam.r_wp_inner, stressclparam.tan_theta_coil, - stressclparam.theta_coil, + stressclparam.rad_tf_coil_toroidal, stressclparam.r_wp_outer, stressclparam.a_tf_steel, stressclparam.a_case_front, From e60e43550c74ddbaa95fa96542171be42ef2601f Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 28 Mar 2025 14:12:28 +0000 Subject: [PATCH 05/21] =?UTF-8?q?=F0=9F=94=84=20Rename=20tfareain=20to=20a?= =?UTF-8?q?=5Ftf=5Fcoil=5Finboard=20for=20clarity=20and=20consistency;=20u?= =?UTF-8?q?pdate=20references=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/io/obsolete_vars.py | 2 +- process/resistive_tf_coil.py | 4 +-- process/stellarator.py | 8 ++--- process/superconducting_tf_coil.py | 10 +++---- process/tf_coil.py | 6 ++-- source/fortran/tfcoil_variables.f90 | 2 +- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 6 ++-- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_resistive_tf_coil.py | 10 ++++--- tests/unit/test_sctfcoil.py | 10 ++++--- tests/unit/test_tfcoil.py | 28 +++++++++-------- 24 files changed, 91 insertions(+), 83 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 12cdb80236..7254dd9efb 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -688,7 +688,7 @@ TF_coil_arc_point_3_Z_(m)_______________________________________________ (yarc(4))_____________________ -8.8182E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 1.7350E+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_coils)_______________ 8.6240E-01 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index e9abcd252e..e3d2f634f7 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -685,7 +685,7 @@ TF_coil_arc_point_3_Z_(m)_______________________________________________ (yarc(4))_____________________ -8.8182E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 1.8229E+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_coils)_______________ 8.4752E-01 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 4d35d7e842..860d1190c0 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -685,7 +685,7 @@ TF_coil_arc_point_3_Z_(m)_______________________________________________ (yarc(4))_____________________ -8.8182E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 1.8229E+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_coils)_______________ 8.4752E-01 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index f0a2533387..edde239723 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -685,7 +685,7 @@ TF_coil_arc_point_3_Z_(m)_______________________________________________ (yarc(4))_____________________ -8.8182E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 1.8229E+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_coils)_______________ 8.4752E-01 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index a3d4c946dc..8bdbe5038c 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -685,7 +685,7 @@ TF_coil_arc_point_3_Z_(m)_______________________________________________ (yarc(4))_____________________ -8.8182E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 1.8229E+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_coils)_______________ 8.4752E-01 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 01d23fae3d..5707e6a12f 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -532,7 +532,7 @@ TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(4))_____________________ -9.2447E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 3.3244E+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_coils)_______________ 2.3627E+00 @@ -1527,7 +1527,7 @@ TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(4))_____________________ -9.2447E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 3.3244E+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_coils)_______________ 2.3627E+00 @@ -2522,7 +2522,7 @@ TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(4))_____________________ -9.2447E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 3.3244E+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_coils)_______________ 2.3626E+00 @@ -3517,7 +3517,7 @@ TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(4))_____________________ -9.2447E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 3.3244E+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_coils)_______________ 2.3626E+00 @@ -4512,7 +4512,7 @@ TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(4))_____________________ -9.2447E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 3.3244E+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_coils)_______________ 2.3626E+00 @@ -5507,7 +5507,7 @@ TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(4))_____________________ -9.2447E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 3.3244E+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_coils)_______________ 2.3626E+00 @@ -6502,7 +6502,7 @@ TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(4))_____________________ -9.2447E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 3.3244E+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_coils)_______________ 2.3626E+00 @@ -7497,7 +7497,7 @@ TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(4))_____________________ -9.2447E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 3.3244E+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_coils)_______________ 2.3626E+00 @@ -8492,7 +8492,7 @@ TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(4))_____________________ -9.2447E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 3.3244E+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_coils)_______________ 2.3626E+00 diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index 958843343c..cf09663a6b 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -18,7 +18,7 @@ "itfsup": "i_tf_sup", "r_tf_inleg_mid": "r_tf_inboard_mid", "rtot": "r_tf_outboard_mid", - "a_tf_inboard": "tfareain", + "a_tf_inboard": "a_tf_coil_inboard", "r_tf_inleg_in": "r_tf_inleg_in", "r_tf_inleg_out": "r_tf_inleg_out", "a_tf_wp": "awpc", diff --git a/process/resistive_tf_coil.py b/process/resistive_tf_coil.py index 1eb41ab838..a8339b4bb0 100644 --- a/process/resistive_tf_coil.py +++ b/process/resistive_tf_coil.py @@ -333,14 +333,14 @@ def res_tf_internal_geom(self): sctfcoil_module.f_tf_ins = ( tfcoil_variables.n_tf_coils * sctfcoil_module.a_tf_ins - / tfcoil_variables.tfareain + / tfcoil_variables.a_tf_coil_inboard ) # 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_coils + tfcoil_variables.a_tf_coil_inboard / tfcoil_variables.n_tf_coils ) - sctfcoil_module.awpc # Current per turn diff --git a/process/stellarator.py b/process/stellarator.py index 849010c2a0..bc53ec45d6 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -1050,7 +1050,7 @@ def blanket_neutronics(self): # Rough estimate of TF coil volume used, assuming 25% of the total # TF coil perimeter is inboard, 75% outboard tf_volume = ( - 0.25 * tfcoil_variables.len_tf_coil * tfcoil_variables.tfareain + 0.25 * tfcoil_variables.len_tf_coil * tfcoil_variables.a_tf_coil_inboard + 0.75 * tfcoil_variables.len_tf_coil * tfcoil_variables.a_tf_leg_outboard @@ -2793,14 +2793,14 @@ def stcoil(self, output: bool): coilcoilgap = tfcoil_variables.toroidalgap - tfcoil_variables.tftort # Variables for ALL coils. - tfcoil_variables.tfareain = ( + tfcoil_variables.a_tf_coil_inboard = ( tfcoil_variables.n_tf_coils * tfcoil_variables.a_tf_leg_outboard ) # [m^2] Total area of all coil legs (midplane) tfcoil_variables.c_tf_total = ( tfcoil_variables.n_tf_coils * coilcurrent * 1.0e6 ) # [A] Total current in ALL coils tfcoil_variables.oacdcp = ( - tfcoil_variables.c_tf_total / tfcoil_variables.tfareain + tfcoil_variables.c_tf_total / tfcoil_variables.a_tf_coil_inboard ) # [A / m^2] overall current density tfcoil_variables.rbmax = ( r_coil_major - r_coil_minor + awp_rad @@ -3648,7 +3648,7 @@ def stcoil_output( self.outfile, "Cross-sectional area per coil (m2)", "(tfarea/n_tf_coils)", - tfcoil_variables.tfareain / tfcoil_variables.n_tf_coils, + tfcoil_variables.a_tf_coil_inboard / tfcoil_variables.n_tf_coils, ) po.ovarre( self.outfile, diff --git a/process/superconducting_tf_coil.py b/process/superconducting_tf_coil.py index 2693357fca..89097fb150 100644 --- a/process/superconducting_tf_coil.py +++ b/process/superconducting_tf_coil.py @@ -1710,7 +1710,7 @@ def sc_tf_internal_geom(self, i_tf_wp_geom, i_tf_case_geom, i_tf_turns_integer): sctfcoil_module.f_tf_steel = ( tfcoil_variables.n_tf_coils * sctfcoil_module.a_tf_steel - / tfcoil_variables.tfareain + / tfcoil_variables.a_tf_coil_inboard ) # Inboard coil insulation cross-section [m2] @@ -1722,7 +1722,7 @@ def sc_tf_internal_geom(self, i_tf_wp_geom, i_tf_case_geom, i_tf_turns_integer): sctfcoil_module.f_tf_ins = ( tfcoil_variables.n_tf_coils * sctfcoil_module.a_tf_ins - / tfcoil_variables.tfareain + / tfcoil_variables.a_tf_coil_inboard ) # Negative areas or fractions error reporting @@ -1913,7 +1913,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_coils + tfcoil_variables.a_tf_coil_inboard / tfcoil_variables.n_tf_coils ) - sctfcoil_module.awpc # Outboard leg cross-sectional area of surrounding case [m2] @@ -2403,8 +2403,8 @@ def outtf(self, peaktfflag): po.ovarre( self.outfile, "TF cross-section (total) (m2)", - "(tfareain)", - tfcoil_variables.tfareain, + "(a_tf_coil_inboard)", + tfcoil_variables.a_tf_coil_inboard, ) po.ovarre( self.outfile, diff --git a/process/tf_coil.py b/process/tf_coil.py index 62ed59f154..32ccda2be8 100644 --- a/process/tf_coil.py +++ b/process/tf_coil.py @@ -268,12 +268,12 @@ def tf_global_geometry(self): # TF coil inboard legs mid-plane cross-section area (WP + casing ) [m2] if tfcoil_variables.i_tf_case_geom == 0: # Circular front case - tfcoil_variables.tfareain = np.pi * ( + tfcoil_variables.a_tf_coil_inboard = np.pi * ( build_variables.r_tf_inboard_out**2 - build_variables.r_tf_inboard_in**2 ) else: # Straight front case - tfcoil_variables.tfareain = ( + tfcoil_variables.a_tf_coil_inboard = ( tfcoil_variables.n_tf_coils * np.sin(sctfcoil_module.rad_tf_coil_toroidal) * np.cos(sctfcoil_module.rad_tf_coil_toroidal) @@ -385,7 +385,7 @@ def tf_current(self): # Global inboard leg average current in TF coils [A/m2] tfcoil_variables.oacdcp = ( - tfcoil_variables.c_tf_total / tfcoil_variables.tfareain + tfcoil_variables.c_tf_total / tfcoil_variables.a_tf_coil_inboard ) def coilshap(self): diff --git a/source/fortran/tfcoil_variables.f90 b/source/fortran/tfcoil_variables.f90 index 7e0d4c1f6e..6a4bc658cb 100644 --- a/source/fortran/tfcoil_variables.f90 +++ b/source/fortran/tfcoil_variables.f90 @@ -499,7 +499,7 @@ module tfcoil_variables !! - exponential quench : e-folding time (s)` !! - linear quench : discharge time (s) - real(dp) :: tfareain + real(dp) :: a_tf_coil_inboard !! Area of inboard midplane TF legs (m2) real(dp) :: len_tf_bus diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index be2b59ce9a..2fbc2d33af 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -684,7 +684,7 @@ TF_coil_arc_point_3_Z_(m)_______________________________________________ (yarc(4))_____________________ -8.8182E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 1.8229E+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_coils)_______________ 8.4752E-01 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 2378885561..9fbe0a8dba 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -685,7 +685,7 @@ TF_coil_arc_point_3_Z_(m)_______________________________________________ (yarc(4))_____________________ -8.8182E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 1.8229E+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_coils)_______________ 8.4752E-01 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 16c4d3f681..c204ffa8f3 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -685,7 +685,7 @@ TF_coil_arc_point_3_Z_(m)_______________________________________________ (yarc(4))_____________________ -8.8182E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 1.8229E+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_coils)_______________ 8.4752E-01 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 23d97a7d49..65206399fb 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -685,7 +685,7 @@ TF_coil_arc_point_3_Z_(m)_______________________________________________ (yarc(4))_____________________ -8.8182E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 1.8229E+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_coils)_______________ 8.4752E-01 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index cfd534be56..fa99fd4665 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -688,7 +688,7 @@ TF_coil_arc_point_3_Z_(m)_______________________________________________ (yarc(4))_____________________ -8.8182E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 1.8459E+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_coils)_______________ 8.5858E-01 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 4ba120d6fe..a974ac3faa 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -686,7 +686,7 @@ TF_coil_arc_point_3_Z_(m)_______________________________________________ (yarc(4))_____________________ -8.8182E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 1.7522E+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_coils)_______________ 8.3156E-01 @@ -1849,7 +1849,7 @@ TF_coil_arc_point_3_Z_(m)_______________________________________________ (yarc(4))_____________________ -8.8182E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 1.7234E+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_coils)_______________ 8.2321E-01 @@ -3012,7 +3012,7 @@ TF_coil_arc_point_3_Z_(m)_______________________________________________ (yarc(4))_____________________ -8.8182E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 1.6999E+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_coils)_______________ 8.1642E-01 @@ -4175,7 +4175,7 @@ TF_coil_arc_point_3_Z_(m)_______________________________________________ (yarc(4))_____________________ -8.8182E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 1.7023E+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_coils)_______________ 8.1709E-01 @@ -5338,7 +5338,7 @@ TF_coil_arc_point_3_Z_(m)_______________________________________________ (yarc(4))_____________________ -8.8182E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 1.7234E+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_coils)_______________ 8.2348E-01 @@ -6501,7 +6501,7 @@ TF_coil_arc_point_3_Z_(m)_______________________________________________ (yarc(4))_____________________ -8.8182E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 1.7533E+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_coils)_______________ 8.3058E-01 @@ -7664,7 +7664,7 @@ TF_coil_arc_point_3_Z_(m)_______________________________________________ (yarc(4))_____________________ -8.8182E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 1.7561E+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_coils)_______________ 8.3152E-01 @@ -8827,7 +8827,7 @@ TF_coil_arc_point_3_Z_(m)_______________________________________________ (yarc(4))_____________________ -8.8182E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 1.7306E+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_coils)_______________ 8.2402E-01 @@ -9990,7 +9990,7 @@ TF_coil_arc_point_3_Z_(m)_______________________________________________ (yarc(4))_____________________ -8.8182E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 1.7063E+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_coils)_______________ 8.1680E-01 @@ -11153,7 +11153,7 @@ TF_coil_arc_point_3_Z_(m)_______________________________________________ (yarc(4))_____________________ -8.8182E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 1.7077E+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_coils)_______________ 8.1713E-01 @@ -12316,7 +12316,7 @@ TF_coil_arc_point_3_Z_(m)_______________________________________________ (yarc(4))_____________________ -8.8182E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 1.7321E+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_coils)_______________ 8.2448E-01 @@ -13479,7 +13479,7 @@ TF_coil_arc_point_3_Z_(m)_______________________________________________ (yarc(4))_____________________ -8.8182E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 1.7571E+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_coils)_______________ 8.3158E-01 @@ -14642,7 +14642,7 @@ TF_coil_arc_point_3_Z_(m)_______________________________________________ (yarc(4))_____________________ -8.8182E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 1.7588E+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_coils)_______________ 8.3202E-01 @@ -15805,7 +15805,7 @@ TF_coil_arc_point_3_Z_(m)_______________________________________________ (yarc(4))_____________________ -8.8182E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 1.7331E+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_coils)_______________ 8.2421E-01 @@ -16968,7 +16968,7 @@ TF_coil_arc_point_3_Z_(m)_______________________________________________ (yarc(4))_____________________ -8.8182E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 1.7073E+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_coils)_______________ 8.1641E-01 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index c6758dab77..3bdff9434a 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -532,7 +532,7 @@ TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(4))_____________________ -9.2447E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 3.3244E+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_coils)_______________ 2.3627E+00 @@ -1527,7 +1527,7 @@ TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(4))_____________________ -9.2447E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 3.3244E+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_coils)_______________ 2.3627E+00 @@ -2522,7 +2522,7 @@ TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(4))_____________________ -9.2447E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 3.3244E+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_coils)_______________ 2.3626E+00 @@ -3517,7 +3517,7 @@ TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(4))_____________________ -9.2447E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 3.3244E+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_coils)_______________ 2.3626E+00 @@ -4512,7 +4512,7 @@ TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(4))_____________________ -9.2447E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 3.3244E+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_coils)_______________ 2.3626E+00 @@ -5507,7 +5507,7 @@ TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(4))_____________________ -9.2447E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 3.3244E+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_coils)_______________ 2.3626E+00 @@ -6502,7 +6502,7 @@ TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(4))_____________________ -9.2447E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 3.3244E+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_coils)_______________ 2.3626E+00 @@ -7497,7 +7497,7 @@ TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(4))_____________________ -9.2447E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 3.3244E+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_coils)_______________ 2.3626E+00 @@ -8492,7 +8492,7 @@ TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(4))_____________________ -9.2447E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 3.3244E+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_coils)_______________ 2.3626E+00 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index da9fc3ca64..5de4e4822c 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -7492,7 +7492,7 @@ ], "tfacmw": 0.0, "tfacpd": 0.0, - "tfareain": 0.0, + "a_tf_coil_inboard": 0.0, "tfb": [ 0.0, 0.0, @@ -10707,7 +10707,7 @@ "tfa": "Horizontal radius of inside edge of TF coil (m)", "tfacmw": "IFE target factory power (MW)", "tfacpd": "total steady state TF coil AC power demand (MW)", - "tfareain": "Area of inboard midplane TF legs (m2)", + "a_tf_coil_inboard": "Area of inboard midplane TF legs (m2)", "tfb": "Vertical radius of inside edge of TF coil (m)", "len_tf_bus": "TF coil bus length (m)", "m_tf_bus": "TF coil bus mass (kg)", @@ -19429,7 +19429,7 @@ "taucq", "tcritsc", "tdmptf", - "tfareain", + "a_tf_coil_inboard", "len_tf_bus", "m_tf_bus", "tfckw", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 792edf43cb..ead45da86c 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -688,7 +688,7 @@ TF_coil_arc_point_3_Z_(m)_______________________________________________ (yarc(4))_____________________ -8.8182E+00 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 + TF_cross-section_(total)_(m2)___________________________________________ (a_tf_coil_inboard)____________________ 1.8459E+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_coils)_______________ 8.5858E-01 diff --git a/tests/unit/test_resistive_tf_coil.py b/tests/unit/test_resistive_tf_coil.py index bb6c19fee7..8bb042d9d6 100644 --- a/tests/unit/test_resistive_tf_coil.py +++ b/tests/unit/test_resistive_tf_coil.py @@ -32,7 +32,7 @@ class ResTfInternalGeomParam(NamedTuple): tftort: Any = None - tfareain: Any = None + a_tf_coil_inboard: Any = None c_tf_total: Any = None @@ -82,7 +82,7 @@ class ResTfInternalGeomParam(NamedTuple): thkcas=0, dr_tf_wp=0.15483000000000002, tftort=0.45367650933034859, - tfareain=0.0753112923616783, + a_tf_coil_inboard=0.0753112923616783, c_tf_total=25500000, fcoolcp=0.12725, cpttf=70000, @@ -109,7 +109,7 @@ class ResTfInternalGeomParam(NamedTuple): thkcas=0, dr_tf_wp=0.14708850000000001, tftort=0.44435902370665786, - tfareain=0.0753112923616783, + a_tf_coil_inboard=0.0753112923616783, c_tf_total=25500000, fcoolcp=0.12725, cpttf=2125000, @@ -158,7 +158,9 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, resistive_tf_ monkeypatch.setattr(tfcoil_variables, "tftort", restfinternalgeomparam.tftort) - monkeypatch.setattr(tfcoil_variables, "tfareain", restfinternalgeomparam.tfareain) + monkeypatch.setattr( + tfcoil_variables, "a_tf_coil_inboard", restfinternalgeomparam.a_tf_coil_inboard + ) monkeypatch.setattr( tfcoil_variables, "c_tf_total", restfinternalgeomparam.c_tf_total diff --git a/tests/unit/test_sctfcoil.py b/tests/unit/test_sctfcoil.py index 67a7f4b43d..fa2be36ed1 100644 --- a/tests/unit/test_sctfcoil.py +++ b/tests/unit/test_sctfcoil.py @@ -727,7 +727,7 @@ class TfCaseGeomParam(NamedTuple): a_tf_leg_outboard: Any = None - tfareain: Any = None + a_tf_coil_inboard: Any = None n_tf_coils: Any = None @@ -779,7 +779,7 @@ class TfCaseGeomParam(NamedTuple): acasetf=0, acasetfo=0, a_tf_leg_outboard=1.9805354702921749, - tfareain=27.308689677971632, + a_tf_coil_inboard=27.308689677971632, n_tf_coils=16, casths=0.05000000000000001, casthi=0.060000000000000012, @@ -806,7 +806,7 @@ class TfCaseGeomParam(NamedTuple): acasetf=1.0015169239205168, acasetfo=1.2752592893394648, a_tf_leg_outboard=1.9805354702921749, - tfareain=27.308689677971632, + a_tf_coil_inboard=27.308689677971632, n_tf_coils=16, casths=0.05000000000000001, casthi=0.060000000000000012, @@ -852,7 +852,9 @@ def test_tf_case_geom(tfcasegeomparam, monkeypatch, sctfcoil): tfcoil_variables, "a_tf_leg_outboard", tfcasegeomparam.a_tf_leg_outboard ) - monkeypatch.setattr(tfcoil_variables, "tfareain", tfcasegeomparam.tfareain) + monkeypatch.setattr( + tfcoil_variables, "a_tf_coil_inboard", tfcasegeomparam.a_tf_coil_inboard + ) monkeypatch.setattr(tfcoil_variables, "n_tf_coils", tfcasegeomparam.n_tf_coils) diff --git a/tests/unit/test_tfcoil.py b/tests/unit/test_tfcoil.py index 928b322c28..33650f5733 100644 --- a/tests/unit/test_tfcoil.py +++ b/tests/unit/test_tfcoil.py @@ -251,7 +251,7 @@ class TfGlobalGeometryParam(NamedTuple): dr_tf_outboard: Any = None - tfareain: Any = None + a_tf_coil_inboard: Any = None c_tf_total: Any = None @@ -283,7 +283,7 @@ class TfGlobalGeometryParam(NamedTuple): tan_theta_coil: Any = None - expected_tfareain: Any = None + expected_a_tf_coil_inboard: Any = None expected_tftort: Any = None @@ -307,7 +307,7 @@ class TfGlobalGeometryParam(NamedTuple): r_tf_inboard_in=2.9939411851091102, r_tf_inboard_out=4.20194118510911, dr_tf_outboard=1.208, - tfareain=0, + a_tf_coil_inboard=0, c_tf_total=0, tftort=1, n_tf_coils=16, @@ -323,7 +323,7 @@ class TfGlobalGeometryParam(NamedTuple): r_tf_outboard_out=0, rad_tf_coil_toroidal=0, tan_theta_coil=0, - expected_tfareain=27.308689677971632, + expected_a_tf_coil_inboard=27.308689677971632, expected_tftort=1.6395161177915356, expected_a_tf_leg_outboard=1.9805354702921749, expected_r_tf_outboard_in=15.915405859443332, @@ -337,7 +337,7 @@ class TfGlobalGeometryParam(NamedTuple): r_tf_inboard_in=2.9538679176819831, r_tf_inboard_out=4.4822055399518357, dr_tf_outboard=1.5283376222698528, - tfareain=35.703669036223495, + a_tf_coil_inboard=35.703669036223495, c_tf_total=241812532.66279837, tftort=1.7488698442633552, n_tf_coils=16, @@ -353,7 +353,7 @@ class TfGlobalGeometryParam(NamedTuple): r_tf_outboard_out=17.827520102947819, rad_tf_coil_toroidal=0.19634954084936207, tan_theta_coil=0.19891236737965801, - expected_tfareain=35.703669036223495, + expected_a_tf_coil_inboard=35.703669036223495, expected_tftort=1.7488698442633552, expected_a_tf_leg_outboard=2.6728635794409041, expected_r_tf_outboard_in=16.299182480677967, @@ -397,7 +397,9 @@ def test_tf_global_geometry(tfglobalgeometryparam, monkeypatch, tfcoil): build_variables, "dr_tf_outboard", tfglobalgeometryparam.dr_tf_outboard ) - monkeypatch.setattr(tfcoil_variables, "tfareain", tfglobalgeometryparam.tfareain) + monkeypatch.setattr( + tfcoil_variables, "a_tf_coil_inboard", tfglobalgeometryparam.a_tf_coil_inboard + ) monkeypatch.setattr( tfcoil_variables, "c_tf_total", tfglobalgeometryparam.c_tf_total @@ -449,8 +451,8 @@ def test_tf_global_geometry(tfglobalgeometryparam, monkeypatch, tfcoil): tfcoil.tf_global_geometry() - assert tfcoil_variables.tfareain == pytest.approx( - tfglobalgeometryparam.expected_tfareain + assert tfcoil_variables.a_tf_coil_inboard == pytest.approx( + tfglobalgeometryparam.expected_a_tf_coil_inboard ) assert tfcoil_variables.tftort == pytest.approx( @@ -513,7 +515,7 @@ class TfCurrentParam(NamedTuple): oacdcp: Any = None - tfareain: Any = None + a_tf_coil_inboard: Any = None r_tf_inboard_out: Any = None @@ -561,7 +563,7 @@ class TfCurrentParam(NamedTuple): thicndut=0.002, thkcas=0.52465000000000006, oacdcp=8673900, - tfareain=27.308689677971632, + a_tf_coil_inboard=27.308689677971632, r_tf_inboard_out=4.20194118510911, r_tf_inboard_in=2.9939411851091102, dr_tf_inboard=1.208, @@ -639,7 +641,9 @@ def test_tf_current(tfcurrentparam, monkeypatch, tfcoil): monkeypatch.setattr(tfcoil_variables, "oacdcp", tfcurrentparam.oacdcp) - monkeypatch.setattr(tfcoil_variables, "tfareain", tfcurrentparam.tfareain) + monkeypatch.setattr( + tfcoil_variables, "a_tf_coil_inboard", tfcurrentparam.a_tf_coil_inboard + ) monkeypatch.setattr( build_variables, "r_tf_inboard_out", tfcurrentparam.r_tf_inboard_out From b56cd90229f444f46ed260745e806c1e2a96f2a4 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 28 Mar 2025 14:18:45 +0000 Subject: [PATCH 06/21] =?UTF-8?q?=F0=9F=94=84=20Rename=20h=5Fcp=5Ftop=20to?= =?UTF-8?q?=20z=5Fcp=5Ftop=20for=20clarity=20and=20consistency;=20update?= =?UTF-8?q?=20references=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/hcpb.py | 10 +++++----- process/resistive_tf_coil.py | 2 +- process/superconducting_tf_coil.py | 4 ++-- process/tf_coil.py | 2 +- source/fortran/sctfcoil.f90 | 2 +- tests/integration/ref_dicts.json | 6 +++--- tests/unit/test_ccfe_hcpb.py | 8 ++++---- tests/unit/test_resistive_tf_coil.py | 8 ++++---- tests/unit/test_tfcoil.py | 8 ++++---- 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/process/hcpb.py b/process/hcpb.py index a7c20db746..95201f7de5 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -865,7 +865,7 @@ def powerflow_calc(self, output: bool): "OP ", ) - def st_cp_angle_fraction(self, h_cp_top, r_cp_mid, r_cp_top, rmajor): + def st_cp_angle_fraction(self, z_cp_top, r_cp_mid, r_cp_top, rmajor): """Author : S. Kahn, CCFE, Culham science centre Estimates the CP angular solid angle coverage fration Equation (1-3) from @@ -873,7 +873,7 @@ def st_cp_angle_fraction(self, h_cp_top, r_cp_mid, r_cp_top, rmajor): Initial, but undocumented calculation kept as commented section without any talor expansion approximation - :param h_cp_top: Centrepost shield half height [m] + :param z_cp_top: Centrepost shield half height [m] :param r_cp_top: Centrepost top radius [m] :param r_cp_mid: Centrepost mid-plane radius [m] :param rmajor: Plasma major radius [m] @@ -911,7 +911,7 @@ def st_cp_angle_fraction(self, h_cp_top, r_cp_mid, r_cp_top, rmajor): int_calc_3 = 0.0 int_calc_1 = 1.0 / np.sqrt( - h_cp_top**2 + (rho_maj * np.cos(phy_cp_calc) - np.sqrt(int_calc_3)) ** 2 + z_cp_top**2 + (rho_maj * np.cos(phy_cp_calc) - np.sqrt(int_calc_3)) ** 2 ) phy_cp_calc = phy_cp_calc + d_phy_cp @@ -922,12 +922,12 @@ def st_cp_angle_fraction(self, h_cp_top, r_cp_mid, r_cp_top, rmajor): int_calc_3 = 0.0 int_calc_2 = 1.0 / np.sqrt( - h_cp_top**2 + (rho_maj * np.cos(phy_cp_calc) - np.sqrt(int_calc_3)) ** 2 + z_cp_top**2 + (rho_maj * np.cos(phy_cp_calc) - np.sqrt(int_calc_3)) ** 2 ) cp_sol_angle = cp_sol_angle + d_phy_cp * 0.5 * (int_calc_1 + int_calc_2) - cp_sol_angle = cp_sol_angle * 4.0 * h_cp_top + cp_sol_angle = cp_sol_angle * 4.0 * z_cp_top # Solid angle fraction covered by the CP (OUTPUT) [-] return 0.25 * cp_sol_angle / np.pi diff --git a/process/resistive_tf_coil.py b/process/resistive_tf_coil.py index a8339b4bb0..a27583cf22 100644 --- a/process/resistive_tf_coil.py +++ b/process/resistive_tf_coil.py @@ -459,7 +459,7 @@ def tf_res_heating(self) -> None: build_variables.r_tf_inboard_in, build_variables.r_tf_inboard_out, build_variables.r_cp_top, - sctfcoil_module.h_cp_top, + sctfcoil_module.z_cp_top, build_variables.hmax + build_variables.dr_tf_outboard, tfcoil_variables.thkcas, tfcoil_variables.casthi, diff --git a/process/superconducting_tf_coil.py b/process/superconducting_tf_coil.py index 89097fb150..281624cedc 100644 --- a/process/superconducting_tf_coil.py +++ b/process/superconducting_tf_coil.py @@ -2386,8 +2386,8 @@ def outtf(self, peaktfflag): po.ovarre( self.outfile, "Distance from the midplane to the top of the tapered section (m)", - "(h_cp_top)", - sctfcoil_module.h_cp_top, + "(z_cp_top)", + sctfcoil_module.z_cp_top, ) po.ovarre( self.outfile, diff --git a/process/tf_coil.py b/process/tf_coil.py index 32ccda2be8..7c19acde8c 100644 --- a/process/tf_coil.py +++ b/process/tf_coil.py @@ -283,7 +283,7 @@ def tf_global_geometry(self): # Vertical distance from the midplane to the top of the tapered section [m] if physics_variables.itart == 1: - sctfcoil_module.h_cp_top = ( + sctfcoil_module.z_cp_top = ( build_variables.z_plasma_xpoint_upper + tfcoil_variables.dztop ) # --- diff --git a/source/fortran/sctfcoil.f90 b/source/fortran/sctfcoil.f90 index 7e0432f2af..7284bccbe4 100755 --- a/source/fortran/sctfcoil.f90 +++ b/source/fortran/sctfcoil.f90 @@ -54,7 +54,7 @@ module sctfcoil_module real(dp) :: f_tf_ins !! Inboard coil insulation fraction [-] - real(dp) :: h_cp_top + real(dp) :: z_cp_top !! Vertical distance from the midplane to the top of the tapered section [m] real(dp) :: r_tf_outboard_in diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 5de4e4822c..d294246deb 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -2183,7 +2183,7 @@ "gsmass": 0.0, "gtscale": 0.0, "h": null, - "h_cp_top": 0.0, + "z_cp_top": 0.0, "h_ib": 0.0, "h_ob": 0.0, "harnum": 1.0, @@ -9672,7 +9672,7 @@ "gsmass": "reactor core gravity support mass (kg)", "gtscale": "switch for a/R scaling of beta_norm_max (`iprofile=0` only):\n
    \n
  • =0 do not scale beta_norm_max with eps
    • \n
  • =1 scale beta_norm_max with eps, original scaling
    • \n
  • =2 scale beta_norm_max with eps, Menard scaling
    • \n
", "h": "", - "h_cp_top": "Vertical distance from the midplane to the top of the tapered section [m]", + "z_cp_top": "Vertical distance from the midplane to the top of the tapered section [m]", "h_ib": "", "h_ob": "", "harnum": "cyclotron harmonic frequency number, used in EBW cut-off", @@ -19216,7 +19216,7 @@ "a_tf_ins", "f_tf_steel", "f_tf_ins", - "h_cp_top", + "z_cp_top", "r_tf_outboard_in", "r_tf_outboard_out", "r_wp_inner", diff --git a/tests/unit/test_ccfe_hcpb.py b/tests/unit/test_ccfe_hcpb.py index f3cac1a70c..6bfe21e6ac 100644 --- a/tests/unit/test_ccfe_hcpb.py +++ b/tests/unit/test_ccfe_hcpb.py @@ -1160,7 +1160,7 @@ def test_powerflow_calc(powerflowcalcparam, monkeypatch, ccfe_hcpb): class StCpAngleFractionParam(NamedTuple): - h_cp_top: Any = None + z_cp_top: Any = None r_cp_top: Any = None @@ -1175,14 +1175,14 @@ class StCpAngleFractionParam(NamedTuple): "stcpanglefractionparam", ( StCpAngleFractionParam( - h_cp_top=2.6714285714285717, + z_cp_top=2.6714285714285717, r_cp_top=0.92643571428571436, r_cp_mid=0.20483000000000001, rmajor=1.7000000000000002, expected_f_geom_cp=0.08375588625302606, ), StCpAngleFractionParam( - h_cp_top=2.6714285714285717, + z_cp_top=2.6714285714285717, r_cp_top=0.92643571428571436, r_cp_mid=0.20483000000000001, rmajor=1.7000000000000002, @@ -1201,7 +1201,7 @@ def test_st_cp_angle_fraction(stcpanglefractionparam, ccfe_hcpb): """ f_geom_cp = ccfe_hcpb.st_cp_angle_fraction( - h_cp_top=stcpanglefractionparam.h_cp_top, + z_cp_top=stcpanglefractionparam.z_cp_top, r_cp_top=stcpanglefractionparam.r_cp_top, r_cp_mid=stcpanglefractionparam.r_cp_mid, rmajor=stcpanglefractionparam.rmajor, diff --git a/tests/unit/test_resistive_tf_coil.py b/tests/unit/test_resistive_tf_coil.py index 8bb042d9d6..b0feced456 100644 --- a/tests/unit/test_resistive_tf_coil.py +++ b/tests/unit/test_resistive_tf_coil.py @@ -285,7 +285,7 @@ class TfResHeatingParam(NamedTuple): r_tf_inboard_in: Any = None r_tf_inboard_out: Any = None itart: Any = None - h_cp_top: Any = None + z_cp_top: Any = None is_leg_cp_temp_same: Any = None expected_rho_cp: Any = None expected_rho_tf_leg: Any = None @@ -339,7 +339,7 @@ class TfResHeatingParam(NamedTuple): r_tf_inboard_in=0, r_tf_inboard_out=0.15483000000000002, itart=1, - h_cp_top=2.6714285714285717, + z_cp_top=2.6714285714285717, is_leg_cp_temp_same=0, expected_rho_cp=2.0721414e-08, expected_rho_tf_leg=2.0721414e-08, @@ -389,7 +389,7 @@ class TfResHeatingParam(NamedTuple): r_tf_inboard_in=0, r_tf_inboard_out=0.15483000000000002, itart=1, - h_cp_top=2.6714285714285717, + z_cp_top=2.6714285714285717, is_leg_cp_temp_same=1, expected_rho_cp=2.0721414e-08, expected_rho_tf_leg=2.0721414e-08, @@ -518,7 +518,7 @@ def test_tf_res_heating(tfresheatingparam, monkeypatch, resistive_tf_coil): monkeypatch.setattr(physics_variables, "itart", tfresheatingparam.itart) - monkeypatch.setattr(sctfcoil_module, "h_cp_top", tfresheatingparam.h_cp_top) + monkeypatch.setattr(sctfcoil_module, "z_cp_top", tfresheatingparam.z_cp_top) monkeypatch.setattr( sctfcoil_module, "is_leg_cp_temp_same", tfresheatingparam.is_leg_cp_temp_same diff --git a/tests/unit/test_tfcoil.py b/tests/unit/test_tfcoil.py index 33650f5733..20bb0f38a0 100644 --- a/tests/unit/test_tfcoil.py +++ b/tests/unit/test_tfcoil.py @@ -273,7 +273,7 @@ class TfGlobalGeometryParam(NamedTuple): rminor: Any = None - h_cp_top: Any = None + z_cp_top: Any = None r_tf_outboard_in: Any = None @@ -318,7 +318,7 @@ class TfGlobalGeometryParam(NamedTuple): itart=0, kappa=1.8480000000000001, rminor=2.8677741935483869, - h_cp_top=0, + z_cp_top=0, r_tf_outboard_in=0, r_tf_outboard_out=0, rad_tf_coil_toroidal=0, @@ -348,7 +348,7 @@ class TfGlobalGeometryParam(NamedTuple): itart=0, kappa=1.8480000000000001, rminor=2.9620024998595755, - h_cp_top=0, + z_cp_top=0, r_tf_outboard_in=16.299182480677967, r_tf_outboard_out=17.827520102947819, rad_tf_coil_toroidal=0.19634954084936207, @@ -429,7 +429,7 @@ def test_tf_global_geometry(tfglobalgeometryparam, monkeypatch, tfcoil): monkeypatch.setattr(physics_variables, "rminor", tfglobalgeometryparam.rminor) - monkeypatch.setattr(sctfcoil_module, "h_cp_top", tfglobalgeometryparam.h_cp_top) + monkeypatch.setattr(sctfcoil_module, "z_cp_top", tfglobalgeometryparam.z_cp_top) monkeypatch.setattr( sctfcoil_module, "r_tf_outboard_in", tfglobalgeometryparam.r_tf_outboard_in From 5f24ac2406bf45d6e46fb68cc9f764dc40363c6d Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 28 Mar 2025 14:22:44 +0000 Subject: [PATCH 07/21] =?UTF-8?q?=F0=9F=94=84=20Rename=20tftort=20to=20dx?= =?UTF-8?q?=5Ftf=5Finboard=5Fout=5Ftoroidal=20for=20clarity=20and=20consis?= =?UTF-8?q?tency;=20update=20references=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/fusion-devices/stellarator.md | 2 +- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/build.py | 4 ++- process/resistive_tf_coil.py | 8 +++-- process/stellarator.py | 22 +++++++------ process/superconducting_tf_coil.py | 4 +-- process/tf_coil.py | 8 ++--- process/utilities/errorlist.json | 2 +- source/fortran/constraint_equations.f90 | 14 ++++---- source/fortran/numerics.f90 | 6 ++-- source/fortran/tfcoil_variables.f90 | 6 ++-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 ++++++++--------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 16 +++++----- .../spherical_tokamak_once_through.IN.DAT | 2 +- .../stellarator_helias_once_through.IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_build.py | 24 +++++++++----- tests/unit/test_resistive_tf_coil.py | 24 +++++++++----- tests/unit/test_stellarator.py | 12 ++++--- tests/unit/test_tfcoil.py | 32 ++++++++++++------- 31 files changed, 155 insertions(+), 121 deletions(-) diff --git a/documentation/proc-pages/fusion-devices/stellarator.md b/documentation/proc-pages/fusion-devices/stellarator.md index fc1ca32c07..ddb332025e 100644 --- a/documentation/proc-pages/fusion-devices/stellarator.md +++ b/documentation/proc-pages/fusion-devices/stellarator.md @@ -209,7 +209,7 @@ The fully three-dimensional shape of the coils is assumed to be fixed, but the s The stellarator coils are assumed to be superconducting - no resistive coil calculations are performed. The critical field at the superconductor is calculated using circular approximations for the coils in the inductance and field calculations, and the limit is enforced automatically. All superconductor materials that are available for tokamaks are also available for stellarators. -The winding pack cross-section is rectangular for the stellarator coils, rather than the two-step cross-section assumed for tokamaks. The coil thicknesses and most of the dimensions of the materials within the coil cross-section are outputs from the model, instead of being inputs as is the case for tokamaks; see the variable descriptor file for details. In addition, certain iteration variables (`dr_tf_inboard`, no. 13; `thkcas`, no. 57; `cpttf`, no. 60 and `tftort`, no. 77) should not be turned on in the input file as they are calculated self-consistently (`thkcas` is required as input); the code will stop with an error message of this is attempted. +The winding pack cross-section is rectangular for the stellarator coils, rather than the two-step cross-section assumed for tokamaks. The coil thicknesses and most of the dimensions of the materials within the coil cross-section are outputs from the model, instead of being inputs as is the case for tokamaks; see the variable descriptor file for details. In addition, certain iteration variables (`dr_tf_inboard`, no. 13; `thkcas`, no. 57; `cpttf`, no. 60 and `dx_tf_inboard_out_toroidal`, no. 77) should not be turned on in the input file as they are calculated self-consistently (`thkcas` is required as input); the code will stop with an error message of this is attempted. The conduit insulation thickness (`thicndut`), as well as the steel thickness around each conductor (`thwcndut`) should be given as input parameters together with the dimension of the conductor area (`t_turn_tf`). diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 7254dd9efb..09bcf4f727 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -674,7 +674,7 @@ Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4985E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 8.6482E-01 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 8.6482E-01 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7815E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index e3d2f634f7..95e7496cd9 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -671,7 +671,7 @@ Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4985E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 9.1597E-01 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 9.1597E-01 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7937E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 860d1190c0..1951f27991 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -671,7 +671,7 @@ Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4985E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 9.1597E-01 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 9.1597E-01 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7937E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index edde239723..fc48528455 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -671,7 +671,7 @@ Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4985E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 9.1597E-01 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 9.1597E-01 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7937E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 8bdbe5038c..a045847e6d 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -671,7 +671,7 @@ Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4985E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 9.1597E-01 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 9.1597E-01 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7937E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 5707e6a12f..f765914c06 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -518,7 +518,7 @@ Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 1.4000E+00 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 1.4000E+00 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.7477E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.7477E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 9.2447E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 5.1957E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 @@ -1513,7 +1513,7 @@ Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 1.4000E+00 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 1.4000E+00 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.7477E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.7477E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 9.2447E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 5.1957E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 @@ -2508,7 +2508,7 @@ Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 1.4000E+00 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 1.4000E+00 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.7477E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.7477E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 9.2447E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 5.1957E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 @@ -3503,7 +3503,7 @@ Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 1.4000E+00 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 1.4000E+00 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.7477E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.7477E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 9.2447E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 5.1957E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 @@ -4498,7 +4498,7 @@ Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 1.4000E+00 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 1.4000E+00 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.7477E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.7477E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 9.2447E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 5.1957E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 @@ -5493,7 +5493,7 @@ Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 1.4000E+00 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 1.4000E+00 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.7477E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.7477E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 9.2447E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 5.1957E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 @@ -6488,7 +6488,7 @@ Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 1.4000E+00 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 1.4000E+00 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.7477E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.7477E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 9.2447E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 5.1957E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 @@ -7483,7 +7483,7 @@ Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 1.4000E+00 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 1.4000E+00 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.7477E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.7477E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 9.2447E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 5.1957E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 @@ -8478,7 +8478,7 @@ Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 1.4000E+00 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 1.4000E+00 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.7477E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.7477E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 9.2447E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 5.1957E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 diff --git a/process/build.py b/process/build.py index 898e57a67c..4ba8fa2353 100644 --- a/process/build.py +++ b/process/build.py @@ -49,7 +49,9 @@ def portsz(self): 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) + a = ( + 0.5e0 * tfcoil_variables.dx_tf_inboard_out_toroidal + ) # (previously used inboard leg width) try: assert a < np.inf except AssertionError: diff --git a/process/resistive_tf_coil.py b/process/resistive_tf_coil.py index a27583cf22..c0c7af4476 100644 --- a/process/resistive_tf_coil.py +++ b/process/resistive_tf_coil.py @@ -352,7 +352,7 @@ def res_tf_internal_geom(self): tfcoil_variables.cdtfleg = tfcoil_variables.c_tf_total / ( (1.0e0 - tfcoil_variables.fcoolcp) * ( - tfcoil_variables.tftort + tfcoil_variables.dx_tf_inboard_out_toroidal - 2.0e0 * ( tfcoil_variables.n_tf_turn * tfcoil_variables.thicndut @@ -477,12 +477,14 @@ def tf_res_heating(self) -> None: # --- # Leg ground insulation area per coil [m2] sctfcoil_module.a_leg_gr_ins = tfcoil_variables.a_tf_leg_outboard - ( - tfcoil_variables.tftort - 2.0e0 * tfcoil_variables.tinstf + tfcoil_variables.dx_tf_inboard_out_toroidal + - 2.0e0 * tfcoil_variables.tinstf ) * (build_variables.dr_tf_outboard - 2.0e0 * tfcoil_variables.tinstf) # Outboard leg turns insulation area per coil [m2] sctfcoil_module.a_leg_ins = 2.0e0 * tfcoil_variables.thicndut * ( - tfcoil_variables.tftort - 2.0e0 * tfcoil_variables.tinstf + tfcoil_variables.dx_tf_inboard_out_toroidal + - 2.0e0 * tfcoil_variables.tinstf ) + 2.0e0 * tfcoil_variables.thicndut * tfcoil_variables.n_tf_turn * ( build_variables.dr_tf_outboard - 2.0e0 * (tfcoil_variables.thicndut + tfcoil_variables.tinstf) diff --git a/process/stellarator.py b/process/stellarator.py index bc53ec45d6..9fa7cf57e3 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -782,7 +782,7 @@ def ststrc(self, output): # The following line is correct AS LONG AS we do not scale the coil sizes intercoil_surface = ( stellarator_configuration.stella_config_coilsurface * st.f_r**2 - - tfcoil_variables.tftort + - tfcoil_variables.dx_tf_inboard_out_toroidal * stellarator_configuration.stella_config_coillength * st.f_r * st.f_n @@ -2734,7 +2734,7 @@ def stcoil(self, output: bool): ####################################################################################### # General Coil Geometry values # - tfcoil_variables.tftort = ( + tfcoil_variables.dx_tf_inboard_out_toroidal = ( tfcoil_variables.wwp1 + 2.0e0 * tfcoil_variables.casths + 2.0e0 * tfcoil_variables.tinstf @@ -2753,24 +2753,24 @@ def stcoil(self, output: bool): + 2.0e0 * tfcoil_variables.tinstf ) # [m] Thickness of outboard leg in radial direction (same as inboard) tfcoil_variables.a_tf_leg_outboard = ( - build_variables.dr_tf_inboard * tfcoil_variables.tftort + build_variables.dr_tf_inboard * tfcoil_variables.dx_tf_inboard_out_toroidal ) # [m^2] overall coil cross-sectional area (assuming inboard and # outboard leg are the same) tfcoil_variables.acasetf = ( - build_variables.dr_tf_inboard * tfcoil_variables.tftort + build_variables.dr_tf_inboard * tfcoil_variables.dx_tf_inboard_out_toroidal ) - awpc # [m^2] Cross-sectional area of surrounding case tfcoil_variables.tfocrn = ( - 0.5e0 * tfcoil_variables.tftort + 0.5e0 * tfcoil_variables.dx_tf_inboard_out_toroidal ) # [m] Half-width of side of coil nearest torus centreline tfcoil_variables.tficrn = ( - 0.5e0 * tfcoil_variables.tftort + 0.5e0 * tfcoil_variables.dx_tf_inboard_out_toroidal ) # [m] Half-width of side of coil nearest plasma # [m^2] Total surface area of coil side facing plasma: inboard region tfcoil_variables.tfsai = ( tfcoil_variables.n_tf_coils - * tfcoil_variables.tftort + * tfcoil_variables.dx_tf_inboard_out_toroidal * 0.5e0 * tfcoil_variables.len_tf_coil ) @@ -2790,7 +2790,9 @@ def stcoil(self, output: bool): ) ) # Left-Over coil gap between two coils (m) - coilcoilgap = tfcoil_variables.toroidalgap - tfcoil_variables.tftort + coilcoilgap = ( + tfcoil_variables.toroidalgap - tfcoil_variables.dx_tf_inboard_out_toroidal + ) # Variables for ALL coils. tfcoil_variables.a_tf_coil_inboard = ( @@ -3677,8 +3679,8 @@ def stcoil_output( po.ovarre( self.outfile, "Outboard leg toroidal thickness (m)", - "(tftort)", - tfcoil_variables.tftort, + "(dx_tf_inboard_out_toroidal)", + tfcoil_variables.dx_tf_inboard_out_toroidal, ) po.ovarre( self.outfile, "Minimum coil distance (m)", "(toroidalgap)", toroidalgap diff --git a/process/superconducting_tf_coil.py b/process/superconducting_tf_coil.py index 281624cedc..0b212cb190 100644 --- a/process/superconducting_tf_coil.py +++ b/process/superconducting_tf_coil.py @@ -2285,8 +2285,8 @@ def outtf(self, peaktfflag): po.ovarre( self.outfile, "Outboard leg toroidal thickness (m)", - "(tftort)", - tfcoil_variables.tftort, + "(dx_tf_inboard_out_toroidal)", + tfcoil_variables.dx_tf_inboard_out_toroidal, "OP ", ) po.ovarre( diff --git a/process/tf_coil.py b/process/tf_coil.py index 7c19acde8c..2322af5945 100644 --- a/process/tf_coil.py +++ b/process/tf_coil.py @@ -303,7 +303,7 @@ def tf_global_geometry(self): # *** # Sliding joints geometry if physics_variables.itart == 1 and tfcoil_variables.i_tf_sup != 1: - tfcoil_variables.tftort = ( + tfcoil_variables.dx_tf_inboard_out_toroidal = ( 2.0e0 * build_variables.r_cp_top * np.sin(sctfcoil_module.rad_tf_coil_toroidal) @@ -311,13 +311,13 @@ def tf_global_geometry(self): # Default thickness, initially written for DEMO SC magnets elif physics_variables.itart == 1 and tfcoil_variables.i_tf_sup == 1: - tfcoil_variables.tftort = ( + tfcoil_variables.dx_tf_inboard_out_toroidal = ( 2.0e0 * build_variables.r_tf_inboard_out * np.sin(sctfcoil_module.rad_tf_coil_toroidal) ) else: - tfcoil_variables.tftort = ( + tfcoil_variables.dx_tf_inboard_out_toroidal = ( 2.0e0 * build_variables.r_tf_inboard_out * np.sin(sctfcoil_module.rad_tf_coil_toroidal) @@ -325,7 +325,7 @@ def tf_global_geometry(self): # Area of rectangular cross-section TF outboard leg [m2] tfcoil_variables.a_tf_leg_outboard = ( - tfcoil_variables.tftort * build_variables.dr_tf_outboard + tfcoil_variables.dx_tf_inboard_out_toroidal * build_variables.dr_tf_outboard ) # --- diff --git a/process/utilities/errorlist.json b/process/utilities/errorlist.json index 790e476653..59c2ab37f6 100644 --- a/process/utilities/errorlist.json +++ b/process/utilities/errorlist.json @@ -263,7 +263,7 @@ { "no": 51, "level": 3, - "message": "LOADXC: Do not use tftort as an iteration variable if irfp=0" + "message": "LOADXC: Do not use dx_tf_inboard_out_toroidal as an iteration variable if irfp=0" }, { "no": 52, diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index e231d880f6..5abd95996a 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -3096,14 +3096,14 @@ subroutine constraint_eqn_082(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! author: J Lion, IPP Greifswald !! args : output structure : residual error; constraint value; !! residual error in physical units; output string; units string - !! toroidalgap > tftort + !! toroidalgap > dx_tf_inboard_out_toroidal !! #=# tfcoil - !! #=#=# tftort, ftoroidalgap + !! #=#=# dx_tf_inboard_out_toroidal, ftoroidalgap !! Logic change during pre-factoring: err, symbol, units will be assigned only if present. - !! ftoroidalgap : input real : f-value for constraint toroidalgap > tftort + !! ftoroidalgap : input real : f-value for constraint toroidalgap > dx_tf_inboard_out_toroidal !! toroidalgap : input real : minimal gap between two stellarator coils - !! tftort : input real : total toroidal width of a tf coil - use tfcoil_variables, only: tftort,ftoroidalgap,toroidalgap + !! dx_tf_inboard_out_toroidal : input real : total toroidal width of a tf coil + use tfcoil_variables, only: dx_tf_inboard_out_toroidal,ftoroidalgap,toroidalgap implicit none real(dp), intent(out) :: tmp_cc real(dp), intent(out) :: tmp_con @@ -3111,9 +3111,9 @@ subroutine constraint_eqn_082(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 - ftoroidalgap * toroidalgap/tftort + tmp_cc = 1.0D0 - ftoroidalgap * toroidalgap/dx_tf_inboard_out_toroidal tmp_con = toroidalgap - tmp_err = toroidalgap - tftort/ftoroidalgap + tmp_err = toroidalgap - dx_tf_inboard_out_toroidal/ftoroidalgap tmp_symbol = '<' tmp_units = 'm' diff --git a/source/fortran/numerics.f90 b/source/fortran/numerics.f90 index d81af5588e..52b8eae2a5 100755 --- a/source/fortran/numerics.f90 +++ b/source/fortran/numerics.f90 @@ -186,7 +186,7 @@ module numerics !!
  • (79) Peak CS field upper limit (itv 149 fb_cs_limit_max) !!
  • (80) Divertor power lower limit pdivt (itv 153 fpdivlim) !!
  • (81) Ne(0) > ne(ped) constraint (itv 154 fne0) - !!
  • (82) toroidalgap > tftort constraint (itv 171 ftoroidalgap) + !!
  • (82) toroidalgap > dx_tf_inboard_out_toroidal constraint (itv 171 ftoroidalgap) !!
  • (83) Radial build consistency for stellarators (itv 172 f_avspace) !!
  • (84) Lower limit for beta (itv 173 fbeta_min) !!
  • (85) Constraint for CP lifetime @@ -364,7 +364,7 @@ module numerics !!
  • (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only) !!
  • (157) fvs_cs_pf_total_ramp : F-value for available to required start up flux (con. 51) !!
  • (158) croco_thick : Thickness of CroCo copper tube (m) - !!
  • (159) ftoroidalgap : F-value for toroidalgap > tftort constraint (con. 82) + !!
  • (159) ftoroidalgap : F-value for toroidalgap > dx_tf_inboard_out_toroidal constraint (con. 82) !!
  • (160) f_avspace (f-value for equation 83) !!
  • (161) fbeta_min (f-value for equation 84) !!
  • (162) r_cp_top : Top outer radius of the centropost (ST only) (m) @@ -551,7 +551,7 @@ subroutine init_numerics() 'Peak CS field upper limit ', & 'pdivt lower limit ', & 'ne0 > neped ', & - 'toroidalgap > tftort ', & + 'toroidalgap > dx_tf_inboard_out_toroidal ', & 'available_space > required_space ', & 'beta > beta_min ', & 'CP lifetime ', & diff --git a/source/fortran/tfcoil_variables.f90 b/source/fortran/tfcoil_variables.f90 index 6a4bc658cb..1138571736 100644 --- a/source/fortran/tfcoil_variables.f90 +++ b/source/fortran/tfcoil_variables.f90 @@ -86,7 +86,7 @@ module tfcoil_variables !! inboard TF coil sidewall case thickness (m) (calculated for stellarators) real(dp) :: casths_fraction - !! inboard TF coil sidewall case thickness as a fraction of tftort + !! inboard TF coil sidewall case thickness as a fraction of dx_tf_inboard_out_toroidal logical :: tfc_sidewall_is_fraction !! logical switch to make casths a fraction of TF coil thickness (`casths_fraction`) @@ -388,7 +388,7 @@ module tfcoil_variables !! Minimal distance between two toroidal coils. (m) real(dp) :: ftoroidalgap - !! F-value for minimum tftort (`constraint equation 82`) + !! F-value for minimum dx_tf_inboard_out_toroidal (`constraint equation 82`) real(dp) :: ripmax !! aximum allowable toroidal field ripple amplitude at plasma edge (%) @@ -601,7 +601,7 @@ module tfcoil_variables real(dp) :: tftmp !! peak helium coolant temperature in TF coils and PF coils (K) - real(dp) :: tftort + real(dp) :: dx_tf_inboard_out_toroidal !! TF coil toroidal thickness (m) real(dp) :: thicndut diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 2fbc2d33af..9401a64e9a 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -670,7 +670,7 @@ Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4985E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 9.1597E-01 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 9.1597E-01 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7937E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 9fbe0a8dba..af57ea30b0 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -671,7 +671,7 @@ Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4985E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 9.1597E-01 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 9.1597E-01 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7937E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index c204ffa8f3..8d71dc34e9 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -671,7 +671,7 @@ Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4985E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 9.1597E-01 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 9.1597E-01 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7937E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 65206399fb..1617ab147c 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -671,7 +671,7 @@ Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4985E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 9.1597E-01 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 9.1597E-01 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7937E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index fa99fd4665..3a30cec160 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -674,7 +674,7 @@ Outboard_leg_nose_case_type_____________________________________________ (i_tf_case_geom)______________ 0.0000E+00 Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 9.2950E-01 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 9.2950E-01 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7969E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index a974ac3faa..e5e476c046 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -672,7 +672,7 @@ Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 8.7479E-01 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 8.7479E-01 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7838E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 @@ -1835,7 +1835,7 @@ Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 8.5817E-01 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 8.5817E-01 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7798E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 @@ -2998,7 +2998,7 @@ Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 8.4468E-01 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 8.4468E-01 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7766E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 @@ -4161,7 +4161,7 @@ Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 8.4602E-01 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 8.4602E-01 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7769E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 @@ -5324,7 +5324,7 @@ Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 8.5817E-01 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 8.5817E-01 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7798E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 @@ -6487,7 +6487,7 @@ Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 8.7538E-01 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 8.7538E-01 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7840E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 @@ -7650,7 +7650,7 @@ Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 8.7704E-01 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 8.7704E-01 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7844E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 @@ -8813,7 +8813,7 @@ Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 8.6229E-01 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 8.6229E-01 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7808E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 @@ -9976,7 +9976,7 @@ Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 8.4832E-01 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 8.4832E-01 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7775E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 @@ -11139,7 +11139,7 @@ Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 8.4911E-01 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 8.4911E-01 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7777E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 @@ -12302,7 +12302,7 @@ Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 8.6318E-01 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 8.6318E-01 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7810E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 @@ -13465,7 +13465,7 @@ Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 8.7762E-01 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 8.7762E-01 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7845E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 @@ -14628,7 +14628,7 @@ Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 8.7862E-01 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 8.7862E-01 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7847E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 @@ -15791,7 +15791,7 @@ Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 8.6375E-01 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 8.6375E-01 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7812E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 @@ -16954,7 +16954,7 @@ Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 8.4888E-01 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 8.4888E-01 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7776E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 3bdff9434a..601869cc06 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -518,7 +518,7 @@ Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 1.4000E+00 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 1.4000E+00 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.7477E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.7477E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 9.2447E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 5.1957E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 @@ -1513,7 +1513,7 @@ Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 1.4000E+00 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 1.4000E+00 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.7477E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.7477E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 9.2447E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 5.1957E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 @@ -2508,7 +2508,7 @@ Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 1.4000E+00 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 1.4000E+00 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.7477E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.7477E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 9.2447E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 5.1957E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 @@ -3503,7 +3503,7 @@ Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 1.4000E+00 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 1.4000E+00 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.7477E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.7477E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 9.2447E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 5.1957E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 @@ -4498,7 +4498,7 @@ Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 1.4000E+00 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 1.4000E+00 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.7477E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.7477E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 9.2447E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 5.1957E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 @@ -5493,7 +5493,7 @@ Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 1.4000E+00 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 1.4000E+00 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.7477E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.7477E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 9.2447E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 5.1957E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 @@ -6488,7 +6488,7 @@ Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 1.4000E+00 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 1.4000E+00 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.7477E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.7477E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 9.2447E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 5.1957E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 @@ -7483,7 +7483,7 @@ Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 1.4000E+00 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 1.4000E+00 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.7477E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.7477E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 9.2447E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 5.1957E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 @@ -8478,7 +8478,7 @@ Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 1.4000E+00 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 1.4000E+00 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.7477E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.7477E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 9.2447E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 5.1957E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index d294246deb..b6f5faaeb8 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -2954,7 +2954,7 @@ "PeakCSfieldupperlimit", "pdivtlowerlimit", "ne0>neped", - "toroidalgap>tftort", + "toroidalgap>dx_tf_inboard_out_toroidal", "available_space>required_space", "beta>beta_min", "CPlifetime", @@ -7524,7 +7524,7 @@ "tfsao": 0.0, "dr_tf_outboard": 0.0, "tftmp": 4.5, - "tftort": 1.0, + "dx_tf_inboard_out_toroidal": 1.0, "dr_tf_shld_gap": 0.05, "temp_fw_max": 823.0, "tgain": 85.0, @@ -9028,7 +9028,7 @@ "casthi_fraction": "inboard TF coil case plasma side thickness as a fraction of dr_tf_inboard", "casthi_is_fraction": "logical switch to make casthi a fraction of TF coil thickness (`casthi_fraction`)", "casths": "inboard TF coil sidewall case thickness (m) (calculated for stellarators)", - "casths_fraction": "inboard TF coil sidewall case thickness as a fraction of tftort", + "casths_fraction": "inboard TF coil sidewall case thickness as a fraction of dx_tf_inboard_out_toroidal", "cboot": "bootstrap current fraction multiplier (`i_bootstrap_current=1`)", "ccl0": "", "ccl0_ma": "PF group current array, flux-swing cancellation current (MA)\n Input if i_pf_current=0, computed otherwise", @@ -9586,7 +9586,7 @@ "ftmargtf": "f-value for TF coil temperature margin (`constraint equation 36`, `iteration variable 54`)", "ft_current_ramp_up": "f-value for plasma current ramp-up time (`constraint equation 41`, `iteration variable 66`)", "ftol": "ftol /1.0e-4/ : error tolerance for HYBRD", - "ftoroidalgap": "F-value for minimum tftort (`constraint equation 82`)", + "ftoroidalgap": "F-value for minimum dx_tf_inboard_out_toroidal (`constraint equation 82`)", "ftpeak": "f-value for first wall peak temperature (`constraint equation 39`, `iteration variable 63`)", "f_tritium": "tritium fuel fraction", "f_tritium_beam": "fraction of beam that is tritium", @@ -9900,8 +9900,8 @@ "kron": "", "lablcc": "lablcc(ipeqns) : labels describing constraint equations (corresponding itvs)
      \n
      \n
    • ( 1) Beta (consistency equation) (itv 5)\n
    • ( 2) Global power balance (consistency equation) (itv 10,1,2,3,4,6,11)\n
    • ( 3) Ion power balance DEPRECATED (itv 10,1,2,3,4,6,11)\n
    • ( 4) Electron power balance DEPRECATED (itv 10,1,2,3,4,6,11)\n
    • ( 5) Density upper limit (itv 9,1,2,3,4,5,6)\n
    • ( 6) (Epsilon x beta poloidal) upper limit (itv 8,1,2,3,4,6)\n
    • ( 7) Beam ion density (NBI) (consistency equation) (itv 7)\n
    • ( 8) Neutron wall load upper limit (itv 14,1,2,3,4,6)\n
    • ( 9) Fusion power upper limit (itv 26,1,2,3,4,6)\n
    • (10) Toroidal field 1/R (consistency equation) (itv 12,1,2,3,13 )\n
    • (11) Radial build (consistency equation) (itv 3,1,13,16,29,42,61)\n
    • (12) Volt second lower limit (STEADY STATE) (itv 15,1,2,3)\n
    • (13) Burn time lower limit (PULSE) (itv 21,1,16,17,29,42,44,61)\n (itv 19,1,2,3,6)\n
    • (14) Neutral beam decay lengths to plasma centre (NBI) (consistency equation)\n
    • (15) LH power threshold limit (itv 103)\n
    • (16) Net electric power lower limit (itv 25,1,2,3)\n
    • (17) Radiation fraction upper limit (itv 28)\n
    • (18) Divertor heat load upper limit (itv 27)\n
    • (19) MVA upper limit (itv 30)\n
    • (20) Neutral beam tangency radius upper limit (NBI) (itv 33,31,3,13)\n
    • (21) Plasma minor radius lower limit (itv 32)\n
    • (22) Divertor collisionality upper limit (itv 34,43)\n
    • (23) Conducting shell to plasma minor radius ratio upper limit\n (itv 104,1,74)\n
    • (24) Beta upper limit (itv 36,1,2,3,4,6,18)\n
    • (25) Peak toroidal field upper limit (itv 35,3,13,29)\n
    • (26) Central solenoid EOF current density upper limit (i_pf_conductor=0)\n (itv 38,37,41,12)\n
    • (27) Central solenoid BOP current density upper limit (i_pf_conductor=0)\n (itv 39,37,41,12)\n
    • (28) Fusion gain Q lower limit (itv 45,47,40)\n
    • (29) Inboard radial build consistency (itv 3,1,13,16,29,42,61)\n
    • (30) Injection power upper limit (itv 46,47,11)\n
    • (31) TF coil case stress upper limit (SCTF) (itv 48,56,57,58,59,60,24)\n
    • (32) TF coil conduit stress upper limit (SCTF) (itv 49,56,57,58,59,60,24)\n
    • (33) I_op / I_critical (TF coil) (SCTF) (itv 50,56,57,58,59,60,24)\n
    • (34) Dump voltage upper limit (SCTF) (itv 51,52,56,57,58,59,60,24)\n
    • (35) J_winding pack/J_protection upper limit (SCTF) (itv 53,56,57,58,59,60,24)\n
    • (36) TF coil temperature margin lower limit (SCTF) (itv 54,55,56,57,58,59,60,24)\n
    • (37) Current drive gamma upper limit (itv 40,47)\n
    • (38) First wall coolant temperature rise upper limit (itv 62)\n
    • (39) First wall peak temperature upper limit (itv 63)\n
    • (40) Start-up injection power lower limit (PULSE) (itv 64)\n
    • (41) Plasma current ramp-up time lower limit (PULSE) (itv 66,65)\n
    • (42) Cycle time lower limit (PULSE) (itv 17,67,65)\n
    • (43) Average centrepost temperature\n (TART) (consistency equation) (itv 13,20,69,70)\n
    • (44) Peak centrepost temperature upper limit (TART) (itv 68,69,70)\n
    • (45) Edge safety factor lower limit (TART) (itv 71,1,2,3)\n
    • (46) Equation for Ip/Irod upper limit (TART) (itv 72,2,60)\n
    • (47) NOT USED\n
    • (48) Poloidal beta upper limit (itv 79,2,3,18)\n
    • (49) NOT USED\n
    • (50) IFE repetition rate upper limit (IFE)\n
    • (51) Startup volt-seconds consistency (PULSE) (itv 16,29,3,1)\n
    • (52) Tritium breeding ratio lower limit (itv 89,90,91)\n
    • (53) Neutron fluence on TF coil upper limit (itv 92,93,94)\n
    • (54) Peak TF coil nuclear heating upper limit (itv 95,93,94)\n
    • (55) Vacuum vessel helium concentration upper limit i_blanket_type =2 (itv 96,93,94)\n
    • (56) Pseparatrix/Rmajor upper limit (itv 97,1,3)\n
    • (57) NOT USED\n
    • (58) NOT USED\n
    • (59) Neutral beam shine-through fraction upper limit (NBI) (itv 105,6,19,4 )\n
    • (60) Central solenoid temperature margin lower limit (SCTF) (itv 106)\n
    • (61) Minimum availability value (itv 107)\n
    • (62) f_alpha_energy_confinement the ratio of particle to energy confinement times (itv 110)\n
    • (63) The number of ITER-like vacuum pumps niterpump < tfno (itv 111)\n
    • (64) Zeff less than or equal to zeffmax (itv 112)\n
    • (65) Dump time set by VV loads (itv 56, 113)\n
    • (66) Limit on rate of change of energy in poloidal field\n (Use iteration variable 65(t_current_ramp_up), 115)\n
    • (67) Simple Radiation Wall load limit (itv 116, 4,6)\n
    • (68) Psep * Bt / qAR upper limit (itv 117)\n
    • (69) ensure separatrix power = the value from Kallenbach divertor (itv 118)\n
    • (70) ensure that teomp = separatrix temperature in the pedestal profile,\n (itv 119 (tesep))\n
    • (71) ensure that neomp = separatrix density (nesep) x neratio\n
    • (72) central solenoid shear stress limit (Tresca yield criterion) (itv 123 foh_stress)\n
    • (73) Psep >= Plh + Paux (itv 137 (fplhsep))\n
    • (74) TFC quench < tmax_croco (itv 141 (fcqt))\n
    • (75) TFC current/copper area < Maximum (itv 143 f_coppera_m2)\n
    • (76) Eich critical separatrix density\n
    • (77) TF coil current per turn upper limit\n
    • (78) Reinke criterion impurity fraction lower limit (itv 147 freinke)\n
    • (79) Peak CS field upper limit (itv 149 fb_cs_limit_max)\n
    • (80) Divertor power lower limit pdivt (itv 153 fpdivlim)\n
    • (81) Ne(0) > ne(ped) constraint (itv 154 fne0)\n
    • (82) toroidalgap > tftort constraint (itv 171 ftoroidalgap)\n
    • (83) Radial build consistency for stellarators (itv 172 f_avspace)\n
    • (84) Lower limit for beta (itv 173 fbeta_min)\n
    • (85) Constraint for CP lifetime\n
    • (86) Constraint for TF coil turn dimension\n
    • (87) Constraint for cryogenic power\n
    • (88) Constraint for TF coil strain absolute value\n
    • (89) Constraint for CS coil quench protection\n
    • (90) Checking if the design point is ECRH ignitable (itv 164 fecrh_ignition)
    \n\n\n\n", "lablmm": "lablmm(ipnfoms) : labels describing figures of merit:
      \n
      \n
    • ( 1) major radius\n
    • ( 2) not used\n
    • ( 3) neutron wall load\n
    • ( 4) P_tf + P_pf\n
    • ( 5) fusion gain Q\n
    • ( 6) cost of electricity\n
    • ( 7) capital cost (direct cost if ireactor=0,\n constructed cost otherwise)\n
    • ( 8) aspect ratio\n
    • ( 9) divertor heat load\n
    • (10) toroidal field\n
    • (11) total injected power\n
    • (12) hydrogen plant capital cost OBSOLETE\n
    • (13) hydrogen production rate OBSOLETE\n
    • (14) pulse length\n
    • (15) plant availability factor (N.B. requires\n iavail=1 to be set)\n
    • (16) linear combination of major radius (minimised) and pulse length (maximised)\n note: FoM should be minimised only!\n
    • (17) net electrical output\n
    • (18) Null Figure of Merit\n
    • (19) linear combination of big Q and pulse length (maximised)\n note: FoM should be minimised only!
    \n\n\n", - "lablxc": "lablxc(ipnvars) : labels describing iteration variables
      \n
      \n
    • ( 1) aspect\n
    • ( 2) bt\n
    • ( 3) rmajor\n
    • ( 4) te\n
    • ( 5) beta\n
    • ( 6) dene\n
    • ( 7) f_nd_beam_electron\n
    • ( 8) fbeta_poloidal_eps (f-value for equation 6)\n
    • ( 9) fdene (f-value for equation 5)\n
    • (10) hfact\n
    • (11) pheat\n
    • (12) oacdcp\n
    • (13) dr_tf_inboard (NOT RECOMMENDED)\n
    • (14) fwalld (f-value for equation 8)\n
    • (15) fvs (f-value for equation 12)\n
    • (16) dr_cs\n
    • (17) tdwell\n
    • (18) q\n
    • (19) beam_energy\n
    • (20) temp_cp_average\n
    • (21) ftburn (f-value for equation 13)\n
    • (22) NOT USED\n
    • (23) fcoolcp\n
    • (24) NOT USED\n
    • (25) fpnetel (f-value for equation 16)\n
    • (26) ffuspow (f-value for equation 9)\n
    • (27) fhldiv (f-value for equation 18)\n
    • (28) fradpwr (f-value for equation 17), total radiation fraction\n
    • (29) dr_bore\n
    • (30) fmva (f-value for equation 19)\n
    • (31) gapomin\n
    • (32) frminor (f-value for equation 21)\n
    • (33) fportsz (f-value for equation 20)\n
    • (34) fdivcol (f-value for equation 22)\n
    • (35) fpeakb (f-value for equation 25)\n
    • (36) fbeta_max (f-value for equation 24)\n
    • (37) j_cs_flat_top_end\n
    • (38) fjohc (f-value for equation 26)\n
    • (39) fjohc0 (f-value for equation 27)\n
    • (40) fgamcd (f-value for equation 37)\n
    • (41) f_j_cs_start_pulse_end_flat_top\n
    • (42) dr_cs_tf_gap\n
    • (43) NOT USED\n
    • (44) fvsbrnni\n
    • (45) fqval (f-value for equation 28)\n
    • (46) fpinj (f-value for equation 30)\n
    • (47) feffcd\n
    • (48) fstrcase (f-value for equation 31)\n
    • (49) fstrcond (f-value for equation 32)\n
    • (50) fiooic (f-value for equation 33)\n
    • (51) fvdump (f-value for equation 34)\n
    • (52) vdalw\n
    • (53) fjprot (f-value for equation 35)\n
    • (54) ftmargtf (f-value for equation 36)\n
    • (55) NOT USED\n
    • (56) tdmptf\n
    • (57) thkcas\n
    • (58) thwcndut\n
    • (59) fcutfsu\n
    • (60) cpttf\n
    • (61) dr_shld_vv_gap_inboard\n
    • (62) fdtmp (f-value for equation 38)\n
    • (63) ftpeak (f-value for equation 39)\n
    • (64) fauxmn (f-value for equation 40)\n
    • (65) tohs\n
    • (66) ftohs (f-value for equation 41)\n
    • (67) ftcycl (f-value for equation 42)\n
    • (68) fptemp (f-value for equation 44)\n
    • (69) rcool\n
    • (70) vcool\n
    • (71) fq (f-value for equation 45)\n
    • (72) fipir (f-value for equation 46)\n
    • (73) dr_fw_plasma_gap_inboard\n
    • (74) dr_fw_plasma_gap_outboard\n
    • (75) tfootfi\n
    • (76) NOT USED\n
    • (77) NOT USED\n
    • (78) NOT USED\n
    • (79) fbeta_poloidal (f-value for equation 48)\n
    • (80) NOT USED\n
    • (81) edrive\n
    • (82) drveff\n
    • (83) tgain\n
    • (84) chrad\n
    • (85) pdrive\n
    • (86) frrmax (f-value for equation 50)\n
    • (87) NOT USED\n
    • (88) NOT USED\n
    • (89) ftbr (f-value for equation 52)\n
    • (90) blbuith\n
    • (91) blbuoth\n
    • (92) fflutf (f-value for equation 53)\n
    • (93) dr_shld_inboard\n
    • (94) dr_shld_outboard\n
    • (95) fptfnuc (f-value for equation 54)\n
    • (96) fvvhe (f-value for equation 55)\n
    • (97) fpsepr (f-value for equation 56)\n
    • (98) f_blkt_li6_enrichment\n
    • (99) NOT USED\n
    • (100) NOT USED\n
    • (101) NOT USED\n
    • (102) fimpvar\n
    • (103) fl_h_threshold (f-value for equation 15)\n
    • (104)fr_conducting_wall (f-value for equation 23)\n
    • (105) fnbshinef (f-value for equation 59)\n
    • (106) ftmargoh (f-value for equation 60)\n
    • (107) favail (f-value for equation 61)\n
    • (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)\n
    • (109) f_nd_alpha_electron: thermal alpha density / electron density\n
    • (110) falpha_energy_confinement: Lower limit on f_alpha_energy_confinement the ratio of alpha\n
    • (111) fniterpump: f-value for constraint that number\n
    • (112) fzeffmax: f-value for max Zeff (f-value for equation 64)\n
    • (113) ftaucq: f-value for minimum quench time (f-value for equation 65)\n
    • (114) len_fw_channel: Length of a single first wall channel\n
    • (115) fpoloidalpower: f-value for max rate of change of\n
    • (116) fradwall: f-value for radiation wall load limit (eq. 67)\n
    • (117) fpsepbqar: f-value for Psep*Bt/qar upper limit (eq. 68)\n
    • (118) fpsep: f-value to ensure separatrix power is less than\n
    • (119) tesep: separatrix temperature calculated by the Kallenbach divertor model\n
    • (120) ttarget: Plasma temperature adjacent to divertor sheath [eV]\n
    • (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP\n
    • (122) f_a_cs_steel : streel fraction of Central Solenoid\n
    • (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72)\n
    • (124) qtargettotal : Power density on target including surface recombination [W/m2]\n
    • (125) fimp(3) : Beryllium density fraction relative to electron density\n
    • (126) fimp(4) : Carbon density fraction relative to electron density\n
    • (127) fimp(5) : Nitrogen fraction relative to electron density\n
    • (128) fimp(6) : Oxygen density fraction relative to electron density\n
    • (129) fimp(7) : Neon density fraction relative to electron density\n
    • (130) fimp(8) : Silicon density fraction relative to electron density\n
    • (131) fimp(9) : Argon density fraction relative to electron density\n
    • (132) fimp(10) : Iron density fraction relative to electron density\n
    • (133) fimp(11) : Nickel density fraction relative to electron density\n
    • (134) fimp(12) : Krypton density fraction relative to electron density\n
    • (135) fimp(13) : Xenon density fraction relative to electron density\n
    • (136) fimp(14) : Tungsten density fraction relative to electron density\n
    • (137) fplhsep (f-value for equation 73)\n
    • (138) rebco_thickness : thickness of REBCO layer in tape (m)\n
    • (139) copper_thick : thickness of copper layer in tape (m)\n
    • (140) dr_tf_wp : radial thickness of TFC winding pack (m)\n
    • (141) fcqt : TF coil quench temperature < tmax_croco (f-value for equation 74)\n
    • (142) nesep : electron density at separatrix [m-3]\n
    • (143) f_copperA_m2 : TF coil current / copper area < Maximum value\n
    • (144) fnesep : Eich critical electron density at separatrix\n
    • (145) fgwped : fraction of Greenwald density to set as pedestal-top density\n
    • (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77)\n
    • (147) freinke : F-value for Reinke detachment criterion (constraint equation 78)\n
    • (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion\n
    • (149) fb_cs_limit_max : F-value for max peak CS field (con. 79, itvar 149)\n
    • (152) fb_cs_limit_max : Ratio of separatrix density to Greenwald density\n
    • (153) fpdivlim : F-value for minimum pdivt (con. 80)\n
    • (154) fne0 : F-value for ne(0) > ne(ped) (con. 81)\n
    • (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only)\n
    • (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only)\n
    • (157) fvs_cs_pf_total_ramp : F-value for available to required start up flux (con. 51)\n
    • (158) croco_thick : Thickness of CroCo copper tube (m)\n
    • (159) ftoroidalgap : F-value for toroidalgap > tftort constraint (con. 82)\n
    • (160) f_avspace (f-value for equation 83)\n
    • (161) fbeta_min (f-value for equation 84)\n
    • (162) r_cp_top : Top outer radius of the centropost (ST only) (m)\n
    • (163) f_t_turn_tf : f-value for TF coils WP trurn squared dimension constraint\n
    • (164) f_crypmw : f-value for cryogenic plant power\n
    • (165) fstr_wp : f-value for TF coil strain absolute value\n
    • (166) f_copperaoh_m2 : CS coil current /copper area < Maximum value\n
    • (167) fecrh_ignition: f-value for equation 90\n
    • (168) EMPTY : Description\n
    • (169) EMPTY : Description\n
    • (170) EMPTY : Description\n
    • (171) EMPTY : Description\n
    • (172) EMPTY : Description\n
    • (173) EMPTY : Description\n
    • (174) EMPTY : Description\n
    • (175) EMPTY : Description\n\n\n\n", - "lablxc": "lablxc(ipnvars) : labels describing iteration variables
        \n
        \n
      • ( 1) aspect\n
      • ( 2) bt\n
      • ( 3) rmajor\n
      • ( 4) te\n
      • ( 5) beta\n
      • ( 6) dene\n
      • ( 7) f_nd_beam_electron\n
      • ( 8) fbeta_poloidal_eps (f-value for equation 6)\n
      • ( 9) fdene (f-value for equation 5)\n
      • (10) hfact\n
      • (11) pheat\n
      • (12) oacdcp\n
      • (13) dr_tf_inboard (NOT RECOMMENDED)\n
      • (14) fwalld (f-value for equation 8)\n
      • (15) fvs (f-value for equation 12)\n
      • (16) dr_cs\n
      • (17) t_between_pulse\n
      • (18) q\n
      • (19) beam_energy\n
      • (20) temp_cp_average\n
      • (21) ft_burn (f-value for equation 13)\n
      • (22) NOT USED\n
      • (23) fcoolcp\n
      • (24) NOT USED\n
      • (25) fpnetel (f-value for equation 16)\n
      • (26) ffuspow (f-value for equation 9)\n
      • (27) fhldiv (f-value for equation 18)\n
      • (28) fradpwr (f-value for equation 17), total radiation fraction\n
      • (29) dr_bore\n
      • (30) fmva (f-value for equation 19)\n
      • (31) gapomin\n
      • (32) frminor (f-value for equation 21)\n
      • (33) fportsz (f-value for equation 20)\n
      • (34) fdivcol (f-value for equation 22)\n
      • (35) fpeakb (f-value for equation 25)\n
      • (36) fbeta_max (f-value for equation 24)\n
      • (37) j_cs_flat_top_end\n
      • (38) fjohc (f-value for equation 26)\n
      • (39) fjohc0 (f-value for equation 27)\n
      • (40) fgamcd (f-value for equation 37)\n
      • (41) f_j_cs_start_pulse_end_flat_top\n
      • (42) dr_cs_tf_gap\n
      • (43) NOT USED\n
      • (44) fvsbrnni\n
      • (45) fqval (f-value for equation 28)\n
      • (46) fpinj (f-value for equation 30)\n
      • (47) feffcd\n
      • (48) fstrcase (f-value for equation 31)\n
      • (49) fstrcond (f-value for equation 32)\n
      • (50) fiooic (f-value for equation 33)\n
      • (51) fvdump (f-value for equation 34)\n
      • (52) vdalw\n
      • (53) fjprot (f-value for equation 35)\n
      • (54) ftmargtf (f-value for equation 36)\n
      • (55) NOT USED\n
      • (56) tdmptf\n
      • (57) thkcas\n
      • (58) thwcndut\n
      • (59) fcutfsu\n
      • (60) cpttf\n
      • (61) dr_shld_vv_gap_inboard\n
      • (62) fdtmp (f-value for equation 38)\n
      • (63) ftpeak (f-value for equation 39)\n
      • (64) fauxmn (f-value for equation 40)\n
      • (65) t_current_ramp_up\n
      • (66) ft_current_ramp_up (f-value for equation 41)\n
      • (67) ftcycl (f-value for equation 42)\n
      • (68) fptemp (f-value for equation 44)\n
      • (69) rcool\n
      • (70) vcool\n
      • (71) fq (f-value for equation 45)\n
      • (72) fipir (f-value for equation 46)\n
      • (73) dr_fw_plasma_gap_inboard\n
      • (74) dr_fw_plasma_gap_outboard\n
      • (75) tfootfi\n
      • (76) NOT USED\n
      • (77) NOT USED\n
      • (78) NOT USED\n
      • (79) fbetap (f-value for equation 48)\n
      • (80) NOT USED\n
      • (81) edrive\n
      • (82) drveff\n
      • (83) tgain\n
      • (84) chrad\n
      • (85) pdrive\n
      • (86) frrmax (f-value for equation 50)\n
      • (87) NOT USED\n
      • (88) NOT USED\n
      • (89) ftbr (f-value for equation 52)\n
      • (90) blbuith\n
      • (91) blbuoth\n
      • (92) fflutf (f-value for equation 53)\n
      • (93) dr_shld_inboard\n
      • (94) dr_shld_outboard\n
      • (95) fptfnuc (f-value for equation 54)\n
      • (96) fvvhe (f-value for equation 55)\n
      • (97) fpsepr (f-value for equation 56)\n
      • (98) f_blkt_li6_enrichment\n
      • (99) NOT USED\n
      • (100) NOT USED\n
      • (101) NOT USED\n
      • (102) fimpvar\n
      • (103) fl_h_threshold (f-value for equation 15)\n
      • (104)fr_conducting_wall (f-value for equation 23)\n
      • (105) fnbshinef (f-value for equation 59)\n
      • (106) ftmargoh (f-value for equation 60)\n
      • (107) favail (f-value for equation 61)\n
      • (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)\n
      • (109) f_nd_alpha_electron: thermal alpha density / electron density\n
      • (110) falpha_energy_confinement: Lower limit on f_alpha_energy_confinement the ratio of alpha\n
      • (111) fniterpump: f-value for constraint that number\n
      • (112) fzeffmax: f-value for max Zeff (f-value for equation 64)\n
      • (113) ftaucq: f-value for minimum quench time (f-value for equation 65)\n
      • (114) len_fw_channel: Length of a single first wall channel\n
      • (115) fpoloidalpower: f-value for max rate of change of\n
      • (116) fradwall: f-value for radiation wall load limit (eq. 67)\n
      • (117) fpsepbqar: f-value for Psep*Bt/qar upper limit (eq. 68)\n
      • (118) fpsep: f-value to ensure separatrix power is less than\n
      • (119) tesep: separatrix temperature calculated by the Kallenbach divertor model\n
      • (120) ttarget: Plasma temperature adjacent to divertor sheath [eV]\n
      • (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP\n
      • (122) f_a_cs_steel : streel fraction of Central Solenoid\n
      • (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72)\n
      • (124) qtargettotal : Power density on target including surface recombination [W/m2]\n
      • (125) fimp(3) : Beryllium density fraction relative to electron density\n
      • (126) fimp(4) : Carbon density fraction relative to electron density\n
      • (127) fimp(5) : Nitrogen fraction relative to electron density\n
      • (128) fimp(6) : Oxygen density fraction relative to electron density\n
      • (129) fimp(7) : Neon density fraction relative to electron density\n
      • (130) fimp(8) : Silicon density fraction relative to electron density\n
      • (131) fimp(9) : Argon density fraction relative to electron density\n
      • (132) fimp(10) : Iron density fraction relative to electron density\n
      • (133) fimp(11) : Nickel density fraction relative to electron density\n
      • (134) fimp(12) : Krypton density fraction relative to electron density\n
      • (135) fimp(13) : Xenon density fraction relative to electron density\n
      • (136) fimp(14) : Tungsten density fraction relative to electron density\n
      • (137) fplhsep (f-value for equation 73)\n
      • (138) rebco_thickness : thickness of REBCO layer in tape (m)\n
      • (139) copper_thick : thickness of copper layer in tape (m)\n
      • (140) dr_tf_wp : radial thickness of TFC winding pack (m)\n
      • (141) fcqt : TF coil quench temperature < tmax_croco (f-value for equation 74)\n
      • (142) nesep : electron density at separatrix [m-3]\n
      • (143) f_copperA_m2 : TF coil current / copper area < Maximum value\n
      • (144) fnesep : Eich critical electron density at separatrix\n
      • (145) fgwped : fraction of Greenwald density to set as pedestal-top density\n
      • (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77)\n
      • (147) freinke : F-value for Reinke detachment criterion (constraint equation 78)\n
      • (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion\n
      • (149) fb_cs_limit_max : F-value for max peak CS field (con. 79, itvar 149)\n
      • (152) fb_cs_limit_max : Ratio of separatrix density to Greenwald density\n
      • (153) fpdivlim : F-value for minimum pdivt (con. 80)\n
      • (154) fne0 : F-value for ne(0) > ne(ped) (con. 81)\n
      • (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only)\n
      • (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only)\n
      • (157) fvs_cs_pf_total_ramp : F-value for available to required start up flux (con. 51)\n
      • (158) croco_thick : Thickness of CroCo copper tube (m)\n
      • (159) ftoroidalgap : F-value for toroidalgap > tftort constraint (con. 82)\n
      • (160) f_avspace (f-value for equation 83)\n
      • (161) fbeta_min (f-value for equation 84)\n
      • (162) r_cp_top : Top outer radius of the centropost (ST only) (m)\n
      • (163) f_t_turn_tf : f-value for TF coils WP trurn squared dimension constraint\n
      • (164) f_crypmw : f-value for cryogenic plant power\n
      • (165) fstr_wp : f-value for TF coil strain absolute value\n
      • (166) f_copperaoh_m2 : CS coil current /copper area < Maximum value\n
      • (167) fecrh_ignition: f-value for equation 90\n
      • (168) EMPTY : Description\n
      • (169) EMPTY : Description\n
      • (170) EMPTY : Description\n
      • (171) EMPTY : Description\n
      • (172) EMPTY : Description\n
      • (173) EMPTY : Description\n
      • (174) EMPTY : Description\n
      • (175) EMPTY : Description\n\n\n\n", + "lablxc": "lablxc(ipnvars) : labels describing iteration variables
          \n
          \n
        • ( 1) aspect\n
        • ( 2) bt\n
        • ( 3) rmajor\n
        • ( 4) te\n
        • ( 5) beta\n
        • ( 6) dene\n
        • ( 7) f_nd_beam_electron\n
        • ( 8) fbeta_poloidal_eps (f-value for equation 6)\n
        • ( 9) fdene (f-value for equation 5)\n
        • (10) hfact\n
        • (11) pheat\n
        • (12) oacdcp\n
        • (13) dr_tf_inboard (NOT RECOMMENDED)\n
        • (14) fwalld (f-value for equation 8)\n
        • (15) fvs (f-value for equation 12)\n
        • (16) dr_cs\n
        • (17) tdwell\n
        • (18) q\n
        • (19) beam_energy\n
        • (20) temp_cp_average\n
        • (21) ftburn (f-value for equation 13)\n
        • (22) NOT USED\n
        • (23) fcoolcp\n
        • (24) NOT USED\n
        • (25) fpnetel (f-value for equation 16)\n
        • (26) ffuspow (f-value for equation 9)\n
        • (27) fhldiv (f-value for equation 18)\n
        • (28) fradpwr (f-value for equation 17), total radiation fraction\n
        • (29) dr_bore\n
        • (30) fmva (f-value for equation 19)\n
        • (31) gapomin\n
        • (32) frminor (f-value for equation 21)\n
        • (33) fportsz (f-value for equation 20)\n
        • (34) fdivcol (f-value for equation 22)\n
        • (35) fpeakb (f-value for equation 25)\n
        • (36) fbeta_max (f-value for equation 24)\n
        • (37) j_cs_flat_top_end\n
        • (38) fjohc (f-value for equation 26)\n
        • (39) fjohc0 (f-value for equation 27)\n
        • (40) fgamcd (f-value for equation 37)\n
        • (41) f_j_cs_start_pulse_end_flat_top\n
        • (42) dr_cs_tf_gap\n
        • (43) NOT USED\n
        • (44) fvsbrnni\n
        • (45) fqval (f-value for equation 28)\n
        • (46) fpinj (f-value for equation 30)\n
        • (47) feffcd\n
        • (48) fstrcase (f-value for equation 31)\n
        • (49) fstrcond (f-value for equation 32)\n
        • (50) fiooic (f-value for equation 33)\n
        • (51) fvdump (f-value for equation 34)\n
        • (52) vdalw\n
        • (53) fjprot (f-value for equation 35)\n
        • (54) ftmargtf (f-value for equation 36)\n
        • (55) NOT USED\n
        • (56) tdmptf\n
        • (57) thkcas\n
        • (58) thwcndut\n
        • (59) fcutfsu\n
        • (60) cpttf\n
        • (61) dr_shld_vv_gap_inboard\n
        • (62) fdtmp (f-value for equation 38)\n
        • (63) ftpeak (f-value for equation 39)\n
        • (64) fauxmn (f-value for equation 40)\n
        • (65) tohs\n
        • (66) ftohs (f-value for equation 41)\n
        • (67) ftcycl (f-value for equation 42)\n
        • (68) fptemp (f-value for equation 44)\n
        • (69) rcool\n
        • (70) vcool\n
        • (71) fq (f-value for equation 45)\n
        • (72) fipir (f-value for equation 46)\n
        • (73) dr_fw_plasma_gap_inboard\n
        • (74) dr_fw_plasma_gap_outboard\n
        • (75) tfootfi\n
        • (76) NOT USED\n
        • (77) NOT USED\n
        • (78) NOT USED\n
        • (79) fbeta_poloidal (f-value for equation 48)\n
        • (80) NOT USED\n
        • (81) edrive\n
        • (82) drveff\n
        • (83) tgain\n
        • (84) chrad\n
        • (85) pdrive\n
        • (86) frrmax (f-value for equation 50)\n
        • (87) NOT USED\n
        • (88) NOT USED\n
        • (89) ftbr (f-value for equation 52)\n
        • (90) blbuith\n
        • (91) blbuoth\n
        • (92) fflutf (f-value for equation 53)\n
        • (93) dr_shld_inboard\n
        • (94) dr_shld_outboard\n
        • (95) fptfnuc (f-value for equation 54)\n
        • (96) fvvhe (f-value for equation 55)\n
        • (97) fpsepr (f-value for equation 56)\n
        • (98) f_blkt_li6_enrichment\n
        • (99) NOT USED\n
        • (100) NOT USED\n
        • (101) NOT USED\n
        • (102) fimpvar\n
        • (103) fl_h_threshold (f-value for equation 15)\n
        • (104)fr_conducting_wall (f-value for equation 23)\n
        • (105) fnbshinef (f-value for equation 59)\n
        • (106) ftmargoh (f-value for equation 60)\n
        • (107) favail (f-value for equation 61)\n
        • (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)\n
        • (109) f_nd_alpha_electron: thermal alpha density / electron density\n
        • (110) falpha_energy_confinement: Lower limit on f_alpha_energy_confinement the ratio of alpha\n
        • (111) fniterpump: f-value for constraint that number\n
        • (112) fzeffmax: f-value for max Zeff (f-value for equation 64)\n
        • (113) ftaucq: f-value for minimum quench time (f-value for equation 65)\n
        • (114) len_fw_channel: Length of a single first wall channel\n
        • (115) fpoloidalpower: f-value for max rate of change of\n
        • (116) fradwall: f-value for radiation wall load limit (eq. 67)\n
        • (117) fpsepbqar: f-value for Psep*Bt/qar upper limit (eq. 68)\n
        • (118) fpsep: f-value to ensure separatrix power is less than\n
        • (119) tesep: separatrix temperature calculated by the Kallenbach divertor model\n
        • (120) ttarget: Plasma temperature adjacent to divertor sheath [eV]\n
        • (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP\n
        • (122) f_a_cs_steel : streel fraction of Central Solenoid\n
        • (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72)\n
        • (124) qtargettotal : Power density on target including surface recombination [W/m2]\n
        • (125) fimp(3) : Beryllium density fraction relative to electron density\n
        • (126) fimp(4) : Carbon density fraction relative to electron density\n
        • (127) fimp(5) : Nitrogen fraction relative to electron density\n
        • (128) fimp(6) : Oxygen density fraction relative to electron density\n
        • (129) fimp(7) : Neon density fraction relative to electron density\n
        • (130) fimp(8) : Silicon density fraction relative to electron density\n
        • (131) fimp(9) : Argon density fraction relative to electron density\n
        • (132) fimp(10) : Iron density fraction relative to electron density\n
        • (133) fimp(11) : Nickel density fraction relative to electron density\n
        • (134) fimp(12) : Krypton density fraction relative to electron density\n
        • (135) fimp(13) : Xenon density fraction relative to electron density\n
        • (136) fimp(14) : Tungsten density fraction relative to electron density\n
        • (137) fplhsep (f-value for equation 73)\n
        • (138) rebco_thickness : thickness of REBCO layer in tape (m)\n
        • (139) copper_thick : thickness of copper layer in tape (m)\n
        • (140) dr_tf_wp : radial thickness of TFC winding pack (m)\n
        • (141) fcqt : TF coil quench temperature < tmax_croco (f-value for equation 74)\n
        • (142) nesep : electron density at separatrix [m-3]\n
        • (143) f_copperA_m2 : TF coil current / copper area < Maximum value\n
        • (144) fnesep : Eich critical electron density at separatrix\n
        • (145) fgwped : fraction of Greenwald density to set as pedestal-top density\n
        • (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77)\n
        • (147) freinke : F-value for Reinke detachment criterion (constraint equation 78)\n
        • (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion\n
        • (149) fb_cs_limit_max : F-value for max peak CS field (con. 79, itvar 149)\n
        • (152) fb_cs_limit_max : Ratio of separatrix density to Greenwald density\n
        • (153) fpdivlim : F-value for minimum pdivt (con. 80)\n
        • (154) fne0 : F-value for ne(0) > ne(ped) (con. 81)\n
        • (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only)\n
        • (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only)\n
        • (157) fvs_cs_pf_total_ramp : F-value for available to required start up flux (con. 51)\n
        • (158) croco_thick : Thickness of CroCo copper tube (m)\n
        • (159) ftoroidalgap : F-value for toroidalgap > dx_tf_inboard_out_toroidal constraint (con. 82)\n
        • (160) f_avspace (f-value for equation 83)\n
        • (161) fbeta_min (f-value for equation 84)\n
        • (162) r_cp_top : Top outer radius of the centropost (ST only) (m)\n
        • (163) f_t_turn_tf : f-value for TF coils WP trurn squared dimension constraint\n
        • (164) f_crypmw : f-value for cryogenic plant power\n
        • (165) fstr_wp : f-value for TF coil strain absolute value\n
        • (166) f_copperaoh_m2 : CS coil current /copper area < Maximum value\n
        • (167) fecrh_ignition: f-value for equation 90\n
        • (168) EMPTY : Description\n
        • (169) EMPTY : Description\n
        • (170) EMPTY : Description\n
        • (171) EMPTY : Description\n
        • (172) EMPTY : Description\n
        • (173) EMPTY : Description\n
        • (174) EMPTY : Description\n
        • (175) EMPTY : Description\n\n\n\n", + "lablxc": "lablxc(ipnvars) : labels describing iteration variables
            \n
            \n
          • ( 1) aspect\n
          • ( 2) bt\n
          • ( 3) rmajor\n
          • ( 4) te\n
          • ( 5) beta\n
          • ( 6) dene\n
          • ( 7) f_nd_beam_electron\n
          • ( 8) fbeta_poloidal_eps (f-value for equation 6)\n
          • ( 9) fdene (f-value for equation 5)\n
          • (10) hfact\n
          • (11) pheat\n
          • (12) oacdcp\n
          • (13) dr_tf_inboard (NOT RECOMMENDED)\n
          • (14) fwalld (f-value for equation 8)\n
          • (15) fvs (f-value for equation 12)\n
          • (16) dr_cs\n
          • (17) t_between_pulse\n
          • (18) q\n
          • (19) beam_energy\n
          • (20) temp_cp_average\n
          • (21) ft_burn (f-value for equation 13)\n
          • (22) NOT USED\n
          • (23) fcoolcp\n
          • (24) NOT USED\n
          • (25) fpnetel (f-value for equation 16)\n
          • (26) ffuspow (f-value for equation 9)\n
          • (27) fhldiv (f-value for equation 18)\n
          • (28) fradpwr (f-value for equation 17), total radiation fraction\n
          • (29) dr_bore\n
          • (30) fmva (f-value for equation 19)\n
          • (31) gapomin\n
          • (32) frminor (f-value for equation 21)\n
          • (33) fportsz (f-value for equation 20)\n
          • (34) fdivcol (f-value for equation 22)\n
          • (35) fpeakb (f-value for equation 25)\n
          • (36) fbeta_max (f-value for equation 24)\n
          • (37) j_cs_flat_top_end\n
          • (38) fjohc (f-value for equation 26)\n
          • (39) fjohc0 (f-value for equation 27)\n
          • (40) fgamcd (f-value for equation 37)\n
          • (41) f_j_cs_start_pulse_end_flat_top\n
          • (42) dr_cs_tf_gap\n
          • (43) NOT USED\n
          • (44) fvsbrnni\n
          • (45) fqval (f-value for equation 28)\n
          • (46) fpinj (f-value for equation 30)\n
          • (47) feffcd\n
          • (48) fstrcase (f-value for equation 31)\n
          • (49) fstrcond (f-value for equation 32)\n
          • (50) fiooic (f-value for equation 33)\n
          • (51) fvdump (f-value for equation 34)\n
          • (52) vdalw\n
          • (53) fjprot (f-value for equation 35)\n
          • (54) ftmargtf (f-value for equation 36)\n
          • (55) NOT USED\n
          • (56) tdmptf\n
          • (57) thkcas\n
          • (58) thwcndut\n
          • (59) fcutfsu\n
          • (60) cpttf\n
          • (61) dr_shld_vv_gap_inboard\n
          • (62) fdtmp (f-value for equation 38)\n
          • (63) ftpeak (f-value for equation 39)\n
          • (64) fauxmn (f-value for equation 40)\n
          • (65) t_current_ramp_up\n
          • (66) ft_current_ramp_up (f-value for equation 41)\n
          • (67) ftcycl (f-value for equation 42)\n
          • (68) fptemp (f-value for equation 44)\n
          • (69) rcool\n
          • (70) vcool\n
          • (71) fq (f-value for equation 45)\n
          • (72) fipir (f-value for equation 46)\n
          • (73) dr_fw_plasma_gap_inboard\n
          • (74) dr_fw_plasma_gap_outboard\n
          • (75) tfootfi\n
          • (76) NOT USED\n
          • (77) NOT USED\n
          • (78) NOT USED\n
          • (79) fbetap (f-value for equation 48)\n
          • (80) NOT USED\n
          • (81) edrive\n
          • (82) drveff\n
          • (83) tgain\n
          • (84) chrad\n
          • (85) pdrive\n
          • (86) frrmax (f-value for equation 50)\n
          • (87) NOT USED\n
          • (88) NOT USED\n
          • (89) ftbr (f-value for equation 52)\n
          • (90) blbuith\n
          • (91) blbuoth\n
          • (92) fflutf (f-value for equation 53)\n
          • (93) dr_shld_inboard\n
          • (94) dr_shld_outboard\n
          • (95) fptfnuc (f-value for equation 54)\n
          • (96) fvvhe (f-value for equation 55)\n
          • (97) fpsepr (f-value for equation 56)\n
          • (98) f_blkt_li6_enrichment\n
          • (99) NOT USED\n
          • (100) NOT USED\n
          • (101) NOT USED\n
          • (102) fimpvar\n
          • (103) fl_h_threshold (f-value for equation 15)\n
          • (104)fr_conducting_wall (f-value for equation 23)\n
          • (105) fnbshinef (f-value for equation 59)\n
          • (106) ftmargoh (f-value for equation 60)\n
          • (107) favail (f-value for equation 61)\n
          • (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)\n
          • (109) f_nd_alpha_electron: thermal alpha density / electron density\n
          • (110) falpha_energy_confinement: Lower limit on f_alpha_energy_confinement the ratio of alpha\n
          • (111) fniterpump: f-value for constraint that number\n
          • (112) fzeffmax: f-value for max Zeff (f-value for equation 64)\n
          • (113) ftaucq: f-value for minimum quench time (f-value for equation 65)\n
          • (114) len_fw_channel: Length of a single first wall channel\n
          • (115) fpoloidalpower: f-value for max rate of change of\n
          • (116) fradwall: f-value for radiation wall load limit (eq. 67)\n
          • (117) fpsepbqar: f-value for Psep*Bt/qar upper limit (eq. 68)\n
          • (118) fpsep: f-value to ensure separatrix power is less than\n
          • (119) tesep: separatrix temperature calculated by the Kallenbach divertor model\n
          • (120) ttarget: Plasma temperature adjacent to divertor sheath [eV]\n
          • (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP\n
          • (122) f_a_cs_steel : streel fraction of Central Solenoid\n
          • (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72)\n
          • (124) qtargettotal : Power density on target including surface recombination [W/m2]\n
          • (125) fimp(3) : Beryllium density fraction relative to electron density\n
          • (126) fimp(4) : Carbon density fraction relative to electron density\n
          • (127) fimp(5) : Nitrogen fraction relative to electron density\n
          • (128) fimp(6) : Oxygen density fraction relative to electron density\n
          • (129) fimp(7) : Neon density fraction relative to electron density\n
          • (130) fimp(8) : Silicon density fraction relative to electron density\n
          • (131) fimp(9) : Argon density fraction relative to electron density\n
          • (132) fimp(10) : Iron density fraction relative to electron density\n
          • (133) fimp(11) : Nickel density fraction relative to electron density\n
          • (134) fimp(12) : Krypton density fraction relative to electron density\n
          • (135) fimp(13) : Xenon density fraction relative to electron density\n
          • (136) fimp(14) : Tungsten density fraction relative to electron density\n
          • (137) fplhsep (f-value for equation 73)\n
          • (138) rebco_thickness : thickness of REBCO layer in tape (m)\n
          • (139) copper_thick : thickness of copper layer in tape (m)\n
          • (140) dr_tf_wp : radial thickness of TFC winding pack (m)\n
          • (141) fcqt : TF coil quench temperature < tmax_croco (f-value for equation 74)\n
          • (142) nesep : electron density at separatrix [m-3]\n
          • (143) f_copperA_m2 : TF coil current / copper area < Maximum value\n
          • (144) fnesep : Eich critical electron density at separatrix\n
          • (145) fgwped : fraction of Greenwald density to set as pedestal-top density\n
          • (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77)\n
          • (147) freinke : F-value for Reinke detachment criterion (constraint equation 78)\n
          • (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion\n
          • (149) fb_cs_limit_max : F-value for max peak CS field (con. 79, itvar 149)\n
          • (152) fb_cs_limit_max : Ratio of separatrix density to Greenwald density\n
          • (153) fpdivlim : F-value for minimum pdivt (con. 80)\n
          • (154) fne0 : F-value for ne(0) > ne(ped) (con. 81)\n
          • (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only)\n
          • (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only)\n
          • (157) fvs_cs_pf_total_ramp : F-value for available to required start up flux (con. 51)\n
          • (158) croco_thick : Thickness of CroCo copper tube (m)\n
          • (159) ftoroidalgap : F-value for toroidalgap > dx_tf_inboard_out_toroidal constraint (con. 82)\n
          • (160) f_avspace (f-value for equation 83)\n
          • (161) fbeta_min (f-value for equation 84)\n
          • (162) r_cp_top : Top outer radius of the centropost (ST only) (m)\n
          • (163) f_t_turn_tf : f-value for TF coils WP trurn squared dimension constraint\n
          • (164) f_crypmw : f-value for cryogenic plant power\n
          • (165) fstr_wp : f-value for TF coil strain absolute value\n
          • (166) f_copperaoh_m2 : CS coil current /copper area < Maximum value\n
          • (167) fecrh_ignition: f-value for equation 90\n
          • (168) EMPTY : Description\n
          • (169) EMPTY : Description\n
          • (170) EMPTY : Description\n
          • (171) EMPTY : Description\n
          • (172) EMPTY : Description\n
          • (173) EMPTY : Description\n
          • (174) EMPTY : Description\n
          • (175) EMPTY : Description\n\n\n\n", "lambda_EU": "Decay length in EUROFER [cm]", "lambda_He_VV": "Decay length [cm]", "lambda_n_BZ_IB": "Decay length in IB BZ [cm]", @@ -10734,7 +10734,7 @@ "tfsao": "area of the outboard TF coil legs (m2)", "dr_tf_outboard": "Outboard TF coil thickness (m)", "tftmp": "peak helium coolant temperature in TF coils and PF coils (K)", - "tftort": "TF coil toroidal thickness (m)", + "dx_tf_inboard_out_toroidal": "TF coil toroidal thickness (m)", "dr_tf_shld_gap": "Minimum metal-to-metal gap between TF coil and thermal shield (m)", "temp_fw_max": "maximum temperature of first wall material (K) (`i_thermal_electric_conversion>1`)", "tgain": "IFE target gain (if `ifedrv = 0`) (`iteration variable 83`)", @@ -19459,7 +19459,7 @@ "tfsai", "tfsao", "tftmp", - "tftort", + "dx_tf_inboard_out_toroidal", "thicndut", "layer_ins", "thkcas", diff --git a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT index b09f7484c0..7008419387 100644 --- a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT @@ -417,7 +417,7 @@ i_pulsed_plant = 0 * Switch for reactor model; sig_tf_case_max = 850.0e6 * Allowable maximum shear stress (Tresca criterion) in TF coil case (Pa) sig_tf_wp_max = 700.0e6 * Allowable maximum shear stress (Tresca criterion) in TF coil conduit (Pa) casthi_fraction = 1.0e-12 * inboard TF coil case plasma side thickness as a fraction of tfcth -casths_fraction = 0.65 * inboard TF coil sidewall case thickness as a fraction of tftort +casths_fraction = 0.65 * inboard TF coil sidewall case thickness as a fraction of dx_tf_inboard_out_toroidal i_tf_stress_model = 0 * Switch for the TF coil stress model i_tf_tresca = 0 * Switch for TF coil conduit Tresca stress criterion; i_tf_wp_geom = 2 * Switch for TF WP geometry selection diff --git a/tests/regression/input_files/stellarator_helias_once_through.IN.DAT b/tests/regression/input_files/stellarator_helias_once_through.IN.DAT index 884c8c391c..1204ba044d 100644 --- a/tests/regression/input_files/stellarator_helias_once_through.IN.DAT +++ b/tests/regression/input_files/stellarator_helias_once_through.IN.DAT @@ -367,7 +367,7 @@ sig_tf_wp_max = 4.e8 * Allowable maximum shear stress (Tresca criterion) in TF c t_turn_tf = 0.037 * TF coil turn edge length including turn insulation [m] fcutfsu = 0.7630096974258808 * copper fraction of cable conductor (TF coils) i_tf_sc_mat = 8 * Switch for superconductor material in TF coils; -ftoroidalgap = 1. * F-value for minimum tftort (`constraint equation 82`) +ftoroidalgap = 1. * F-value for minimum dx_tf_inboard_out_toroidal (`constraint equation 82`) tdmptf = 7.400147540321247 * fast discharge time for TF coil in event of quench (s) (`iteration variable 56`) tftmp = 4.5 * peak helium coolant temperature in TF coils and PF coils (K) thicndut = 0.001 * conduit insulation thickness (m) diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index ead45da86c..92286c6060 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -674,7 +674,7 @@ Outboard_leg_nose_case_type_____________________________________________ (i_tf_case_geom)______________ 0.0000E+00 Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 9.2950E-01 ITV Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 9.2950E-01 - Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP + Outboard_leg_toroidal_thickness_(m)_____________________________________ (dx_tf_inboard_out_toroidal)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7969E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 diff --git a/tests/unit/test_build.py b/tests/unit/test_build.py index abe370b44f..d9252250fe 100644 --- a/tests/unit/test_build.py +++ b/tests/unit/test_build.py @@ -67,7 +67,7 @@ class RippleAmplitudeParam(NamedTuple): n_tf_coils: Any = None - tftort: Any = None + dx_tf_inboard_out_toroidal: Any = None casths: Any = None @@ -198,7 +198,7 @@ def test_divgeom(divgeomparam, monkeypatch, build): rmajor=8.8901000000000003, tinstf=0.0080000000000000019, n_tf_coils=16, - tftort=1, + dx_tf_inboard_out_toroidal=1, casths=0.05000000000000001, dr_tf_wp=0.54261087836601019, thkcas=0.52465000000000006, @@ -219,7 +219,7 @@ def test_divgeom(divgeomparam, monkeypatch, build): rmajor=8.8901000000000003, tinstf=0.0080000000000000019, n_tf_coils=16, - tftort=1, + dx_tf_inboard_out_toroidal=1, casths=0.05000000000000001, dr_tf_wp=0.54261087836601019, thkcas=0.52465000000000006, @@ -261,7 +261,11 @@ def test_ripple_amplitude(rippleamplitudeparam, monkeypatch, build): monkeypatch.setattr(tfcoil_variables, "n_tf_coils", rippleamplitudeparam.n_tf_coils) - monkeypatch.setattr(tfcoil_variables, "tftort", rippleamplitudeparam.tftort) + monkeypatch.setattr( + tfcoil_variables, + "dx_tf_inboard_out_toroidal", + rippleamplitudeparam.dx_tf_inboard_out_toroidal, + ) monkeypatch.setattr(tfcoil_variables, "casths", rippleamplitudeparam.casths) @@ -322,7 +326,7 @@ class PortszParam(NamedTuple): rmajor: Any = None - tftort: Any = None + dx_tf_inboard_out_toroidal: Any = None n_tf_coils: Any = None @@ -343,7 +347,7 @@ class PortszParam(NamedTuple): beamwd=0.57999999999999996, frbeam=1.05, rmajor=8.8901000000000003, - tftort=1.6395161177915356, + dx_tf_inboard_out_toroidal=1.6395161177915356, n_tf_coils=16, expected_rtanbeam=9.3346050000000016, expected_rtanmax=14.735821603386416, @@ -357,7 +361,7 @@ class PortszParam(NamedTuple): beamwd=0.57999999999999996, frbeam=1.05, rmajor=8.8901000000000003, - tftort=1.6395161177915356, + dx_tf_inboard_out_toroidal=1.6395161177915356, n_tf_coils=16, expected_rtanbeam=9.3346050000000016, expected_rtanmax=14.735821603386416, @@ -398,7 +402,11 @@ def test_portsz(portszparam, monkeypatch, build): monkeypatch.setattr(physics_variables, "rmajor", portszparam.rmajor) - monkeypatch.setattr(tfcoil_variables, "tftort", portszparam.tftort) + monkeypatch.setattr( + tfcoil_variables, + "dx_tf_inboard_out_toroidal", + portszparam.dx_tf_inboard_out_toroidal, + ) monkeypatch.setattr(tfcoil_variables, "n_tf_coils", portszparam.n_tf_coils) diff --git a/tests/unit/test_resistive_tf_coil.py b/tests/unit/test_resistive_tf_coil.py index b0feced456..669872b2b9 100644 --- a/tests/unit/test_resistive_tf_coil.py +++ b/tests/unit/test_resistive_tf_coil.py @@ -30,7 +30,7 @@ class ResTfInternalGeomParam(NamedTuple): dr_tf_wp: Any = None - tftort: Any = None + dx_tf_inboard_out_toroidal: Any = None a_tf_coil_inboard: Any = None @@ -81,7 +81,7 @@ class ResTfInternalGeomParam(NamedTuple): thicndut=0.00080000000000000004, thkcas=0, dr_tf_wp=0.15483000000000002, - tftort=0.45367650933034859, + dx_tf_inboard_out_toroidal=0.45367650933034859, a_tf_coil_inboard=0.0753112923616783, c_tf_total=25500000, fcoolcp=0.12725, @@ -108,7 +108,7 @@ class ResTfInternalGeomParam(NamedTuple): thicndut=0.00080000000000000004, thkcas=0, dr_tf_wp=0.14708850000000001, - tftort=0.44435902370665786, + dx_tf_inboard_out_toroidal=0.44435902370665786, a_tf_coil_inboard=0.0753112923616783, c_tf_total=25500000, fcoolcp=0.12725, @@ -156,7 +156,11 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, resistive_tf_ monkeypatch.setattr(tfcoil_variables, "dr_tf_wp", restfinternalgeomparam.dr_tf_wp) - monkeypatch.setattr(tfcoil_variables, "tftort", restfinternalgeomparam.tftort) + monkeypatch.setattr( + tfcoil_variables, + "dx_tf_inboard_out_toroidal", + restfinternalgeomparam.dx_tf_inboard_out_toroidal, + ) monkeypatch.setattr( tfcoil_variables, "a_tf_coil_inboard", restfinternalgeomparam.a_tf_coil_inboard @@ -256,7 +260,7 @@ class TfResHeatingParam(NamedTuple): vol_cond_cp: Any = None n_tf_turn: Any = None thkcas: Any = None - tftort: Any = None + dx_tf_inboard_out_toroidal: Any = None len_tf_coil: Any = None res_tf_leg: Any = None temp_cp_average: Any = None @@ -310,7 +314,7 @@ class TfResHeatingParam(NamedTuple): vol_cond_cp=0, n_tf_turn=1, thkcas=0, - tftort=0.45367650933034859, + dx_tf_inboard_out_toroidal=0.45367650933034859, len_tf_coil=15.582502857142856, res_tf_leg=0, temp_cp_average=347.13, @@ -360,7 +364,7 @@ class TfResHeatingParam(NamedTuple): vol_cond_cp=12.020160732580297, n_tf_turn=1, thkcas=0, - tftort=0.44435902370665786, + dx_tf_inboard_out_toroidal=0.44435902370665786, len_tf_coil=15.654502857142857, res_tf_leg=5.647653956699231e-06, temp_cp_average=347.13, @@ -438,7 +442,11 @@ def test_tf_res_heating(tfresheatingparam, monkeypatch, resistive_tf_coil): monkeypatch.setattr(tfcoil_variables, "thkcas", tfresheatingparam.thkcas) - monkeypatch.setattr(tfcoil_variables, "tftort", tfresheatingparam.tftort) + monkeypatch.setattr( + tfcoil_variables, + "dx_tf_inboard_out_toroidal", + tfresheatingparam.dx_tf_inboard_out_toroidal, + ) monkeypatch.setattr(tfcoil_variables, "len_tf_coil", tfresheatingparam.len_tf_coil) diff --git a/tests/unit/test_stellarator.py b/tests/unit/test_stellarator.py index 4479325755..1d6490a33d 100644 --- a/tests/unit/test_stellarator.py +++ b/tests/unit/test_stellarator.py @@ -702,7 +702,7 @@ class StstrcParam(NamedTuple): vtfskv: Any = None - tftort: Any = None + dx_tf_inboard_out_toroidal: Any = None stella_config_coilsurface: Any = None @@ -740,7 +740,7 @@ class StstrcParam(NamedTuple): tcritsc=16, estotftgj=132.55990646265246, vtfskv=4.3242392290600487, - tftort=0.67648706726464258, + dx_tf_inboard_out_toroidal=0.67648706726464258, stella_config_coilsurface=4817.6999999999998, stella_config_coillength=1680, f_n=1, @@ -764,7 +764,7 @@ class StstrcParam(NamedTuple): tcritsc=16, estotftgj=132.55990646265246, vtfskv=4.3242392290600487, - tftort=0.67648706726464258, + dx_tf_inboard_out_toroidal=0.67648706726464258, stella_config_coilsurface=4817.6999999999998, stella_config_coillength=1680, f_n=1, @@ -815,7 +815,11 @@ def test_ststrc(ststrcparam, monkeypatch, stellarator): monkeypatch.setattr(tfcoil_variables, "vtfskv", ststrcparam.vtfskv) - monkeypatch.setattr(tfcoil_variables, "tftort", ststrcparam.tftort) + monkeypatch.setattr( + tfcoil_variables, + "dx_tf_inboard_out_toroidal", + ststrcparam.dx_tf_inboard_out_toroidal, + ) monkeypatch.setattr( stellarator_configuration, diff --git a/tests/unit/test_tfcoil.py b/tests/unit/test_tfcoil.py index 20bb0f38a0..51ec588087 100644 --- a/tests/unit/test_tfcoil.py +++ b/tests/unit/test_tfcoil.py @@ -255,7 +255,7 @@ class TfGlobalGeometryParam(NamedTuple): c_tf_total: Any = None - tftort: Any = None + dx_tf_inboard_out_toroidal: Any = None n_tf_coils: Any = None @@ -285,7 +285,7 @@ class TfGlobalGeometryParam(NamedTuple): expected_a_tf_coil_inboard: Any = None - expected_tftort: Any = None + expected_dx_tf_inboard_out_toroidal: Any = None expected_a_tf_leg_outboard: Any = None @@ -309,7 +309,7 @@ class TfGlobalGeometryParam(NamedTuple): dr_tf_outboard=1.208, a_tf_coil_inboard=0, c_tf_total=0, - tftort=1, + dx_tf_inboard_out_toroidal=1, n_tf_coils=16, a_tf_leg_outboard=0, i_tf_sup=1, @@ -324,7 +324,7 @@ class TfGlobalGeometryParam(NamedTuple): rad_tf_coil_toroidal=0, tan_theta_coil=0, expected_a_tf_coil_inboard=27.308689677971632, - expected_tftort=1.6395161177915356, + expected_dx_tf_inboard_out_toroidal=1.6395161177915356, expected_a_tf_leg_outboard=1.9805354702921749, expected_r_tf_outboard_in=15.915405859443332, expected_r_tf_outboard_out=17.123405859443331, @@ -339,7 +339,7 @@ class TfGlobalGeometryParam(NamedTuple): dr_tf_outboard=1.5283376222698528, a_tf_coil_inboard=35.703669036223495, c_tf_total=241812532.66279837, - tftort=1.7488698442633552, + dx_tf_inboard_out_toroidal=1.7488698442633552, n_tf_coils=16, a_tf_leg_outboard=2.6728635794409041, i_tf_sup=1, @@ -354,7 +354,7 @@ class TfGlobalGeometryParam(NamedTuple): rad_tf_coil_toroidal=0.19634954084936207, tan_theta_coil=0.19891236737965801, expected_a_tf_coil_inboard=35.703669036223495, - expected_tftort=1.7488698442633552, + expected_dx_tf_inboard_out_toroidal=1.7488698442633552, expected_a_tf_leg_outboard=2.6728635794409041, expected_r_tf_outboard_in=16.299182480677967, expected_r_tf_outboard_out=17.827520102947819, @@ -405,7 +405,11 @@ def test_tf_global_geometry(tfglobalgeometryparam, monkeypatch, tfcoil): tfcoil_variables, "c_tf_total", tfglobalgeometryparam.c_tf_total ) - monkeypatch.setattr(tfcoil_variables, "tftort", tfglobalgeometryparam.tftort) + monkeypatch.setattr( + tfcoil_variables, + "dx_tf_inboard_out_toroidal", + tfglobalgeometryparam.dx_tf_inboard_out_toroidal, + ) monkeypatch.setattr( tfcoil_variables, "n_tf_coils", tfglobalgeometryparam.n_tf_coils @@ -455,8 +459,8 @@ def test_tf_global_geometry(tfglobalgeometryparam, monkeypatch, tfcoil): tfglobalgeometryparam.expected_a_tf_coil_inboard ) - assert tfcoil_variables.tftort == pytest.approx( - tfglobalgeometryparam.expected_tftort + assert tfcoil_variables.dx_tf_inboard_out_toroidal == pytest.approx( + tfglobalgeometryparam.expected_dx_tf_inboard_out_toroidal ) assert tfcoil_variables.a_tf_leg_outboard == pytest.approx( @@ -493,7 +497,7 @@ class TfCurrentParam(NamedTuple): tinstf: Any = None - tftort: Any = None + dx_tf_inboard_out_toroidal: Any = None b_tf_inboard_peak: Any = None @@ -552,7 +556,7 @@ class TfCurrentParam(NamedTuple): i_tf_sup=1, casths_fraction=0.059999999999999998, tinstf=0.0080000000000000019, - tftort=1.6395161177915356, + dx_tf_inboard_out_toroidal=1.6395161177915356, b_tf_inboard_peak=0, tfinsgap=0.01, tfc_sidewall_is_fraction=False, @@ -609,7 +613,11 @@ def test_tf_current(tfcurrentparam, monkeypatch, tfcoil): monkeypatch.setattr(tfcoil_variables, "tinstf", tfcurrentparam.tinstf) - monkeypatch.setattr(tfcoil_variables, "tftort", tfcurrentparam.tftort) + monkeypatch.setattr( + tfcoil_variables, + "dx_tf_inboard_out_toroidal", + tfcurrentparam.dx_tf_inboard_out_toroidal, + ) monkeypatch.setattr( tfcoil_variables, "b_tf_inboard_peak", tfcurrentparam.b_tf_inboard_peak From 3afa042d8ad605c23f3661eda27452a449636668 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 28 Mar 2025 16:19:27 +0000 Subject: [PATCH 08/21] =?UTF-8?q?=F0=9F=94=84=20Rename=20tfc=5Fcurrent=20t?= =?UTF-8?q?o=20c=5Ftf=5Fcoil=20for=20clarity=20and=20consistency,=20update?= =?UTF-8?q?=20references=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/superconducting_tf_coil.py | 4 ++-- process/tf_coil.py | 2 +- source/fortran/sctfcoil.f90 | 2 +- tests/integration/ref_dicts.json | 6 +++--- tests/unit/test_sctfcoil.py | 12 +++++------- tests/unit/test_tfcoil.py | 14 ++++++-------- 6 files changed, 18 insertions(+), 22 deletions(-) diff --git a/process/superconducting_tf_coil.py b/process/superconducting_tf_coil.py index 0b212cb190..36137f4e3e 100644 --- a/process/superconducting_tf_coil.py +++ b/process/superconducting_tf_coil.py @@ -1529,7 +1529,7 @@ def vv_stress_on_quench(self): + 2.0 * sctfcoil_module.t_lat_case_av, taud=tfcoil_variables.tdmptf, # TODO: is this the correct current? - i_op=sctfcoil_module.tfc_current / tfcoil_variables.n_tf_turn, + i_op=sctfcoil_module.c_tf_coil / tfcoil_variables.n_tf_turn, # VV properties d_vv=build_variables.dr_vv_shells, ) @@ -2015,7 +2015,7 @@ def tf_integer_turn_geom(self, n_layer, n_pancake, thwcndut, thicndut): n_tf_turn = np.double(n_layer * n_pancake) # Current per turn [A/turn] - cpttf = sctfcoil_module.tfc_current / n_tf_turn + cpttf = sctfcoil_module.c_tf_coil / n_tf_turn # Radial and toroidal dimension of conductor [m] sctfcoil_module.t_conductor_radial = ( diff --git a/process/tf_coil.py b/process/tf_coil.py index 2322af5945..b5d04e844d 100644 --- a/process/tf_coil.py +++ b/process/tf_coil.py @@ -379,7 +379,7 @@ def tf_current(self): ) # Current per TF coil [A] - sctfcoil_module.tfc_current = ( + sctfcoil_module.c_tf_coil = ( tfcoil_variables.c_tf_total / tfcoil_variables.n_tf_coils ) diff --git a/source/fortran/sctfcoil.f90 b/source/fortran/sctfcoil.f90 index 7284bccbe4..6de93a40f9 100755 --- a/source/fortran/sctfcoil.f90 +++ b/source/fortran/sctfcoil.f90 @@ -31,7 +31,7 @@ module sctfcoil_module real(dp) :: tf_fit_y !! Ratio of peak field with ripple to nominal axisymmetric peak field - real(dp) :: tfc_current + real(dp) :: c_tf_coil !! Current in each TF coil real(dp) :: awpc diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index b6f5faaeb8..bbb9c1dea5 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -7501,7 +7501,7 @@ ], "len_tf_bus": 0.0, "m_tf_bus": 0.0, - "tfc_current": 0.0, + "c_tf_coil": 0.0, "tfc_nuc_heating": 0.0, "tfc_sidewall_is_fraction": ".false.", "tfcbv": 20000.0, @@ -10711,7 +10711,7 @@ "tfb": "Vertical radius of inside edge of TF coil (m)", "len_tf_bus": "TF coil bus length (m)", "m_tf_bus": "TF coil bus mass (kg)", - "tfc_current": "Current in each TF coil", + "c_tf_coil": "Current in each TF coil", "tfc_nuc_heating": "Unit nuclear heating in TF coil (W per W of fusion power)", "tfc_sidewall_is_fraction": "logical switch to make casths a fraction of TF coil thickness (`casths_fraction`)", "tfcbv": "volume of TF coil power supply building (m3) (calculated if TF coils are superconducting)", @@ -19209,7 +19209,7 @@ "tf_fit_t", "tf_fit_z", "tf_fit_y", - "tfc_current", + "c_tf_coil", "awpc", "awptf", "a_tf_steel", diff --git a/tests/unit/test_sctfcoil.py b/tests/unit/test_sctfcoil.py index fa2be36ed1..1172bcec98 100644 --- a/tests/unit/test_sctfcoil.py +++ b/tests/unit/test_sctfcoil.py @@ -925,7 +925,7 @@ class TfIntegerTurnGeomParam(NamedTuple): t_turn_tf: Any = None - tfc_current: Any = None + c_tf_coil: Any = None t_wp_toroidal: Any = None @@ -989,7 +989,7 @@ class TfIntegerTurnGeomParam(NamedTuple): tfinsgap=0.01, t_conductor=0, t_turn_tf=0, - tfc_current=14805350.287500001, + c_tf_coil=14805350.287500001, t_wp_toroidal=1.299782604942499, t_conductor_radial=0, t_conductor_toroidal=0, @@ -1023,7 +1023,7 @@ class TfIntegerTurnGeomParam(NamedTuple): tfinsgap=0.01, t_conductor=0.052553108427885735, t_turn_tf=0.056579413904423038, - tfc_current=14805350.287500001, + c_tf_coil=14805350.287500001, t_wp_toroidal=1.299782604942499, t_conductor_radial=0.046661087836601015, t_conductor_toroidal=0.059189130247124938, @@ -1078,9 +1078,7 @@ def test_tf_integer_turn_geom(tfintegerturngeomparam, monkeypatch, sctfcoil): monkeypatch.setattr(tfcoil_variables, "t_turn_tf", tfintegerturngeomparam.t_turn_tf) - monkeypatch.setattr( - sctfcoil_module, "tfc_current", tfintegerturngeomparam.tfc_current - ) + monkeypatch.setattr(sctfcoil_module, "c_tf_coil", tfintegerturngeomparam.c_tf_coil) monkeypatch.setattr( sctfcoil_module, "t_wp_toroidal", tfintegerturngeomparam.t_wp_toroidal @@ -1575,7 +1573,7 @@ def test_vv_stress_on_quench_integration(sctfcoil, monkeypatch): 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 + monkeypatch.setattr(sctfcoil_module, "c_tf_coil", 83200 * 192) # Section 3 monkeypatch.setattr( build_variables, "r_vv_inboard_out", 4.45 + (build_variables.dr_vv_inboard / 2) diff --git a/tests/unit/test_tfcoil.py b/tests/unit/test_tfcoil.py index 51ec588087..0204560216 100644 --- a/tests/unit/test_tfcoil.py +++ b/tests/unit/test_tfcoil.py @@ -531,7 +531,7 @@ class TfCurrentParam(NamedTuple): rmajor: Any = None - tfc_current: Any = None + c_tf_coil: Any = None rad_tf_coil_toroidal: Any = None @@ -543,7 +543,7 @@ class TfCurrentParam(NamedTuple): expected_oacdcp: Any = None - expected_tfc_current: Any = None + expected_c_tf_coil: Any = None @pytest.mark.parametrize( @@ -573,13 +573,13 @@ class TfCurrentParam(NamedTuple): dr_tf_inboard=1.208, bt=5.3292000000000002, rmajor=8.8901000000000003, - tfc_current=0, + c_tf_coil=0, rad_tf_coil_toroidal=0.19634954084936207, expected_c_tf_total=236885604.60000002, expected_rbmax=4.0432020634751211, expected_b_tf_inboard_peak=11.717722779177526, expected_oacdcp=8674367.2945641987, - expected_tfc_current=14805350.287500001, + expected_c_tf_coil=14805350.287500001, ), ), ) @@ -667,7 +667,7 @@ def test_tf_current(tfcurrentparam, monkeypatch, tfcoil): monkeypatch.setattr(physics_variables, "rmajor", tfcurrentparam.rmajor) - monkeypatch.setattr(sctfcoil_module, "tfc_current", tfcurrentparam.tfc_current) + monkeypatch.setattr(sctfcoil_module, "c_tf_coil", tfcurrentparam.c_tf_coil) monkeypatch.setattr( sctfcoil_module, "rad_tf_coil_toroidal", tfcurrentparam.rad_tf_coil_toroidal @@ -687,9 +687,7 @@ def test_tf_current(tfcurrentparam, monkeypatch, tfcoil): assert tfcoil_variables.oacdcp == pytest.approx(tfcurrentparam.expected_oacdcp) - assert sctfcoil_module.tfc_current == pytest.approx( - tfcurrentparam.expected_tfc_current - ) + assert sctfcoil_module.c_tf_coil == pytest.approx(tfcurrentparam.expected_c_tf_coil) @pytest.mark.parametrize( From cab98cb11018c05b3c37ca66d660e6c0729c0f17 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 31 Mar 2025 11:12:47 +0100 Subject: [PATCH 09/21] =?UTF-8?q?=F0=9F=94=84=20Rename=20coilshap=20to=20t?= =?UTF-8?q?f=5Fcoil=5Fshape=5Finner=20for=20clarity=20and=20consistency;?= =?UTF-8?q?=20update=20references=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/resistive_tf_coil.py | 2 +- process/superconducting_tf_coil.py | 2 +- process/tf_coil.py | 4 ++-- source/fortran/numerics.f90 | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/process/resistive_tf_coil.py b/process/resistive_tf_coil.py index c0c7af4476..9d3d7737d8 100644 --- a/process/resistive_tf_coil.py +++ b/process/resistive_tf_coil.py @@ -29,7 +29,7 @@ def run(self, output: bool): self.iprint = 0 self.tf_global_geometry() self.tf_current() - self.coilshap() + self.tf_coil_shape_inner() self.res_tf_internal_geom() self.tf_res_heating() diff --git a/process/superconducting_tf_coil.py b/process/superconducting_tf_coil.py index 36137f4e3e..b6092516be 100644 --- a/process/superconducting_tf_coil.py +++ b/process/superconducting_tf_coil.py @@ -52,7 +52,7 @@ def run(self, output: bool): self.iprint = 0 self.tf_global_geometry() self.tf_current() - self.coilshap() + self.tf_coil_shape_inner() self.sc_tf_internal_geom( tfcoil_variables.i_tf_wp_geom, tfcoil_variables.i_tf_case_geom, diff --git a/process/tf_coil.py b/process/tf_coil.py index b5d04e844d..03ca8300b1 100644 --- a/process/tf_coil.py +++ b/process/tf_coil.py @@ -44,7 +44,7 @@ def run(self, output): self.iprint = 0 self.tf_global_geometry() self.tf_current() - self.coilshap() + self.tf_coil_shape_inner() if physics_variables.itart == 0 and tfcoil_variables.i_tf_shape == 1: tfcoil_variables.tfind = self.tfcind( @@ -388,7 +388,7 @@ def tf_current(self): tfcoil_variables.c_tf_total / tfcoil_variables.a_tf_coil_inboard ) - def coilshap(self): + def tf_coil_shape_inner(self): """Calculates the TF coil shape Calculates the shape of the INSIDE of the TF coil. The coil is approximated by a straight inboard section and four elliptical arcs diff --git a/source/fortran/numerics.f90 b/source/fortran/numerics.f90 index 52b8eae2a5..9ef1512a65 100755 --- a/source/fortran/numerics.f90 +++ b/source/fortran/numerics.f90 @@ -551,7 +551,7 @@ subroutine init_numerics() 'Peak CS field upper limit ', & 'pdivt lower limit ', & 'ne0 > neped ', & - 'toroidalgap > dx_tf_inboard_out_toroidal ', & + 'toroidalgap > dx_tf_inboard_out_t', & 'available_space > required_space ', & 'beta > beta_min ', & 'CP lifetime ', & From c4c45cff7489379fcc97040aa02ad2dced4c4daa Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 31 Mar 2025 11:18:19 +0100 Subject: [PATCH 10/21] =?UTF-8?q?=F0=9F=94=84=20Rename=20jwptf=20to=20j=5F?= =?UTF-8?q?tf=5Fwp=20for=20clarity=20and=20consistency;=20update=20referen?= =?UTF-8?q?ces=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/io/plot_proc.py | 8 ++--- process/stellarator.py | 10 +++---- process/superconducting_tf_coil.py | 20 ++++++------- source/fortran/constraint_equations.f90 | 16 +++++----- source/fortran/tfcoil_variables.f90 | 2 +- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 6 ++-- .../input_files/st_regression.IN.DAT | 4 +-- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_sctfcoil.py | 28 ++++++++--------- tests/unit/test_tfcoil.py | 6 ++-- 23 files changed, 94 insertions(+), 94 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 09bcf4f727..377fde4dab 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -738,7 +738,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0251E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0251E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.2085E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 2.4422E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 2.4422E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1672E+07 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.1034E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 1.9146E+08 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 95e7496cd9..8d3c01228f 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -735,7 +735,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.1176E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.1176E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.2636E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 2.5602E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 2.5602E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1617E+07 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.2161E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 2.0908E+08 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 1951f27991..b8648fc291 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -735,7 +735,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.1176E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.1176E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.2636E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 2.5602E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 2.5602E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1617E+07 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.2161E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 2.0908E+08 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index fc48528455..1c66846ce4 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -735,7 +735,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.1176E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.1176E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.2636E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 2.5602E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 2.5602E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1617E+07 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.2161E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 2.0908E+08 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index a045847e6d..301277e9c3 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -735,7 +735,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.1176E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.1176E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.2636E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 2.5602E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 2.5602E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1617E+07 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.2161E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 2.0908E+08 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index f765914c06..4208632521 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -583,7 +583,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1982E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 1.4412E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 1.4412E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 7.2690E+06 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.6312E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 2.5976E+08 OP @@ -1578,7 +1578,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1982E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 1.4412E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 1.4412E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 7.2690E+06 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.6312E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 2.5976E+08 OP @@ -2573,7 +2573,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1982E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 1.4412E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 1.4412E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 7.2690E+06 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.6312E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 2.5976E+08 OP @@ -3568,7 +3568,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1982E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 1.4412E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 1.4412E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 7.2690E+06 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.6312E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 2.5976E+08 OP @@ -4563,7 +4563,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1982E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 1.4412E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 1.4412E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 7.2690E+06 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.6312E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 2.5976E+08 OP @@ -5558,7 +5558,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1982E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 1.4412E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 1.4412E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 7.2690E+06 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.6312E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 2.5976E+08 OP @@ -6553,7 +6553,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1982E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 1.4412E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 1.4412E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 7.2690E+06 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.6312E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 2.5976E+08 OP @@ -7548,7 +7548,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1982E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 1.4412E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 1.4412E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 7.2690E+06 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.6312E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 2.5976E+08 OP @@ -8543,7 +8543,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1982E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 1.4412E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 1.4412E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 7.2690E+06 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.6312E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 2.5976E+08 OP diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index cd4593dfd5..ef159eef80 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -1924,7 +1924,7 @@ def plot_tf_wp(axis, mfile_data, scan: int) -> None: nose_thickness = mfile_data.data["thkcas"].get_scan(scan) side_thickness = mfile_data.data["casths"].get_scan(scan) case_plasma = mfile_data.data["i_tf_case_geom"].get_scan(scan) - jwptf = round(mfile_data.data["jwptf"].get_scan(scan)) / 1e6 + j_tf_wp = round(mfile_data.data["j_tf_wp"].get_scan(scan)) / 1e6 tf_thickness = mfile_data.data["dr_tf_inboard"].get_scan(scan) integer_turns = mfile_data.data["i_tf_turns_integer"].get_scan(scan) @@ -2103,7 +2103,7 @@ def plot_tf_wp(axis, mfile_data, scan: int) -> None: (wp_toridal_dxbig - (2 * tinstf)), color="blue", label=( - f"Winding pack: \n{turns} turns \n{jwptf:.4f} MA/m$^2$ \n$" + f"Winding pack: \n{turns} turns \n{j_tf_wp:.4f} MA/m$^2$ \n$" f"\\Delta$R= {dr_tf_wp:.4f} m \n " ), ) @@ -2175,7 +2175,7 @@ def plot_tf_wp(axis, mfile_data, scan: int) -> None: wp_toridal_dxbig - (2 * tinstf), color="blue", label=( - f"Winding pack: \n{turns} turns \n{jwptf:.4f} MA/m$^2$ \n$" + f"Winding pack: \n{turns} turns \n{j_tf_wp:.4f} MA/m$^2$ \n$" f"\\Delta$R= {dr_tf_wp:.4f} m \n " ), ), @@ -2229,7 +2229,7 @@ def plot_tf_wp(axis, mfile_data, scan: int) -> None: xy=list(zip(x, y, strict=False)), color="blue", label=( - f"Winding pack: \n{turns} turns \n{jwptf:.4f} MA/m$^2$ \n" + f"Winding pack: \n{turns} turns \n{j_tf_wp:.4f} MA/m$^2$ \n" f"$\\Delta$R= {dr_tf_wp:.4f} m \n " ), ) diff --git a/process/stellarator.py b/process/stellarator.py index 9fa7cf57e3..91a5f9b6c0 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -2577,7 +2577,7 @@ def stcoil(self, output: bool): tfcoil_variables.t_crit_nbti, tfcoil_variables.tcritsc, tfcoil_variables.vftf, - tfcoil_variables.jwptf, + tfcoil_variables.j_tf_wp, ) # Get here a temperature margin of 1.5K. # The operation current density weighted with the global iop/icrit fraction @@ -2638,7 +2638,7 @@ def stcoil(self, output: bool): ) awptf = awp_tor * awp_rad # [m^2] winding-pack cross sectional area - tfcoil_variables.jwptf = ( + tfcoil_variables.j_tf_wp = ( coilcurrent * 1.0e6 / awptf ) # [A/m^2] winding pack current density tfcoil_variables.n_tf_turn = ( @@ -3014,7 +3014,7 @@ def stcoil(self, output: bool): tfcoil_variables.t_turn_tf**2, ) - # print *, "Jmax, comparison: ", jwdgpro, " ", jwdgpro2," ",jwptf/jwdgpro, " , tfcoil_variables.tdmptf: ",tdmptf, " tfcoil_variables.fcutfsu: ",fcutfsu + # print *, "Jmax, comparison: ", jwdgpro, " ", jwdgpro2," ",j_tf_wp/jwdgpro, " , tfcoil_variables.tdmptf: ",tdmptf, " tfcoil_variables.fcutfsu: ",fcutfsu # print *, "acstf: ", tfcoil_variables.acstf # Also give the copper area for REBCO quench calculations: rebco_variables.coppera_m2 = ( @@ -3718,8 +3718,8 @@ def stcoil_output( po.ovarre( self.outfile, "Winding pack current density (A/m2)", - "(jwptf)", - tfcoil_variables.jwptf, + "(j_tf_wp)", + tfcoil_variables.j_tf_wp, ) po.ovarre( self.outfile, diff --git a/process/superconducting_tf_coil.py b/process/superconducting_tf_coil.py index b6092516be..7185d1b790 100644 --- a/process/superconducting_tf_coil.py +++ b/process/superconducting_tf_coil.py @@ -279,7 +279,7 @@ def run(self, output: bool): tfes = sctfcoil_module.estotft / tfcoil_variables.n_tf_coils # Cross-sectional area per turn aturn = tfcoil_variables.c_tf_total / ( - tfcoil_variables.jwptf + tfcoil_variables.j_tf_wp * tfcoil_variables.n_tf_coils * tfcoil_variables.n_tf_turn ) @@ -309,7 +309,7 @@ def run(self, output: bool): tfcoil_variables.vftf, tfcoil_variables.fcutfsu, tfcoil_variables.cpttf, - tfcoil_variables.jwptf, + tfcoil_variables.j_tf_wp, tfcoil_variables.i_tf_sc_mat, tfcoil_variables.fhts, tfcoil_variables.tdmptf, @@ -1653,7 +1653,7 @@ def sc_tf_internal_geom(self, i_tf_wp_geom, i_tf_case_geom, i_tf_turns_integer): tfcoil_variables.insulation_area, tfcoil_variables.n_tf_turn, ) = self.tf_averaged_turn_geom( - tfcoil_variables.jwptf, + tfcoil_variables.j_tf_wp, tfcoil_variables.thwcndut, tfcoil_variables.thicndut, tfcoil_variables.i_tf_sc_mat, @@ -2084,7 +2084,7 @@ def tf_wp_currents(self): Author : S. Kahn, CCFE Turn engineering turn currents/densities """ - tfcoil_variables.jwptf = max( + tfcoil_variables.j_tf_wp = max( 1.0e0, tfcoil_variables.c_tf_total / (tfcoil_variables.n_tf_coils * sctfcoil_module.awptf), @@ -2964,8 +2964,8 @@ def outtf(self, peaktfflag): po.ovarre( self.outfile, "Winding pack current density (A/m2)", - "(jwptf)", - tfcoil_variables.jwptf, + "(j_tf_wp)", + tfcoil_variables.j_tf_wp, "OP ", ) @@ -3484,7 +3484,7 @@ def outtf(self, peaktfflag): ) po.oblnkl(self.outfile) - def tf_averaged_turn_geom(self, jwptf, thwcndut, thicndut, i_tf_sc_mat): + def tf_averaged_turn_geom(self, j_tf_wp, thwcndut, thicndut, i_tf_sc_mat): """ subroutine straight from Python, see comments in tf_averaged_turn_geom_wrapper Authors : J. Morris, CCFE @@ -3502,7 +3502,7 @@ def tf_averaged_turn_geom(self, jwptf, thwcndut, thicndut, i_tf_sc_mat): a_turn = tfcoil_variables.t_turn_tf**2 # Current per turn [A] - tfcoil_variables.cpttf = a_turn * jwptf + tfcoil_variables.cpttf = a_turn * j_tf_wp # Turn cable dimension is an input elif tfcoil_variables.t_cable_tf_is_input: @@ -3515,14 +3515,14 @@ def tf_averaged_turn_geom(self, jwptf, thwcndut, thicndut, i_tf_sc_mat): a_turn = tfcoil_variables.t_turn_tf**2 # Current per turn [A] - tfcoil_variables.cpttf = a_turn * jwptf + tfcoil_variables.cpttf = a_turn * j_tf_wp # Current per turn is an input else: # Turn area [m2] # Allow for additional inter-layer insulation MDK 13/11/18 # Area of turn including conduit and inter-layer insulation - a_turn = tfcoil_variables.cpttf / jwptf + a_turn = tfcoil_variables.cpttf / j_tf_wp # Dimension of square cross-section of each turn including inter-turn insulation [m] tfcoil_variables.t_turn_tf = np.sqrt(a_turn) diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index 5abd95996a..43e98d981f 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -1590,9 +1590,9 @@ subroutine constraint_eqn_033(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! Logic change during pre-factoring: err, symbol, units will be assigned only if present. !! fiooic : input real : f-value for TF coil operating current / critical !! jwdgcrt : input real : critical current density for winding pack (A/m2) - !! jwptf : input real : winding pack current density (A/m2) + !! j_tf_wp : input real : winding pack current density (A/m2) use constraint_variables, only: fiooic - use tfcoil_variables, only: jwdgcrt, jwptf + use tfcoil_variables, only: jwdgcrt, j_tf_wp implicit none real(dp), intent(out) :: tmp_cc real(dp), intent(out) :: tmp_con @@ -1601,9 +1601,9 @@ subroutine constraint_eqn_033(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) character(len=10), intent(out) :: tmp_units if (fiooic > 0.7D0) call report_error(285) - tmp_cc = jwptf/jwdgcrt - 1.0D0 * fiooic + tmp_cc = j_tf_wp/jwdgcrt - 1.0D0 * fiooic tmp_con = jwdgcrt * (1.0D0 - tmp_cc) - tmp_err = jwptf * tmp_cc + tmp_err = j_tf_wp * tmp_cc tmp_symbol = '<' tmp_units = 'A/m2' @@ -1651,9 +1651,9 @@ subroutine constraint_eqn_035(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! Logic change during pre-factoring: err, symbol, units will be assigned only if present. !! fjprot : input real : f-value for TF coil winding pack current density !! jwdgpro : input real : allowable TF coil winding pack current density, for dump temperature rise protection (A/m2) - !! jwptf : input real : winding pack current density (A/m2) + !! j_tf_wp : input real : winding pack current density (A/m2) use constraint_variables, only: fjprot - use tfcoil_variables, only: jwdgpro, jwptf + use tfcoil_variables, only: jwdgpro, j_tf_wp implicit none real(dp), intent(out) :: tmp_cc real(dp), intent(out) :: tmp_con @@ -1661,9 +1661,9 @@ subroutine constraint_eqn_035(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 = jwptf/jwdgpro - 1.0D0 * fjprot + tmp_cc = j_tf_wp/jwdgpro - 1.0D0 * fjprot tmp_con = jwdgpro - tmp_err = jwptf - jwdgpro + tmp_err = j_tf_wp - jwdgpro tmp_symbol = '<' tmp_units = 'A/m2' diff --git a/source/fortran/tfcoil_variables.f90 b/source/fortran/tfcoil_variables.f90 index 1138571736..f482d75864 100644 --- a/source/fortran/tfcoil_variables.f90 +++ b/source/fortran/tfcoil_variables.f90 @@ -322,7 +322,7 @@ module tfcoil_variables real(dp) :: jwdgpro !! allowable TF coil winding pack current density, for dump temperature rise protection (A/m2) - real(dp) :: jwptf + real(dp) :: j_tf_wp !! winding pack engineering current density (A/m2) real(dp) :: oacdcp diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 9401a64e9a..d52058fcb0 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -734,7 +734,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.1176E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.1176E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.2636E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 2.5602E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 2.5602E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1617E+07 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.2161E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 2.0908E+08 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index af57ea30b0..e1f315d1ed 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -735,7 +735,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.1176E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.1176E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.2636E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 2.5602E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 2.5602E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1617E+07 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.2161E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 2.0908E+08 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 8d71dc34e9..cf92a1ecd5 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -735,7 +735,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.1176E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.1176E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.2636E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 2.5602E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 2.5602E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1617E+07 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.2161E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 2.0908E+08 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 1617ab147c..7a83c12369 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -735,7 +735,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.1176E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.1176E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.2636E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 2.5602E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 2.5602E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1617E+07 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.2161E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 2.0908E+08 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 3a30cec160..791627a7be 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -738,7 +738,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.1381E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.1381E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.2760E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 2.5505E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 2.5505E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1583E+07 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.2410E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 2.1322E+08 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index e5e476c046..5c7eccf2d8 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -736,7 +736,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0800E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0800E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.2407E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 2.6445E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 2.6445E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1870E+07 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.1644E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 2.0147E+08 OP @@ -1899,7 +1899,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0400E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0400E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.2167E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 2.6304E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 2.6304E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1837E+07 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.1183E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 1.9375E+08 OP @@ -3062,7 +3062,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0000E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0000E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1927E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 2.6163E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 2.6163E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1765E+07 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.0721E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 1.8617E+08 OP @@ -4225,7 +4225,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0000E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0000E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1927E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 2.6111E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 2.6111E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1749E+07 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.0724E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 1.8618E+08 OP @@ -5388,7 +5388,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0400E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0400E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.2167E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 2.6210E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 2.6210E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1837E+07 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.1183E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 1.9378E+08 OP @@ -6551,7 +6551,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0800E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0800E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.2408E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 2.6209E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 2.6209E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1864E+07 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.1645E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 2.0154E+08 OP @@ -7714,7 +7714,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0800E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0800E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.2408E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 2.6147E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 2.6147E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1844E+07 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.1649E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 2.0155E+08 OP @@ -8877,7 +8877,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0400E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0400E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.2168E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 2.6070E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 2.6070E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1788E+07 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.1191E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 1.9381E+08 OP @@ -10040,7 +10040,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0000E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0000E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1928E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 2.5987E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 2.5987E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1721E+07 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.0729E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 1.8621E+08 OP @@ -11203,7 +11203,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0000E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0000E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1928E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 2.5958E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 2.5958E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1712E+07 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.0730E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 1.8622E+08 OP @@ -12366,7 +12366,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0400E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0400E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.2168E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 2.6019E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 2.6019E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1777E+07 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.1193E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 1.9382E+08 OP @@ -13529,7 +13529,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0800E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0800E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.2409E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 2.6095E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 2.6095E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1837E+07 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.1650E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 2.0157E+08 OP @@ -14692,7 +14692,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0800E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0800E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.2409E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 2.6060E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 2.6060E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1826E+07 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.1652E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 2.0158E+08 OP @@ -15855,7 +15855,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0400E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0400E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.2168E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 2.6012E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 2.6012E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1771E+07 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.1194E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 1.9382E+08 OP @@ -17018,7 +17018,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.0000E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.0000E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1928E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 2.5964E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 2.5964E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1715E+07 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.0730E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 1.8621E+08 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 601869cc06..b1a3509f15 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -583,7 +583,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1982E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 1.4412E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 1.4412E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 7.2690E+06 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.6312E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 2.5976E+08 OP @@ -1578,7 +1578,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1982E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 1.4412E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 1.4412E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 7.2690E+06 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.6312E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 2.5976E+08 OP @@ -2573,7 +2573,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1982E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 1.4412E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 1.4412E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 7.2690E+06 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.6312E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 2.5976E+08 OP @@ -3568,7 +3568,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1982E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 1.4412E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 1.4412E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 7.2690E+06 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.6312E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 2.5976E+08 OP @@ -4563,7 +4563,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1982E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 1.4412E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 1.4412E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 7.2690E+06 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.6312E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 2.5976E+08 OP @@ -5558,7 +5558,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1982E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 1.4412E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 1.4412E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 7.2690E+06 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.6312E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 2.5976E+08 OP @@ -6553,7 +6553,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1982E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 1.4412E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 1.4412E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 7.2690E+06 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.6312E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 2.5976E+08 OP @@ -7548,7 +7548,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1982E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 1.4412E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 1.4412E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 7.2690E+06 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.6312E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 2.5976E+08 OP @@ -8543,7 +8543,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.4165E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.4165E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.1982E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 1.4412E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 1.4412E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 7.2690E+06 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.6312E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 2.5976E+08 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index bbb9c1dea5..bf8a6b3801 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -2853,7 +2853,7 @@ "jcableoh_eof": 0.0, "jwdgcrt": 0.0, "jwdgpro": 0.0, - "jwptf": 0.0, + "j_tf_wp": 0.0, "k": null, "k_copper": 330.0, "kallenbach_scan_end": 10.0, @@ -9879,7 +9879,7 @@ "jcableoh_eof": "central solenoid cable critical current density (A/m2) at end-of-flattop", "jwdgcrt": "critical current density for winding pack (A/m2)", "jwdgpro": "allowable TF coil winding pack current density, for dump temperature rise protection (A/m2)", - "jwptf": "winding pack engineering current density (A/m2)", + "j_tf_wp": "winding pack engineering current density (A/m2)", "k": "", "k_copper": "Copper thermal conductivity (W/m/K)", "kallenbach_scan_end": "end value for kallenbach scan parameter", @@ -19384,7 +19384,7 @@ "j_tf_bus", "jwdgcrt", "jwdgpro", - "jwptf", + "j_tf_wp", "oacdcp", "eyoung_ins", "eyoung_steel", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index daff628b26..cb89a32d3f 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -953,7 +953,7 @@ i_tf_sc_mat = 9 icc = 33 * DESCRIPTION: TF superconductor operating current / critical current density * JUSTIFICATION: A quench must be avoided -* VARIABLES: jwptf & jwdgcrt (critical current) calculated in-situ +* VARIABLES: j_tf_wp & jwdgcrt (critical current) calculated in-situ ixc = 50 fiooic = 1.0 @@ -967,7 +967,7 @@ boundu(50) = 1.0 *icc = 35 * DESCRIPTION: Constraint equation for TF coil J_wp/J_prot upper limit (SCTF) * JUSTIFICATION: Turned off, do not care about winding pack current density -* VARIABLES: jwptf calculated in-situ +* VARIABLES: j_tf_wp calculated in-situ *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 92286c6060..a807efa6c1 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -738,7 +738,7 @@ Total_current_in_all_TF_coils_(MA)______________________________________ (c_tf_total/1.D6)__________________ 2.1381E+02 OP TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (c_tf_total)_______________________ 2.1381E+08 Actual_peak_field_at_discrete_conductor_(T)_____________________________ (bmaxtfrp)____________________ 1.2760E+01 OP - Winding_pack_current_density_(A/m2)_____________________________________ (jwptf)_______________________ 2.5505E+07 OP + Winding_pack_current_density_(A/m2)_____________________________________ (j_tf_wp)_______________________ 2.5505E+07 OP Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1583E+07 Total_stored_energy_in_TF_coils_(GJ)____________________________________ (estotftgj)___________________ 1.2410E+02 OP Inboard_vertical_tension_per_coil_(N)___________________________________ (vforce)______________________ 2.1322E+08 OP diff --git a/tests/unit/test_sctfcoil.py b/tests/unit/test_sctfcoil.py index 1172bcec98..51f9b4bbe6 100644 --- a/tests/unit/test_sctfcoil.py +++ b/tests/unit/test_sctfcoil.py @@ -1199,7 +1199,7 @@ class TfAveragedTurnGeomParam(NamedTuple): i_tf_sc_mat: Any = None - jwptf: Any = None + j_tf_wp: Any = None thwcndut: Any = None @@ -1240,7 +1240,7 @@ class TfAveragedTurnGeomParam(NamedTuple): t_turn_toroidal=0, t_cable=0, i_tf_sc_mat=5, - jwptf=26493137.688284047, + j_tf_wp=26493137.688284047, thwcndut=0.0080000000000000019, thicndut=0.00080000000000000004, expected_t_conductor=0.047932469413859431, @@ -1266,7 +1266,7 @@ class TfAveragedTurnGeomParam(NamedTuple): t_turn_toroidal=0.049532469413859428, t_cable=0.031932469413859424, i_tf_sc_mat=5, - jwptf=26493137.688284047, + j_tf_wp=26493137.688284047, thwcndut=0.0080000000000000019, thicndut=0.00080000000000000004, expected_t_conductor=0.047932469413859431, @@ -1292,7 +1292,7 @@ class TfAveragedTurnGeomParam(NamedTuple): t_turn_toroidal=0.05872, t_cable=0.04109, i_tf_sc_mat=1, - jwptf=2.301e07, + j_tf_wp=2.301e07, thwcndut=8.015e-03, thicndut=8.0e-4, expected_t_conductor=5.712e-02, @@ -1318,7 +1318,7 @@ class TfAveragedTurnGeomParam(NamedTuple): t_turn_toroidal=0.05872, t_cable=0.04109, i_tf_sc_mat=1, - jwptf=2.673e07, + j_tf_wp=2.673e07, thwcndut=8.148e-03, thicndut=8.0e-4, expected_t_conductor=0.058296, @@ -1390,7 +1390,7 @@ def test_tf_averaged_turn_geom(tfaveragedturngeomparam, monkeypatch, sctfcoil): acstf, acndttf, insulation_area, n_tf_turn = sctfcoil.tf_averaged_turn_geom( i_tf_sc_mat=tfaveragedturngeomparam.i_tf_sc_mat, - jwptf=tfaveragedturngeomparam.jwptf, + j_tf_wp=tfaveragedturngeomparam.j_tf_wp, thwcndut=tfaveragedturngeomparam.thwcndut, thicndut=tfaveragedturngeomparam.thicndut, ) @@ -1431,11 +1431,11 @@ class TfWpCurrentsParam(NamedTuple): n_tf_coils: Any = None - jwptf: Any = None + j_tf_wp: Any = None awptf: Any = None - expected_jwptf: Any = None + expected_j_tf_wp: Any = None @pytest.mark.parametrize( @@ -1444,16 +1444,16 @@ class TfWpCurrentsParam(NamedTuple): TfWpCurrentsParam( c_tf_total=256500000.00000003, n_tf_coils=16, - jwptf=0, + j_tf_wp=0, awptf=0.60510952642236249, - expected_jwptf=26493137.688284047, + expected_j_tf_wp=26493137.688284047, ), TfWpCurrentsParam( c_tf_total=256500000.00000003, n_tf_coils=16, - jwptf=26493137.688284047, + j_tf_wp=26493137.688284047, awptf=0.60510952642236249, - expected_jwptf=26493137.688284047, + expected_j_tf_wp=26493137.688284047, ), ), ) @@ -1474,13 +1474,13 @@ def test_tf_wp_currents(tfwpcurrentsparam, monkeypatch, sctfcoil): monkeypatch.setattr(tfcoil_variables, "n_tf_coils", tfwpcurrentsparam.n_tf_coils) - monkeypatch.setattr(tfcoil_variables, "jwptf", tfwpcurrentsparam.jwptf) + monkeypatch.setattr(tfcoil_variables, "j_tf_wp", tfwpcurrentsparam.j_tf_wp) monkeypatch.setattr(sctfcoil_module, "awptf", tfwpcurrentsparam.awptf) sctfcoil.tf_wp_currents() - assert tfcoil_variables.jwptf == pytest.approx(tfwpcurrentsparam.expected_jwptf) + assert tfcoil_variables.j_tf_wp == pytest.approx(tfwpcurrentsparam.expected_j_tf_wp) def test_vv_stress_on_quench(): diff --git a/tests/unit/test_tfcoil.py b/tests/unit/test_tfcoil.py index 0204560216..ac354d9d3d 100644 --- a/tests/unit/test_tfcoil.py +++ b/tests/unit/test_tfcoil.py @@ -1594,7 +1594,7 @@ class StressclParam(NamedTuple): c_tf_total: Any = None - jwptf: Any = None + j_tf_wp: Any = None sig_tf_cs_bucked: Any = None @@ -1764,7 +1764,7 @@ class StressclParam(NamedTuple): acstf=0.001293323051622732, vforce=250545611.13801825, c_tf_total=236885604.60000002, - jwptf=23124470.793774806, + j_tf_wp=23124470.793774806, sig_tf_cs_bucked=0, sig_tf_case=0, sig_tf_wp=0, @@ -1887,7 +1887,7 @@ class StressclParam(NamedTuple): acstf=0.001293323051622732, vforce=250545611.13801825, c_tf_total=236885604.60000002, - jwptf=23124470.793774806, + j_tf_wp=23124470.793774806, sig_tf_cs_bucked=0, sig_tf_case=543381805.25001633, sig_tf_wp=397005702.35272157, From 8c3f37125fd2bf5d926fe2cb66e6e5d47dc04623 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 31 Mar 2025 11:22:00 +0100 Subject: [PATCH 11/21] =?UTF-8?q?=F0=9F=94=84=20Rename=20rbmax=20to=20r=5F?= =?UTF-8?q?b=5Ftf=5Finboard=5Fpeak=20for=20clarity=20and=20consistency;=20?= =?UTF-8?q?update=20references=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- documentation/proc-pages/eng-models/tf-coil.md | 2 +- process/stellarator.py | 2 +- process/tf_coil.py | 12 ++++++++---- source/fortran/constraint_equations.f90 | 2 +- source/fortran/tfcoil_variables.f90 | 2 +- tests/integration/ref_dicts.json | 6 +++--- tests/unit/test_tfcoil.py | 16 ++++++++++------ 7 files changed, 25 insertions(+), 17 deletions(-) diff --git a/documentation/proc-pages/eng-models/tf-coil.md b/documentation/proc-pages/eng-models/tf-coil.md index 59b29d22e5..0e95f721fa 100644 --- a/documentation/proc-pages/eng-models/tf-coil.md +++ b/documentation/proc-pages/eng-models/tf-coil.md @@ -1180,7 +1180,7 @@ For `i_tf_sc_mat = 4`, important superconductor properties may be input as follo - Upper critical field at zero temperature and strain: `bcritsc`, - Critical temperature at zero field and strain: `tcritsc`. -The toroidal field falls off at a rate $1/R$, with the peak value occurring at the outer edge of the inboard portion of the TF coil winding pack (radius `rbmax`). +The toroidal field falls off at a rate $1/R$, with the peak value occurring at the outer edge of the inboard portion of the TF coil winding pack (radius `r_b_tf_inboard_peak`). Three constraints are relevant to the operating current density $J_{\mbox{op}}$ in the TF coils. diff --git a/process/stellarator.py b/process/stellarator.py index 91a5f9b6c0..d2168dc172 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -2804,7 +2804,7 @@ def stcoil(self, output: bool): tfcoil_variables.oacdcp = ( tfcoil_variables.c_tf_total / tfcoil_variables.a_tf_coil_inboard ) # [A / m^2] overall current density - tfcoil_variables.rbmax = ( + tfcoil_variables.r_b_tf_inboard_peak = ( r_coil_major - r_coil_minor + awp_rad ) # [m] radius of peak field occurrence, average # jlion: not sure what this will be used for. Not very diff --git a/process/tf_coil.py b/process/tf_coil.py index 03ca8300b1..fd35acfd13 100644 --- a/process/tf_coil.py +++ b/process/tf_coil.py @@ -350,7 +350,7 @@ def tf_current(self): if tfcoil_variables.i_tf_sup == 1: # SC : conservative assumption as the radius is calculated with the # WP radial distances defined at the TF middle (cos) - tfcoil_variables.rbmax = ( + tfcoil_variables.r_b_tf_inboard_peak = ( build_variables.r_tf_inboard_out * np.cos(sctfcoil_module.rad_tf_coil_toroidal) - tfcoil_variables.casthi @@ -360,7 +360,7 @@ def tf_current(self): else: # Resistive coils : No approx necessary as the symmetry is cylindrical # The turn insulation th (tfcoil_variables.thicndut) is also subtracted too here - tfcoil_variables.rbmax = ( + tfcoil_variables.r_b_tf_inboard_peak = ( build_variables.r_tf_inboard_out - tfcoil_variables.casthi - tfcoil_variables.thicndut @@ -369,13 +369,17 @@ def tf_current(self): # Calculation of the maximum B field on the magnet [T] tfcoil_variables.b_tf_inboard_peak = ( - physics_variables.bt * physics_variables.rmajor / tfcoil_variables.rbmax + physics_variables.bt + * physics_variables.rmajor + / tfcoil_variables.r_b_tf_inboard_peak ) # Total current in TF coils [A] # rem SK : ritcf is no longer an input tfcoil_variables.c_tf_total = ( - tfcoil_variables.b_tf_inboard_peak * tfcoil_variables.rbmax * 5.0e6 + tfcoil_variables.b_tf_inboard_peak + * tfcoil_variables.r_b_tf_inboard_peak + * 5.0e6 ) # Current per TF coil [A] diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index 43e98d981f..acac493def 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -807,7 +807,7 @@ subroutine constraint_eqn_010(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! #=#=# consistency !! rmajor | plasma major radius (m) !! bt | toroidal field on axis (T) - !! rbmax | radius of maximum toroidal field (m) + !! r_b_tf_inboard_peak | radius of maximum toroidal field (m) !! b_tf_inboard_peak | peak field at toroidal field coil (T) !! This constraint is depreciated diff --git a/source/fortran/tfcoil_variables.f90 b/source/fortran/tfcoil_variables.f90 index f482d75864..0055447eb2 100644 --- a/source/fortran/tfcoil_variables.f90 +++ b/source/fortran/tfcoil_variables.f90 @@ -378,7 +378,7 @@ module tfcoil_variables real(dp) :: poisson_cond_trans !! SC TF coil conductor Poisson's ratio in the transverse-transverse direction - real(dp) :: rbmax + real(dp) :: r_b_tf_inboard_peak !! Radius of maximum TF B-field (m) real(dp) :: res_tf_leg diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index bf8a6b3801..22993c1f75 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3734,7 +3734,7 @@ "rat": 1.3e-08, "r_pf_coil_outer": 0.0, "rbld": 0.0, - "rbmax": 0.0, + "r_b_tf_inboard_peak": 0.0, "rbrt": 1.0, "rbvfac": 1.6, "rbvol": 0.0, @@ -10423,7 +10423,7 @@ "rat": "plasma chamber wall outgassing rate (Pa-m/s)", "r_pf_coil_outer": "outer radius of coil i (m)", "rbld": "sum of thicknesses to the major radius (m)", - "rbmax": "Radius of maximum TF B-field (m)", + "r_b_tf_inboard_peak": "Radius of maximum TF B-field (m)", "rbrt": "reactor building roof thickness (m)", "rbvfac": "reactor building volume multiplication factor", "rbvol": "reactor building volume (m3)", @@ -19399,7 +19399,7 @@ "poisson_ins", "poisson_cond_axial", "poisson_cond_trans", - "rbmax", + "r_b_tf_inboard_peak", "res_tf_leg", "toroidalgap", "ftoroidalgap", diff --git a/tests/unit/test_tfcoil.py b/tests/unit/test_tfcoil.py index ac354d9d3d..d02ef32a36 100644 --- a/tests/unit/test_tfcoil.py +++ b/tests/unit/test_tfcoil.py @@ -489,7 +489,7 @@ class TfCurrentParam(NamedTuple): c_tf_total: Any = None - rbmax: Any = None + r_b_tf_inboard_peak: Any = None i_tf_sup: Any = None @@ -537,7 +537,7 @@ class TfCurrentParam(NamedTuple): expected_c_tf_total: Any = None - expected_rbmax: Any = None + expected_r_b_tf_inboard_peak: Any = None expected_b_tf_inboard_peak: Any = None @@ -552,7 +552,7 @@ class TfCurrentParam(NamedTuple): TfCurrentParam( casthi=0.060000000000000012, c_tf_total=0, - rbmax=0, + r_b_tf_inboard_peak=0, i_tf_sup=1, casths_fraction=0.059999999999999998, tinstf=0.0080000000000000019, @@ -576,7 +576,7 @@ class TfCurrentParam(NamedTuple): c_tf_coil=0, rad_tf_coil_toroidal=0.19634954084936207, expected_c_tf_total=236885604.60000002, - expected_rbmax=4.0432020634751211, + expected_r_b_tf_inboard_peak=4.0432020634751211, expected_b_tf_inboard_peak=11.717722779177526, expected_oacdcp=8674367.2945641987, expected_c_tf_coil=14805350.287500001, @@ -603,7 +603,9 @@ def test_tf_current(tfcurrentparam, monkeypatch, tfcoil): monkeypatch.setattr(tfcoil_variables, "c_tf_total", tfcurrentparam.c_tf_total) - monkeypatch.setattr(tfcoil_variables, "rbmax", tfcurrentparam.rbmax) + monkeypatch.setattr( + tfcoil_variables, "r_b_tf_inboard_peak", tfcurrentparam.r_b_tf_inboard_peak + ) monkeypatch.setattr(tfcoil_variables, "i_tf_sup", tfcurrentparam.i_tf_sup) @@ -679,7 +681,9 @@ def test_tf_current(tfcurrentparam, monkeypatch, tfcoil): tfcurrentparam.expected_c_tf_total ) - assert tfcoil_variables.rbmax == pytest.approx(tfcurrentparam.expected_rbmax) + assert tfcoil_variables.r_b_tf_inboard_peak == pytest.approx( + tfcurrentparam.expected_r_b_tf_inboard_peak + ) assert tfcoil_variables.b_tf_inboard_peak == pytest.approx( tfcurrentparam.expected_b_tf_inboard_peak From 993cabd575ba3221efa48779d6f3106e706963cb Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 31 Mar 2025 11:25:40 +0100 Subject: [PATCH 12/21] =?UTF-8?q?=F0=9F=94=84=20Rename=20tfind=20to=20ind?= =?UTF-8?q?=5Ftf=5Fcoil=20for=20clarity=20and=20consistency;=20update=20re?= =?UTF-8?q?ferences=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/resistive_tf_coil.py | 6 +++--- process/superconducting_tf_coil.py | 6 +++--- process/tf_coil.py | 14 +++++++------- source/fortran/tfcoil_variables.f90 | 2 +- tests/integration/ref_dicts.json | 6 +++--- tests/unit/test_tfcoil.py | 18 +++++++++--------- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/process/resistive_tf_coil.py b/process/resistive_tf_coil.py index 9d3d7737d8..f4a629b2ac 100644 --- a/process/resistive_tf_coil.py +++ b/process/resistive_tf_coil.py @@ -34,13 +34,13 @@ def run(self, output: bool): self.tf_res_heating() if physics_variables.itart == 0 and tfcoil_variables.i_tf_shape == 1: - tfcoil_variables.tfind = self.tfcind( + tfcoil_variables.ind_tf_coil = self.tfcind( build_variables.dr_tf_inboard, tfcoil_variables.xarc, tfcoil_variables.yarc, ) else: - tfcoil_variables.tfind = ( + tfcoil_variables.ind_tf_coil = ( (build_variables.hmax + build_variables.dr_tf_outboard) * RMU0 / constants.pi @@ -51,7 +51,7 @@ def run(self, output: bool): # Total TF coil stored magnetic energy [J] sctfcoil_module.estotft = ( - 0.5e0 * tfcoil_variables.tfind * tfcoil_variables.c_tf_total**2 + 0.5e0 * tfcoil_variables.ind_tf_coil * tfcoil_variables.c_tf_total**2 ) # Total TF coil stored magnetic energy [Gigajoule] diff --git a/process/superconducting_tf_coil.py b/process/superconducting_tf_coil.py index 7185d1b790..c26289e988 100644 --- a/process/superconducting_tf_coil.py +++ b/process/superconducting_tf_coil.py @@ -60,13 +60,13 @@ def run(self, output: bool): ) if physics_variables.itart == 0 and tfcoil_variables.i_tf_shape == 1: - tfcoil_variables.tfind = self.tfcind( + tfcoil_variables.ind_tf_coil = self.tfcind( build_variables.dr_tf_inboard, tfcoil_variables.xarc, tfcoil_variables.yarc, ) else: - tfcoil_variables.tfind = ( + tfcoil_variables.ind_tf_coil = ( (build_variables.hmax + build_variables.dr_tf_outboard) * RMU0 / constants.pi @@ -77,7 +77,7 @@ def run(self, output: bool): # Total TF coil stored magnetic energy [J] sctfcoil_module.estotft = ( - 0.5e0 * tfcoil_variables.tfind * tfcoil_variables.c_tf_total**2 + 0.5e0 * tfcoil_variables.ind_tf_coil * tfcoil_variables.c_tf_total**2 ) # Total TF coil stored magnetic energy [Gigajoule] diff --git a/process/tf_coil.py b/process/tf_coil.py index fd35acfd13..dca5728fe0 100644 --- a/process/tf_coil.py +++ b/process/tf_coil.py @@ -47,13 +47,13 @@ def run(self, output): self.tf_coil_shape_inner() if physics_variables.itart == 0 and tfcoil_variables.i_tf_shape == 1: - tfcoil_variables.tfind = self.tfcind( + tfcoil_variables.ind_tf_coil = self.tfcind( build_variables.dr_tf_inboard, tfcoil_variables.xarc, tfcoil_variables.yarc, ) else: - tfcoil_variables.tfind = ( + tfcoil_variables.ind_tf_coil = ( (build_variables.hmax + build_variables.dr_tf_outboard) * RMU0 / constants.pi @@ -64,7 +64,7 @@ def run(self, output): # Total TF coil stored magnetic energy [J] sctfcoil_module.estotft = ( - 0.5e0 * tfcoil_variables.tfind * tfcoil_variables.c_tf_total**2 + 0.5e0 * tfcoil_variables.ind_tf_coil * tfcoil_variables.c_tf_total**2 ) # Total TF coil stored magnetic energy [Gigajoule] @@ -1238,7 +1238,7 @@ def tfcind(tfthk, xarc, yarc): # Initialise major radius r = x0 - dr / 2.0e0 - tfind = 0 + ind_tf_coil = 0 for _ in range(NINTERVALS): # Field in the dr_bore for unit current @@ -1254,7 +1254,7 @@ def tfcind(tfthk, xarc, yarc): # Assume B in TF coil = 1/2 B in dr_bore # Multiply by 2 for upper and lower halves of coil - tfind += b * dr * (2.0e0 * h_bore + h_thick) + ind_tf_coil += b * dr * (2.0e0 * h_bore + h_thick) r = r - dr # Outboard arc @@ -1279,10 +1279,10 @@ def tfcind(tfthk, xarc, yarc): # Assume B in TF coil = 1/2 B in dr_bore # Multiply by 2 for upper and lower halves of coil - tfind += b * dr * (2.0e0 * h_bore + h_thick) + ind_tf_coil += b * dr * (2.0e0 * h_bore + h_thick) r = r + dr - return tfind + return ind_tf_coil def tf_coil_area_and_masses(self): """Subroutine to calculate the TF coil areas and masses""" diff --git a/source/fortran/tfcoil_variables.f90 b/source/fortran/tfcoil_variables.f90 index 0055447eb2..d094ebbf50 100644 --- a/source/fortran/tfcoil_variables.f90 +++ b/source/fortran/tfcoil_variables.f90 @@ -526,7 +526,7 @@ module tfcoil_variables real(dp) :: tficrn !! TF coil half-width - inner dr_bore (m) - real(dp) :: tfind + real(dp) :: ind_tf_coil !! TF coil inductance (H) real(dp) :: tfinsgap diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 22993c1f75..423d8a1d25 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -7511,7 +7511,7 @@ "tfcryoarea": 0.0, "dr_tf_inboard": 0.0, "tficrn": 0.0, - "tfind": 0.0, + "ind_tf_coil": 0.0, "tfinsgap": 0.01, "tfjtsmw": 0.0, "tflegmw": 0.0, @@ -10721,7 +10721,7 @@ "tfcryoarea": "surface area of toroidal shells covering TF coils (m2)", "dr_tf_inboard": "inboard TF coil thickness, (centrepost for ST) (m)\n (input, calculated or `iteration variable 13`)", "tficrn": "TF coil half-width - inner dr_bore (m)", - "tfind": "TF coil inductance (H)", + "ind_tf_coil": "TF coil inductance (H)", "tfinsgap": "TF coil WP insertion gap (m)", "tfjtsmw": "TF joints resistive power losses (MW)", "tflegmw": "TF coil outboard leg resistive power (MW)", @@ -19438,7 +19438,7 @@ "tfjtsmw", "tfcryoarea", "tficrn", - "tfind", + "ind_tf_coil", "tfinsgap", "tflegmw", "rho_cp", diff --git a/tests/unit/test_tfcoil.py b/tests/unit/test_tfcoil.py index d02ef32a36..cf88c26bee 100644 --- a/tests/unit/test_tfcoil.py +++ b/tests/unit/test_tfcoil.py @@ -978,13 +978,13 @@ class TfcindParam(NamedTuple): xarc: Any = None - tfind: Any = None + ind_tf_coil: Any = None tfthk: Any = None expected_yarc: Any = None - expected_tfind: Any = None + expected_ind_tf_coil: Any = None @pytest.mark.parametrize( @@ -1011,9 +1011,9 @@ class TfcindParam(NamedTuple): ), order="F", ), - tfind=0, + ind_tf_coil=0, tfthk=1.208, - expected_tfind=5.4453892599192845e-06, + expected_ind_tf_coil=5.4453892599192845e-06, ), TfcindParam( yarc=np.array( @@ -1036,9 +1036,9 @@ class TfcindParam(NamedTuple): ), order="F", ), - tfind=5.4524893280368181e-06, + ind_tf_coil=5.4524893280368181e-06, tfthk=1.208, - expected_tfind=5.4524893280368181e-06, + expected_ind_tf_coil=5.4524893280368181e-06, ), ), ) @@ -1055,13 +1055,13 @@ def test_tfcind(tfcindparam, monkeypatch, tfcoil): :type monkeypatch: _pytest.monkeypatch.monkeypatch """ - monkeypatch.setattr(tfcoil_variables, "tfind", tfcindparam.tfind) + monkeypatch.setattr(tfcoil_variables, "ind_tf_coil", tfcindparam.ind_tf_coil) - tfind = tfcoil.tfcind( + ind_tf_coil = tfcoil.tfcind( tfthk=tfcindparam.tfthk, xarc=tfcindparam.xarc, yarc=tfcindparam.yarc ) - assert tfind == pytest.approx(tfcindparam.expected_tfind) + assert ind_tf_coil == pytest.approx(tfcindparam.expected_ind_tf_coil) class TfCoilAreaAndMassesParam(NamedTuple): From 64685103b262de82aa55f9fe667c101ebde906de Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 31 Mar 2025 11:31:42 +0100 Subject: [PATCH 13/21] =?UTF-8?q?=F0=9F=94=84=20Rename=20whtconsh=20to=20m?= =?UTF-8?q?=5Ftf=5Fturn=5Fsteel=5Fconduit=20for=20clarity=20and=20consiste?= =?UTF-8?q?ncy;=20update=20references=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/stellarator.py | 10 +++---- process/superconducting_tf_coil.py | 4 +-- process/tf_coil.py | 4 +-- source/fortran/tfcoil_variables.f90 | 2 +- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 6 ++-- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_tfcoil.py | 22 ++++++++------ 20 files changed, 70 insertions(+), 66 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 377fde4dab..aa7d6e39ab 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -729,7 +729,7 @@ Conductor_transverse_Youngs_modulus_____________________________________ (eyoung_cond_trans)___________ 0.0000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 3.2728E+03 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 5.7530E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 9.1497E+04 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.5696E+05 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 8d3c01228f..67cd3c2069 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -726,7 +726,7 @@ Conductor_transverse_Youngs_modulus_____________________________________ (eyoung_cond_trans)___________ 0.0000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 4.6964E+03 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 5.8073E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.9310E+04 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 7.1402E+05 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index b8648fc291..82c5c66fb1 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -726,7 +726,7 @@ Conductor_transverse_Youngs_modulus_____________________________________ (eyoung_cond_trans)___________ 0.0000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 4.6964E+03 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 5.8073E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.9310E+04 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 7.1402E+05 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 1c66846ce4..d8bae26c50 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -726,7 +726,7 @@ Conductor_transverse_Youngs_modulus_____________________________________ (eyoung_cond_trans)___________ 0.0000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 4.6964E+03 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 5.8073E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.9310E+04 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 7.1402E+05 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 301277e9c3..739ebf459c 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -726,7 +726,7 @@ Conductor_transverse_Youngs_modulus_____________________________________ (eyoung_cond_trans)___________ 0.0000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 4.6964E+03 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 5.8073E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.9310E+04 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 7.1402E+05 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 4208632521..d244bce427 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -574,7 +574,7 @@ TF_conductor_temperature_margin_(K)_____________________________________ (tmargtf)_____________________ 1.5000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 1.2418E+04 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 8.5743E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3757E+05 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP @@ -1569,7 +1569,7 @@ TF_conductor_temperature_margin_(K)_____________________________________ (tmargtf)_____________________ 1.5000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 1.2418E+04 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 8.5748E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3757E+05 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP @@ -2564,7 +2564,7 @@ TF_conductor_temperature_margin_(K)_____________________________________ (tmargtf)_____________________ 1.5000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 1.2418E+04 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 8.5751E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3756E+05 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP @@ -3559,7 +3559,7 @@ TF_conductor_temperature_margin_(K)_____________________________________ (tmargtf)_____________________ 1.5000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 1.2418E+04 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 8.5755E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3755E+05 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP @@ -4554,7 +4554,7 @@ TF_conductor_temperature_margin_(K)_____________________________________ (tmargtf)_____________________ 1.5000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 1.2418E+04 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 8.5759E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3755E+05 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP @@ -5549,7 +5549,7 @@ TF_conductor_temperature_margin_(K)_____________________________________ (tmargtf)_____________________ 1.5000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 1.2418E+04 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 8.5762E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3754E+05 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP @@ -6544,7 +6544,7 @@ TF_conductor_temperature_margin_(K)_____________________________________ (tmargtf)_____________________ 1.5000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 1.2418E+04 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 8.5765E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3753E+05 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP @@ -7539,7 +7539,7 @@ TF_conductor_temperature_margin_(K)_____________________________________ (tmargtf)_____________________ 1.5000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 1.2418E+04 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 8.5768E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3753E+05 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP @@ -8534,7 +8534,7 @@ TF_conductor_temperature_margin_(K)_____________________________________ (tmargtf)_____________________ 1.5000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 1.2418E+04 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 8.5771E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3752E+05 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP diff --git a/process/stellarator.py b/process/stellarator.py index d2168dc172..153249ef62 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -2908,13 +2908,13 @@ def stcoil(self, output: bool): - tfcoil_variables.len_tf_coil * tfcoil_variables.awphec ) * constants.dcopper # [kg] mass of Steel conduit (sheath) - tfcoil_variables.whtconsh = ( + tfcoil_variables.m_tf_turn_steel_conduit = ( tfcoil_variables.len_tf_coil * tfcoil_variables.n_tf_turn * tfcoil_variables.acndttf * fwbs_variables.denstl ) - # if (i_tf_sc_mat==6) tfcoil_variables.whtconsh = fcondsteel * awptf *tfcoil_variables.len_tf_coil* fwbs_variables.denstl + # if (i_tf_sc_mat==6) tfcoil_variables.m_tf_turn_steel_conduit = fcondsteel * awptf *tfcoil_variables.len_tf_coil* fwbs_variables.denstl # Conduit insulation mass [kg] # (tfcoil_variables.a_tf_coil_wp_turn_insulation already contains tfcoil_variables.n_tf_turn) tfcoil_variables.whtconin = ( @@ -2926,7 +2926,7 @@ def stcoil(self, output: bool): tfcoil_variables.whtcon = ( tfcoil_variables.whtconsc + tfcoil_variables.whtconcu - + tfcoil_variables.whtconsh + + tfcoil_variables.m_tf_turn_steel_conduit + tfcoil_variables.whtconin ) # [kg] Total coil mass @@ -3798,8 +3798,8 @@ def stcoil_output( po.ovarre( self.outfile, "Steel conduit mass per coil (kg)", - "(whtconsh)", - tfcoil_variables.whtconsh, + "(m_tf_turn_steel_conduit)", + tfcoil_variables.m_tf_turn_steel_conduit, ) po.ovarre( self.outfile, diff --git a/process/superconducting_tf_coil.py b/process/superconducting_tf_coil.py index c26289e988..7684407856 100644 --- a/process/superconducting_tf_coil.py +++ b/process/superconducting_tf_coil.py @@ -2880,8 +2880,8 @@ def outtf(self, peaktfflag): po.ovarre( self.outfile, "Steel conduit mass per coil (kg)", - "(whtconsh)", - tfcoil_variables.whtconsh, + "(m_tf_turn_steel_conduit)", + tfcoil_variables.m_tf_turn_steel_conduit, "OP ", ) po.ovarre( diff --git a/process/tf_coil.py b/process/tf_coil.py index dca5728fe0..3a4b6f748e 100644 --- a/process/tf_coil.py +++ b/process/tf_coil.py @@ -1388,7 +1388,7 @@ def tf_coil_area_and_masses(self): tfcoil_variables.whtconcu = 0.0e0 # Steel conduit (sheath) mass [kg] - tfcoil_variables.whtconsh = ( + tfcoil_variables.m_tf_turn_steel_conduit = ( tfcoil_variables.len_tf_coil * tfcoil_variables.n_tf_turn * tfcoil_variables.acndttf @@ -1407,7 +1407,7 @@ def tf_coil_area_and_masses(self): tfcoil_variables.whtcon = ( tfcoil_variables.whtconsc + tfcoil_variables.whtconcu - + tfcoil_variables.whtconsh + + tfcoil_variables.m_tf_turn_steel_conduit + tfcoil_variables.whtconin ) # --------------------------------- diff --git a/source/fortran/tfcoil_variables.f90 b/source/fortran/tfcoil_variables.f90 index d094ebbf50..9adae03d27 100644 --- a/source/fortran/tfcoil_variables.f90 +++ b/source/fortran/tfcoil_variables.f90 @@ -702,7 +702,7 @@ module tfcoil_variables real(dp) :: whtconsc !! superconductor mass in TF coil cable (kg/coil) - real(dp) :: whtconsh + real(dp) :: m_tf_turn_steel_conduit !! steel conduit mass in TF coil conductor (kg/coil) real(dp) :: whtgw diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index d52058fcb0..384b3d0f2b 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -725,7 +725,7 @@ Conductor_transverse_Youngs_modulus_____________________________________ (eyoung_cond_trans)___________ 0.0000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 4.6964E+03 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 5.8073E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.9310E+04 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 7.1402E+05 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index e1f315d1ed..99d5ae9385 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -726,7 +726,7 @@ Conductor_transverse_Youngs_modulus_____________________________________ (eyoung_cond_trans)___________ 0.0000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 4.6964E+03 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 5.8073E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.9310E+04 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 7.1402E+05 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index cf92a1ecd5..1091b75e0a 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -726,7 +726,7 @@ Conductor_transverse_Youngs_modulus_____________________________________ (eyoung_cond_trans)___________ 0.0000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 4.6964E+03 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 5.8073E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.9310E+04 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 7.1402E+05 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 7a83c12369..3a21bc2c7a 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -726,7 +726,7 @@ Conductor_transverse_Youngs_modulus_____________________________________ (eyoung_cond_trans)___________ 0.0000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 4.6964E+03 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 5.8073E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.9310E+04 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 7.1402E+05 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 791627a7be..c545ab38d6 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -729,7 +729,7 @@ Conductor_transverse_Youngs_modulus_____________________________________ (eyoung_cond_trans)___________ 0.0000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 4.9062E+03 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 5.7969E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 9.1170E+04 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 7.2486E+05 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 5c7eccf2d8..75ffdbdf3e 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -727,7 +727,7 @@ Conductor_transverse_Youngs_modulus_____________________________________ (eyoung_cond_trans)___________ 0.0000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 4.1902E+03 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 5.3501E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.6415E+04 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.8257E+05 OP @@ -1890,7 +1890,7 @@ Conductor_transverse_Youngs_modulus_____________________________________ (eyoung_cond_trans)___________ 0.0000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 3.7215E+03 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 5.2837E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.5813E+04 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.6839E+05 OP @@ -3053,7 +3053,7 @@ Conductor_transverse_Youngs_modulus_____________________________________ (eyoung_cond_trans)___________ 0.0000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 3.2683E+03 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 5.2246E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.4962E+04 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.5756E+05 OP @@ -4216,7 +4216,7 @@ Conductor_transverse_Youngs_modulus_____________________________________ (eyoung_cond_trans)___________ 0.0000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 3.2652E+03 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 5.2369E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.5162E+04 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.5855E+05 OP @@ -5379,7 +5379,7 @@ Conductor_transverse_Youngs_modulus_____________________________________ (eyoung_cond_trans)___________ 0.0000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 3.7328E+03 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 5.2934E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.6364E+04 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.6756E+05 OP @@ -6542,7 +6542,7 @@ Conductor_transverse_Youngs_modulus_____________________________________ (eyoung_cond_trans)___________ 0.0000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 4.2408E+03 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 5.3770E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.7899E+04 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.8120E+05 OP @@ -7705,7 +7705,7 @@ Conductor_transverse_Youngs_modulus_____________________________________ (eyoung_cond_trans)___________ 0.0000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 4.2351E+03 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 5.3931E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.8136E+04 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.8240E+05 OP @@ -8868,7 +8868,7 @@ Conductor_transverse_Youngs_modulus_____________________________________ (eyoung_cond_trans)___________ 0.0000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 3.7437E+03 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 5.3382E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.6855E+04 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.7080E+05 OP @@ -10031,7 +10031,7 @@ Conductor_transverse_Youngs_modulus_____________________________________ (eyoung_cond_trans)___________ 0.0000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 3.2927E+03 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 5.2820E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.5529E+04 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.5997E+05 OP @@ -11194,7 +11194,7 @@ Conductor_transverse_Youngs_modulus_____________________________________ (eyoung_cond_trans)___________ 0.0000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 3.2917E+03 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 5.2896E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.5641E+04 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.6056E+05 OP @@ -12357,7 +12357,7 @@ Conductor_transverse_Youngs_modulus_____________________________________ (eyoung_cond_trans)___________ 0.0000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 3.7517E+03 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 5.3474E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.7086E+04 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.7129E+05 OP @@ -13520,7 +13520,7 @@ Conductor_transverse_Youngs_modulus_____________________________________ (eyoung_cond_trans)___________ 0.0000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 4.2545E+03 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 5.4117E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.8270E+04 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.8254E+05 OP @@ -14683,7 +14683,7 @@ Conductor_transverse_Youngs_modulus_____________________________________ (eyoung_cond_trans)___________ 0.0000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 4.2524E+03 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 5.4211E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.8412E+04 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.8328E+05 OP @@ -15846,7 +15846,7 @@ Conductor_transverse_Youngs_modulus_____________________________________ (eyoung_cond_trans)___________ 0.0000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 3.7633E+03 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 5.3629E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.6959E+04 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.7183E+05 OP @@ -17009,7 +17009,7 @@ Conductor_transverse_Youngs_modulus_____________________________________ (eyoung_cond_trans)___________ 0.0000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 3.3149E+03 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 5.2992E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.5488E+04 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 6.6037E+05 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index b1a3509f15..a4cc32ed42 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -574,7 +574,7 @@ TF_conductor_temperature_margin_(K)_____________________________________ (tmargtf)_____________________ 1.5000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 1.2418E+04 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 8.5743E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3757E+05 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP @@ -1569,7 +1569,7 @@ TF_conductor_temperature_margin_(K)_____________________________________ (tmargtf)_____________________ 1.5000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 1.2418E+04 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 8.5748E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3757E+05 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP @@ -2564,7 +2564,7 @@ TF_conductor_temperature_margin_(K)_____________________________________ (tmargtf)_____________________ 1.5000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 1.2418E+04 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 8.5751E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3756E+05 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP @@ -3559,7 +3559,7 @@ TF_conductor_temperature_margin_(K)_____________________________________ (tmargtf)_____________________ 1.5000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 1.2418E+04 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 8.5755E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3755E+05 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP @@ -4554,7 +4554,7 @@ TF_conductor_temperature_margin_(K)_____________________________________ (tmargtf)_____________________ 1.5000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 1.2418E+04 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 8.5759E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3755E+05 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP @@ -5549,7 +5549,7 @@ TF_conductor_temperature_margin_(K)_____________________________________ (tmargtf)_____________________ 1.5000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 1.2418E+04 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 8.5762E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3754E+05 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP @@ -6544,7 +6544,7 @@ TF_conductor_temperature_margin_(K)_____________________________________ (tmargtf)_____________________ 1.5000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 1.2418E+04 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 8.5765E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3753E+05 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP @@ -7539,7 +7539,7 @@ TF_conductor_temperature_margin_(K)_____________________________________ (tmargtf)_____________________ 1.5000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 1.2418E+04 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 8.5768E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3753E+05 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP @@ -8534,7 +8534,7 @@ TF_conductor_temperature_margin_(K)_____________________________________ (tmargtf)_____________________ 1.5000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 1.2418E+04 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 8.5771E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3752E+05 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 1.5629E+06 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 423d8a1d25..d239782d35 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -8022,7 +8022,7 @@ "whtconcu": 0.0, "whtconin": 0.0, "whtconsc": 0.0, - "whtconsh": 0.0, + "m_tf_turn_steel_conduit": 0.0, "whtcp": 0.0, "whtgw": 0.0, "m_pf_coil_conductor_total": 0.0, @@ -11096,7 +11096,7 @@ "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)", + "m_tf_turn_steel_conduit": "steel conduit mass in TF coil conductor (kg/coil)", "whtcp": "mass of TF coil inboard legs (kg)", "whtgw": "mass of ground-wall insulation layer per coil (kg/coil)", "m_pf_coil_conductor_total": "total mass of the PF coil conductor (kg)", @@ -19490,7 +19490,7 @@ "whtconal", "whtconin", "whtconsc", - "whtconsh", + "m_tf_turn_steel_conduit", "whtgw", "m_tf_coils_total", "wwp1", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index a807efa6c1..a4230c92e4 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -729,7 +729,7 @@ Conductor_transverse_Youngs_modulus_____________________________________ (eyoung_cond_trans)___________ 0.0000E+00 Superconductor_mass_per_coil_(kg)_______________________________________ (whtconsc)____________________ 4.9062E+03 OP Copper_mass_per_coil_(kg)_______________________________________________ (whtconcu)____________________ 5.7969E+04 OP - Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 9.1170E+04 OP + Steel_conduit_mass_per_coil_(kg)________________________________________ (m_tf_turn_steel_conduit)____________________ 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)_______________________________________________ (m_tf_coils_total/n_tf_coils)__________________ 7.2486E+05 OP diff --git a/tests/unit/test_tfcoil.py b/tests/unit/test_tfcoil.py index cf88c26bee..5ed19d19fa 100644 --- a/tests/unit/test_tfcoil.py +++ b/tests/unit/test_tfcoil.py @@ -1081,7 +1081,7 @@ class TfCoilAreaAndMassesParam(NamedTuple): denstl: Any = None - whtconsh: Any = None + m_tf_turn_steel_conduit: Any = None m_tf_coils_total: Any = None @@ -1173,7 +1173,7 @@ class TfCoilAreaAndMassesParam(NamedTuple): tan_theta_coil: Any = None - expected_whtconsh: Any = None + expected_m_tf_turn_steel_conduit: Any = None expected_whtcas: Any = None @@ -1208,7 +1208,7 @@ class TfCoilAreaAndMassesParam(NamedTuple): r_tf_inboard_out=4.20194118510911, hmax=9.0730900215620327, denstl=7800, - whtconsh=0, + m_tf_turn_steel_conduit=0, m_tf_coils_total=0, whtcas=0, tficrn=0, @@ -1259,7 +1259,7 @@ class TfCoilAreaAndMassesParam(NamedTuple): a_leg_cond=0, rad_tf_coil_toroidal=0.19634954084936207, tan_theta_coil=0.19891236737965801, - expected_whtconsh=115651.90127937049, + expected_m_tf_turn_steel_conduit=115651.90127937049, expected_whtcas=1034021.9996272125, expected_tficrn=0.8197580588957678, expected_tfcryoarea=6381.2092203414386, @@ -1280,7 +1280,7 @@ class TfCoilAreaAndMassesParam(NamedTuple): r_tf_inboard_out=4.20194118510911, hmax=9.0730900215620327, denstl=7800, - whtconsh=115651.90127937049, + m_tf_turn_steel_conduit=115651.90127937049, m_tf_coils_total=19649856.627845347, whtcas=1034021.9996272125, tficrn=0.8197580588957678, @@ -1331,7 +1331,7 @@ class TfCoilAreaAndMassesParam(NamedTuple): a_leg_cond=0, rad_tf_coil_toroidal=0.19634954084936207, tan_theta_coil=0.19891236737965801, - expected_whtconsh=115721.02357090525, + expected_m_tf_turn_steel_conduit=115721.02357090525, expected_whtcas=1034699.2182961091, expected_tficrn=0.8197580588957678, expected_tfcryoarea=6385.0231118485681, @@ -1384,7 +1384,11 @@ def test_tf_coil_area_and_masses(tfcoilareaandmassesparam, monkeypatch, tfcoil): monkeypatch.setattr(fwbs_variables, "denstl", tfcoilareaandmassesparam.denstl) - monkeypatch.setattr(tfcoil_variables, "whtconsh", tfcoilareaandmassesparam.whtconsh) + monkeypatch.setattr( + tfcoil_variables, + "m_tf_turn_steel_conduit", + tfcoilareaandmassesparam.m_tf_turn_steel_conduit, + ) monkeypatch.setattr( tfcoil_variables, "m_tf_coils_total", tfcoilareaandmassesparam.m_tf_coils_total @@ -1522,8 +1526,8 @@ def test_tf_coil_area_and_masses(tfcoilareaandmassesparam, monkeypatch, tfcoil): tfcoil.tf_coil_area_and_masses() - assert tfcoil_variables.whtconsh == pytest.approx( - tfcoilareaandmassesparam.expected_whtconsh + assert tfcoil_variables.m_tf_turn_steel_conduit == pytest.approx( + tfcoilareaandmassesparam.expected_m_tf_turn_steel_conduit ) assert tfcoil_variables.whtcas == pytest.approx( From db37f48a21b090eecacb671b5916a3d55455d42e Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 31 Mar 2025 11:33:22 +0100 Subject: [PATCH 14/21] =?UTF-8?q?=F0=9F=94=84=20Rename=20tmpcry=20to=20tem?= =?UTF-8?q?p=5Ftf=5Fcryo=20for=20clarity=20and=20consistency;=20update=20r?= =?UTF-8?q?eferences=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eng-models/cryostat-and-vacuum-system.md | 2 +- .../proc-pages/fusion-devices/stellarator.md | 2 +- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/costs.py | 2 +- process/init.py | 4 +-- process/input.py | 2 +- process/power.py | 18 +++++------ process/utilities/errorlist.json | 2 +- source/fortran/heat_transport_variables.f90 | 2 +- source/fortran/tfcoil_variables.f90 | 2 +- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 12 ++++---- tests/regression/input_files/helias_5b.IN.DAT | 2 +- .../spherical_tokamak_once_through.IN.DAT | 2 +- .../input_files/st_regression.IN.DAT | 2 +- .../stellarator_helias_once_through.IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_costs_1990.py | 8 ++--- tests/unit/test_power.py | 8 ++--- 30 files changed, 80 insertions(+), 80 deletions(-) diff --git a/documentation/proc-pages/eng-models/cryostat-and-vacuum-system.md b/documentation/proc-pages/eng-models/cryostat-and-vacuum-system.md index 82cc41c636..da7e87e665 100644 --- a/documentation/proc-pages/eng-models/cryostat-and-vacuum-system.md +++ b/documentation/proc-pages/eng-models/cryostat-and-vacuum-system.md @@ -87,7 +87,7 @@ The power balance for cryogenics is detailed as in the example below. The calcu Resistive losses in current leads (MW) (qcl/1.0D6) 2.065E-02 OP 45% allowance for heat loads in transfer lines, storage tanks etc (MW) (qmisc/1.0D6) 3.116E-02 OP Sum = Total heat removal at cryogenic temperatures (W) (helpow/1.0D6) 1.004E-01 OP - Temperature of cryogenic components (K) (tmpcry) 4.500E+00 + Temperature of cryogenic components (K) (temp_tf_cryo) 4.500E+00 Efficiency (figure of merit) of cryogenic plant is 13% of ideal Carnot v 2.028E-03 OP Electric power for cryogenic plant (MW) (crypmw) 4.952E+01 OP ``` diff --git a/documentation/proc-pages/fusion-devices/stellarator.md b/documentation/proc-pages/fusion-devices/stellarator.md index ddb332025e..5dc35c5dc6 100644 --- a/documentation/proc-pages/fusion-devices/stellarator.md +++ b/documentation/proc-pages/fusion-devices/stellarator.md @@ -224,7 +224,7 @@ i_tf_sc_mat = 8 * Switch for superconductor material in tf coils; sig_tf_wp_max = 4.e8 * Maximal allowable Stress level on Ground insulation for a simple stellarator coil stress module (Pa) fcutfsu = 0.7 *Copper fraction of cable conductor (TF coils), Schauer: 900 SCU strands, 522 Copper strands. Value for 0.4 Helium tftmp = 4.75 *Peak helium coolant temperature in TF coils and PF coils (K) -tmpcry = 4.75 * Temperature in TF coils, required for plant efficiency (K) +temp_tf_cryo = 4.75 * Temperature in TF coils, required for plant efficiency (K) vftf = 0.3 *Coolant fraction of TF coil leg (itfsup=0) this is the same for conductor and strand! fiooic = 0.78 *Fraction TF coil critical current to operation current (should be iteration variable!) vdalw = 12.64 * Max voltage across tf coil during quench (kV) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index aa7d6e39ab..ceab21e162 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -1100,7 +1100,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0d6)___________________ 1.7533E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0d6)_________________ 2.1839E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(tfcoil_variables.tmp (helpow_+_helpow_cryal/1.0d6)_ 7.0370E-02 OP - Temperature_of_cryogenic_superconducting_components_(K)_________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_superconducting_components_(K)_________________ (temp_tf_cryo)______________________ 4.5000E+00 Temperature_of_cryogenic_aluminium_components_(K)_______________________ (tcoolin)_____________________ 3.1315E+02 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Efficiency_(figure_of_merit)_of_cryogenic_aluminium_plant_is_40%_of_idea ______________________________ -2.0203E+00 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 67cd3c2069..7b76ea3ce9 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -1095,7 +1095,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0d6)___________________ 1.9539E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0d6)_________________ 2.3011E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(tfcoil_variables.tmp (helpow_+_helpow_cryal/1.0d6)_ 7.4146E-02 OP - Temperature_of_cryogenic_superconducting_components_(K)_________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_superconducting_components_(K)_________________ (temp_tf_cryo)______________________ 4.5000E+00 Temperature_of_cryogenic_aluminium_components_(K)_______________________ (tcoolin)_____________________ 3.1315E+02 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Efficiency_(figure_of_merit)_of_cryogenic_aluminium_plant_is_40%_of_idea ______________________________ -2.0203E+00 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 82c5c66fb1..171a4007e2 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -1095,7 +1095,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0d6)___________________ 1.9539E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0d6)_________________ 2.3011E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(tfcoil_variables.tmp (helpow_+_helpow_cryal/1.0d6)_ 7.4146E-02 OP - Temperature_of_cryogenic_superconducting_components_(K)_________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_superconducting_components_(K)_________________ (temp_tf_cryo)______________________ 4.5000E+00 Temperature_of_cryogenic_aluminium_components_(K)_______________________ (tcoolin)_____________________ 3.1315E+02 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Efficiency_(figure_of_merit)_of_cryogenic_aluminium_plant_is_40%_of_idea ______________________________ -2.0203E+00 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index d8bae26c50..efcc0e59b6 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -1095,7 +1095,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0d6)___________________ 1.9539E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0d6)_________________ 2.3011E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(tfcoil_variables.tmp (helpow_+_helpow_cryal/1.0d6)_ 7.4146E-02 OP - Temperature_of_cryogenic_superconducting_components_(K)_________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_superconducting_components_(K)_________________ (temp_tf_cryo)______________________ 4.5000E+00 Temperature_of_cryogenic_aluminium_components_(K)_______________________ (tcoolin)_____________________ 3.1315E+02 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Efficiency_(figure_of_merit)_of_cryogenic_aluminium_plant_is_40%_of_idea ______________________________ -2.0203E+00 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 739ebf459c..2806368a72 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -1095,7 +1095,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0d6)___________________ 1.9539E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0d6)_________________ 2.3011E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(tfcoil_variables.tmp (helpow_+_helpow_cryal/1.0d6)_ 7.4146E-02 OP - Temperature_of_cryogenic_superconducting_components_(K)_________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_superconducting_components_(K)_________________ (temp_tf_cryo)______________________ 4.5000E+00 Temperature_of_cryogenic_aluminium_components_(K)_______________________ (tcoolin)_____________________ 3.1315E+02 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Efficiency_(figure_of_merit)_of_cryogenic_aluminium_plant_is_40%_of_idea ______________________________ -2.0203E+00 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index d244bce427..0465f04c32 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -924,7 +924,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0D6)___________________ 1.6432E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0D6)_________________ 2.5632E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(W)__________________ (helpow/1.0D6)________________ 8.2594E-02 OP - Temperature_of_cryogenic_components_(K)_________________________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_components_(K)_________________________________ (temp_tf_cryo)______________________ 4.5000E+00 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 4.0732E+01 OP # Plant Power / Heat Transport Balance # @@ -1919,7 +1919,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0D6)___________________ 1.6432E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0D6)_________________ 2.5632E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(W)__________________ (helpow/1.0D6)________________ 8.2594E-02 OP - Temperature_of_cryogenic_components_(K)_________________________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_components_(K)_________________________________ (temp_tf_cryo)______________________ 4.5000E+00 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 4.0732E+01 OP # Plant Power / Heat Transport Balance # @@ -2914,7 +2914,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0D6)___________________ 1.6432E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0D6)_________________ 2.5632E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(W)__________________ (helpow/1.0D6)________________ 8.2594E-02 OP - Temperature_of_cryogenic_components_(K)_________________________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_components_(K)_________________________________ (temp_tf_cryo)______________________ 4.5000E+00 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 4.0732E+01 OP # Plant Power / Heat Transport Balance # @@ -3909,7 +3909,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0D6)___________________ 1.6432E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0D6)_________________ 2.5632E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(W)__________________ (helpow/1.0D6)________________ 8.2594E-02 OP - Temperature_of_cryogenic_components_(K)_________________________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_components_(K)_________________________________ (temp_tf_cryo)______________________ 4.5000E+00 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 4.0732E+01 OP # Plant Power / Heat Transport Balance # @@ -4904,7 +4904,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0D6)___________________ 1.6432E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0D6)_________________ 2.5633E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(W)__________________ (helpow/1.0D6)________________ 8.2594E-02 OP - Temperature_of_cryogenic_components_(K)_________________________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_components_(K)_________________________________ (temp_tf_cryo)______________________ 4.5000E+00 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 4.0732E+01 OP # Plant Power / Heat Transport Balance # @@ -5899,7 +5899,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0D6)___________________ 1.6432E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0D6)_________________ 2.5633E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(W)__________________ (helpow/1.0D6)________________ 8.2594E-02 OP - Temperature_of_cryogenic_components_(K)_________________________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_components_(K)_________________________________ (temp_tf_cryo)______________________ 4.5000E+00 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 4.0732E+01 OP # Plant Power / Heat Transport Balance # @@ -6894,7 +6894,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0D6)___________________ 1.6432E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0D6)_________________ 2.5633E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(W)__________________ (helpow/1.0D6)________________ 8.2594E-02 OP - Temperature_of_cryogenic_components_(K)_________________________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_components_(K)_________________________________ (temp_tf_cryo)______________________ 4.5000E+00 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 4.0732E+01 OP # Plant Power / Heat Transport Balance # @@ -7889,7 +7889,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0D6)___________________ 1.6432E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0D6)_________________ 2.5633E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(W)__________________ (helpow/1.0D6)________________ 8.2594E-02 OP - Temperature_of_cryogenic_components_(K)_________________________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_components_(K)_________________________________ (temp_tf_cryo)______________________ 4.5000E+00 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 4.0732E+01 OP # Plant Power / Heat Transport Balance # @@ -8884,7 +8884,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0D6)___________________ 1.6432E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0D6)_________________ 2.5633E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(W)__________________ (helpow/1.0D6)________________ 8.2594E-02 OP - Temperature_of_cryogenic_components_(K)_________________________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_components_(K)_________________________________ (temp_tf_cryo)______________________ 4.5000E+00 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 4.0732E+01 OP # Plant Power / Heat Transport Balance # diff --git a/process/costs.py b/process/costs.py index 27f1df25a6..e67b34838a 100644 --- a/process/costs.py +++ b/process/costs.py @@ -2201,7 +2201,7 @@ def acc2263(self): 1.0e-6 * cost_variables.uccry * 4.5e0 - / tfcoil_variables.tmpcry + / tfcoil_variables.temp_tf_cryo * heat_transport_variables.helpow**expcry ) diff --git a/process/init.py b/process/init.py index 654efc4627..de3b402583 100644 --- a/process/init.py +++ b/process/init.py @@ -1110,8 +1110,8 @@ def check_process(inputs): # noqa: ARG001 ) # Cold end of the cryocooler should be colder than the TF - if fortran.tfcoil_variables.tmpcry > fortran.tfcoil_variables.tftmp: - raise ProcessValidationError("tmpcry should be lower than tftmp") + if fortran.tfcoil_variables.temp_tf_cryo > fortran.tfcoil_variables.tftmp: + raise ProcessValidationError("temp_tf_cryo should be lower than tftmp") # Cannot use TF coil strain limit if i_str_wp is off: if ( diff --git a/process/input.py b/process/input.py index 68f0ae6dfe..3b889215e1 100644 --- a/process/input.py +++ b/process/input.py @@ -1249,7 +1249,7 @@ def __post_init__(self): "tmargmin_tf": InputVariable(fortran.tfcoil_variables, float, range=(0.0, 20.0)), "tmax_croco": InputVariable(fortran.tfcoil_variables, float, range=(4.0, 1000.0)), "tmaxpro": InputVariable(fortran.tfcoil_variables, float, range=(0.0, 1000.0)), - "tmpcry": InputVariable(fortran.tfcoil_variables, float, range=(0.01, 293.0)), + "temp_tf_cryo": InputVariable(fortran.tfcoil_variables, float, range=(0.01, 293.0)), "tn": InputVariable(fortran.vacuum_variables, float, range=(1.0, 1000.0)), "i_t_current_ramp_up": InputVariable(fortran.times_variables, int, choices=[0, 1]), "transp_clrnc": InputVariable( diff --git a/process/power.py b/process/power.py index 4e443bc130..39ac8ff457 100644 --- a/process/power.py +++ b/process/power.py @@ -827,11 +827,11 @@ def power1(self): # Use 13% of ideal Carnot efficiency to fit J. Miller estimate # Rem SK : This ITER efficiency is very low compare to the Strowbridge curve # any reasons why? - # Calculate electric power requirement for cryogenic plant at tfcoil_variables.tmpcry (MW) + # Calculate electric power requirement for cryogenic plant at tfcoil_variables.temp_tf_cryo (MW) heat_transport_variables.crypmw = ( 1.0e-6 - * (293.0e0 - tfcoil_variables.tmpcry) - / (tfcoil_variables.eff_tf_cryo * tfcoil_variables.tmpcry) + * (293.0e0 - tfcoil_variables.temp_tf_cryo) + / (tfcoil_variables.eff_tf_cryo * tfcoil_variables.temp_tf_cryo) * heat_transport_variables.helpow ) @@ -865,7 +865,7 @@ def power1(self): # Calculate cryo cooling requirement at 4.5K (kW) tfcoil_variables.cryo_cool_req = ( heat_transport_variables.helpow - * ((293 / tfcoil_variables.tmpcry) - 1) + * ((293 / tfcoil_variables.temp_tf_cryo) - 1) / ((293 / 4.5) - 1) + heat_transport_variables.helpow_cryal * ((293 / tfcoil_variables.tcoolin) - 1) @@ -1004,7 +1004,7 @@ def power2(self, output: bool): po.ovarre( self.outfile, - "Sum = Total heat removal at cryogenic temperatures (tmpcry & tcoolin) (MW)", + "Sum = Total heat removal at cryogenic temperatures (temp_tf_cryo & tcoolin) (MW)", "(helpow + helpow_cryal/1.0d6)", (heat_transport_variables.helpow + heat_transport_variables.helpow_cryal) * 1.0e-6, @@ -1013,8 +1013,8 @@ def power2(self, output: bool): po.ovarre( self.outfile, "Temperature of cryogenic superconducting components (K)", - "(tmpcry)", - tfcoil_variables.tmpcry, + "(temp_tf_cryo)", + tfcoil_variables.temp_tf_cryo, ) po.ovarre( self.outfile, @@ -1027,8 +1027,8 @@ def power2(self, output: bool): self.outfile, "Efficiency (figure of merit) of cryogenic plant is 13% of ideal Carnot value:", "", - (tfcoil_variables.eff_tf_cryo * tfcoil_variables.tmpcry) - / (293.0e0 - tfcoil_variables.tmpcry), + (tfcoil_variables.eff_tf_cryo * tfcoil_variables.temp_tf_cryo) + / (293.0e0 - tfcoil_variables.temp_tf_cryo), "OP ", ) po.ovarre( diff --git a/process/utilities/errorlist.json b/process/utilities/errorlist.json index 59c2ab37f6..465cb05ff5 100644 --- a/process/utilities/errorlist.json +++ b/process/utilities/errorlist.json @@ -1373,7 +1373,7 @@ { "no": 273, "level": 3, - "message": "[tfcoil]: tmpcry should be lower than tftmp" + "message": "[tfcoil]: temp_tf_cryo should be lower than tftmp" }, { "no": 274, diff --git a/source/fortran/heat_transport_variables.f90 b/source/fortran/heat_transport_variables.f90 index 04781a0d27..4406089039 100644 --- a/source/fortran/heat_transport_variables.f90 +++ b/source/fortran/heat_transport_variables.f90 @@ -71,7 +71,7 @@ module heat_transport_variables !! Minimum total electrical power for primary coolant pumps (MW) (NOT RECOMMENDED) real(dp) :: helpow - !! Heat removal at cryogenic temperature tmpcry (W) + !! Heat removal at cryogenic temperature temp_tf_cryo (W) real(dp) :: helpow_cryal !! Heat removal at cryogenic temperature tcoolin (W) diff --git a/source/fortran/tfcoil_variables.f90 b/source/fortran/tfcoil_variables.f90 index 9adae03d27..cdbfe4ca7a 100644 --- a/source/fortran/tfcoil_variables.f90 +++ b/source/fortran/tfcoil_variables.f90 @@ -650,7 +650,7 @@ module tfcoil_variables real(dp) :: croco_quench_temperature !! CroCo strand: Actual temp reached during a quench (K) - real(dp) :: tmpcry + real(dp) :: temp_tf_cryo !! coil temperature for cryogenic plant power calculation (K) real(dp) :: n_tf_turn diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 384b3d0f2b..bb1275672e 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -1094,7 +1094,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0d6)___________________ 1.9539E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0d6)_________________ 2.3011E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(tfcoil_variables.tmp (helpow_+_helpow_cryal/1.0d6)_ 7.4146E-02 OP - Temperature_of_cryogenic_superconducting_components_(K)_________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_superconducting_components_(K)_________________ (temp_tf_cryo)______________________ 4.5000E+00 Temperature_of_cryogenic_aluminium_components_(K)_______________________ (tcoolin)_____________________ 3.1315E+02 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Efficiency_(figure_of_merit)_of_cryogenic_aluminium_plant_is_40%_of_idea ______________________________ -2.0203E+00 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 99d5ae9385..83b49efd46 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -1095,7 +1095,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0d6)___________________ 1.9539E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0d6)_________________ 2.3011E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(tfcoil_variables.tmp (helpow_+_helpow_cryal/1.0d6)_ 7.4146E-02 OP - Temperature_of_cryogenic_superconducting_components_(K)_________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_superconducting_components_(K)_________________ (temp_tf_cryo)______________________ 4.5000E+00 Temperature_of_cryogenic_aluminium_components_(K)_______________________ (tcoolin)_____________________ 3.1315E+02 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Efficiency_(figure_of_merit)_of_cryogenic_aluminium_plant_is_40%_of_idea ______________________________ -2.0203E+00 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 1091b75e0a..955c11ef21 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -1095,7 +1095,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0d6)___________________ 1.9539E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0d6)_________________ 2.3011E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(tfcoil_variables.tmp (helpow_+_helpow_cryal/1.0d6)_ 7.4146E-02 OP - Temperature_of_cryogenic_superconducting_components_(K)_________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_superconducting_components_(K)_________________ (temp_tf_cryo)______________________ 4.5000E+00 Temperature_of_cryogenic_aluminium_components_(K)_______________________ (tcoolin)_____________________ 3.1315E+02 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Efficiency_(figure_of_merit)_of_cryogenic_aluminium_plant_is_40%_of_idea ______________________________ -2.0203E+00 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 3a21bc2c7a..97d71d4735 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -1095,7 +1095,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0d6)___________________ 1.9539E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0d6)_________________ 2.3011E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(tfcoil_variables.tmp (helpow_+_helpow_cryal/1.0d6)_ 7.4146E-02 OP - Temperature_of_cryogenic_superconducting_components_(K)_________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_superconducting_components_(K)_________________ (temp_tf_cryo)______________________ 4.5000E+00 Temperature_of_cryogenic_aluminium_components_(K)_______________________ (tcoolin)_____________________ 3.1315E+02 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Efficiency_(figure_of_merit)_of_cryogenic_aluminium_plant_is_40%_of_idea ______________________________ -2.0203E+00 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index c545ab38d6..2353174486 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -1098,7 +1098,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0d6)___________________ 1.9134E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0d6)_________________ 2.2978E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(tfcoil_variables.tmp (helpow_+_helpow_cryal/1.0d6)_ 7.4042E-02 OP - Temperature_of_cryogenic_superconducting_components_(K)_________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_superconducting_components_(K)_________________ (temp_tf_cryo)______________________ 4.5000E+00 Temperature_of_cryogenic_aluminium_components_(K)_______________________ (tcoolin)_____________________ 3.1315E+02 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Efficiency_(figure_of_merit)_of_cryogenic_aluminium_plant_is_40%_of_idea ______________________________ -2.0203E+00 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 75ffdbdf3e..0b5918c581 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -1096,7 +1096,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0d6)___________________ 1.9207E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0d6)_________________ 2.2817E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(tfcoil_variables.tmp (helpow_+_helpow_cryal/1.0d6)_ 7.3522E-02 OP - Temperature_of_cryogenic_superconducting_components_(K)_________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_superconducting_components_(K)_________________ (temp_tf_cryo)______________________ 4.5000E+00 Temperature_of_cryogenic_aluminium_components_(K)_______________________ (tcoolin)_____________________ 3.1315E+02 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Efficiency_(figure_of_merit)_of_cryogenic_aluminium_plant_is_40%_of_idea ______________________________ -2.0203E+00 OP @@ -2259,7 +2259,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0d6)___________________ 1.9205E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0d6)_________________ 2.2709E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(tfcoil_variables.tmp (helpow_+_helpow_cryal/1.0d6)_ 7.3173E-02 OP - Temperature_of_cryogenic_superconducting_components_(K)_________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_superconducting_components_(K)_________________ (temp_tf_cryo)______________________ 4.5000E+00 Temperature_of_cryogenic_aluminium_components_(K)_______________________ (tcoolin)_____________________ 3.1315E+02 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Efficiency_(figure_of_merit)_of_cryogenic_aluminium_plant_is_40%_of_idea ______________________________ -2.0203E+00 OP @@ -3422,7 +3422,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0d6)___________________ 1.9054E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0d6)_________________ 2.2566E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(tfcoil_variables.tmp (helpow_+_helpow_cryal/1.0d6)_ 7.2712E-02 OP - Temperature_of_cryogenic_superconducting_components_(K)_________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_superconducting_components_(K)_________________ (temp_tf_cryo)______________________ 4.5000E+00 Temperature_of_cryogenic_aluminium_components_(K)_______________________ (tcoolin)_____________________ 3.1315E+02 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Efficiency_(figure_of_merit)_of_cryogenic_aluminium_plant_is_40%_of_idea ______________________________ -2.0203E+00 OP @@ -4585,7 +4585,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0d6)___________________ 1.9047E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0d6)_________________ 2.2548E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(tfcoil_variables.tmp (helpow_+_helpow_cryal/1.0d6)_ 7.2654E-02 OP - Temperature_of_cryogenic_superconducting_components_(K)_________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_superconducting_components_(K)_________________ (temp_tf_cryo)______________________ 4.5000E+00 Temperature_of_cryogenic_aluminium_components_(K)_______________________ (tcoolin)_____________________ 3.1315E+02 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Efficiency_(figure_of_merit)_of_cryogenic_aluminium_plant_is_40%_of_idea ______________________________ -2.0203E+00 OP @@ -5748,7 +5748,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0d6)___________________ 1.9280E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0d6)_________________ 2.2722E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(tfcoil_variables.tmp (helpow_+_helpow_cryal/1.0d6)_ 7.3215E-02 OP - Temperature_of_cryogenic_superconducting_components_(K)_________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_superconducting_components_(K)_________________ (temp_tf_cryo)______________________ 4.5000E+00 Temperature_of_cryogenic_aluminium_components_(K)_______________________ (tcoolin)_____________________ 3.1315E+02 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Efficiency_(figure_of_merit)_of_cryogenic_aluminium_plant_is_40%_of_idea ______________________________ -2.0203E+00 OP @@ -6911,7 +6911,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0d6)___________________ 1.9550E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0d6)_________________ 2.2905E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(tfcoil_variables.tmp (helpow_+_helpow_cryal/1.0d6)_ 7.3806E-02 OP - Temperature_of_cryogenic_superconducting_components_(K)_________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_superconducting_components_(K)_________________ (temp_tf_cryo)______________________ 4.5000E+00 Temperature_of_cryogenic_aluminium_components_(K)_______________________ (tcoolin)_____________________ 3.1315E+02 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Efficiency_(figure_of_merit)_of_cryogenic_aluminium_plant_is_40%_of_idea ______________________________ -2.0203E+00 OP @@ -8074,7 +8074,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0d6)___________________ 1.9531E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0d6)_________________ 2.2883E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(tfcoil_variables.tmp (helpow_+_helpow_cryal/1.0d6)_ 7.3735E-02 OP - Temperature_of_cryogenic_superconducting_components_(K)_________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_superconducting_components_(K)_________________ (temp_tf_cryo)______________________ 4.5000E+00 Temperature_of_cryogenic_aluminium_components_(K)_______________________ (tcoolin)_____________________ 3.1315E+02 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Efficiency_(figure_of_merit)_of_cryogenic_aluminium_plant_is_40%_of_idea ______________________________ -2.0203E+00 OP @@ -9237,7 +9237,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0d6)___________________ 1.9381E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0d6)_________________ 2.2756E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(tfcoil_variables.tmp (helpow_+_helpow_cryal/1.0d6)_ 7.3323E-02 OP - Temperature_of_cryogenic_superconducting_components_(K)_________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_superconducting_components_(K)_________________ (temp_tf_cryo)______________________ 4.5000E+00 Temperature_of_cryogenic_aluminium_components_(K)_______________________ (tcoolin)_____________________ 3.1315E+02 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Efficiency_(figure_of_merit)_of_cryogenic_aluminium_plant_is_40%_of_idea ______________________________ -2.0203E+00 OP @@ -10400,7 +10400,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0d6)___________________ 1.9205E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0d6)_________________ 2.2615E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(tfcoil_variables.tmp (helpow_+_helpow_cryal/1.0d6)_ 7.2872E-02 OP - Temperature_of_cryogenic_superconducting_components_(K)_________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_superconducting_components_(K)_________________ (temp_tf_cryo)______________________ 4.5000E+00 Temperature_of_cryogenic_aluminium_components_(K)_______________________ (tcoolin)_____________________ 3.1315E+02 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Efficiency_(figure_of_merit)_of_cryogenic_aluminium_plant_is_40%_of_idea ______________________________ -2.0203E+00 OP @@ -11563,7 +11563,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0d6)___________________ 1.9206E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0d6)_________________ 2.2611E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(tfcoil_variables.tmp (helpow_+_helpow_cryal/1.0d6)_ 7.2858E-02 OP - Temperature_of_cryogenic_superconducting_components_(K)_________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_superconducting_components_(K)_________________ (temp_tf_cryo)______________________ 4.5000E+00 Temperature_of_cryogenic_aluminium_components_(K)_______________________ (tcoolin)_____________________ 3.1315E+02 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Efficiency_(figure_of_merit)_of_cryogenic_aluminium_plant_is_40%_of_idea ______________________________ -2.0203E+00 OP @@ -12726,7 +12726,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0d6)___________________ 1.9393E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0d6)_________________ 2.2761E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(tfcoil_variables.tmp (helpow_+_helpow_cryal/1.0d6)_ 7.3340E-02 OP - Temperature_of_cryogenic_superconducting_components_(K)_________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_superconducting_components_(K)_________________ (temp_tf_cryo)______________________ 4.5000E+00 Temperature_of_cryogenic_aluminium_components_(K)_______________________ (tcoolin)_____________________ 3.1315E+02 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Efficiency_(figure_of_merit)_of_cryogenic_aluminium_plant_is_40%_of_idea ______________________________ -2.0203E+00 OP @@ -13889,7 +13889,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0d6)___________________ 1.9582E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0d6)_________________ 2.2904E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(tfcoil_variables.tmp (helpow_+_helpow_cryal/1.0d6)_ 7.3801E-02 OP - Temperature_of_cryogenic_superconducting_components_(K)_________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_superconducting_components_(K)_________________ (temp_tf_cryo)______________________ 4.5000E+00 Temperature_of_cryogenic_aluminium_components_(K)_______________________ (tcoolin)_____________________ 3.1315E+02 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Efficiency_(figure_of_merit)_of_cryogenic_aluminium_plant_is_40%_of_idea ______________________________ -2.0203E+00 OP @@ -15052,7 +15052,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0d6)___________________ 1.9580E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0d6)_________________ 2.2897E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(tfcoil_variables.tmp (helpow_+_helpow_cryal/1.0d6)_ 7.3778E-02 OP - Temperature_of_cryogenic_superconducting_components_(K)_________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_superconducting_components_(K)_________________ (temp_tf_cryo)______________________ 4.5000E+00 Temperature_of_cryogenic_aluminium_components_(K)_______________________ (tcoolin)_____________________ 3.1315E+02 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Efficiency_(figure_of_merit)_of_cryogenic_aluminium_plant_is_40%_of_idea ______________________________ -2.0203E+00 OP @@ -16215,7 +16215,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0d6)___________________ 1.9427E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0d6)_________________ 2.2783E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(tfcoil_variables.tmp (helpow_+_helpow_cryal/1.0d6)_ 7.3412E-02 OP - Temperature_of_cryogenic_superconducting_components_(K)_________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_superconducting_components_(K)_________________ (temp_tf_cryo)______________________ 4.5000E+00 Temperature_of_cryogenic_aluminium_components_(K)_______________________ (tcoolin)_____________________ 3.1315E+02 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Efficiency_(figure_of_merit)_of_cryogenic_aluminium_plant_is_40%_of_idea ______________________________ -2.0203E+00 OP @@ -17378,7 +17378,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0d6)___________________ 1.9267E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0d6)_________________ 2.2667E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(tfcoil_variables.tmp (helpow_+_helpow_cryal/1.0d6)_ 7.3038E-02 OP - Temperature_of_cryogenic_superconducting_components_(K)_________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_superconducting_components_(K)_________________ (temp_tf_cryo)______________________ 4.5000E+00 Temperature_of_cryogenic_aluminium_components_(K)_______________________ (tcoolin)_____________________ 3.1315E+02 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Efficiency_(figure_of_merit)_of_cryogenic_aluminium_plant_is_40%_of_idea ______________________________ -2.0203E+00 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index a4cc32ed42..68a9c1564e 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -924,7 +924,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0D6)___________________ 1.6432E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0D6)_________________ 2.5632E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(W)__________________ (helpow/1.0D6)________________ 8.2594E-02 OP - Temperature_of_cryogenic_components_(K)_________________________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_components_(K)_________________________________ (temp_tf_cryo)______________________ 4.5000E+00 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 4.0732E+01 OP # Plant Power / Heat Transport Balance # @@ -1919,7 +1919,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0D6)___________________ 1.6432E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0D6)_________________ 2.5632E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(W)__________________ (helpow/1.0D6)________________ 8.2594E-02 OP - Temperature_of_cryogenic_components_(K)_________________________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_components_(K)_________________________________ (temp_tf_cryo)______________________ 4.5000E+00 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 4.0732E+01 OP # Plant Power / Heat Transport Balance # @@ -2914,7 +2914,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0D6)___________________ 1.6432E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0D6)_________________ 2.5632E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(W)__________________ (helpow/1.0D6)________________ 8.2594E-02 OP - Temperature_of_cryogenic_components_(K)_________________________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_components_(K)_________________________________ (temp_tf_cryo)______________________ 4.5000E+00 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 4.0732E+01 OP # Plant Power / Heat Transport Balance # @@ -3909,7 +3909,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0D6)___________________ 1.6432E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0D6)_________________ 2.5632E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(W)__________________ (helpow/1.0D6)________________ 8.2594E-02 OP - Temperature_of_cryogenic_components_(K)_________________________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_components_(K)_________________________________ (temp_tf_cryo)______________________ 4.5000E+00 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 4.0732E+01 OP # Plant Power / Heat Transport Balance # @@ -4904,7 +4904,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0D6)___________________ 1.6432E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0D6)_________________ 2.5633E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(W)__________________ (helpow/1.0D6)________________ 8.2594E-02 OP - Temperature_of_cryogenic_components_(K)_________________________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_components_(K)_________________________________ (temp_tf_cryo)______________________ 4.5000E+00 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 4.0732E+01 OP # Plant Power / Heat Transport Balance # @@ -5899,7 +5899,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0D6)___________________ 1.6432E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0D6)_________________ 2.5633E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(W)__________________ (helpow/1.0D6)________________ 8.2594E-02 OP - Temperature_of_cryogenic_components_(K)_________________________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_components_(K)_________________________________ (temp_tf_cryo)______________________ 4.5000E+00 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 4.0732E+01 OP # Plant Power / Heat Transport Balance # @@ -6894,7 +6894,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0D6)___________________ 1.6432E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0D6)_________________ 2.5633E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(W)__________________ (helpow/1.0D6)________________ 8.2594E-02 OP - Temperature_of_cryogenic_components_(K)_________________________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_components_(K)_________________________________ (temp_tf_cryo)______________________ 4.5000E+00 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 4.0732E+01 OP # Plant Power / Heat Transport Balance # @@ -7889,7 +7889,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0D6)___________________ 1.6432E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0D6)_________________ 2.5633E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(W)__________________ (helpow/1.0D6)________________ 8.2594E-02 OP - Temperature_of_cryogenic_components_(K)_________________________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_components_(K)_________________________________ (temp_tf_cryo)______________________ 4.5000E+00 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 4.0732E+01 OP # Plant Power / Heat Transport Balance # @@ -8884,7 +8884,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0D6)___________________ 1.6432E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0D6)_________________ 2.5633E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(W)__________________ (helpow/1.0D6)________________ 8.2594E-02 OP - Temperature_of_cryogenic_components_(K)_________________________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_components_(K)_________________________________ (temp_tf_cryo)______________________ 4.5000E+00 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 4.0732E+01 OP # Plant Power / Heat Transport Balance # diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index d239782d35..0403a135b1 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -7581,7 +7581,7 @@ "tmargtf": 0.0, "tmax_croco": 200.0, "tmaxpro": 150.0, - "tmpcry": 4.5, + "temp_tf_cryo": 4.5, "tn": 300.0, "t_current_ramp_up": 30.0, "tohsin": 0.0, @@ -9691,7 +9691,7 @@ "heat_sink_l": "heat sinks length, width, height (m)", "heat_sink_w": "heat sinks length, width, height (m)", "helium": "", - "helpow": "Heat removal at cryogenic temperature tmpcry (W)", + "helpow": "Heat removal at cryogenic temperature temp_tf_cryo (W)", "helpow_cryal": "Heat removal at cryogenic temperature tcoolin (W)", "hfac": "H factors for an ignited plasma for each energy confinement time scaling law", "hfact": "H factor on energy confinement times, radiation corrected (`iteration variable 10`)", @@ -10777,7 +10777,7 @@ "tmargtf": "TF coil temperature margin (K)", "tmax_croco": "CroCo strand: maximum permitted temp during a quench (K)", "tmaxpro": "maximum temp rise during a quench for protection (K)", - "tmpcry": "coil temperature for cryogenic plant power calculation (K)", + "temp_tf_cryo": "coil temperature for cryogenic plant power calculation (K)", "tn": "neutral gas temperature in chamber (K)", "t_current_ramp_up": "plasma current ramp-up time for current initiation (s) (calculated if `i_pulsed_plant=0`)\n (`iteration variable 65`)", "tohsin": "Switch for plasma current ramp-up time (if i_pulsed_plant=0):\n
              \n
            • = 0, t_current_ramp_up = t_precharge = t_ramp_down = Ip(MA)/0.5
              • \n
            • <>0, t_current_ramp_up = tohsin; t_precharge, t_ramp_down are input
              • \n
            ", @@ -14447,7 +14447,7 @@ "lb": 0.0, "ub": 1000.0 }, - "tmpcry": { + "temp_tf_cryo": { "lb": 0.01, "ub": 293.0 }, @@ -19474,7 +19474,7 @@ "tmaxpro", "tmax_croco", "croco_quench_temperature", - "tmpcry", + "temp_tf_cryo", "n_tf_turn", "vdalw", "vforce", @@ -20571,7 +20571,7 @@ "tmax_croco": "real_variable", "tmax_jacket": "real_variable", "tmaxpro": "real_variable", - "tmpcry": "real_variable", + "temp_tf_cryo": "real_variable", "tn": "real_variable", "t_current_ramp_up": "real_variable", "tohsin": "real_variable", diff --git a/tests/regression/input_files/helias_5b.IN.DAT b/tests/regression/input_files/helias_5b.IN.DAT index 73caa93e69..fde072c3de 100644 --- a/tests/regression/input_files/helias_5b.IN.DAT +++ b/tests/regression/input_files/helias_5b.IN.DAT @@ -170,7 +170,7 @@ runtitle = HELIAS-5B fcutfsu = 0.69 *Copper fraction of cable conductor (TF coils) i_tf_sc_mat = 1 *Switch for superconductor material in tf coils (1: ITER Nb3Sn) tftmp = 4.2 *Peak helium coolant temperature in TF coils and PF coils (k) -tmpcry = 4.2 *Coil temperature for cryogenic plant power calculation (K) +temp_tf_cryo = 4.2 *Coil temperature for cryogenic plant power calculation (K) t_turn_tf = 0.056 *Dimension conductor area including steel and insulation. thicndut = 0.002 *Conduit insulation thickness (m) thwcndut = 0.0012 *TF coil conduit case thickness (m) diff --git a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT index 7008419387..b2c29ebeb5 100644 --- a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT @@ -434,7 +434,7 @@ n_tf_coils = 12 * Number of TF coils (default = 50 for stellarators); Number tftmp = 20.0 * peak helium coolant temperature in TF coils and PF coils (K) thkcas = 0.1293140904093427 * inboard TF coil case outer (non-plasma side) thickness (m) (`iteration variable 57`) dr_tf_wp = 0.6044340543574178 * radial thickness of winding pack (m) (`iteration variable 140`) (issue #514) -tmpcry = 20.0 * coil temperature for cryogenic plant power calculation (K) +temp_tf_cryo = 20.0 * coil temperature for cryogenic plant power calculation (K) f_vforce_inboard = 0.5 * Fraction of the total vertical force taken by the TF inboard leg tension *-----------------Times Variables------------------* diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index cb89a32d3f..229823bf7a 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -1400,7 +1400,7 @@ boundu(49) = 1.0 * DESCRIPTION: TF coil cryo-plant efficiency * JUSTIFICATION: Not yet set, assuming default -tmpcry = 20.0 +temp_tf_cryo = 20.0 * DESCRIPTION: Coil temperature for cryogenic plant power calculation (K) * JUSTIFICATION: diff --git a/tests/regression/input_files/stellarator_helias_once_through.IN.DAT b/tests/regression/input_files/stellarator_helias_once_through.IN.DAT index 1204ba044d..d4b9cf6f75 100644 --- a/tests/regression/input_files/stellarator_helias_once_through.IN.DAT +++ b/tests/regression/input_files/stellarator_helias_once_through.IN.DAT @@ -374,7 +374,7 @@ thicndut = 0.001 * conduit insulation thickness (m) thkcas = 0.05 * inboard TF coil case outer (non-plasma side) thickness (m) (`iteration variable 57`) thwcndut = 0.006 * TF coil conduit case thickness (m) (`iteration variable 58`) tinstf = 0.01 * Thickness of the ground insulation layer surrounding (m) -tmpcry = 4.5 * coil temperature for cryogenic plant power calculation (K) +temp_tf_cryo = 4.5 * coil temperature for cryogenic plant power calculation (K) vdalw = 12.5 * max voltage across TF coil during quench (kV) (`iteration variable 52`) vftf = 0.3 * coolant fraction of TFC 'cable' (`i_tf_sup=1`); or of TFC leg (`i_tf_ssup=0`) diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index a4230c92e4..c70b1dff51 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -1098,7 +1098,7 @@ Resistive_losses_in_current_leads_(MW)__________________________________ (qcl/1.0d6)___________________ 1.9134E-02 OP 45%_allowance_for_heat_loads_in_transfer_lines,_storage_tanks_etc_(MW)__ (qmisc/1.0d6)_________________ 2.2978E-02 OP Sum_=_Total_heat_removal_at_cryogenic_temperatures_(tfcoil_variables.tmp (helpow_+_helpow_cryal/1.0d6)_ 7.4042E-02 OP - Temperature_of_cryogenic_superconducting_components_(K)_________________ (tmpcry)______________________ 4.5000E+00 + Temperature_of_cryogenic_superconducting_components_(K)_________________ (temp_tf_cryo)______________________ 4.5000E+00 Temperature_of_cryogenic_aluminium_components_(K)_______________________ (tcoolin)_____________________ 3.1315E+02 Efficiency_(figure_of_merit)_of_cryogenic_plant_is_13%_of_ideal_Carnot_v ______________________________ 2.0277E-03 OP Efficiency_(figure_of_merit)_of_cryogenic_aluminium_plant_is_40%_of_idea ______________________________ -2.0203E+00 OP diff --git a/tests/unit/test_costs_1990.py b/tests/unit/test_costs_1990.py index ecfb4649ea..d4814227c8 100644 --- a/tests/unit/test_costs_1990.py +++ b/tests/unit/test_costs_1990.py @@ -4085,7 +4085,7 @@ class Acc2263Param(NamedTuple): helpow: Any = None - tmpcry: Any = None + temp_tf_cryo: Any = None c226: Any = None @@ -4104,7 +4104,7 @@ class Acc2263Param(NamedTuple): lsa=2, fkind=1, helpow=76851.741036987034, - tmpcry=4.5, + temp_tf_cryo=4.5, c226=0, c2263=0, c22=0, @@ -4115,7 +4115,7 @@ class Acc2263Param(NamedTuple): lsa=2, fkind=1, helpow=220505.71684249729, - tmpcry=4.5, + temp_tf_cryo=4.5, c226=228.30921518184891, c2263=122.17123799205466, c22=3474.7391916096453, @@ -4144,7 +4144,7 @@ def test_acc2263_rut(acc2263param, monkeypatch, costs): monkeypatch.setattr(heat_transport_variables, "helpow", acc2263param.helpow) - monkeypatch.setattr(tfcoil_variables, "tmpcry", acc2263param.tmpcry) + monkeypatch.setattr(tfcoil_variables, "temp_tf_cryo", acc2263param.temp_tf_cryo) monkeypatch.setattr(costs, "c226", acc2263param.c226) diff --git a/tests/unit/test_power.py b/tests/unit/test_power.py index 3892982124..070d172241 100644 --- a/tests/unit/test_power.py +++ b/tests/unit/test_power.py @@ -2179,7 +2179,7 @@ class Power2Param(NamedTuple): tfcmw: Any = None - tmpcry: Any = None + temp_tf_cryo: Any = None tcoolin: Any = None @@ -2311,7 +2311,7 @@ class Power2Param(NamedTuple): ppump=0, i_tf_sup=1, tfcmw=0, - tmpcry=4.5, + temp_tf_cryo=4.5, tcoolin=313.14999999999998, eff_tf_cryo=0.13, htpmw_fw_blkt=202.02739897087824, @@ -2413,7 +2413,7 @@ class Power2Param(NamedTuple): ppump=0, i_tf_sup=1, tfcmw=0, - tmpcry=4.5, + temp_tf_cryo=4.5, tcoolin=313.14999999999998, eff_tf_cryo=0.13, htpmw_fw_blkt=201.96778859673452, @@ -2644,7 +2644,7 @@ def test_power2(power2param, monkeypatch, power): monkeypatch.setattr(tfcoil_variables, "tfcmw", power2param.tfcmw) - monkeypatch.setattr(tfcoil_variables, "tmpcry", power2param.tmpcry) + monkeypatch.setattr(tfcoil_variables, "temp_tf_cryo", power2param.temp_tf_cryo) monkeypatch.setattr(tfcoil_variables, "tcoolin", power2param.tcoolin) From 84b07841cb0d011188f2ba478a755b7aad21b7c3 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 31 Mar 2025 11:49:08 +0100 Subject: [PATCH 15/21] =?UTF-8?q?=F0=9F=94=84=20Rename=20thkcas=20to=20dr?= =?UTF-8?q?=5Ftf=5Fnose=5Fcase=20for=20clarity=20and=20consistency;=20upda?= =?UTF-8?q?te=20references=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/eng-models/tf-coil.md | 8 ++--- .../proc-pages/fusion-devices/stellarator.md | 6 ++-- .../data/csv_output_large_tokamak_MFILE.DAT | 12 +++---- examples/data/large_tokamak_1_MFILE.DAT | 6 ++-- examples/data/large_tokamak_2_MFILE.DAT | 6 ++-- examples/data/large_tokamak_3_MFILE.DAT | 6 ++-- examples/data/large_tokamak_4_MFILE.DAT | 6 ++-- examples/data/large_tokamak_IN.DAT | 4 +-- examples/data/scan_MFILE.DAT | 24 ++++++------- examples/data/scan_example_file_IN.DAT | 4 +-- process/build.py | 14 ++++---- process/input.py | 2 +- process/io/obsolete_vars.py | 2 +- process/io/plot_proc.py | 6 ++-- process/io/variable_metadata.py | 2 +- process/resistive_tf_coil.py | 6 ++-- process/stellarator.py | 16 ++++----- process/superconducting_tf_coil.py | 28 +++++++-------- process/tf_coil.py | 2 +- process/utilities/errorlist.json | 2 +- source/fortran/numerics.f90 | 2 +- source/fortran/tfcoil_variables.f90 | 2 +- .../data/large_tokamak_1_MFILE.DAT | 6 ++-- .../data/large_tokamak_2_MFILE.DAT | 6 ++-- .../data/large_tokamak_3_MFILE.DAT | 6 ++-- .../data/large_tokamak_4_MFILE.DAT | 6 ++-- tests/integration/data/large_tokamak_IN.DAT | 4 +-- .../integration/data/large_tokamak_MFILE.DAT | 6 ++-- .../data/large_tokamak_once_through.IN.DAT | 4 +-- tests/integration/data/ref_IN.DAT | 6 ++-- tests/integration/data/scan_2D_MFILE.DAT | 34 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 24 ++++++------- .../data/uncertainties_nonopt_ref_IN.DAT | 6 ++-- .../integration/data/uncertainties_ref_IN.DAT | 6 ++-- tests/integration/ref_dicts.json | 24 ++++++------- tests/regression/input_files/helias_5b.IN.DAT | 2 +- .../input_files/large_tokamak.IN.DAT | 4 +-- .../input_files/large_tokamak_nof.IN.DAT | 4 +-- .../large_tokamak_once_through.IN.DAT | 4 +-- .../spherical_tokamak_once_through.IN.DAT | 4 +-- .../input_files/st_regression.IN.DAT | 2 +- .../stellarator_helias_once_through.IN.DAT | 2 +- tests/unit/data/large_tokamak_IN.DAT | 4 +-- tests/unit/data/large_tokamak_MFILE.DAT | 6 ++-- tests/unit/test_build.py | 10 +++--- tests/unit/test_resistive_tf_coil.py | 20 ++++++----- tests/unit/test_sctfcoil.py | 10 +++--- tests/unit/test_tfcoil.py | 18 ++++++---- 48 files changed, 204 insertions(+), 190 deletions(-) diff --git a/documentation/proc-pages/eng-models/tf-coil.md b/documentation/proc-pages/eng-models/tf-coil.md index 0e95f721fa..5c0fb906ce 100644 --- a/documentation/proc-pages/eng-models/tf-coil.md +++ b/documentation/proc-pages/eng-models/tf-coil.md @@ -58,7 +58,7 @@ The TF coils are assumed to be supporting each other against the net centering f #### TF coil inboard radial size

            - Following the geometry and its parametrization presented in Figure 1, the TF total thickness dr_tf_inboard \( \left( \Delta R_\mathrm{TF} \right) \) is related with the inner and outer case radial thicknesses (thkcas, \( \Delta R_\mathrm{case}^\mathrm{in} \) and casthi, \( \Delta R_\mathrm{case}^\mathrm{out} \) respectively) and the WP radial thickness dr_tf_wp \(\Delta R_\mathrm{WP}\) by the following equation : + Following the geometry and its parametrization presented in Figure 1, the TF total thickness dr_tf_inboard \( \left( \Delta R_\mathrm{TF} \right) \) is related with the inner and outer case radial thicknesses (dr_tf_nose_case, \( \Delta R_\mathrm{case}^\mathrm{in} \) and casthi, \( \Delta R_\mathrm{case}^\mathrm{out} \) respectively) and the WP radial thickness dr_tf_wp \(\Delta R_\mathrm{WP}\) by the following equation :

            $$ @@ -89,7 +89,7 @@ $$ Although not physically divided into pieces, three sections of the case can be considered:

            -

            - **The nose casing:** this section corresponds to the case separating the WP with the machine center. Due to the presence of net electromechanical centering forces, this case has a major structural purpose and is often much larger than the other sides. The nose case dimension is set by its radial thickness that the user can specify using the `thkcas` input variable (iteration variable 57). + **The nose casing:** this section corresponds to the case separating the WP with the machine center. Due to the presence of net electromechanical centering forces, this case has a major structural purpose and is often much larger than the other sides. The nose case dimension is set by its radial thickness that the user can specify using the `dr_tf_nose_case` input variable (iteration variable 57).

            -

            **Sidewall casing:** this section corresponds to the lateral side of the case, separating the WP with the other vaulted coils. As in the WP geometry is generally squared, the sidewall case thickness may vary with the machine radius. For this reason, the user sets its dimensions though its minimal thickness `casths`. The user can either directly specify `casths` or define it as a fraction of the total coil thickness at the inner radius of the WP (`r_wp_inner`) with the `casths_fraction` input. If `casths_fraction` is set in the input file, the `casths` value will be overwritten. @@ -268,7 +268,7 @@ turns. The number of turns can be parametrized in three different ways : A much simpler inboard mid-plane geometry is used for resistive TF coils, as shown in Figure 6. The most important difference is the absence of the lateral steel casing structure. Three main sections can be distinguished:

            -- **The bucking cylinder:** radial thickness `thkcas` (iteration variable 57), is present to support the centering forces. Its presence is however not mandatory and can be can be removed setting TODO. +- **The bucking cylinder:** radial thickness `dr_tf_nose_case` (iteration variable 57), is present to support the centering forces. Its presence is however not mandatory and can be can be removed setting TODO. - **The conductor area:** radial thickness `dr_tf_wp` (iteration variable 140). Ground insulation, corresponding to the dark grey area in *Figure 6* is included in this section by convention. - **The outer cylinder:** radial thickness `casthi`. This cylinder plays no role in the structural models in PROCESS. @@ -1259,7 +1259,7 @@ Another subroutine, `tfspcall` is called outside `stfcoil` to estimate to check | `dr_tf_inboard` | TF coil maximum radial size
            calculated if `dr_tf_wp` is used as iteration variable | ixc = 13 | No default | m | | `tfootfi` | Outboard/inboard TF coil thickness ratio | - | 1 | - | | `dr_tf_wp` | Winding pack radial thickness
            calculated if `dr_tf_inboard` is used as iteration variable. Include the ground insulation and the insertion gap. | ixc = 140 | No default | m | -| `thkcas` | Nose/inner case radial thickness | ixc = 57 | 0.3 | m | +| `dr_tf_nose_case` | Nose/inner case radial thickness | ixc = 57 | 0.3 | m | | `casths` | Minimal sidewall casing thickness | - | - | m | | `casths_fraction` | Minimal sidewall casing thickness as a fraction of the TF coil toroidal thickness. Overwites the `casths` input value | - | 0.03 | - | | `casthi` | Minimal plasma side casing thickness | - | - | m | diff --git a/documentation/proc-pages/fusion-devices/stellarator.md b/documentation/proc-pages/fusion-devices/stellarator.md index 5dc35c5dc6..3fa84f047a 100644 --- a/documentation/proc-pages/fusion-devices/stellarator.md +++ b/documentation/proc-pages/fusion-devices/stellarator.md @@ -200,7 +200,7 @@ This file needs to be prepared by hand or can be written automatically by the pr Alternatively `istell = 1,2,3,4,5` allow for pre-selected stellarator machines. ![alt text](../images/stellartor_windingpack.png "Thingy") -*Figure 3: Differences of the stellarator coil cross section in PROCESS compared to the tokamak description. Note the identical `thkcas` around the cable area.* +*Figure 3: Differences of the stellarator coil cross section in PROCESS compared to the tokamak description. Note the identical `dr_tf_nose_case` around the cable area.* The stellarator coil model[^6] uses scaling aspects based on a reference calculation of the stellarator configuration, using numerical calculations at a reference point. Examples for these calculations are inductances, peak field calculations or stellarator forces. @@ -209,7 +209,7 @@ The fully three-dimensional shape of the coils is assumed to be fixed, but the s The stellarator coils are assumed to be superconducting - no resistive coil calculations are performed. The critical field at the superconductor is calculated using circular approximations for the coils in the inductance and field calculations, and the limit is enforced automatically. All superconductor materials that are available for tokamaks are also available for stellarators. -The winding pack cross-section is rectangular for the stellarator coils, rather than the two-step cross-section assumed for tokamaks. The coil thicknesses and most of the dimensions of the materials within the coil cross-section are outputs from the model, instead of being inputs as is the case for tokamaks; see the variable descriptor file for details. In addition, certain iteration variables (`dr_tf_inboard`, no. 13; `thkcas`, no. 57; `cpttf`, no. 60 and `dx_tf_inboard_out_toroidal`, no. 77) should not be turned on in the input file as they are calculated self-consistently (`thkcas` is required as input); the code will stop with an error message of this is attempted. +The winding pack cross-section is rectangular for the stellarator coils, rather than the two-step cross-section assumed for tokamaks. The coil thicknesses and most of the dimensions of the materials within the coil cross-section are outputs from the model, instead of being inputs as is the case for tokamaks; see the variable descriptor file for details. In addition, certain iteration variables (`dr_tf_inboard`, no. 13; `dr_tf_nose_case`, no. 57; `cpttf`, no. 60 and `dx_tf_inboard_out_toroidal`, no. 77) should not be turned on in the input file as they are calculated self-consistently (`dr_tf_nose_case` is required as input); the code will stop with an error message of this is attempted. The conduit insulation thickness (`thicndut`), as well as the steel thickness around each conductor (`thwcndut`) should be given as input parameters together with the dimension of the conductor area (`t_turn_tf`). @@ -229,7 +229,7 @@ vftf = 0.3 *Coolant fraction of TF coil leg (itfsup=0) this is the same for cond fiooic = 0.78 *Fraction TF coil critical current to operation current (should be iteration variable!) vdalw = 12.64 * Max voltage across tf coil during quench (kV) tdmptf = 20 * Dump time (should be iteration variable) -thkcas = 0.1 * Thickness TF Coil case (for stellarators: Also for toroidal direction) +dr_tf_nose_case = 0.1 * Thickness TF Coil case (for stellarators: Also for toroidal direction) t_turn_tf = 0.048 * Dimension conductor area including steel and insulation. Important parameter. thicndut = 0.0015 * Conduit insulation thickness (one side) (m) thwcndut = 0.006 * thickness of steel around each conductor (one side) (m) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index ceab21e162..233b36958e 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -133,9 +133,9 @@ tdmptf__________________________________________________________________ (itvar037)____________________ 1.9607E+01 tdmptf_(final_value/initial_value)______________________________________ (xcm037)______________________ 7.8427E-01 tdmptf_(range_normalised)_______________________________________________ (nitvar037)___________________ 1.9526E-01 - thkcas__________________________________________________________________ (itvar038)____________________ 2.2965E-01 - thkcas_(final_value/initial_value)______________________________________ (xcm038)______________________ 4.5931E-01 - thkcas_(range_normalised)_______________________________________________ (nitvar038)___________________ 1.8911E-01 + dr_tf_nose_case__________________________________________________________________ (itvar038)____________________ 2.2965E-01 + dr_tf_nose_case_(final_value/initial_value)______________________________________ (xcm038)______________________ 4.5931E-01 + dr_tf_nose_case_(range_normalised)_______________________________________________ (nitvar038)___________________ 1.8911E-01 thwcndut________________________________________________________________ (itvar039)____________________ 8.0000E-03 thwcndut_(final_value/initial_value)____________________________________ (xcm039)______________________ 1.0000E+00 thwcndut_(range_normalised)_____________________________________________ (nitvar039)___________________ 0.0000E+00 @@ -695,7 +695,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 2.2965E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.2965E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 4.9722E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.7619E-01 @@ -1440,9 +1440,9 @@ fvsbrnni = 0.4 ixc = 56 tdmptf = 25.0 -* thkcas [m] +* dr_tf_nose_case [m] ixc = 57 -thkcas = 0.5 +dr_tf_nose_case = 0.5 * TF coil conduit thickness [m] ixc = 58 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 7b76ea3ce9..75f0722a1d 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -692,7 +692,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 2.8216E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.8216E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.5456E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.7486E-01 @@ -1434,9 +1434,9 @@ fvsbrnni = 0.4 ixc = 56 tdmptf = 25.0 -* thkcas [m] +* dr_tf_nose_case [m] ixc = 57 -thkcas = 0.5 +dr_tf_nose_case = 0.5 * TF coil conduit thickness [m] ixc = 58 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 171a4007e2..af77d7412e 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -692,7 +692,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 2.8216E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.8216E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.5456E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.7486E-01 @@ -1434,9 +1434,9 @@ fvsbrnni = 0.4 ixc = 56 tdmptf = 25.0 -* thkcas [m] +* dr_tf_nose_case [m] ixc = 57 -thkcas = 0.5 +dr_tf_nose_case = 0.5 * TF coil conduit thickness [m] ixc = 58 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index efcc0e59b6..41e885c279 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -692,7 +692,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 2.8216E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.8216E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.5456E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.7486E-01 @@ -1434,9 +1434,9 @@ fvsbrnni = 0.4 ixc = 56 tdmptf = 25.0 -* thkcas [m] +* dr_tf_nose_case [m] ixc = 57 -thkcas = 0.5 +dr_tf_nose_case = 0.5 * TF coil conduit thickness [m] ixc = 58 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 2806368a72..4bbff9ad0b 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -692,7 +692,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 2.8216E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.8216E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.5456E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.7486E-01 @@ -1434,9 +1434,9 @@ fvsbrnni = 0.4 ixc = 56 tdmptf = 25.0 -* thkcas [m] +* dr_tf_nose_case [m] ixc = 57 -thkcas = 0.5 +dr_tf_nose_case = 0.5 * TF coil conduit thickness [m] ixc = 58 diff --git a/examples/data/large_tokamak_IN.DAT b/examples/data/large_tokamak_IN.DAT index 5a8e12fc6d..5ddaaf2aee 100644 --- a/examples/data/large_tokamak_IN.DAT +++ b/examples/data/large_tokamak_IN.DAT @@ -244,9 +244,9 @@ fvsbrnni = 0.4 ixc = 56 tdmptf = 25.0 -* thkcas [m] +* dr_tf_nose_case [m] ixc = 57 -thkcas = 0.5 +dr_tf_nose_case = 0.5 * TF coil conduit thickness [m] ixc = 58 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 0465f04c32..6d646f49d7 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -539,7 +539,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 3.7026E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 3.7026E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 1.2094E+06 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 1.1243E+00 @@ -1534,7 +1534,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 3.7026E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 3.7026E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 1.2094E+06 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 1.1243E+00 @@ -2529,7 +2529,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 3.7027E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 3.7027E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 1.2094E+06 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 1.1243E+00 @@ -3524,7 +3524,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 3.7028E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 3.7028E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 1.2094E+06 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 1.1243E+00 @@ -4519,7 +4519,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 3.7029E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 3.7029E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 1.2094E+06 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 1.1243E+00 @@ -5514,7 +5514,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 3.7029E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 3.7029E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 1.2094E+06 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 1.1243E+00 @@ -6509,7 +6509,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 3.7030E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 3.7030E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 1.2094E+06 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 1.1243E+00 @@ -7504,7 +7504,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 3.7030E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 3.7030E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 1.2094E+06 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 1.1243E+00 @@ -8499,7 +8499,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 3.7031E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 3.7031E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 1.2094E+06 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 1.1243E+00 @@ -9043,7 +9043,7 @@ ixc = 52 * vdalw boundu(52) = 10.0 ixc = 53 * fjprot ixc = 56 * tdmptf -ixc = 57 * thkcas +ixc = 57 * dr_tf_nose_case ixc = 58 * thwcndut boundl(58) = 8.0d-3 ixc = 61 * dr_shld_vv_gap_inboard @@ -9290,7 +9290,7 @@ sig_tf_wp_max = 5.8E8 * Allowable maximum shear stress in TF coil conduit (Tr 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) thicndut = 2.0d-3 * Conduit insulation thickness (m) -thkcas = 0.495 * Inboard tf coil case outer (non-plasma side) thickness (m) +dr_tf_nose_case = 0.495 * Inboard tf coil case outer (non-plasma side) thickness (m) thwcndut = 0.008 * Tf coil conduit case thickness (m) tinstf = 0.008 * Ground insulation thickness surrounding winding pack (m) tmargmin = 1.500 * Minimum allowable temperature margin (cs and tf coils) (k) @@ -9339,7 +9339,7 @@ t_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) vdalw = 1.0000E+01 fjprot = 1.0000E+00 tdmptf = 2.5829E+01 - thkcas = 5.2465E-01 + dr_tf_nose_case = 5.2465E-01 thwcndut = 8.0000E-03 dr_shld_vv_gap_inboard = 2.0000E-02 fl_h_threshold = 1.4972E+00 diff --git a/examples/data/scan_example_file_IN.DAT b/examples/data/scan_example_file_IN.DAT index e415f46bed..39357e3b51 100644 --- a/examples/data/scan_example_file_IN.DAT +++ b/examples/data/scan_example_file_IN.DAT @@ -244,9 +244,9 @@ fvsbrnni = 0.4 ixc = 56 tdmptf = 25.0 -* thkcas [m] +* dr_tf_nose_case [m] ixc = 57 -thkcas = 0.5 +dr_tf_nose_case = 0.5 * TF coil conduit thickness [m] ixc = 58 diff --git a/process/build.py b/process/build.py index 4ba8fa2353..96d30cdd97 100644 --- a/process/build.py +++ b/process/build.py @@ -1480,7 +1480,9 @@ def ripple_amplitude(self, ripmax: float, r_tf_outboard_mid: float) -> float: n = float(tfcoil_variables.n_tf_coils) if tfcoil_variables.i_tf_sup == 1: # Minimal inboard WP radius [m] - r_wp_min = build_variables.r_tf_inboard_in + tfcoil_variables.thkcas + r_wp_min = ( + build_variables.r_tf_inboard_in + tfcoil_variables.dr_tf_nose_case + ) # Rectangular WP if tfcoil_variables.i_tf_wp_geom == 0: @@ -1515,7 +1517,7 @@ def ripple_amplitude(self, ripmax: float, r_tf_outboard_mid: float) -> float: # Radius used to define the t_wp_max [m] r_wp_max = ( build_variables.r_tf_inboard_in - + tfcoil_variables.thkcas + + tfcoil_variables.dr_tf_nose_case + tfcoil_variables.dr_tf_wp ) @@ -1687,7 +1689,7 @@ def calculate_radial_build(self, output: bool) -> None: build_variables.r_tf_inboard_in + tfcoil_variables.dr_tf_wp + tfcoil_variables.casthi - + tfcoil_variables.thkcas + + tfcoil_variables.dr_tf_nose_case ) / np.cos( np.pi / tfcoil_variables.n_tf_coils ) - build_variables.r_tf_inboard_in @@ -1697,7 +1699,7 @@ def calculate_radial_build(self, output: bool) -> None: build_variables.dr_tf_inboard = ( tfcoil_variables.dr_tf_wp + tfcoil_variables.casthi - + tfcoil_variables.thkcas + + tfcoil_variables.dr_tf_nose_case ) # Radial build to tfcoil middle [m] @@ -1720,7 +1722,7 @@ def calculate_radial_build(self, output: bool) -> None: * build_variables.r_tf_inboard_out - build_variables.r_tf_inboard_in - tfcoil_variables.casthi - - tfcoil_variables.thkcas + - tfcoil_variables.dr_tf_nose_case ) # Resistive magnets @@ -1728,7 +1730,7 @@ def calculate_radial_build(self, output: bool) -> None: tfcoil_variables.dr_tf_wp = ( build_variables.dr_tf_inboard - tfcoil_variables.casthi - - tfcoil_variables.thkcas + - tfcoil_variables.dr_tf_nose_case ) # Radius of the centrepost at the top of the machine diff --git a/process/input.py b/process/input.py index 3b889215e1..306effedfc 100644 --- a/process/input.py +++ b/process/input.py @@ -1237,7 +1237,7 @@ def __post_init__(self): "theta1_coil": InputVariable(fortran.tfcoil_variables, float, range=(0.1, 60.0)), "theta1_vv": InputVariable(fortran.tfcoil_variables, float, range=(0.1, 60.0)), "thicndut": InputVariable(fortran.tfcoil_variables, float, range=(0.0, 0.1)), - "thkcas": InputVariable(fortran.tfcoil_variables, float, range=(0.0, 1.0)), + "dr_tf_nose_case": InputVariable(fortran.tfcoil_variables, float, range=(0.0, 1.0)), "dz_shld_thermal": InputVariable(fortran.build_variables, float, range=(0.0, 10.0)), "thwcndut": InputVariable(fortran.tfcoil_variables, float, range=(0.0, 0.1)), "ti": InputVariable(fortran.physics_variables, float, range=(5.0, 50.0)), diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index cf09663a6b..b2089c164f 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -40,7 +40,7 @@ "isumattf": "i_tf_sc_mat", "turnstf": "n_tf_turn", "awptf": "a_tf_wp", - "dr_tf_case_in": "thkcas", + "dr_tf_case_in": "dr_tf_nose_case", "f_tf_case_out": "casthi_fraction", "dr_tf_case_out": "casthi", "eyoung_reinforced_al": "eyoung_nibron", diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index ef159eef80..8e22fd5d6c 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -1921,7 +1921,7 @@ def plot_tf_wp(axis, mfile_data, scan: int) -> None: turns = round(mfile_data.data["n_tf_turn"].get_scan(scan)) wp_shape = round(mfile_data.data["i_tf_wp_geom"].get_scan(scan)) cond_type = round(mfile_data.data["i_tf_sup"].get_scan(scan)) - nose_thickness = mfile_data.data["thkcas"].get_scan(scan) + nose_thickness = mfile_data.data["dr_tf_nose_case"].get_scan(scan) side_thickness = mfile_data.data["casths"].get_scan(scan) case_plasma = mfile_data.data["i_tf_case_geom"].get_scan(scan) j_tf_wp = round(mfile_data.data["j_tf_wp"].get_scan(scan)) / 1e6 @@ -3772,7 +3772,7 @@ def main(args=None): global wwp2 global dr_tf_wp global tinstf - global thkcas + global dr_tf_nose_case global casthi n_tf_coils = m_file.data["n_tf_coils"].get_scan(scan) @@ -3782,7 +3782,7 @@ def main(args=None): wwp2 = m_file.data["wwp2"].get_scan(scan) dr_tf_wp = m_file.data["dr_tf_wp"].get_scan(scan) tinstf = m_file.data["tinstf"].get_scan(scan) - thkcas = m_file.data["thkcas"].get_scan(scan) + dr_tf_nose_case = m_file.data["dr_tf_nose_case"].get_scan(scan) # To be re-inergrated to resistives when in-plane stresses is integrated casthi = m_file.data["casthi"].get_scan(scan) diff --git a/process/io/variable_metadata.py b/process/io/variable_metadata.py index 5d6fe627b7..0f5c71ab54 100644 --- a/process/io/variable_metadata.py +++ b/process/io/variable_metadata.py @@ -74,7 +74,7 @@ class VariableMetadata: description="TF coil vertical force", units="N", ), - "thkcas": VariableMetadata( + "dr_tf_nose_case": VariableMetadata( latex=r"$\Delta R_\mathrm{TF}^\mathrm{buck}$ [$m$]", description="Inboard TF coil case outer (non-plasma side) thickness", units="m", diff --git a/process/resistive_tf_coil.py b/process/resistive_tf_coil.py index f4a629b2ac..352360e5e9 100644 --- a/process/resistive_tf_coil.py +++ b/process/resistive_tf_coil.py @@ -244,7 +244,7 @@ def res_tf_internal_geom(self): """ sctfcoil_module.r_wp_inner = ( - build_variables.r_tf_inboard_in + tfcoil_variables.thkcas + build_variables.r_tf_inboard_in + tfcoil_variables.dr_tf_nose_case ) sctfcoil_module.r_wp_outer = ( build_variables.r_tf_inboard_out - tfcoil_variables.casthi @@ -255,7 +255,7 @@ def res_tf_internal_geom(self): sctfcoil_module.dr_tf_wp_top = ( build_variables.r_cp_top - tfcoil_variables.casthi - - tfcoil_variables.thkcas + - tfcoil_variables.dr_tf_nose_case - build_variables.r_tf_inboard_in ) @@ -461,7 +461,7 @@ def tf_res_heating(self) -> None: build_variables.r_cp_top, sctfcoil_module.z_cp_top, build_variables.hmax + build_variables.dr_tf_outboard, - tfcoil_variables.thkcas, + tfcoil_variables.dr_tf_nose_case, tfcoil_variables.casthi, tfcoil_variables.tinstf, tfcoil_variables.thicndut, diff --git a/process/stellarator.py b/process/stellarator.py index 153249ef62..5a87c82f0c 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -2673,15 +2673,15 @@ def stcoil(self, output: bool): # # Coil case thickness (m). Here assumed to be constant # until something better comes up. - # case_thickness_constant = tfcoil_variables.thkcas #0.2e0 # #? Leave this constant for now... Check this## Should be scaled with forces I think. + # case_thickness_constant = tfcoil_variables.dr_tf_nose_case #0.2e0 # #? Leave this constant for now... Check this## Should be scaled with forces I think. # For now assumed to be constant in a bolted plate model. # tfcoil_variables.casthi = ( - tfcoil_variables.thkcas + tfcoil_variables.dr_tf_nose_case ) # [m] coil case thickness outboard distance (radial) - # thkcas = case_thickness_constant/2.0e0 # [m] coil case thickness inboard distance (radial). + # dr_tf_nose_case = case_thickness_constant/2.0e0 # [m] coil case thickness inboard distance (radial). tfcoil_variables.casths = ( - tfcoil_variables.thkcas + tfcoil_variables.dr_tf_nose_case ) # [m] coil case thickness toroidal distance (toroidal) # End of casing calculations @@ -2741,13 +2741,13 @@ def stcoil(self, output: bool): ) # [m] Thickness of inboard leg in toroidal direction build_variables.dr_tf_inboard = ( - tfcoil_variables.thkcas + tfcoil_variables.dr_tf_nose_case + tfcoil_variables.dr_tf_wp + tfcoil_variables.casthi + 2.0e0 * tfcoil_variables.tinstf ) # [m] Thickness of inboard leg in radial direction build_variables.dr_tf_outboard = ( - tfcoil_variables.thkcas + tfcoil_variables.dr_tf_nose_case + tfcoil_variables.dr_tf_wp + tfcoil_variables.casthi + 2.0e0 * tfcoil_variables.tinstf @@ -4016,8 +4016,8 @@ def stcoil_output( po.ovarre( self.outfile, "Case thickness, outer side (m)", - "(thkcas)", - tfcoil_variables.thkcas, + "(dr_tf_nose_case)", + tfcoil_variables.dr_tf_nose_case, ) po.ovarre( self.outfile, diff --git a/process/superconducting_tf_coil.py b/process/superconducting_tf_coil.py index 7684407856..b54492c975 100644 --- a/process/superconducting_tf_coil.py +++ b/process/superconducting_tf_coil.py @@ -1752,7 +1752,7 @@ def tf_wp_geom(self, i_tf_wp_geom): Seting the WP geometry and area for SC magnets """ sctfcoil_module.r_wp_inner = ( - build_variables.r_tf_inboard_in + tfcoil_variables.thkcas + build_variables.r_tf_inboard_in + tfcoil_variables.dr_tf_nose_case ) # Radial position of outer edge of winding pack [m] @@ -2448,8 +2448,8 @@ def outtf(self, peaktfflag): po.ovarre( self.outfile, 'Inboard leg case inboard "nose" thickness (m)', - "(thkcas)", - tfcoil_variables.thkcas, + "(dr_tf_nose_case)", + tfcoil_variables.dr_tf_nose_case, ) po.ovarre( self.outfile, @@ -2784,8 +2784,8 @@ def outtf(self, peaktfflag): po.ovarre( self.outfile, "Inboard leg bucking cylinder thickness (m)", - "(thkcas)", - tfcoil_variables.thkcas, + "(dr_tf_nose_case)", + tfcoil_variables.dr_tf_nose_case, ) # Conductor layer geometry @@ -3209,13 +3209,13 @@ def outtf(self, peaktfflag): # Radial build for SC TF coils if tfcoil_variables.i_tf_sup == 1: - radius = radius + tfcoil_variables.thkcas + radius = radius + tfcoil_variables.dr_tf_nose_case po.obuild( self.outfile, 'Coil case ("nose")', - tfcoil_variables.thkcas, + tfcoil_variables.dr_tf_nose_case, radius, - "(thkcas)", + "(dr_tf_nose_case)", ) radius = radius + tfcoil_variables.tfinsgap @@ -3306,13 +3306,13 @@ def outtf(self, peaktfflag): # Radial build for restive coil else: - radius = radius + tfcoil_variables.thkcas + radius = radius + tfcoil_variables.dr_tf_nose_case po.obuild( self.outfile, "Coil bucking cylindre", - tfcoil_variables.thkcas, + tfcoil_variables.dr_tf_nose_case, radius, - "(thkcas)", + "(dr_tf_nose_case)", ) radius = radius + tfcoil_variables.tinstf @@ -3413,13 +3413,13 @@ def outtf(self, peaktfflag): radius = build_variables.r_tf_inboard_in po.obuild(self.outfile, "Innermost edge of TF coil", radius, radius) - radius = radius + tfcoil_variables.thkcas + radius = radius + tfcoil_variables.dr_tf_nose_case po.obuild( self.outfile, "Coil bucking cylindre", - tfcoil_variables.thkcas, + tfcoil_variables.dr_tf_nose_case, radius, - "(thkcas)", + "(dr_tf_nose_case)", ) radius = radius + tfcoil_variables.tinstf diff --git a/process/tf_coil.py b/process/tf_coil.py index 3a4b6f748e..b60dfc72fb 100644 --- a/process/tf_coil.py +++ b/process/tf_coil.py @@ -342,7 +342,7 @@ def tf_current(self): if tfcoil_variables.tfc_sidewall_is_fraction: tfcoil_variables.casths = ( tfcoil_variables.casths_fraction - * (build_variables.r_tf_inboard_in + tfcoil_variables.thkcas) + * (build_variables.r_tf_inboard_in + tfcoil_variables.dr_tf_nose_case) * np.tan(np.pi / tfcoil_variables.n_tf_coils) ) diff --git a/process/utilities/errorlist.json b/process/utilities/errorlist.json index 465cb05ff5..0cf872f366 100644 --- a/process/utilities/errorlist.json +++ b/process/utilities/errorlist.json @@ -248,7 +248,7 @@ { "no": 48, "level": 3, - "message": "LOADXC: Do not use thkcas as an iteration variable if istell=1" + "message": "LOADXC: Do not use dr_tf_nose_case as an iteration variable if istell=1" }, { "no": 49, diff --git a/source/fortran/numerics.f90 b/source/fortran/numerics.f90 index 9ef1512a65..0c82fd4880 100755 --- a/source/fortran/numerics.f90 +++ b/source/fortran/numerics.f90 @@ -262,7 +262,7 @@ module numerics !!
          • (54) ftmargtf (f-value for equation 36) !!
          • (55) NOT USED !!
          • (56) tdmptf - !!
          • (57) thkcas + !!
          • (57) dr_tf_nose_case !!
          • (58) thwcndut !!
          • (59) fcutfsu !!
          • (60) cpttf diff --git a/source/fortran/tfcoil_variables.f90 b/source/fortran/tfcoil_variables.f90 index cdbfe4ca7a..80864bfe5c 100644 --- a/source/fortran/tfcoil_variables.f90 +++ b/source/fortran/tfcoil_variables.f90 @@ -610,7 +610,7 @@ module tfcoil_variables real(dp) :: layer_ins !! Additional insulation thickness between layers (m) - real(dp) :: thkcas + real(dp) :: dr_tf_nose_case !! inboard TF coil case outer (non-plasma side) thickness (m) (`iteration variable 57`) !! (calculated for stellarators) diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index bb1275672e..24f04d53e5 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -691,7 +691,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 2.8216E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.8216E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.5456E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.7486E-01 @@ -1433,9 +1433,9 @@ fvsbrnni = 0.4 ixc = 56 tdmptf = 25.0 -* thkcas [m] +* dr_tf_nose_case [m] ixc = 57 -thkcas = 0.5 +dr_tf_nose_case = 0.5 * TF coil conduit thickness [m] ixc = 58 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 83b49efd46..3ef6016136 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -692,7 +692,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 2.8216E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.8216E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.5456E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.7486E-01 @@ -1434,9 +1434,9 @@ fvsbrnni = 0.4 ixc = 56 tdmptf = 25.0 -* thkcas [m] +* dr_tf_nose_case [m] ixc = 57 -thkcas = 0.5 +dr_tf_nose_case = 0.5 * TF coil conduit thickness [m] ixc = 58 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 955c11ef21..9b02032e96 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -692,7 +692,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 2.8216E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.8216E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.5456E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.7486E-01 @@ -1434,9 +1434,9 @@ fvsbrnni = 0.4 ixc = 56 tdmptf = 25.0 -* thkcas [m] +* dr_tf_nose_case [m] ixc = 57 -thkcas = 0.5 +dr_tf_nose_case = 0.5 * TF coil conduit thickness [m] ixc = 58 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 97d71d4735..be1d859051 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -692,7 +692,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 2.8216E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.8216E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.5456E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.7486E-01 @@ -1434,9 +1434,9 @@ fvsbrnni = 0.4 ixc = 56 tdmptf = 25.0 -* thkcas [m] +* dr_tf_nose_case [m] ixc = 57 -thkcas = 0.5 +dr_tf_nose_case = 0.5 * TF coil conduit thickness [m] ixc = 58 diff --git a/tests/integration/data/large_tokamak_IN.DAT b/tests/integration/data/large_tokamak_IN.DAT index ff04ea734f..299cf2d0f7 100644 --- a/tests/integration/data/large_tokamak_IN.DAT +++ b/tests/integration/data/large_tokamak_IN.DAT @@ -244,9 +244,9 @@ fvsbrnni = 0.4 ixc = 56 tdmptf = 25.0 -* thkcas [m] +* dr_tf_nose_case [m] ixc = 57 -thkcas = 0.5 +dr_tf_nose_case = 0.5 * TF coil conduit thickness [m] ixc = 58 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 2353174486..75efaa3ff5 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -695,7 +695,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 2.8843E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.8843E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.6337E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.8202E-01 @@ -1435,9 +1435,9 @@ fvsbrnni = 0.4 ixc = 56 tdmptf = 25.0 -* thkcas [m] +* dr_tf_nose_case [m] ixc = 57 -thkcas = 0.5 +dr_tf_nose_case = 0.5 * TF coil conduit thickness [m] ixc = 58 diff --git a/tests/integration/data/large_tokamak_once_through.IN.DAT b/tests/integration/data/large_tokamak_once_through.IN.DAT index 10c6508b65..fb760715cf 100644 --- a/tests/integration/data/large_tokamak_once_through.IN.DAT +++ b/tests/integration/data/large_tokamak_once_through.IN.DAT @@ -60,7 +60,7 @@ ixc = 37 * j_cs_flat_top_end ixc = 41 * f_j_cs_start_pulse_end_flat_top ixc = 44 * fvsbrnni ixc = 56 * tdmptf -ixc = 57 * thkcas +ixc = 57 * dr_tf_nose_case ixc = 58 * thwcndut boundl(58) = 0.008 ixc = 59 * fcutfsu @@ -417,7 +417,7 @@ 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_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_nose_case = 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) thwcndut = 0.008012110032981922 * TF coil conduit case thickness (m) (`iteration variable 58`) tinstf = 0.008 * Thickness of the ground insulation layer surrounding (m) diff --git a/tests/integration/data/ref_IN.DAT b/tests/integration/data/ref_IN.DAT index ea70bb398b..1c038323c7 100644 --- a/tests/integration/data/ref_IN.DAT +++ b/tests/integration/data/ref_IN.DAT @@ -64,7 +64,7 @@ boundu(50) = 1.0 ixc = 51 * fvdump ixc = 53 * fjprot ixc = 56 * tdmptf -ixc = 57 * thkcas +ixc = 57 * dr_tf_nose_case ixc = 58 * thwcndut boundl(58) = 8.0d-3 ixc = 61 * dr_shld_vv_gap_inboard @@ -310,7 +310,7 @@ 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) thicndut = 2.0d-3 * Conduit insulation thickness (m) -thkcas = 0.495 * Inboard tf coil case outer (non-plasma side) thickness (m) +dr_tf_nose_case = 0.495 * Inboard tf coil case outer (non-plasma side) thickness (m) thwcndut = 0.008 * Tf coil conduit case thickness (m) tinstf = 0.008 * Ground insulation thickness surrounding winding pack (m) tmargmin = 1.500 * Minimum allowable temperature margin (cs and tf coils) (k) @@ -359,7 +359,7 @@ t_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) vdalw = 1.0000E+01 fjprot = 1.0000E+00 tdmptf = 2.5829E+01 - thkcas = 5.2465E-01 + dr_tf_nose_case = 5.2465E-01 thwcndut = 8.0000E-03 dr_shld_vv_gap_inboard = 2.0000E-02 fl_h_threshold = 1.4972E+00 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 0b5918c581..108e4e4e0f 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -693,7 +693,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 2.6707E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.6707E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.3122E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.4883E-01 @@ -1856,7 +1856,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 2.5744E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.5744E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.1884E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.4179E-01 @@ -3019,7 +3019,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 2.5098E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.5098E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.0995E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.3467E-01 @@ -4182,7 +4182,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 2.5136E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.5136E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.1061E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.3564E-01 @@ -5345,7 +5345,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 2.5568E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.5568E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.1735E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.4356E-01 @@ -6508,7 +6508,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 2.6314E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.6314E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.2805E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.5336E-01 @@ -7671,7 +7671,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 2.6359E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.6359E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.2885E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.5458E-01 @@ -8834,7 +8834,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 2.5713E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.5713E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.1963E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.4625E-01 @@ -9997,7 +9997,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 2.5136E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.5136E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.1119E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.3798E-01 @@ -11160,7 +11160,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 2.5159E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.5159E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.1159E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.3854E-01 @@ -12323,7 +12323,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 2.5705E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.5705E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.1979E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.4722E-01 @@ -13486,7 +13486,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 2.6317E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.6317E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.2865E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.5559E-01 @@ -14649,7 +14649,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 2.6346E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.6346E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.2915E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.5629E-01 @@ -15812,7 +15812,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 2.5747E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.5747E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.2028E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.4737E-01 @@ -16975,7 +16975,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 2.5148E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.5148E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.1143E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.3842E-01 @@ -17720,9 +17720,9 @@ fvsbrnni = 0.4 ixc = 56 tdmptf = 25.0 -* thkcas [m] +* dr_tf_nose_case [m] ixc = 57 -thkcas = 0.5 +dr_tf_nose_case = 0.5 * TF coil conduit thickness [m] ixc = 58 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 68a9c1564e..3d64c2f771 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -539,7 +539,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 3.7026E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 3.7026E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 1.2094E+06 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 1.1243E+00 @@ -1534,7 +1534,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 3.7026E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 3.7026E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 1.2094E+06 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 1.1243E+00 @@ -2529,7 +2529,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 3.7027E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 3.7027E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 1.2094E+06 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 1.1243E+00 @@ -3524,7 +3524,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 3.7028E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 3.7028E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 1.2094E+06 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 1.1243E+00 @@ -4519,7 +4519,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 3.7029E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 3.7029E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 1.2094E+06 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 1.1243E+00 @@ -5514,7 +5514,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 3.7029E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 3.7029E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 1.2094E+06 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 1.1243E+00 @@ -6509,7 +6509,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 3.7030E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 3.7030E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 1.2094E+06 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 1.1243E+00 @@ -7504,7 +7504,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 3.7030E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 3.7030E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 1.2094E+06 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 1.1243E+00 @@ -8499,7 +8499,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 3.7031E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 3.7031E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 1.2094E+06 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 1.1243E+00 @@ -9043,7 +9043,7 @@ ixc = 52 * vdalw boundu(52) = 10.0 ixc = 53 * fjprot ixc = 56 * tdmptf -ixc = 57 * thkcas +ixc = 57 * dr_tf_nose_case ixc = 58 * thwcndut boundl(58) = 8.0d-3 ixc = 61 * dr_shld_vv_gap_inboard @@ -9290,7 +9290,7 @@ sig_tf_wp_max = 5.8E8 * Allowable maximum shear stress in TF coil conduit (Tr 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) thicndut = 2.0d-3 * Conduit insulation thickness (m) -thkcas = 0.495 * Inboard tf coil case outer (non-plasma side) thickness (m) +dr_tf_nose_case = 0.495 * Inboard tf coil case outer (non-plasma side) thickness (m) thwcndut = 0.008 * Tf coil conduit case thickness (m) tinstf = 0.008 * Ground insulation thickness surrounding winding pack (m) tmargmin = 1.500 * Minimum allowable temperature margin (cs and tf coils) (k) @@ -9339,7 +9339,7 @@ t_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) vdalw = 1.0000E+01 fjprot = 1.0000E+00 tdmptf = 2.5829E+01 - thkcas = 5.2465E-01 + dr_tf_nose_case = 5.2465E-01 thwcndut = 8.0000E-03 dr_shld_vv_gap_inboard = 2.0000E-02 fl_h_threshold = 1.4972E+00 diff --git a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT index d0f7a92d4d..133dbc376a 100644 --- a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT +++ b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT @@ -64,7 +64,7 @@ boundu(50) = 1.0 ixc = 51 * fvdump ixc = 53 * fjprot ixc = 56 * tdmptf -ixc = 57 * thkcas +ixc = 57 * dr_tf_nose_case ixc = 58 * thwcndut boundl(58) = 8.0d-3 ixc = 61 * dr_shld_vv_gap_inboard @@ -310,7 +310,7 @@ 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) thicndut = 2.0d-3 * Conduit insulation thickness (m) -thkcas = 0.495 * Inboard tf coil case outer (non-plasma side) thickness (m) +dr_tf_nose_case = 0.495 * Inboard tf coil case outer (non-plasma side) thickness (m) thwcndut = 0.008 * Tf coil conduit case thickness (m) tinstf = 0.008 * Ground insulation thickness surrounding winding pack (m) tmargmin = 1.500 * Minimum allowable temperature margin (cs and tf coils) (k) @@ -359,7 +359,7 @@ t_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) vdalw = 1.0000E+01 fjprot = 1.0000E+00 tdmptf = 2.5829E+01 - thkcas = 5.2465E-01 + dr_tf_nose_case = 5.2465E-01 thwcndut = 8.0000E-03 dr_shld_vv_gap_inboard = 2.0000E-02 fl_h_threshold = 1.4972E+00 diff --git a/tests/integration/data/uncertainties_ref_IN.DAT b/tests/integration/data/uncertainties_ref_IN.DAT index 9d022ffb48..6f81908315 100644 --- a/tests/integration/data/uncertainties_ref_IN.DAT +++ b/tests/integration/data/uncertainties_ref_IN.DAT @@ -64,7 +64,7 @@ boundu(50) = 1.0 ixc = 51 * fvdump ixc = 53 * fjprot ixc = 56 * tdmptf -ixc = 57 * thkcas +ixc = 57 * dr_tf_nose_case ixc = 58 * thwcndut boundl(58) = 8.0d-3 ixc = 61 * dr_shld_vv_gap_inboard @@ -310,7 +310,7 @@ 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) thicndut = 2.0d-3 * Conduit insulation thickness (m) -thkcas = 0.495 * Inboard tf coil case outer (non-plasma side) thickness (m) +dr_tf_nose_case = 0.495 * Inboard tf coil case outer (non-plasma side) thickness (m) thwcndut = 0.008 * Tf coil conduit case thickness (m) tinstf = 0.008 * Ground insulation thickness surrounding winding pack (m) tmargmin = 1.500 * Minimum allowable temperature margin (cs and tf coils) (k) @@ -359,7 +359,7 @@ t_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) vdalw = 1.0000E+01 fjprot = 1.0000E+00 tdmptf = 2.5829E+01 - thkcas = 5.2465E-01 + dr_tf_nose_case = 5.2465E-01 thwcndut = 8.0000E-03 dr_shld_vv_gap_inboard = 2.0000E-02 fl_h_threshold = 1.4972E+00 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 0403a135b1..68eeaff4a7 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -7546,7 +7546,7 @@ "thick_sw_ib": 0.025, "thick_sw_ob": 0.025, "thicndut": 0.0008, - "thkcas": 0.3, + "dr_tf_nose_case": 0.3, "thshield": 0.05, "thwcndut": 0.008, "ti": 12.9, @@ -9900,8 +9900,8 @@ "kron": "", "lablcc": "lablcc(ipeqns) : labels describing constraint equations (corresponding itvs)
              \n
              \n
            • ( 1) Beta (consistency equation) (itv 5)\n
            • ( 2) Global power balance (consistency equation) (itv 10,1,2,3,4,6,11)\n
            • ( 3) Ion power balance DEPRECATED (itv 10,1,2,3,4,6,11)\n
            • ( 4) Electron power balance DEPRECATED (itv 10,1,2,3,4,6,11)\n
            • ( 5) Density upper limit (itv 9,1,2,3,4,5,6)\n
            • ( 6) (Epsilon x beta poloidal) upper limit (itv 8,1,2,3,4,6)\n
            • ( 7) Beam ion density (NBI) (consistency equation) (itv 7)\n
            • ( 8) Neutron wall load upper limit (itv 14,1,2,3,4,6)\n
            • ( 9) Fusion power upper limit (itv 26,1,2,3,4,6)\n
            • (10) Toroidal field 1/R (consistency equation) (itv 12,1,2,3,13 )\n
            • (11) Radial build (consistency equation) (itv 3,1,13,16,29,42,61)\n
            • (12) Volt second lower limit (STEADY STATE) (itv 15,1,2,3)\n
            • (13) Burn time lower limit (PULSE) (itv 21,1,16,17,29,42,44,61)\n (itv 19,1,2,3,6)\n
            • (14) Neutral beam decay lengths to plasma centre (NBI) (consistency equation)\n
            • (15) LH power threshold limit (itv 103)\n
            • (16) Net electric power lower limit (itv 25,1,2,3)\n
            • (17) Radiation fraction upper limit (itv 28)\n
            • (18) Divertor heat load upper limit (itv 27)\n
            • (19) MVA upper limit (itv 30)\n
            • (20) Neutral beam tangency radius upper limit (NBI) (itv 33,31,3,13)\n
            • (21) Plasma minor radius lower limit (itv 32)\n
            • (22) Divertor collisionality upper limit (itv 34,43)\n
            • (23) Conducting shell to plasma minor radius ratio upper limit\n (itv 104,1,74)\n
            • (24) Beta upper limit (itv 36,1,2,3,4,6,18)\n
            • (25) Peak toroidal field upper limit (itv 35,3,13,29)\n
            • (26) Central solenoid EOF current density upper limit (i_pf_conductor=0)\n (itv 38,37,41,12)\n
            • (27) Central solenoid BOP current density upper limit (i_pf_conductor=0)\n (itv 39,37,41,12)\n
            • (28) Fusion gain Q lower limit (itv 45,47,40)\n
            • (29) Inboard radial build consistency (itv 3,1,13,16,29,42,61)\n
            • (30) Injection power upper limit (itv 46,47,11)\n
            • (31) TF coil case stress upper limit (SCTF) (itv 48,56,57,58,59,60,24)\n
            • (32) TF coil conduit stress upper limit (SCTF) (itv 49,56,57,58,59,60,24)\n
            • (33) I_op / I_critical (TF coil) (SCTF) (itv 50,56,57,58,59,60,24)\n
            • (34) Dump voltage upper limit (SCTF) (itv 51,52,56,57,58,59,60,24)\n
            • (35) J_winding pack/J_protection upper limit (SCTF) (itv 53,56,57,58,59,60,24)\n
            • (36) TF coil temperature margin lower limit (SCTF) (itv 54,55,56,57,58,59,60,24)\n
            • (37) Current drive gamma upper limit (itv 40,47)\n
            • (38) First wall coolant temperature rise upper limit (itv 62)\n
            • (39) First wall peak temperature upper limit (itv 63)\n
            • (40) Start-up injection power lower limit (PULSE) (itv 64)\n
            • (41) Plasma current ramp-up time lower limit (PULSE) (itv 66,65)\n
            • (42) Cycle time lower limit (PULSE) (itv 17,67,65)\n
            • (43) Average centrepost temperature\n (TART) (consistency equation) (itv 13,20,69,70)\n
            • (44) Peak centrepost temperature upper limit (TART) (itv 68,69,70)\n
            • (45) Edge safety factor lower limit (TART) (itv 71,1,2,3)\n
            • (46) Equation for Ip/Irod upper limit (TART) (itv 72,2,60)\n
            • (47) NOT USED\n
            • (48) Poloidal beta upper limit (itv 79,2,3,18)\n
            • (49) NOT USED\n
            • (50) IFE repetition rate upper limit (IFE)\n
            • (51) Startup volt-seconds consistency (PULSE) (itv 16,29,3,1)\n
            • (52) Tritium breeding ratio lower limit (itv 89,90,91)\n
            • (53) Neutron fluence on TF coil upper limit (itv 92,93,94)\n
            • (54) Peak TF coil nuclear heating upper limit (itv 95,93,94)\n
            • (55) Vacuum vessel helium concentration upper limit i_blanket_type =2 (itv 96,93,94)\n
            • (56) Pseparatrix/Rmajor upper limit (itv 97,1,3)\n
            • (57) NOT USED\n
            • (58) NOT USED\n
            • (59) Neutral beam shine-through fraction upper limit (NBI) (itv 105,6,19,4 )\n
            • (60) Central solenoid temperature margin lower limit (SCTF) (itv 106)\n
            • (61) Minimum availability value (itv 107)\n
            • (62) f_alpha_energy_confinement the ratio of particle to energy confinement times (itv 110)\n
            • (63) The number of ITER-like vacuum pumps niterpump < tfno (itv 111)\n
            • (64) Zeff less than or equal to zeffmax (itv 112)\n
            • (65) Dump time set by VV loads (itv 56, 113)\n
            • (66) Limit on rate of change of energy in poloidal field\n (Use iteration variable 65(t_current_ramp_up), 115)\n
            • (67) Simple Radiation Wall load limit (itv 116, 4,6)\n
            • (68) Psep * Bt / qAR upper limit (itv 117)\n
            • (69) ensure separatrix power = the value from Kallenbach divertor (itv 118)\n
            • (70) ensure that teomp = separatrix temperature in the pedestal profile,\n (itv 119 (tesep))\n
            • (71) ensure that neomp = separatrix density (nesep) x neratio\n
            • (72) central solenoid shear stress limit (Tresca yield criterion) (itv 123 foh_stress)\n
            • (73) Psep >= Plh + Paux (itv 137 (fplhsep))\n
            • (74) TFC quench < tmax_croco (itv 141 (fcqt))\n
            • (75) TFC current/copper area < Maximum (itv 143 f_coppera_m2)\n
            • (76) Eich critical separatrix density\n
            • (77) TF coil current per turn upper limit\n
            • (78) Reinke criterion impurity fraction lower limit (itv 147 freinke)\n
            • (79) Peak CS field upper limit (itv 149 fb_cs_limit_max)\n
            • (80) Divertor power lower limit pdivt (itv 153 fpdivlim)\n
            • (81) Ne(0) > ne(ped) constraint (itv 154 fne0)\n
            • (82) toroidalgap > tftort constraint (itv 171 ftoroidalgap)\n
            • (83) Radial build consistency for stellarators (itv 172 f_avspace)\n
            • (84) Lower limit for beta (itv 173 fbeta_min)\n
            • (85) Constraint for CP lifetime\n
            • (86) Constraint for TF coil turn dimension\n
            • (87) Constraint for cryogenic power\n
            • (88) Constraint for TF coil strain absolute value\n
            • (89) Constraint for CS coil quench protection\n
            • (90) Checking if the design point is ECRH ignitable (itv 164 fecrh_ignition)
            \n\n\n\n", "lablmm": "lablmm(ipnfoms) : labels describing figures of merit:
              \n
              \n
            • ( 1) major radius\n
            • ( 2) not used\n
            • ( 3) neutron wall load\n
            • ( 4) P_tf + P_pf\n
            • ( 5) fusion gain Q\n
            • ( 6) cost of electricity\n
            • ( 7) capital cost (direct cost if ireactor=0,\n constructed cost otherwise)\n
            • ( 8) aspect ratio\n
            • ( 9) divertor heat load\n
            • (10) toroidal field\n
            • (11) total injected power\n
            • (12) hydrogen plant capital cost OBSOLETE\n
            • (13) hydrogen production rate OBSOLETE\n
            • (14) pulse length\n
            • (15) plant availability factor (N.B. requires\n iavail=1 to be set)\n
            • (16) linear combination of major radius (minimised) and pulse length (maximised)\n note: FoM should be minimised only!\n
            • (17) net electrical output\n
            • (18) Null Figure of Merit\n
            • (19) linear combination of big Q and pulse length (maximised)\n note: FoM should be minimised only!
            \n\n\n", - "lablxc": "lablxc(ipnvars) : labels describing iteration variables
              \n
              \n
            • ( 1) aspect\n
            • ( 2) bt\n
            • ( 3) rmajor\n
            • ( 4) te\n
            • ( 5) beta\n
            • ( 6) dene\n
            • ( 7) f_nd_beam_electron\n
            • ( 8) fbeta_poloidal_eps (f-value for equation 6)\n
            • ( 9) fdene (f-value for equation 5)\n
            • (10) hfact\n
            • (11) pheat\n
            • (12) oacdcp\n
            • (13) dr_tf_inboard (NOT RECOMMENDED)\n
            • (14) fwalld (f-value for equation 8)\n
            • (15) fvs (f-value for equation 12)\n
            • (16) dr_cs\n
            • (17) tdwell\n
            • (18) q\n
            • (19) beam_energy\n
            • (20) temp_cp_average\n
            • (21) ftburn (f-value for equation 13)\n
            • (22) NOT USED\n
            • (23) fcoolcp\n
            • (24) NOT USED\n
            • (25) fpnetel (f-value for equation 16)\n
            • (26) ffuspow (f-value for equation 9)\n
            • (27) fhldiv (f-value for equation 18)\n
            • (28) fradpwr (f-value for equation 17), total radiation fraction\n
            • (29) dr_bore\n
            • (30) fmva (f-value for equation 19)\n
            • (31) gapomin\n
            • (32) frminor (f-value for equation 21)\n
            • (33) fportsz (f-value for equation 20)\n
            • (34) fdivcol (f-value for equation 22)\n
            • (35) fpeakb (f-value for equation 25)\n
            • (36) fbeta_max (f-value for equation 24)\n
            • (37) j_cs_flat_top_end\n
            • (38) fjohc (f-value for equation 26)\n
            • (39) fjohc0 (f-value for equation 27)\n
            • (40) fgamcd (f-value for equation 37)\n
            • (41) f_j_cs_start_pulse_end_flat_top\n
            • (42) dr_cs_tf_gap\n
            • (43) NOT USED\n
            • (44) fvsbrnni\n
            • (45) fqval (f-value for equation 28)\n
            • (46) fpinj (f-value for equation 30)\n
            • (47) feffcd\n
            • (48) fstrcase (f-value for equation 31)\n
            • (49) fstrcond (f-value for equation 32)\n
            • (50) fiooic (f-value for equation 33)\n
            • (51) fvdump (f-value for equation 34)\n
            • (52) vdalw\n
            • (53) fjprot (f-value for equation 35)\n
            • (54) ftmargtf (f-value for equation 36)\n
            • (55) NOT USED\n
            • (56) tdmptf\n
            • (57) thkcas\n
            • (58) thwcndut\n
            • (59) fcutfsu\n
            • (60) cpttf\n
            • (61) dr_shld_vv_gap_inboard\n
            • (62) fdtmp (f-value for equation 38)\n
            • (63) ftpeak (f-value for equation 39)\n
            • (64) fauxmn (f-value for equation 40)\n
            • (65) tohs\n
            • (66) ftohs (f-value for equation 41)\n
            • (67) ftcycl (f-value for equation 42)\n
            • (68) fptemp (f-value for equation 44)\n
            • (69) rcool\n
            • (70) vcool\n
            • (71) fq (f-value for equation 45)\n
            • (72) fipir (f-value for equation 46)\n
            • (73) dr_fw_plasma_gap_inboard\n
            • (74) dr_fw_plasma_gap_outboard\n
            • (75) tfootfi\n
            • (76) NOT USED\n
            • (77) NOT USED\n
            • (78) NOT USED\n
            • (79) fbeta_poloidal (f-value for equation 48)\n
            • (80) NOT USED\n
            • (81) edrive\n
            • (82) drveff\n
            • (83) tgain\n
            • (84) chrad\n
            • (85) pdrive\n
            • (86) frrmax (f-value for equation 50)\n
            • (87) NOT USED\n
            • (88) NOT USED\n
            • (89) ftbr (f-value for equation 52)\n
            • (90) blbuith\n
            • (91) blbuoth\n
            • (92) fflutf (f-value for equation 53)\n
            • (93) dr_shld_inboard\n
            • (94) dr_shld_outboard\n
            • (95) fptfnuc (f-value for equation 54)\n
            • (96) fvvhe (f-value for equation 55)\n
            • (97) fpsepr (f-value for equation 56)\n
            • (98) f_blkt_li6_enrichment\n
            • (99) NOT USED\n
            • (100) NOT USED\n
            • (101) NOT USED\n
            • (102) fimpvar\n
            • (103) fl_h_threshold (f-value for equation 15)\n
            • (104)fr_conducting_wall (f-value for equation 23)\n
            • (105) fnbshinef (f-value for equation 59)\n
            • (106) ftmargoh (f-value for equation 60)\n
            • (107) favail (f-value for equation 61)\n
            • (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)\n
            • (109) f_nd_alpha_electron: thermal alpha density / electron density\n
            • (110) falpha_energy_confinement: Lower limit on f_alpha_energy_confinement the ratio of alpha\n
            • (111) fniterpump: f-value for constraint that number\n
            • (112) fzeffmax: f-value for max Zeff (f-value for equation 64)\n
            • (113) ftaucq: f-value for minimum quench time (f-value for equation 65)\n
            • (114) len_fw_channel: Length of a single first wall channel\n
            • (115) fpoloidalpower: f-value for max rate of change of\n
            • (116) fradwall: f-value for radiation wall load limit (eq. 67)\n
            • (117) fpsepbqar: f-value for Psep*Bt/qar upper limit (eq. 68)\n
            • (118) fpsep: f-value to ensure separatrix power is less than\n
            • (119) tesep: separatrix temperature calculated by the Kallenbach divertor model\n
            • (120) ttarget: Plasma temperature adjacent to divertor sheath [eV]\n
            • (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP\n
            • (122) f_a_cs_steel : streel fraction of Central Solenoid\n
            • (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72)\n
            • (124) qtargettotal : Power density on target including surface recombination [W/m2]\n
            • (125) fimp(3) : Beryllium density fraction relative to electron density\n
            • (126) fimp(4) : Carbon density fraction relative to electron density\n
            • (127) fimp(5) : Nitrogen fraction relative to electron density\n
            • (128) fimp(6) : Oxygen density fraction relative to electron density\n
            • (129) fimp(7) : Neon density fraction relative to electron density\n
            • (130) fimp(8) : Silicon density fraction relative to electron density\n
            • (131) fimp(9) : Argon density fraction relative to electron density\n
            • (132) fimp(10) : Iron density fraction relative to electron density\n
            • (133) fimp(11) : Nickel density fraction relative to electron density\n
            • (134) fimp(12) : Krypton density fraction relative to electron density\n
            • (135) fimp(13) : Xenon density fraction relative to electron density\n
            • (136) fimp(14) : Tungsten density fraction relative to electron density\n
            • (137) fplhsep (f-value for equation 73)\n
            • (138) rebco_thickness : thickness of REBCO layer in tape (m)\n
            • (139) copper_thick : thickness of copper layer in tape (m)\n
            • (140) dr_tf_wp : radial thickness of TFC winding pack (m)\n
            • (141) fcqt : TF coil quench temperature < tmax_croco (f-value for equation 74)\n
            • (142) nesep : electron density at separatrix [m-3]\n
            • (143) f_copperA_m2 : TF coil current / copper area < Maximum value\n
            • (144) fnesep : Eich critical electron density at separatrix\n
            • (145) fgwped : fraction of Greenwald density to set as pedestal-top density\n
            • (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77)\n
            • (147) freinke : F-value for Reinke detachment criterion (constraint equation 78)\n
            • (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion\n
            • (149) fb_cs_limit_max : F-value for max peak CS field (con. 79, itvar 149)\n
            • (152) fb_cs_limit_max : Ratio of separatrix density to Greenwald density\n
            • (153) fpdivlim : F-value for minimum pdivt (con. 80)\n
            • (154) fne0 : F-value for ne(0) > ne(ped) (con. 81)\n
            • (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only)\n
            • (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only)\n
            • (157) fvs_cs_pf_total_ramp : F-value for available to required start up flux (con. 51)\n
            • (158) croco_thick : Thickness of CroCo copper tube (m)\n
            • (159) ftoroidalgap : F-value for toroidalgap > dx_tf_inboard_out_toroidal constraint (con. 82)\n
            • (160) f_avspace (f-value for equation 83)\n
            • (161) fbeta_min (f-value for equation 84)\n
            • (162) r_cp_top : Top outer radius of the centropost (ST only) (m)\n
            • (163) f_t_turn_tf : f-value for TF coils WP trurn squared dimension constraint\n
            • (164) f_crypmw : f-value for cryogenic plant power\n
            • (165) fstr_wp : f-value for TF coil strain absolute value\n
            • (166) f_copperaoh_m2 : CS coil current /copper area < Maximum value\n
            • (167) fecrh_ignition: f-value for equation 90\n
            • (168) EMPTY : Description\n
            • (169) EMPTY : Description\n
            • (170) EMPTY : Description\n
            • (171) EMPTY : Description\n
            • (172) EMPTY : Description\n
            • (173) EMPTY : Description\n
            • (174) EMPTY : Description\n
            • (175) EMPTY : Description\n\n\n\n", - "lablxc": "lablxc(ipnvars) : labels describing iteration variables
                \n
                \n
              • ( 1) aspect\n
              • ( 2) bt\n
              • ( 3) rmajor\n
              • ( 4) te\n
              • ( 5) beta\n
              • ( 6) dene\n
              • ( 7) f_nd_beam_electron\n
              • ( 8) fbeta_poloidal_eps (f-value for equation 6)\n
              • ( 9) fdene (f-value for equation 5)\n
              • (10) hfact\n
              • (11) pheat\n
              • (12) oacdcp\n
              • (13) dr_tf_inboard (NOT RECOMMENDED)\n
              • (14) fwalld (f-value for equation 8)\n
              • (15) fvs (f-value for equation 12)\n
              • (16) dr_cs\n
              • (17) t_between_pulse\n
              • (18) q\n
              • (19) beam_energy\n
              • (20) temp_cp_average\n
              • (21) ft_burn (f-value for equation 13)\n
              • (22) NOT USED\n
              • (23) fcoolcp\n
              • (24) NOT USED\n
              • (25) fpnetel (f-value for equation 16)\n
              • (26) ffuspow (f-value for equation 9)\n
              • (27) fhldiv (f-value for equation 18)\n
              • (28) fradpwr (f-value for equation 17), total radiation fraction\n
              • (29) dr_bore\n
              • (30) fmva (f-value for equation 19)\n
              • (31) gapomin\n
              • (32) frminor (f-value for equation 21)\n
              • (33) fportsz (f-value for equation 20)\n
              • (34) fdivcol (f-value for equation 22)\n
              • (35) fpeakb (f-value for equation 25)\n
              • (36) fbeta_max (f-value for equation 24)\n
              • (37) j_cs_flat_top_end\n
              • (38) fjohc (f-value for equation 26)\n
              • (39) fjohc0 (f-value for equation 27)\n
              • (40) fgamcd (f-value for equation 37)\n
              • (41) f_j_cs_start_pulse_end_flat_top\n
              • (42) dr_cs_tf_gap\n
              • (43) NOT USED\n
              • (44) fvsbrnni\n
              • (45) fqval (f-value for equation 28)\n
              • (46) fpinj (f-value for equation 30)\n
              • (47) feffcd\n
              • (48) fstrcase (f-value for equation 31)\n
              • (49) fstrcond (f-value for equation 32)\n
              • (50) fiooic (f-value for equation 33)\n
              • (51) fvdump (f-value for equation 34)\n
              • (52) vdalw\n
              • (53) fjprot (f-value for equation 35)\n
              • (54) ftmargtf (f-value for equation 36)\n
              • (55) NOT USED\n
              • (56) tdmptf\n
              • (57) thkcas\n
              • (58) thwcndut\n
              • (59) fcutfsu\n
              • (60) cpttf\n
              • (61) dr_shld_vv_gap_inboard\n
              • (62) fdtmp (f-value for equation 38)\n
              • (63) ftpeak (f-value for equation 39)\n
              • (64) fauxmn (f-value for equation 40)\n
              • (65) t_current_ramp_up\n
              • (66) ft_current_ramp_up (f-value for equation 41)\n
              • (67) ftcycl (f-value for equation 42)\n
              • (68) fptemp (f-value for equation 44)\n
              • (69) rcool\n
              • (70) vcool\n
              • (71) fq (f-value for equation 45)\n
              • (72) fipir (f-value for equation 46)\n
              • (73) dr_fw_plasma_gap_inboard\n
              • (74) dr_fw_plasma_gap_outboard\n
              • (75) tfootfi\n
              • (76) NOT USED\n
              • (77) NOT USED\n
              • (78) NOT USED\n
              • (79) fbetap (f-value for equation 48)\n
              • (80) NOT USED\n
              • (81) edrive\n
              • (82) drveff\n
              • (83) tgain\n
              • (84) chrad\n
              • (85) pdrive\n
              • (86) frrmax (f-value for equation 50)\n
              • (87) NOT USED\n
              • (88) NOT USED\n
              • (89) ftbr (f-value for equation 52)\n
              • (90) blbuith\n
              • (91) blbuoth\n
              • (92) fflutf (f-value for equation 53)\n
              • (93) dr_shld_inboard\n
              • (94) dr_shld_outboard\n
              • (95) fptfnuc (f-value for equation 54)\n
              • (96) fvvhe (f-value for equation 55)\n
              • (97) fpsepr (f-value for equation 56)\n
              • (98) f_blkt_li6_enrichment\n
              • (99) NOT USED\n
              • (100) NOT USED\n
              • (101) NOT USED\n
              • (102) fimpvar\n
              • (103) fl_h_threshold (f-value for equation 15)\n
              • (104)fr_conducting_wall (f-value for equation 23)\n
              • (105) fnbshinef (f-value for equation 59)\n
              • (106) ftmargoh (f-value for equation 60)\n
              • (107) favail (f-value for equation 61)\n
              • (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)\n
              • (109) f_nd_alpha_electron: thermal alpha density / electron density\n
              • (110) falpha_energy_confinement: Lower limit on f_alpha_energy_confinement the ratio of alpha\n
              • (111) fniterpump: f-value for constraint that number\n
              • (112) fzeffmax: f-value for max Zeff (f-value for equation 64)\n
              • (113) ftaucq: f-value for minimum quench time (f-value for equation 65)\n
              • (114) len_fw_channel: Length of a single first wall channel\n
              • (115) fpoloidalpower: f-value for max rate of change of\n
              • (116) fradwall: f-value for radiation wall load limit (eq. 67)\n
              • (117) fpsepbqar: f-value for Psep*Bt/qar upper limit (eq. 68)\n
              • (118) fpsep: f-value to ensure separatrix power is less than\n
              • (119) tesep: separatrix temperature calculated by the Kallenbach divertor model\n
              • (120) ttarget: Plasma temperature adjacent to divertor sheath [eV]\n
              • (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP\n
              • (122) f_a_cs_steel : streel fraction of Central Solenoid\n
              • (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72)\n
              • (124) qtargettotal : Power density on target including surface recombination [W/m2]\n
              • (125) fimp(3) : Beryllium density fraction relative to electron density\n
              • (126) fimp(4) : Carbon density fraction relative to electron density\n
              • (127) fimp(5) : Nitrogen fraction relative to electron density\n
              • (128) fimp(6) : Oxygen density fraction relative to electron density\n
              • (129) fimp(7) : Neon density fraction relative to electron density\n
              • (130) fimp(8) : Silicon density fraction relative to electron density\n
              • (131) fimp(9) : Argon density fraction relative to electron density\n
              • (132) fimp(10) : Iron density fraction relative to electron density\n
              • (133) fimp(11) : Nickel density fraction relative to electron density\n
              • (134) fimp(12) : Krypton density fraction relative to electron density\n
              • (135) fimp(13) : Xenon density fraction relative to electron density\n
              • (136) fimp(14) : Tungsten density fraction relative to electron density\n
              • (137) fplhsep (f-value for equation 73)\n
              • (138) rebco_thickness : thickness of REBCO layer in tape (m)\n
              • (139) copper_thick : thickness of copper layer in tape (m)\n
              • (140) dr_tf_wp : radial thickness of TFC winding pack (m)\n
              • (141) fcqt : TF coil quench temperature < tmax_croco (f-value for equation 74)\n
              • (142) nesep : electron density at separatrix [m-3]\n
              • (143) f_copperA_m2 : TF coil current / copper area < Maximum value\n
              • (144) fnesep : Eich critical electron density at separatrix\n
              • (145) fgwped : fraction of Greenwald density to set as pedestal-top density\n
              • (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77)\n
              • (147) freinke : F-value for Reinke detachment criterion (constraint equation 78)\n
              • (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion\n
              • (149) fb_cs_limit_max : F-value for max peak CS field (con. 79, itvar 149)\n
              • (152) fb_cs_limit_max : Ratio of separatrix density to Greenwald density\n
              • (153) fpdivlim : F-value for minimum pdivt (con. 80)\n
              • (154) fne0 : F-value for ne(0) > ne(ped) (con. 81)\n
              • (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only)\n
              • (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only)\n
              • (157) fvs_cs_pf_total_ramp : F-value for available to required start up flux (con. 51)\n
              • (158) croco_thick : Thickness of CroCo copper tube (m)\n
              • (159) ftoroidalgap : F-value for toroidalgap > dx_tf_inboard_out_toroidal constraint (con. 82)\n
              • (160) f_avspace (f-value for equation 83)\n
              • (161) fbeta_min (f-value for equation 84)\n
              • (162) r_cp_top : Top outer radius of the centropost (ST only) (m)\n
              • (163) f_t_turn_tf : f-value for TF coils WP trurn squared dimension constraint\n
              • (164) f_crypmw : f-value for cryogenic plant power\n
              • (165) fstr_wp : f-value for TF coil strain absolute value\n
              • (166) f_copperaoh_m2 : CS coil current /copper area < Maximum value\n
              • (167) fecrh_ignition: f-value for equation 90\n
              • (168) EMPTY : Description\n
              • (169) EMPTY : Description\n
              • (170) EMPTY : Description\n
              • (171) EMPTY : Description\n
              • (172) EMPTY : Description\n
              • (173) EMPTY : Description\n
              • (174) EMPTY : Description\n
              • (175) EMPTY : Description\n\n\n\n", + "lablxc": "lablxc(ipnvars) : labels describing iteration variables
                  \n
                  \n
                • ( 1) aspect\n
                • ( 2) bt\n
                • ( 3) rmajor\n
                • ( 4) te\n
                • ( 5) beta\n
                • ( 6) dene\n
                • ( 7) f_nd_beam_electron\n
                • ( 8) fbeta_poloidal_eps (f-value for equation 6)\n
                • ( 9) fdene (f-value for equation 5)\n
                • (10) hfact\n
                • (11) pheat\n
                • (12) oacdcp\n
                • (13) dr_tf_inboard (NOT RECOMMENDED)\n
                • (14) fwalld (f-value for equation 8)\n
                • (15) fvs (f-value for equation 12)\n
                • (16) dr_cs\n
                • (17) tdwell\n
                • (18) q\n
                • (19) beam_energy\n
                • (20) temp_cp_average\n
                • (21) ftburn (f-value for equation 13)\n
                • (22) NOT USED\n
                • (23) fcoolcp\n
                • (24) NOT USED\n
                • (25) fpnetel (f-value for equation 16)\n
                • (26) ffuspow (f-value for equation 9)\n
                • (27) fhldiv (f-value for equation 18)\n
                • (28) fradpwr (f-value for equation 17), total radiation fraction\n
                • (29) dr_bore\n
                • (30) fmva (f-value for equation 19)\n
                • (31) gapomin\n
                • (32) frminor (f-value for equation 21)\n
                • (33) fportsz (f-value for equation 20)\n
                • (34) fdivcol (f-value for equation 22)\n
                • (35) fpeakb (f-value for equation 25)\n
                • (36) fbeta_max (f-value for equation 24)\n
                • (37) j_cs_flat_top_end\n
                • (38) fjohc (f-value for equation 26)\n
                • (39) fjohc0 (f-value for equation 27)\n
                • (40) fgamcd (f-value for equation 37)\n
                • (41) f_j_cs_start_pulse_end_flat_top\n
                • (42) dr_cs_tf_gap\n
                • (43) NOT USED\n
                • (44) fvsbrnni\n
                • (45) fqval (f-value for equation 28)\n
                • (46) fpinj (f-value for equation 30)\n
                • (47) feffcd\n
                • (48) fstrcase (f-value for equation 31)\n
                • (49) fstrcond (f-value for equation 32)\n
                • (50) fiooic (f-value for equation 33)\n
                • (51) fvdump (f-value for equation 34)\n
                • (52) vdalw\n
                • (53) fjprot (f-value for equation 35)\n
                • (54) ftmargtf (f-value for equation 36)\n
                • (55) NOT USED\n
                • (56) tdmptf\n
                • (57) dr_tf_nose_case\n
                • (58) thwcndut\n
                • (59) fcutfsu\n
                • (60) cpttf\n
                • (61) dr_shld_vv_gap_inboard\n
                • (62) fdtmp (f-value for equation 38)\n
                • (63) ftpeak (f-value for equation 39)\n
                • (64) fauxmn (f-value for equation 40)\n
                • (65) tohs\n
                • (66) ftohs (f-value for equation 41)\n
                • (67) ftcycl (f-value for equation 42)\n
                • (68) fptemp (f-value for equation 44)\n
                • (69) rcool\n
                • (70) vcool\n
                • (71) fq (f-value for equation 45)\n
                • (72) fipir (f-value for equation 46)\n
                • (73) dr_fw_plasma_gap_inboard\n
                • (74) dr_fw_plasma_gap_outboard\n
                • (75) tfootfi\n
                • (76) NOT USED\n
                • (77) NOT USED\n
                • (78) NOT USED\n
                • (79) fbeta_poloidal (f-value for equation 48)\n
                • (80) NOT USED\n
                • (81) edrive\n
                • (82) drveff\n
                • (83) tgain\n
                • (84) chrad\n
                • (85) pdrive\n
                • (86) frrmax (f-value for equation 50)\n
                • (87) NOT USED\n
                • (88) NOT USED\n
                • (89) ftbr (f-value for equation 52)\n
                • (90) blbuith\n
                • (91) blbuoth\n
                • (92) fflutf (f-value for equation 53)\n
                • (93) dr_shld_inboard\n
                • (94) dr_shld_outboard\n
                • (95) fptfnuc (f-value for equation 54)\n
                • (96) fvvhe (f-value for equation 55)\n
                • (97) fpsepr (f-value for equation 56)\n
                • (98) f_blkt_li6_enrichment\n
                • (99) NOT USED\n
                • (100) NOT USED\n
                • (101) NOT USED\n
                • (102) fimpvar\n
                • (103) fl_h_threshold (f-value for equation 15)\n
                • (104)fr_conducting_wall (f-value for equation 23)\n
                • (105) fnbshinef (f-value for equation 59)\n
                • (106) ftmargoh (f-value for equation 60)\n
                • (107) favail (f-value for equation 61)\n
                • (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)\n
                • (109) f_nd_alpha_electron: thermal alpha density / electron density\n
                • (110) falpha_energy_confinement: Lower limit on f_alpha_energy_confinement the ratio of alpha\n
                • (111) fniterpump: f-value for constraint that number\n
                • (112) fzeffmax: f-value for max Zeff (f-value for equation 64)\n
                • (113) ftaucq: f-value for minimum quench time (f-value for equation 65)\n
                • (114) len_fw_channel: Length of a single first wall channel\n
                • (115) fpoloidalpower: f-value for max rate of change of\n
                • (116) fradwall: f-value for radiation wall load limit (eq. 67)\n
                • (117) fpsepbqar: f-value for Psep*Bt/qar upper limit (eq. 68)\n
                • (118) fpsep: f-value to ensure separatrix power is less than\n
                • (119) tesep: separatrix temperature calculated by the Kallenbach divertor model\n
                • (120) ttarget: Plasma temperature adjacent to divertor sheath [eV]\n
                • (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP\n
                • (122) f_a_cs_steel : streel fraction of Central Solenoid\n
                • (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72)\n
                • (124) qtargettotal : Power density on target including surface recombination [W/m2]\n
                • (125) fimp(3) : Beryllium density fraction relative to electron density\n
                • (126) fimp(4) : Carbon density fraction relative to electron density\n
                • (127) fimp(5) : Nitrogen fraction relative to electron density\n
                • (128) fimp(6) : Oxygen density fraction relative to electron density\n
                • (129) fimp(7) : Neon density fraction relative to electron density\n
                • (130) fimp(8) : Silicon density fraction relative to electron density\n
                • (131) fimp(9) : Argon density fraction relative to electron density\n
                • (132) fimp(10) : Iron density fraction relative to electron density\n
                • (133) fimp(11) : Nickel density fraction relative to electron density\n
                • (134) fimp(12) : Krypton density fraction relative to electron density\n
                • (135) fimp(13) : Xenon density fraction relative to electron density\n
                • (136) fimp(14) : Tungsten density fraction relative to electron density\n
                • (137) fplhsep (f-value for equation 73)\n
                • (138) rebco_thickness : thickness of REBCO layer in tape (m)\n
                • (139) copper_thick : thickness of copper layer in tape (m)\n
                • (140) dr_tf_wp : radial thickness of TFC winding pack (m)\n
                • (141) fcqt : TF coil quench temperature < tmax_croco (f-value for equation 74)\n
                • (142) nesep : electron density at separatrix [m-3]\n
                • (143) f_copperA_m2 : TF coil current / copper area < Maximum value\n
                • (144) fnesep : Eich critical electron density at separatrix\n
                • (145) fgwped : fraction of Greenwald density to set as pedestal-top density\n
                • (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77)\n
                • (147) freinke : F-value for Reinke detachment criterion (constraint equation 78)\n
                • (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion\n
                • (149) fb_cs_limit_max : F-value for max peak CS field (con. 79, itvar 149)\n
                • (152) fb_cs_limit_max : Ratio of separatrix density to Greenwald density\n
                • (153) fpdivlim : F-value for minimum pdivt (con. 80)\n
                • (154) fne0 : F-value for ne(0) > ne(ped) (con. 81)\n
                • (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only)\n
                • (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only)\n
                • (157) fvs_cs_pf_total_ramp : F-value for available to required start up flux (con. 51)\n
                • (158) croco_thick : Thickness of CroCo copper tube (m)\n
                • (159) ftoroidalgap : F-value for toroidalgap > dx_tf_inboard_out_toroidal constraint (con. 82)\n
                • (160) f_avspace (f-value for equation 83)\n
                • (161) fbeta_min (f-value for equation 84)\n
                • (162) r_cp_top : Top outer radius of the centropost (ST only) (m)\n
                • (163) f_t_turn_tf : f-value for TF coils WP trurn squared dimension constraint\n
                • (164) f_crypmw : f-value for cryogenic plant power\n
                • (165) fstr_wp : f-value for TF coil strain absolute value\n
                • (166) f_copperaoh_m2 : CS coil current /copper area < Maximum value\n
                • (167) fecrh_ignition: f-value for equation 90\n
                • (168) EMPTY : Description\n
                • (169) EMPTY : Description\n
                • (170) EMPTY : Description\n
                • (171) EMPTY : Description\n
                • (172) EMPTY : Description\n
                • (173) EMPTY : Description\n
                • (174) EMPTY : Description\n
                • (175) EMPTY : Description\n\n\n\n", + "lablxc": "lablxc(ipnvars) : labels describing iteration variables
                    \n
                    \n
                  • ( 1) aspect\n
                  • ( 2) bt\n
                  • ( 3) rmajor\n
                  • ( 4) te\n
                  • ( 5) beta\n
                  • ( 6) dene\n
                  • ( 7) f_nd_beam_electron\n
                  • ( 8) fbeta_poloidal_eps (f-value for equation 6)\n
                  • ( 9) fdene (f-value for equation 5)\n
                  • (10) hfact\n
                  • (11) pheat\n
                  • (12) oacdcp\n
                  • (13) dr_tf_inboard (NOT RECOMMENDED)\n
                  • (14) fwalld (f-value for equation 8)\n
                  • (15) fvs (f-value for equation 12)\n
                  • (16) dr_cs\n
                  • (17) t_between_pulse\n
                  • (18) q\n
                  • (19) beam_energy\n
                  • (20) temp_cp_average\n
                  • (21) ft_burn (f-value for equation 13)\n
                  • (22) NOT USED\n
                  • (23) fcoolcp\n
                  • (24) NOT USED\n
                  • (25) fpnetel (f-value for equation 16)\n
                  • (26) ffuspow (f-value for equation 9)\n
                  • (27) fhldiv (f-value for equation 18)\n
                  • (28) fradpwr (f-value for equation 17), total radiation fraction\n
                  • (29) dr_bore\n
                  • (30) fmva (f-value for equation 19)\n
                  • (31) gapomin\n
                  • (32) frminor (f-value for equation 21)\n
                  • (33) fportsz (f-value for equation 20)\n
                  • (34) fdivcol (f-value for equation 22)\n
                  • (35) fpeakb (f-value for equation 25)\n
                  • (36) fbeta_max (f-value for equation 24)\n
                  • (37) j_cs_flat_top_end\n
                  • (38) fjohc (f-value for equation 26)\n
                  • (39) fjohc0 (f-value for equation 27)\n
                  • (40) fgamcd (f-value for equation 37)\n
                  • (41) f_j_cs_start_pulse_end_flat_top\n
                  • (42) dr_cs_tf_gap\n
                  • (43) NOT USED\n
                  • (44) fvsbrnni\n
                  • (45) fqval (f-value for equation 28)\n
                  • (46) fpinj (f-value for equation 30)\n
                  • (47) feffcd\n
                  • (48) fstrcase (f-value for equation 31)\n
                  • (49) fstrcond (f-value for equation 32)\n
                  • (50) fiooic (f-value for equation 33)\n
                  • (51) fvdump (f-value for equation 34)\n
                  • (52) vdalw\n
                  • (53) fjprot (f-value for equation 35)\n
                  • (54) ftmargtf (f-value for equation 36)\n
                  • (55) NOT USED\n
                  • (56) tdmptf\n
                  • (57) dr_tf_nose_case\n
                  • (58) thwcndut\n
                  • (59) fcutfsu\n
                  • (60) cpttf\n
                  • (61) dr_shld_vv_gap_inboard\n
                  • (62) fdtmp (f-value for equation 38)\n
                  • (63) ftpeak (f-value for equation 39)\n
                  • (64) fauxmn (f-value for equation 40)\n
                  • (65) t_current_ramp_up\n
                  • (66) ft_current_ramp_up (f-value for equation 41)\n
                  • (67) ftcycl (f-value for equation 42)\n
                  • (68) fptemp (f-value for equation 44)\n
                  • (69) rcool\n
                  • (70) vcool\n
                  • (71) fq (f-value for equation 45)\n
                  • (72) fipir (f-value for equation 46)\n
                  • (73) dr_fw_plasma_gap_inboard\n
                  • (74) dr_fw_plasma_gap_outboard\n
                  • (75) tfootfi\n
                  • (76) NOT USED\n
                  • (77) NOT USED\n
                  • (78) NOT USED\n
                  • (79) fbetap (f-value for equation 48)\n
                  • (80) NOT USED\n
                  • (81) edrive\n
                  • (82) drveff\n
                  • (83) tgain\n
                  • (84) chrad\n
                  • (85) pdrive\n
                  • (86) frrmax (f-value for equation 50)\n
                  • (87) NOT USED\n
                  • (88) NOT USED\n
                  • (89) ftbr (f-value for equation 52)\n
                  • (90) blbuith\n
                  • (91) blbuoth\n
                  • (92) fflutf (f-value for equation 53)\n
                  • (93) dr_shld_inboard\n
                  • (94) dr_shld_outboard\n
                  • (95) fptfnuc (f-value for equation 54)\n
                  • (96) fvvhe (f-value for equation 55)\n
                  • (97) fpsepr (f-value for equation 56)\n
                  • (98) f_blkt_li6_enrichment\n
                  • (99) NOT USED\n
                  • (100) NOT USED\n
                  • (101) NOT USED\n
                  • (102) fimpvar\n
                  • (103) fl_h_threshold (f-value for equation 15)\n
                  • (104)fr_conducting_wall (f-value for equation 23)\n
                  • (105) fnbshinef (f-value for equation 59)\n
                  • (106) ftmargoh (f-value for equation 60)\n
                  • (107) favail (f-value for equation 61)\n
                  • (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)\n
                  • (109) f_nd_alpha_electron: thermal alpha density / electron density\n
                  • (110) falpha_energy_confinement: Lower limit on f_alpha_energy_confinement the ratio of alpha\n
                  • (111) fniterpump: f-value for constraint that number\n
                  • (112) fzeffmax: f-value for max Zeff (f-value for equation 64)\n
                  • (113) ftaucq: f-value for minimum quench time (f-value for equation 65)\n
                  • (114) len_fw_channel: Length of a single first wall channel\n
                  • (115) fpoloidalpower: f-value for max rate of change of\n
                  • (116) fradwall: f-value for radiation wall load limit (eq. 67)\n
                  • (117) fpsepbqar: f-value for Psep*Bt/qar upper limit (eq. 68)\n
                  • (118) fpsep: f-value to ensure separatrix power is less than\n
                  • (119) tesep: separatrix temperature calculated by the Kallenbach divertor model\n
                  • (120) ttarget: Plasma temperature adjacent to divertor sheath [eV]\n
                  • (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP\n
                  • (122) f_a_cs_steel : streel fraction of Central Solenoid\n
                  • (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72)\n
                  • (124) qtargettotal : Power density on target including surface recombination [W/m2]\n
                  • (125) fimp(3) : Beryllium density fraction relative to electron density\n
                  • (126) fimp(4) : Carbon density fraction relative to electron density\n
                  • (127) fimp(5) : Nitrogen fraction relative to electron density\n
                  • (128) fimp(6) : Oxygen density fraction relative to electron density\n
                  • (129) fimp(7) : Neon density fraction relative to electron density\n
                  • (130) fimp(8) : Silicon density fraction relative to electron density\n
                  • (131) fimp(9) : Argon density fraction relative to electron density\n
                  • (132) fimp(10) : Iron density fraction relative to electron density\n
                  • (133) fimp(11) : Nickel density fraction relative to electron density\n
                  • (134) fimp(12) : Krypton density fraction relative to electron density\n
                  • (135) fimp(13) : Xenon density fraction relative to electron density\n
                  • (136) fimp(14) : Tungsten density fraction relative to electron density\n
                  • (137) fplhsep (f-value for equation 73)\n
                  • (138) rebco_thickness : thickness of REBCO layer in tape (m)\n
                  • (139) copper_thick : thickness of copper layer in tape (m)\n
                  • (140) dr_tf_wp : radial thickness of TFC winding pack (m)\n
                  • (141) fcqt : TF coil quench temperature < tmax_croco (f-value for equation 74)\n
                  • (142) nesep : electron density at separatrix [m-3]\n
                  • (143) f_copperA_m2 : TF coil current / copper area < Maximum value\n
                  • (144) fnesep : Eich critical electron density at separatrix\n
                  • (145) fgwped : fraction of Greenwald density to set as pedestal-top density\n
                  • (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77)\n
                  • (147) freinke : F-value for Reinke detachment criterion (constraint equation 78)\n
                  • (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion\n
                  • (149) fb_cs_limit_max : F-value for max peak CS field (con. 79, itvar 149)\n
                  • (152) fb_cs_limit_max : Ratio of separatrix density to Greenwald density\n
                  • (153) fpdivlim : F-value for minimum pdivt (con. 80)\n
                  • (154) fne0 : F-value for ne(0) > ne(ped) (con. 81)\n
                  • (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only)\n
                  • (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only)\n
                  • (157) fvs_cs_pf_total_ramp : F-value for available to required start up flux (con. 51)\n
                  • (158) croco_thick : Thickness of CroCo copper tube (m)\n
                  • (159) ftoroidalgap : F-value for toroidalgap > dx_tf_inboard_out_toroidal constraint (con. 82)\n
                  • (160) f_avspace (f-value for equation 83)\n
                  • (161) fbeta_min (f-value for equation 84)\n
                  • (162) r_cp_top : Top outer radius of the centropost (ST only) (m)\n
                  • (163) f_t_turn_tf : f-value for TF coils WP trurn squared dimension constraint\n
                  • (164) f_crypmw : f-value for cryogenic plant power\n
                  • (165) fstr_wp : f-value for TF coil strain absolute value\n
                  • (166) f_copperaoh_m2 : CS coil current /copper area < Maximum value\n
                  • (167) fecrh_ignition: f-value for equation 90\n
                  • (168) EMPTY : Description\n
                  • (169) EMPTY : Description\n
                  • (170) EMPTY : Description\n
                  • (171) EMPTY : Description\n
                  • (172) EMPTY : Description\n
                  • (173) EMPTY : Description\n
                  • (174) EMPTY : Description\n
                  • (175) EMPTY : Description\n\n\n\n", "lambda_EU": "Decay length in EUROFER [cm]", "lambda_He_VV": "Decay length [cm]", "lambda_n_BZ_IB": "Decay length in IB BZ [cm]", @@ -10756,7 +10756,7 @@ "thick_sw_ib": "", "thick_sw_ob": "", "thicndut": "conduit insulation thickness (m)", - "thkcas": "inboard TF coil case outer (non-plasma side) thickness (m) (`iteration variable 57`)\n (calculated for stellarators)", + "dr_tf_nose_case": "inboard TF coil case outer (non-plasma side) thickness (m) (`iteration variable 57`)\n (calculated for stellarators)", "thshield": "TF-VV thermal shield thickness (m)", "thwcndut": "TF coil conduit case thickness (m) (`iteration variable 58`)", "ti": "volume averaged ion temperature (keV). N.B. calculated from te if `tratio > 0.0`", @@ -14399,7 +14399,7 @@ "lb": 0.0, "ub": 0.1 }, - "thkcas": { + "dr_tf_nose_case": { "lb": 0.0, "ub": 1.0 }, @@ -15528,7 +15528,7 @@ "lb": 1.0, "ub": 500.0 }, - "thkcas": { + "dr_tf_nose_case": { "lb": 0.05, "ub": 1.0 }, @@ -15689,7 +15689,7 @@ "dr_tf_inboard": 0.0, "tfootfi": 1.19, "tgain": 85.0, - "thkcas": 0.3, + "dr_tf_nose_case": 0.3, "thwcndut": 0.008, "t_current_ramp_up": 30.0, "ttarget": 5.0, @@ -16294,7 +16294,7 @@ }, "57": { "lb": 0.05, - "name": "thkcas", + "name": "dr_tf_nose_case", "ub": 1.0 }, "58": { @@ -16613,7 +16613,7 @@ "53": "fjprot", "54": "ftmargtf", "56": "tdmptf", - "57": "thkcas", + "57": "dr_tf_nose_case", "58": "thwcndut", "59": "fcutfsu", "6": "dene", @@ -16802,7 +16802,7 @@ "dr_tf_inboard": "13", "tfootfi": "75", "tgain": "83", - "thkcas": "57", + "dr_tf_nose_case": "57", "thwcndut": "58", "t_current_ramp_up": "65", "ttarget": "120", @@ -19462,7 +19462,7 @@ "dx_tf_inboard_out_toroidal", "thicndut", "layer_ins", - "thkcas", + "dr_tf_nose_case", "dr_tf_wp", "thwcndut", "tinstf", @@ -20559,7 +20559,7 @@ "th_joint_contact": "real_variable", "t_fusion_ramp": "real_variable", "thicndut": "real_variable", - "thkcas": "real_variable", + "dr_tf_nose_case": "real_variable", "thshield": "real_variable", "thwcndut": "real_variable", "ti": "real_variable", diff --git a/tests/regression/input_files/helias_5b.IN.DAT b/tests/regression/input_files/helias_5b.IN.DAT index fde072c3de..a7b73bca6b 100644 --- a/tests/regression/input_files/helias_5b.IN.DAT +++ b/tests/regression/input_files/helias_5b.IN.DAT @@ -175,7 +175,7 @@ t_turn_tf = 0.056 *Dimension conductor area including steel and insulation thicndut = 0.002 *Conduit insulation thickness (m) thwcndut = 0.0012 *TF coil conduit case thickness (m) vftf = 0.3 *Coolant fraction of TF coil leg (i_tf_sup=0) -thkcas = 0.06 * Case thickness +dr_tf_nose_case = 0.06 * Case thickness *-----------------Pfcoil Variables-----------------* *PF coil vertical positioning adjuster diff --git a/tests/regression/input_files/large_tokamak.IN.DAT b/tests/regression/input_files/large_tokamak.IN.DAT index 846775f3c2..ba2c36f212 100644 --- a/tests/regression/input_files/large_tokamak.IN.DAT +++ b/tests/regression/input_files/large_tokamak.IN.DAT @@ -244,9 +244,9 @@ fvsbrnni = 0.4 ixc = 56 tdmptf = 25.0 -* thkcas [m] +* dr_tf_nose_case [m] ixc = 57 -thkcas = 0.5 +dr_tf_nose_case = 0.5 * TF coil conduit thickness [m] ixc = 58 diff --git a/tests/regression/input_files/large_tokamak_nof.IN.DAT b/tests/regression/input_files/large_tokamak_nof.IN.DAT index f166bd039f..42ee135306 100644 --- a/tests/regression/input_files/large_tokamak_nof.IN.DAT +++ b/tests/regression/input_files/large_tokamak_nof.IN.DAT @@ -226,9 +226,9 @@ fvsbrnni = 0.4 ixc = 56 tdmptf = 25.0 -* thkcas [m] +* dr_tf_nose_case [m] ixc = 57 -thkcas = 0.5 +dr_tf_nose_case = 0.5 * TF coil conduit thickness [m] ixc = 58 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 5161cf5407..7449fe77a4 100644 --- a/tests/regression/input_files/large_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/large_tokamak_once_through.IN.DAT @@ -60,7 +60,7 @@ ixc = 37 * j_cs_flat_top_end ixc = 41 * f_j_cs_start_pulse_end_flat_top ixc = 44 * fvsbrnni ixc = 56 * tdmptf -ixc = 57 * thkcas +ixc = 57 * dr_tf_nose_case ixc = 58 * thwcndut boundl(58) = 0.008 ixc = 59 * fcutfsu @@ -420,7 +420,7 @@ 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_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_nose_case = 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) thwcndut = 0.008012110032981922 * TF coil conduit case thickness (m) (`iteration variable 58`) tinstf = 0.008 * Thickness of the ground insulation layer surrounding (m) diff --git a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT index b2c29ebeb5..522e88e780 100644 --- a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT @@ -65,7 +65,7 @@ boundu(49) = 1.0 ixc = 50 * fiooic boundl(50) = 0.01 boundu(50) = 1.0 -ixc = 57 * thkcas +ixc = 57 * dr_tf_nose_case boundl(57) = 0.01 boundu(57) = 0.5 ixc = 72 * fipir @@ -432,7 +432,7 @@ ripmax = 1.0 * aximum allowable toroidal field ripple amplitude at plasma edge i_cp_joints = 0 * Switch for CP demoutable joints type n_tf_coils = 12 * Number of TF coils (default = 50 for stellarators); Number of TF coils outer legs for ST tftmp = 20.0 * peak helium coolant temperature in TF coils and PF coils (K) -thkcas = 0.1293140904093427 * inboard TF coil case outer (non-plasma side) thickness (m) (`iteration variable 57`) +dr_tf_nose_case = 0.1293140904093427 * inboard TF coil case outer (non-plasma side) thickness (m) (`iteration variable 57`) dr_tf_wp = 0.6044340543574178 * radial thickness of winding pack (m) (`iteration variable 140`) (issue #514) temp_tf_cryo = 20.0 * coil temperature for cryogenic plant power calculation (K) f_vforce_inboard = 0.5 * Fraction of the total vertical force taken by the TF inboard leg tension diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 229823bf7a..d7fee2f676 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -1031,7 +1031,7 @@ i_tf_case_geom = 0 * JUSTIFICATION: Not set, assuming default ixc = 57 -thkcas = 0.4 +dr_tf_nose_case = 0.4 boundl(57) = 0.01 boundu(57) = 0.5 * DESCRIPTION: Inboard TF Coil Case Outer (Nose case) thickness (m) diff --git a/tests/regression/input_files/stellarator_helias_once_through.IN.DAT b/tests/regression/input_files/stellarator_helias_once_through.IN.DAT index d4b9cf6f75..bde589bc0d 100644 --- a/tests/regression/input_files/stellarator_helias_once_through.IN.DAT +++ b/tests/regression/input_files/stellarator_helias_once_through.IN.DAT @@ -371,7 +371,7 @@ ftoroidalgap = 1. * F-value for minimum dx_tf_inboard_out_toroidal (`constraint tdmptf = 7.400147540321247 * fast discharge time for TF coil in event of quench (s) (`iteration variable 56`) tftmp = 4.5 * peak helium coolant temperature in TF coils and PF coils (K) thicndut = 0.001 * conduit insulation thickness (m) -thkcas = 0.05 * inboard TF coil case outer (non-plasma side) thickness (m) (`iteration variable 57`) +dr_tf_nose_case = 0.05 * inboard TF coil case outer (non-plasma side) thickness (m) (`iteration variable 57`) thwcndut = 0.006 * TF coil conduit case thickness (m) (`iteration variable 58`) tinstf = 0.01 * Thickness of the ground insulation layer surrounding (m) temp_tf_cryo = 4.5 * coil temperature for cryogenic plant power calculation (K) diff --git a/tests/unit/data/large_tokamak_IN.DAT b/tests/unit/data/large_tokamak_IN.DAT index d5fbe4a09f..38a1ceee8c 100644 --- a/tests/unit/data/large_tokamak_IN.DAT +++ b/tests/unit/data/large_tokamak_IN.DAT @@ -244,9 +244,9 @@ fvsbrnni = 0.4 ixc = 56 tdmptf = 25.0 -* thkcas [m] +* dr_tf_nose_case [m] ixc = 57 -thkcas = 0.5 +dr_tf_nose_case = 0.5 * TF coil conduit thickness [m] ixc = 58 diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index c70b1dff51..7fb2e9797c 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -695,7 +695,7 @@ 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 - Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (thkcas)______________________ 2.8843E-01 ITV + Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.8843E-01 ITV Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.6337E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.8202E-01 @@ -1435,9 +1435,9 @@ fvsbrnni = 0.4 ixc = 56 tdmptf = 25.0 -* thkcas [m] +* dr_tf_nose_case [m] ixc = 57 -thkcas = 0.5 +dr_tf_nose_case = 0.5 * TF coil conduit thickness [m] ixc = 58 diff --git a/tests/unit/test_build.py b/tests/unit/test_build.py index d9252250fe..0c1cddf74a 100644 --- a/tests/unit/test_build.py +++ b/tests/unit/test_build.py @@ -73,7 +73,7 @@ class RippleAmplitudeParam(NamedTuple): dr_tf_wp: Any = None - thkcas: Any = None + dr_tf_nose_case: Any = None casths_fraction: Any = None @@ -201,7 +201,7 @@ def test_divgeom(divgeomparam, monkeypatch, build): dx_tf_inboard_out_toroidal=1, casths=0.05000000000000001, dr_tf_wp=0.54261087836601019, - thkcas=0.52465000000000006, + dr_tf_nose_case=0.52465000000000006, casths_fraction=0.059999999999999998, i_tf_sup=1, i_tf_wp_geom=0, @@ -222,7 +222,7 @@ def test_divgeom(divgeomparam, monkeypatch, build): dx_tf_inboard_out_toroidal=1, casths=0.05000000000000001, dr_tf_wp=0.54261087836601019, - thkcas=0.52465000000000006, + dr_tf_nose_case=0.52465000000000006, casths_fraction=0.059999999999999998, i_tf_sup=1, i_tf_wp_geom=0, @@ -271,7 +271,9 @@ def test_ripple_amplitude(rippleamplitudeparam, monkeypatch, build): monkeypatch.setattr(tfcoil_variables, "dr_tf_wp", rippleamplitudeparam.dr_tf_wp) - monkeypatch.setattr(tfcoil_variables, "thkcas", rippleamplitudeparam.thkcas) + monkeypatch.setattr( + tfcoil_variables, "dr_tf_nose_case", rippleamplitudeparam.dr_tf_nose_case + ) monkeypatch.setattr( tfcoil_variables, "casths_fraction", rippleamplitudeparam.casths_fraction diff --git a/tests/unit/test_resistive_tf_coil.py b/tests/unit/test_resistive_tf_coil.py index 669872b2b9..e1308001aa 100644 --- a/tests/unit/test_resistive_tf_coil.py +++ b/tests/unit/test_resistive_tf_coil.py @@ -26,7 +26,7 @@ class ResTfInternalGeomParam(NamedTuple): thicndut: Any = None - thkcas: Any = None + dr_tf_nose_case: Any = None dr_tf_wp: Any = None @@ -79,7 +79,7 @@ class ResTfInternalGeomParam(NamedTuple): ResTfInternalGeomParam( n_tf_turn=0, thicndut=0.00080000000000000004, - thkcas=0, + dr_tf_nose_case=0, dr_tf_wp=0.15483000000000002, dx_tf_inboard_out_toroidal=0.45367650933034859, a_tf_coil_inboard=0.0753112923616783, @@ -106,7 +106,7 @@ class ResTfInternalGeomParam(NamedTuple): ResTfInternalGeomParam( n_tf_turn=1, thicndut=0.00080000000000000004, - thkcas=0, + dr_tf_nose_case=0, dr_tf_wp=0.14708850000000001, dx_tf_inboard_out_toroidal=0.44435902370665786, a_tf_coil_inboard=0.0753112923616783, @@ -152,7 +152,9 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, resistive_tf_ monkeypatch.setattr(tfcoil_variables, "thicndut", restfinternalgeomparam.thicndut) - monkeypatch.setattr(tfcoil_variables, "thkcas", restfinternalgeomparam.thkcas) + monkeypatch.setattr( + tfcoil_variables, "dr_tf_nose_case", restfinternalgeomparam.dr_tf_nose_case + ) monkeypatch.setattr(tfcoil_variables, "dr_tf_wp", restfinternalgeomparam.dr_tf_wp) @@ -259,7 +261,7 @@ class TfResHeatingParam(NamedTuple): rho_tf_leg: Any = None vol_cond_cp: Any = None n_tf_turn: Any = None - thkcas: Any = None + dr_tf_nose_case: Any = None dx_tf_inboard_out_toroidal: Any = None len_tf_coil: Any = None res_tf_leg: Any = None @@ -313,7 +315,7 @@ class TfResHeatingParam(NamedTuple): rho_tf_leg=0, vol_cond_cp=0, n_tf_turn=1, - thkcas=0, + dr_tf_nose_case=0, dx_tf_inboard_out_toroidal=0.45367650933034859, len_tf_coil=15.582502857142856, res_tf_leg=0, @@ -363,7 +365,7 @@ class TfResHeatingParam(NamedTuple): rho_tf_leg=2.0721414e-08, vol_cond_cp=12.020160732580297, n_tf_turn=1, - thkcas=0, + dr_tf_nose_case=0, dx_tf_inboard_out_toroidal=0.44435902370665786, len_tf_coil=15.654502857142857, res_tf_leg=5.647653956699231e-06, @@ -440,7 +442,9 @@ def test_tf_res_heating(tfresheatingparam, monkeypatch, resistive_tf_coil): monkeypatch.setattr(tfcoil_variables, "n_tf_turn", tfresheatingparam.n_tf_turn) - monkeypatch.setattr(tfcoil_variables, "thkcas", tfresheatingparam.thkcas) + monkeypatch.setattr( + tfcoil_variables, "dr_tf_nose_case", tfresheatingparam.dr_tf_nose_case + ) monkeypatch.setattr( tfcoil_variables, diff --git a/tests/unit/test_sctfcoil.py b/tests/unit/test_sctfcoil.py index 51f9b4bbe6..dd48ab3644 100644 --- a/tests/unit/test_sctfcoil.py +++ b/tests/unit/test_sctfcoil.py @@ -500,7 +500,7 @@ class TfWpGeomParam(NamedTuple): casthi: Any = None - thkcas: Any = None + dr_tf_nose_case: Any = None casths: Any = None @@ -562,7 +562,7 @@ class TfWpGeomParam(NamedTuple): r_tf_inboard_out=4.20194118510911, dr_tf_wp=0.54261087836601019, casthi=0.060000000000000012, - thkcas=0.52465000000000006, + dr_tf_nose_case=0.52465000000000006, casths=0.05000000000000001, wwp1=0, wwp2=0, @@ -595,7 +595,7 @@ class TfWpGeomParam(NamedTuple): r_tf_inboard_out=4.20194118510911, dr_tf_wp=0.54261087836601019, casthi=0.060000000000000012, - thkcas=0.52465000000000006, + dr_tf_nose_case=0.52465000000000006, casths=0.05000000000000001, wwp1=1.299782604942499, wwp2=0, @@ -651,7 +651,9 @@ def test_tf_wp_geom(tfwpgeomparam, monkeypatch, sctfcoil): monkeypatch.setattr(tfcoil_variables, "casthi", tfwpgeomparam.casthi) - monkeypatch.setattr(tfcoil_variables, "thkcas", tfwpgeomparam.thkcas) + monkeypatch.setattr( + tfcoil_variables, "dr_tf_nose_case", tfwpgeomparam.dr_tf_nose_case + ) monkeypatch.setattr(tfcoil_variables, "casths", tfwpgeomparam.casths) diff --git a/tests/unit/test_tfcoil.py b/tests/unit/test_tfcoil.py index 5ed19d19fa..58123224a8 100644 --- a/tests/unit/test_tfcoil.py +++ b/tests/unit/test_tfcoil.py @@ -515,7 +515,7 @@ class TfCurrentParam(NamedTuple): thicndut: Any = None - thkcas: Any = None + dr_tf_nose_case: Any = None oacdcp: Any = None @@ -565,7 +565,7 @@ class TfCurrentParam(NamedTuple): casthi_fraction=0.050000000000000003, n_tf_coils=16, thicndut=0.002, - thkcas=0.52465000000000006, + dr_tf_nose_case=0.52465000000000006, oacdcp=8673900, a_tf_coil_inboard=27.308689677971632, r_tf_inboard_out=4.20194118510911, @@ -647,7 +647,9 @@ def test_tf_current(tfcurrentparam, monkeypatch, tfcoil): monkeypatch.setattr(tfcoil_variables, "thicndut", tfcurrentparam.thicndut) - monkeypatch.setattr(tfcoil_variables, "thkcas", tfcurrentparam.thkcas) + monkeypatch.setattr( + tfcoil_variables, "dr_tf_nose_case", tfcurrentparam.dr_tf_nose_case + ) monkeypatch.setattr(tfcoil_variables, "oacdcp", tfcurrentparam.oacdcp) @@ -1145,7 +1147,7 @@ class TfCoilAreaAndMassesParam(NamedTuple): a_tf_leg_outboard: Any = None - thkcas: Any = None + dr_tf_nose_case: Any = None voltfleg: Any = None @@ -1245,7 +1247,7 @@ class TfCoilAreaAndMassesParam(NamedTuple): i_tf_sup=1, i_tf_sc_mat=5, a_tf_leg_outboard=1.9805354702921749, - thkcas=0.52465000000000006, + dr_tf_nose_case=0.52465000000000006, voltfleg=0, cplen=0, itart=0, @@ -1317,7 +1319,7 @@ class TfCoilAreaAndMassesParam(NamedTuple): i_tf_sup=1, i_tf_sc_mat=5, a_tf_leg_outboard=1.9805354702921749, - thkcas=0.52465000000000006, + dr_tf_nose_case=0.52465000000000006, voltfleg=0, cplen=20.562180043124066, itart=0, @@ -1478,7 +1480,9 @@ def test_tf_coil_area_and_masses(tfcoilareaandmassesparam, monkeypatch, tfcoil): tfcoilareaandmassesparam.a_tf_leg_outboard, ) - monkeypatch.setattr(tfcoil_variables, "thkcas", tfcoilareaandmassesparam.thkcas) + monkeypatch.setattr( + tfcoil_variables, "dr_tf_nose_case", tfcoilareaandmassesparam.dr_tf_nose_case + ) monkeypatch.setattr(tfcoil_variables, "voltfleg", tfcoilareaandmassesparam.voltfleg) From ad3add99cf65ab84b85f0d9ba4228ad026c3026e Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 31 Mar 2025 11:53:50 +0100 Subject: [PATCH 16/21] =?UTF-8?q?=F0=9F=94=84=20Rename=20casths=20to=20dx?= =?UTF-8?q?=5Ftf=5Fside=5Fcase=20for=20clarity=20and=20consistency;=20upda?= =?UTF-8?q?te=20references=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/eng-models/tf-coil.md | 6 ++-- .../data/csv_output_large_tokamak_MFILE.DAT | 4 +-- examples/data/large_tokamak_1_MFILE.DAT | 4 +-- examples/data/large_tokamak_2_MFILE.DAT | 4 +-- examples/data/large_tokamak_3_MFILE.DAT | 4 +-- examples/data/large_tokamak_4_MFILE.DAT | 4 +-- examples/data/large_tokamak_IN.DAT | 2 +- examples/data/scan_MFILE.DAT | 20 ++++++------ examples/data/scan_example_file_IN.DAT | 2 +- process/build.py | 2 +- process/init.py | 2 +- process/input.py | 2 +- process/io/plot_proc.py | 4 +-- process/stellarator.py | 8 ++--- process/superconducting_tf_coil.py | 22 +++++++------ process/tf_coil.py | 2 +- source/fortran/numerics.f90 | 2 +- source/fortran/tfcoil_variables.f90 | 4 +-- .../data/large_tokamak_1_MFILE.DAT | 4 +-- .../data/large_tokamak_2_MFILE.DAT | 4 +-- .../data/large_tokamak_3_MFILE.DAT | 4 +-- .../data/large_tokamak_4_MFILE.DAT | 4 +-- tests/integration/data/large_tokamak_IN.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 4 +-- .../data/large_tokamak_once_through.IN.DAT | 2 +- tests/integration/data/ref_IN.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 32 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 20 ++++++------ .../data/uncertainties_nonopt_ref_IN.DAT | 2 +- .../integration/data/uncertainties_ref_IN.DAT | 2 +- tests/integration/ref_dicts.json | 12 +++---- .../input_files/large_tokamak.IN.DAT | 2 +- .../input_files/large_tokamak_nof.IN.DAT | 2 +- .../large_tokamak_once_through.IN.DAT | 2 +- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/data/large_tokamak_IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 4 +-- tests/unit/test_build.py | 10 +++--- tests/unit/test_sctfcoil.py | 20 +++++++----- tests/unit/test_tfcoil.py | 8 +++-- 40 files changed, 127 insertions(+), 117 deletions(-) diff --git a/documentation/proc-pages/eng-models/tf-coil.md b/documentation/proc-pages/eng-models/tf-coil.md index 5c0fb906ce..55424520d8 100644 --- a/documentation/proc-pages/eng-models/tf-coil.md +++ b/documentation/proc-pages/eng-models/tf-coil.md @@ -92,7 +92,7 @@ $$ **The nose casing:** this section corresponds to the case separating the WP with the machine center. Due to the presence of net electromechanical centering forces, this case has a major structural purpose and is often much larger than the other sides. The nose case dimension is set by its radial thickness that the user can specify using the `dr_tf_nose_case` input variable (iteration variable 57).

                    -

                    - **Sidewall casing:** this section corresponds to the lateral side of the case, separating the WP with the other vaulted coils. As in the WP geometry is generally squared, the sidewall case thickness may vary with the machine radius. For this reason, the user sets its dimensions though its minimal thickness `casths`. The user can either directly specify `casths` or define it as a fraction of the total coil thickness at the inner radius of the WP (`r_wp_inner`) with the `casths_fraction` input. If `casths_fraction` is set in the input file, the `casths` value will be overwritten. + **Sidewall casing:** this section corresponds to the lateral side of the case, separating the WP with the other vaulted coils. As in the WP geometry is generally squared, the sidewall case thickness may vary with the machine radius. For this reason, the user sets its dimensions though its minimal thickness `dx_tf_side_case`. The user can either directly specify `dx_tf_side_case` or define it as a fraction of the total coil thickness at the inner radius of the WP (`r_wp_inner`) with the `casths_fraction` input. If `casths_fraction` is set in the input file, the `dx_tf_side_case` value will be overwritten.

                    -

                    **Plasma side casing:** this section corresponds to the case section separating the WP with the plasma. As the geometry of this section is rounded, its thickness is set by its minimal value `casthi` (user input). This parameter can also be defined as a fraction of the total TF coil thickness `dr_tf_inboard` using `casthi_fraction`. If the `casthi_fraction` parametrization is used, the `casthi` value will be overwritten. @@ -1260,8 +1260,8 @@ Another subroutine, `tfspcall` is called outside `stfcoil` to estimate to check | `tfootfi` | Outboard/inboard TF coil thickness ratio | - | 1 | - | | `dr_tf_wp` | Winding pack radial thickness
                    calculated if `dr_tf_inboard` is used as iteration variable. Include the ground insulation and the insertion gap. | ixc = 140 | No default | m | | `dr_tf_nose_case` | Nose/inner case radial thickness | ixc = 57 | 0.3 | m | -| `casths` | Minimal sidewall casing thickness | - | - | m | -| `casths_fraction` | Minimal sidewall casing thickness as a fraction of the TF coil toroidal thickness. Overwites the `casths` input value | - | 0.03 | - | +| `dx_tf_side_case` | Minimal sidewall casing thickness | - | - | m | +| `casths_fraction` | Minimal sidewall casing thickness as a fraction of the TF coil toroidal thickness. Overwites the `dx_tf_side_case` input value | - | 0.03 | - | | `casthi` | Minimal plasma side casing thickness | - | - | m | | `casthi_fraction` | Minimal plasma side casing thickness as a fraction of the TF thickness (`dr_tf_inboard`). Overwites the `casthi` input value | - | 0.05 | - | | `i_tf_case_geom` | Plasma side casing geometry option:
                    - 0 : rounder front casing (ITER)
                    - 1 : Straight casing | - | 0 | - | diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 233b36958e..d09e93128d 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -696,7 +696,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.0816E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.2965E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 4.9722E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.7619E-01 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 5.1826E-01 @@ -1779,7 +1779,7 @@ i_cs_superconductor = 1 casthi = 0.06 * Inboard TF coil side-wall case thickness [m] -casths = 0.05 +dx_tf_side_case = 0.05 * Max allowable TF ripple at plasma edge [%] ripmax = 0.6 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 75f0722a1d..79a9057b36 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -693,7 +693,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.6444E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.8216E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.5456E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.7486E-01 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 5.1696E-01 @@ -1773,7 +1773,7 @@ i_cs_superconductor = 1 casthi = 0.06 * Inboard TF coil side-wall case thickness [m] -casths = 0.05 +dx_tf_side_case = 0.05 * Max allowable TF ripple at plasma edge [%] ripmax = 0.6 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index af77d7412e..7b06d13d7e 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -693,7 +693,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.6444E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.8216E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.5456E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.7486E-01 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 5.1696E-01 @@ -1773,7 +1773,7 @@ i_cs_superconductor = 1 casthi = 0.06 * Inboard TF coil side-wall case thickness [m] -casths = 0.05 +dx_tf_side_case = 0.05 * Max allowable TF ripple at plasma edge [%] ripmax = 0.6 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 41e885c279..fa3cdf5c99 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -693,7 +693,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.6444E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.8216E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.5456E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.7486E-01 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 5.1696E-01 @@ -1774,7 +1774,7 @@ i_cs_superconductor = 1 casthi = 0.06 * Inboard TF coil side-wall case thickness [m] -casths = 0.05 +dx_tf_side_case = 0.05 * Max allowable TF ripple at plasma edge [%] ripmax = 0.6 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 4bbff9ad0b..5419f4dd16 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -693,7 +693,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.6444E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.8216E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.5456E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.7486E-01 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 5.1696E-01 @@ -1774,7 +1774,7 @@ i_cs_superconductor = 1 casthi = 0.06 * Inboard TF coil side-wall case thickness [m] -casths = 0.05 +dx_tf_side_case = 0.05 * Max allowable TF ripple at plasma edge [%] ripmax = 0.6 diff --git a/examples/data/large_tokamak_IN.DAT b/examples/data/large_tokamak_IN.DAT index 5ddaaf2aee..1b266eca8c 100644 --- a/examples/data/large_tokamak_IN.DAT +++ b/examples/data/large_tokamak_IN.DAT @@ -584,7 +584,7 @@ i_cs_superconductor = 1 casthi = 0.06 * Inboard TF coil side-wall case thickness [m] -casths = 0.05 +dx_tf_side_case = 0.05 * Max allowable TF ripple at plasma edge [%] ripmax = 0.6 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 6d646f49d7..8e1b35b513 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -540,7 +540,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5346E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 3.7026E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 1.2094E+06 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 1.1243E+00 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 1.0480E+00 @@ -1535,7 +1535,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5347E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 3.7026E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 1.2094E+06 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 1.1243E+00 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 1.0480E+00 @@ -2530,7 +2530,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5347E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 3.7027E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 1.2094E+06 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 1.1243E+00 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 1.0480E+00 @@ -3525,7 +3525,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5348E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 3.7028E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 1.2094E+06 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 1.1243E+00 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 1.0480E+00 @@ -4520,7 +4520,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5349E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 3.7029E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 1.2094E+06 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 1.1243E+00 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 1.0480E+00 @@ -5515,7 +5515,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5349E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 3.7029E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 1.2094E+06 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 1.1243E+00 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 1.0480E+00 @@ -6510,7 +6510,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5350E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 3.7030E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 1.2094E+06 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 1.1243E+00 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 1.0480E+00 @@ -7505,7 +7505,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5350E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 3.7030E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 1.2094E+06 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 1.1243E+00 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 1.0480E+00 @@ -8500,7 +8500,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5351E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 3.7031E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 1.2094E+06 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 1.1243E+00 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 1.0479E+00 @@ -9280,7 +9280,7 @@ t_precharge = 500.0 fpeakb = 1.0 bmxlim = 11.2 casthi = 0.06 * Inboard tf coil case inner \(plasma side) thickness (m) -casths = 0.05 * Inboard tf coil sidewall case thickness (m) +dx_tf_side_case = 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) diff --git a/examples/data/scan_example_file_IN.DAT b/examples/data/scan_example_file_IN.DAT index 39357e3b51..fdfb0aa206 100644 --- a/examples/data/scan_example_file_IN.DAT +++ b/examples/data/scan_example_file_IN.DAT @@ -584,7 +584,7 @@ i_cs_superconductor = 1 casthi = 0.06 * Inboard TF coil side-wall case thickness [m] -casths = 0.05 +dx_tf_side_case = 0.05 * Max allowable TF ripple at plasma edge [%] ripmax = 0.6 diff --git a/process/build.py b/process/build.py index 96d30cdd97..fc4059f462 100644 --- a/process/build.py +++ b/process/build.py @@ -1507,7 +1507,7 @@ def ripple_amplitude(self, ripmax: float, r_tf_outboard_mid: float) -> float: else: t_wp_max = 2.0e0 * ( r_wp_max * np.tan(np.pi / n) - - tfcoil_variables.casths + - tfcoil_variables.dx_tf_side_case - tfcoil_variables.tinstf - tfcoil_variables.tfinsgap ) diff --git a/process/init.py b/process/init.py index de3b402583..a53c2ae5d2 100644 --- a/process/init.py +++ b/process/init.py @@ -815,7 +815,7 @@ def check_process(inputs): # noqa: ARG001 ) # If TFC sidewall has not been set by user - if fortran.tfcoil_variables.casths < 0.1e-10: + if fortran.tfcoil_variables.dx_tf_side_case < 0.1e-10: fortran.tfcoil_variables.tfc_sidewall_is_fraction = True # If inboard TF coil case plasma side thickness has not been set by user diff --git a/process/input.py b/process/input.py index 306effedfc..b857859c08 100644 --- a/process/input.py +++ b/process/input.py @@ -237,7 +237,7 @@ def __post_init__(self): ), "casthi": InputVariable(fortran.tfcoil_variables, float, range=(0.0, 1.0)), "casthi_fraction": InputVariable(fortran.tfcoil_variables, float, range=(0.0, 1.0)), - "casths": InputVariable(fortran.tfcoil_variables, float, range=(0.0, 1.0)), + "dx_tf_side_case": InputVariable(fortran.tfcoil_variables, float, range=(0.0, 1.0)), "casths_fraction": InputVariable(fortran.tfcoil_variables, float, range=(0.0, 1.0)), "cboot": InputVariable(fortran.current_drive_variables, float, range=(0.0, 10.0)), "cconfix": InputVariable(fortran.cost_variables, float, range=(50.0, 200.0)), diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index 8e22fd5d6c..88050d24d5 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -1915,14 +1915,14 @@ def plot_tf_wp(axis, mfile_data, scan: int) -> None: wp_toridal_dxbig = mfile_data.data["wwp1"].get_scan(scan) wp_toridal_dxsmall = mfile_data.data["wwp2"].get_scan(scan) dr_tf_wp = mfile_data.data["dr_tf_wp"].get_scan(scan) - side_case_dx = mfile_data.data["casths"].get_scan(scan) + side_case_dx = mfile_data.data["dx_tf_side_case"].get_scan(scan) wp_inner = mfile_data.data["r_wp_inner"].get_scan(scan) tinstf = mfile_data.data["tinstf"].get_scan(scan) turns = round(mfile_data.data["n_tf_turn"].get_scan(scan)) wp_shape = round(mfile_data.data["i_tf_wp_geom"].get_scan(scan)) cond_type = round(mfile_data.data["i_tf_sup"].get_scan(scan)) nose_thickness = mfile_data.data["dr_tf_nose_case"].get_scan(scan) - side_thickness = mfile_data.data["casths"].get_scan(scan) + side_thickness = mfile_data.data["dx_tf_side_case"].get_scan(scan) case_plasma = mfile_data.data["i_tf_case_geom"].get_scan(scan) j_tf_wp = round(mfile_data.data["j_tf_wp"].get_scan(scan)) / 1e6 tf_thickness = mfile_data.data["dr_tf_inboard"].get_scan(scan) diff --git a/process/stellarator.py b/process/stellarator.py index 5a87c82f0c..ec462e38c5 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -2680,7 +2680,7 @@ def stcoil(self, output: bool): tfcoil_variables.dr_tf_nose_case ) # [m] coil case thickness outboard distance (radial) # dr_tf_nose_case = case_thickness_constant/2.0e0 # [m] coil case thickness inboard distance (radial). - tfcoil_variables.casths = ( + tfcoil_variables.dx_tf_side_case = ( tfcoil_variables.dr_tf_nose_case ) # [m] coil case thickness toroidal distance (toroidal) @@ -2736,7 +2736,7 @@ def stcoil(self, output: bool): # tfcoil_variables.dx_tf_inboard_out_toroidal = ( tfcoil_variables.wwp1 - + 2.0e0 * tfcoil_variables.casths + + 2.0e0 * tfcoil_variables.dx_tf_side_case + 2.0e0 * tfcoil_variables.tinstf ) # [m] Thickness of inboard leg in toroidal direction @@ -4022,8 +4022,8 @@ def stcoil_output( po.ovarre( self.outfile, "Case toroidal thickness (m)", - "(casths)", - tfcoil_variables.casths, + "(dx_tf_side_case)", + tfcoil_variables.dx_tf_side_case, ) po.ovarre( self.outfile, diff --git a/process/superconducting_tf_coil.py b/process/superconducting_tf_coil.py index b54492c975..06a7647f60 100644 --- a/process/superconducting_tf_coil.py +++ b/process/superconducting_tf_coil.py @@ -1769,7 +1769,9 @@ def tf_wp_geom(self, i_tf_wp_geom): t_tf_at_wp = 2.0e0 * sctfcoil_module.r_wp_inner * sctfcoil_module.tan_theta_coil # Minimal toroidal thickness of winding pack [m] - sctfcoil_module.t_wp_toroidal = t_tf_at_wp - 2.0e0 * tfcoil_variables.casths + sctfcoil_module.t_wp_toroidal = ( + t_tf_at_wp - 2.0e0 * tfcoil_variables.dx_tf_side_case + ) # Rectangular WP # -------------- @@ -1807,13 +1809,13 @@ def tf_wp_geom(self, i_tf_wp_geom): # Thickness of winding pack section at R > sctfcoil_module.r_wp_centre [m] tfcoil_variables.wwp1 = 2.0e0 * ( sctfcoil_module.r_wp_centre * sctfcoil_module.tan_theta_coil - - tfcoil_variables.casths + - tfcoil_variables.dx_tf_side_case ) # Thickness of winding pack section at R < sctfcoil_module.r_wp_centre [m] tfcoil_variables.wwp2 = 2.0e0 * ( sctfcoil_module.r_wp_inner * sctfcoil_module.tan_theta_coil - - tfcoil_variables.casths + - tfcoil_variables.dx_tf_side_case ) # Averaged toroidal thickness of of winding pack [m] @@ -1859,13 +1861,13 @@ def tf_wp_geom(self, i_tf_wp_geom): # Thickness of winding pack section at sctfcoil_module.r_wp_outer [m] tfcoil_variables.wwp1 = 2.0e0 * ( sctfcoil_module.r_wp_outer * sctfcoil_module.tan_theta_coil - - tfcoil_variables.casths + - tfcoil_variables.dx_tf_side_case ) # Thickness of winding pack section at sctfcoil_module.r_wp_inner [m] tfcoil_variables.wwp2 = 2.0e0 * ( sctfcoil_module.r_wp_inner * sctfcoil_module.tan_theta_coil - - tfcoil_variables.casths + - tfcoil_variables.dx_tf_side_case ) # Averaged toroidal thickness of of winding pack [m] @@ -1953,20 +1955,20 @@ def tf_case_geom(self, i_tf_wp_geom, i_tf_case_geom): # Rectangular casing if i_tf_wp_geom == 0: sctfcoil_module.t_lat_case_av = ( - tfcoil_variables.casths + tfcoil_variables.dx_tf_side_case + 0.5e0 * sctfcoil_module.tan_theta_coil * tfcoil_variables.dr_tf_wp ) # Double rectangular WP elif i_tf_wp_geom == 1: sctfcoil_module.t_lat_case_av = ( - tfcoil_variables.casths + tfcoil_variables.dx_tf_side_case + 0.25e0 * sctfcoil_module.tan_theta_coil * tfcoil_variables.dr_tf_wp ) # Trapezoidal WP else: - sctfcoil_module.t_lat_case_av = tfcoil_variables.casths + sctfcoil_module.t_lat_case_av = tfcoil_variables.dx_tf_side_case # -------------- @@ -2454,8 +2456,8 @@ def outtf(self, peaktfflag): po.ovarre( self.outfile, "Inboard leg case sidewall thickness at its narrowest point (m)", - "(casths)", - tfcoil_variables.casths, + "(dx_tf_side_case)", + tfcoil_variables.dx_tf_side_case, ) po.ovarre( self.outfile, diff --git a/process/tf_coil.py b/process/tf_coil.py index b60dfc72fb..eeebb50071 100644 --- a/process/tf_coil.py +++ b/process/tf_coil.py @@ -340,7 +340,7 @@ def tf_current(self): # Case thickness of side wall [m] if tfcoil_variables.tfc_sidewall_is_fraction: - tfcoil_variables.casths = ( + tfcoil_variables.dx_tf_side_case = ( tfcoil_variables.casths_fraction * (build_variables.r_tf_inboard_in + tfcoil_variables.dr_tf_nose_case) * np.tan(np.pi / tfcoil_variables.n_tf_coils) diff --git a/source/fortran/numerics.f90 b/source/fortran/numerics.f90 index 0c82fd4880..22f02f8072 100755 --- a/source/fortran/numerics.f90 +++ b/source/fortran/numerics.f90 @@ -377,7 +377,7 @@ module numerics !!

                  • (169) te0_ecrh_achievable: Max. achievable electron temperature at ignition point !!
                  • (170) beta_div : field line angle wrt divertor target plate (degrees) !!
                  • (171) casths_fraction : TF side case thickness as fraction of toridal case thickness - !!
                  • (172) casths : TF side case thickness [m] + !!
                  • (172) dx_tf_side_case : TF side case thickness [m] !!
                  • (173) f_deuterium : Deuterium fraction in fuel !!
                  • (174) EMPTY : Description !!
                  • (175) EMPTY : Description diff --git a/source/fortran/tfcoil_variables.f90 b/source/fortran/tfcoil_variables.f90 index 80864bfe5c..8d86377da8 100644 --- a/source/fortran/tfcoil_variables.f90 +++ b/source/fortran/tfcoil_variables.f90 @@ -82,14 +82,14 @@ module tfcoil_variables logical :: casthi_is_fraction !! logical switch to make casthi a fraction of TF coil thickness (`casthi_fraction`) - real(dp) :: casths + real(dp) :: dx_tf_side_case !! inboard TF coil sidewall case thickness (m) (calculated for stellarators) real(dp) :: casths_fraction !! inboard TF coil sidewall case thickness as a fraction of dx_tf_inboard_out_toroidal logical :: tfc_sidewall_is_fraction - !! logical switch to make casths a fraction of TF coil thickness (`casths_fraction`) + !! logical switch to make dx_tf_side_case a fraction of TF coil thickness (`casths_fraction`) real(dp) :: t_conductor !! Conductor (cable + steel conduit) area averaged dimension [m] diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 24f04d53e5..66ad7139ba 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -692,7 +692,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.6444E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.8216E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.5456E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.7486E-01 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 5.1696E-01 @@ -1772,7 +1772,7 @@ i_cs_superconductor = 1 casthi = 0.06 * Inboard TF coil side-wall case thickness [m] -casths = 0.05 +dx_tf_side_case = 0.05 * Max allowable TF ripple at plasma edge [%] ripmax = 0.6 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 3ef6016136..3a1650544f 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -693,7 +693,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.6444E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.8216E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.5456E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.7486E-01 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 5.1696E-01 @@ -1773,7 +1773,7 @@ i_cs_superconductor = 1 casthi = 0.06 * Inboard TF coil side-wall case thickness [m] -casths = 0.05 +dx_tf_side_case = 0.05 * Max allowable TF ripple at plasma edge [%] ripmax = 0.6 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 9b02032e96..10d9065b2a 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -693,7 +693,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.6444E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.8216E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.5456E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.7486E-01 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 5.1696E-01 @@ -1773,7 +1773,7 @@ i_cs_superconductor = 1 casthi = 0.06 * Inboard TF coil side-wall case thickness [m] -casths = 0.05 +dx_tf_side_case = 0.05 * Max allowable TF ripple at plasma edge [%] ripmax = 0.6 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index be1d859051..9d7b41d9da 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -693,7 +693,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.6444E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.8216E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.5456E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.7486E-01 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 5.1696E-01 @@ -1773,7 +1773,7 @@ i_cs_superconductor = 1 casthi = 0.06 * Inboard TF coil side-wall case thickness [m] -casths = 0.05 +dx_tf_side_case = 0.05 * Max allowable TF ripple at plasma edge [%] ripmax = 0.6 diff --git a/tests/integration/data/large_tokamak_IN.DAT b/tests/integration/data/large_tokamak_IN.DAT index 299cf2d0f7..3ce1fa730d 100644 --- a/tests/integration/data/large_tokamak_IN.DAT +++ b/tests/integration/data/large_tokamak_IN.DAT @@ -583,7 +583,7 @@ i_cs_superconductor = 1 casthi = 0.06 * Inboard TF coil side-wall case thickness [m] -casths = 0.05 +dx_tf_side_case = 0.05 * Max allowable TF ripple at plasma edge [%] ripmax = 0.6 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 75efaa3ff5..eec61a63c9 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -696,7 +696,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.7164E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.8843E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.6337E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.8202E-01 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 5.2394E-01 @@ -1774,7 +1774,7 @@ i_cs_superconductor = 1 casthi = 0.06 * Inboard TF coil side-wall case thickness [m] -casths = 0.05 +dx_tf_side_case = 0.05 * Max allowable TF ripple at plasma edge [%] ripmax = 0.6 diff --git a/tests/integration/data/large_tokamak_once_through.IN.DAT b/tests/integration/data/large_tokamak_once_through.IN.DAT index fb760715cf..c7d9f28a27 100644 --- a/tests/integration/data/large_tokamak_once_through.IN.DAT +++ b/tests/integration/data/large_tokamak_once_through.IN.DAT @@ -408,7 +408,7 @@ i_pulsed_plant = 1 * Switch for reactor model; sig_tf_case_max = 7.5e8 * Allowable maximum shear stress (Tresca criterion) in TF coil case (Pa) sig_tf_wp_max = 7.5e8 * Allowable maximum shear stress (Tresca criterion) in TF coil conduit (Pa) casthi = 0.06 * inboard TF coil case plasma side thickness (m) (calculated for stellarators) -casths = 0.05 * inboard TF coil sidewall case thickness (m) (calculated for stellarators) +dx_tf_side_case = 0.05 * inboard TF coil sidewall case thickness (m) (calculated for stellarators) cpttf = 85462.67500253802 * TF coil current per turn (A); (calculated for stellarators) (calculated for dhecoil = 0.01 * diameter of central helium channel in TF winding (m) fcutfsu = 0.8231999768826475 * copper fraction of cable conductor (TF coils) diff --git a/tests/integration/data/ref_IN.DAT b/tests/integration/data/ref_IN.DAT index 1c038323c7..7550c0e1c9 100644 --- a/tests/integration/data/ref_IN.DAT +++ b/tests/integration/data/ref_IN.DAT @@ -301,7 +301,7 @@ t_precharge = 500.0 fpeakb = 1.0 bmxlim = 11.2 casthi = 0.06 * Inboard tf coil case inner \(plasma side) thickness (m) -casths = 0.05 * Inboard tf coil sidewall case thickness (m) +dx_tf_side_case = 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) diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 108e4e4e0f..aaa2aca428 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -694,7 +694,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.4632E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.6707E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.3122E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.4883E-01 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 4.9159E-01 @@ -1857,7 +1857,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.3536E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.5744E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.1884E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.4179E-01 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 4.8472E-01 @@ -3020,7 +3020,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.2777E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.5098E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.0995E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.3467E-01 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 4.7778E-01 @@ -4183,7 +4183,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.2827E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.5136E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.1061E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.3564E-01 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 4.7873E-01 @@ -5346,7 +5346,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.3358E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.5568E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.1735E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.4356E-01 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 4.8645E-01 @@ -6509,7 +6509,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.4242E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.6314E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.2805E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.5336E-01 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 4.9601E-01 @@ -7672,7 +7672,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.4300E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.6359E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.2885E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.5458E-01 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 4.9720E-01 @@ -8835,7 +8835,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.3537E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.5713E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.1963E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.4625E-01 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 4.8907E-01 @@ -9998,7 +9998,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.2844E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.5136E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.1119E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.3798E-01 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 4.8101E-01 @@ -11161,7 +11161,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.2875E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.5159E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.1159E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.3854E-01 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 4.8155E-01 @@ -12324,7 +12324,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.3536E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.5705E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.1979E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.4722E-01 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 4.9002E-01 @@ -13487,7 +13487,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.4262E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.6317E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.2865E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.5559E-01 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 4.9817E-01 @@ -14650,7 +14650,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.4299E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.6346E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.2915E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.5629E-01 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 4.9886E-01 @@ -15813,7 +15813,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.3582E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.5747E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.2028E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.4737E-01 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 4.9017E-01 @@ -16976,7 +16976,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.2861E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.5148E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.1143E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.3842E-01 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 4.8144E-01 @@ -18060,7 +18060,7 @@ i_cs_superconductor = 1 casthi = 0.06 * Inboard TF coil side-wall case thickness [m] -casths = 0.05 +dx_tf_side_case = 0.05 * Max allowable TF ripple at plasma edge [%] ripmax = 0.6 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 3d64c2f771..c32050fc23 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -540,7 +540,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5346E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 3.7026E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 1.2094E+06 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 1.1243E+00 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 1.0480E+00 @@ -1535,7 +1535,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5347E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 3.7026E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 1.2094E+06 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 1.1243E+00 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 1.0480E+00 @@ -2530,7 +2530,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5347E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 3.7027E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 1.2094E+06 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 1.1243E+00 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 1.0480E+00 @@ -3525,7 +3525,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5348E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 3.7028E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 1.2094E+06 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 1.1243E+00 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 1.0480E+00 @@ -4520,7 +4520,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5349E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 3.7029E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 1.2094E+06 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 1.1243E+00 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 1.0480E+00 @@ -5515,7 +5515,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5349E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 3.7029E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 1.2094E+06 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 1.1243E+00 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 1.0480E+00 @@ -6510,7 +6510,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5350E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 3.7030E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 1.2094E+06 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 1.1243E+00 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 1.0480E+00 @@ -7505,7 +7505,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5350E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 3.7030E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 1.2094E+06 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 1.1243E+00 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 1.0480E+00 @@ -8500,7 +8500,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5351E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 3.7031E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 1.2094E+06 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 1.1243E+00 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 1.0479E+00 @@ -9280,7 +9280,7 @@ t_precharge = 500.0 fpeakb = 1.0 bmxlim = 11.2 casthi = 0.06 * Inboard tf coil case inner \(plasma side) thickness (m) -casths = 0.05 * Inboard tf coil sidewall case thickness (m) +dx_tf_side_case = 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) diff --git a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT index 133dbc376a..9cb3d0124a 100644 --- a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT +++ b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT @@ -301,7 +301,7 @@ t_precharge = 500.0 fpeakb = 1.0 bmxlim = 11.2 casthi = 0.06 * Inboard tf coil case inner \(plasma side) thickness (m) -casths = 0.05 * Inboard tf coil sidewall case thickness (m) +dx_tf_side_case = 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) diff --git a/tests/integration/data/uncertainties_ref_IN.DAT b/tests/integration/data/uncertainties_ref_IN.DAT index 6f81908315..c03898ed21 100644 --- a/tests/integration/data/uncertainties_ref_IN.DAT +++ b/tests/integration/data/uncertainties_ref_IN.DAT @@ -301,7 +301,7 @@ t_precharge = 500.0 fpeakb = 1.0 bmxlim = 11.2 casthi = 0.06 * Inboard tf coil case inner \(plasma side) thickness (m) -casths = 0.05 * Inboard tf coil sidewall case thickness (m) +dx_tf_side_case = 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) diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 68eeaff4a7..314be07405 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1275,7 +1275,7 @@ "casthi": 0.0, "casthi_fraction": 0.05, "casthi_is_fraction": ".false.", - "casths": 0.0, + "dx_tf_side_case": 0.0, "casths_fraction": 0.06, "cboot": 1.0, "ccl0": [ @@ -9027,7 +9027,7 @@ "casthi": "inboard TF coil case plasma side thickness (m) (calculated for stellarators)", "casthi_fraction": "inboard TF coil case plasma side thickness as a fraction of dr_tf_inboard", "casthi_is_fraction": "logical switch to make casthi a fraction of TF coil thickness (`casthi_fraction`)", - "casths": "inboard TF coil sidewall case thickness (m) (calculated for stellarators)", + "dx_tf_side_case": "inboard TF coil sidewall case thickness (m) (calculated for stellarators)", "casths_fraction": "inboard TF coil sidewall case thickness as a fraction of dx_tf_inboard_out_toroidal", "cboot": "bootstrap current fraction multiplier (`i_bootstrap_current=1`)", "ccl0": "", @@ -10713,7 +10713,7 @@ "m_tf_bus": "TF coil bus mass (kg)", "c_tf_coil": "Current in each TF coil", "tfc_nuc_heating": "Unit nuclear heating in TF coil (W per W of fusion power)", - "tfc_sidewall_is_fraction": "logical switch to make casths a fraction of TF coil thickness (`casths_fraction`)", + "tfc_sidewall_is_fraction": "logical switch to make dx_tf_side_case a fraction of TF coil thickness (`casths_fraction`)", "tfcbv": "volume of TF coil power supply building (m3) (calculated if TF coils are superconducting)", "tfckw": "available DC power for charging the TF coils (kW)", "tfcmw": "Peak power per TF power supply (MW)", @@ -11731,7 +11731,7 @@ "lb": 0.0, "ub": 1.0 }, - "casths": { + "dx_tf_side_case": { "lb": 0.0, "ub": 1.0 }, @@ -19337,7 +19337,7 @@ "casthi", "casthi_fraction", "casthi_is_fraction", - "casths", + "dx_tf_side_case", "casths_fraction", "tfc_sidewall_is_fraction", "t_conductor", @@ -19862,7 +19862,7 @@ "cable_helium_fraction": "real_variable", "casthi": "real_variable", "casthi_fraction": "real_variable", - "casths": "real_variable", + "dx_tf_side_case": "real_variable", "casths_fraction": "real_variable", "cboot": "real_variable", "ccl0_ma": "real_array", diff --git a/tests/regression/input_files/large_tokamak.IN.DAT b/tests/regression/input_files/large_tokamak.IN.DAT index ba2c36f212..558a41178f 100644 --- a/tests/regression/input_files/large_tokamak.IN.DAT +++ b/tests/regression/input_files/large_tokamak.IN.DAT @@ -589,7 +589,7 @@ sigpfcf = 0.666 casthi = 0.06 * Inboard TF coil side-wall case thickness [m] -casths = 0.05 +dx_tf_side_case = 0.05 * Max allowable TF ripple at plasma edge [%] ripmax = 0.6 diff --git a/tests/regression/input_files/large_tokamak_nof.IN.DAT b/tests/regression/input_files/large_tokamak_nof.IN.DAT index 42ee135306..21a8877461 100644 --- a/tests/regression/input_files/large_tokamak_nof.IN.DAT +++ b/tests/regression/input_files/large_tokamak_nof.IN.DAT @@ -568,7 +568,7 @@ i_cs_superconductor = 1 casthi = 0.06 * Inboard TF coil side-wall case thickness [m] -casths = 0.05 +dx_tf_side_case = 0.05 * Max allowable TF ripple at plasma edge [%] ripmax = 0.6 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 7449fe77a4..6eec76ee58 100644 --- a/tests/regression/input_files/large_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/large_tokamak_once_through.IN.DAT @@ -411,7 +411,7 @@ i_pulsed_plant = 1 * Switch for reactor model; sig_tf_case_max = 7.5e8 * Allowable maximum shear stress (Tresca criterion) in TF coil case (Pa) sig_tf_wp_max = 7.5e8 * Allowable maximum shear stress (Tresca criterion) in TF coil conduit (Pa) casthi = 0.06 * inboard TF coil case plasma side thickness (m) (calculated for stellarators) -casths = 0.05 * inboard TF coil sidewall case thickness (m) (calculated for stellarators) +dx_tf_side_case = 0.05 * inboard TF coil sidewall case thickness (m) (calculated for stellarators) cpttf = 85462.67500253802 * TF coil current per turn (A); (calculated for stellarators) (calculated for dhecoil = 0.01 * diameter of central helium channel in TF winding (m) fcutfsu = 0.8231999768826475 * copper fraction of cable conductor (TF coils) diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index d7fee2f676..85f6503839 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -1059,7 +1059,7 @@ casths_fraction = 0.65 * Use one or the other * -*casths = 0.05 +*dx_tf_side_case = 0.05 * DESCRIPTION: TF coil case sidewall thickness (m) * JUSTIFICATION: Not used, using casths_fraction instead diff --git a/tests/unit/data/large_tokamak_IN.DAT b/tests/unit/data/large_tokamak_IN.DAT index 38a1ceee8c..31005741ce 100644 --- a/tests/unit/data/large_tokamak_IN.DAT +++ b/tests/unit/data/large_tokamak_IN.DAT @@ -584,7 +584,7 @@ i_cs_superconductor = 1 casthi = 0.06 * Inboard TF coil side-wall case thickness [m] -casths = 0.05 +dx_tf_side_case = 0.05 * Max allowable TF ripple at plasma edge [%] ripmax = 0.6 diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 7fb2e9797c..d013ea3436 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -696,7 +696,7 @@ Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.7164E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 Inboard_leg_case_inboard_"nose"_thickness_(m)___________________________ (dr_tf_nose_case)______________________ 2.8843E-01 ITV - Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (casths)______________________ 5.0000E-02 + Inboard_leg_case_sidewall_thickness_at_its_narrowest_point_(m)__________ (dx_tf_side_case)______________________ 5.0000E-02 External_case_mass_per_coil_(kg)________________________________________ (whtcas)______________________ 5.6337E+05 OP WP_cross_section_area_with_insulation_and_insertion_(per_coil)_(m2)_____ (awpc)________________________ 5.8202E-01 WP_cross_section_area_(per_coil)_(m2)___________________________________ (aswp)________________________ 5.2394E-01 @@ -1775,7 +1775,7 @@ i_cs_superconductor = 1 casthi = 0.06 * Inboard TF coil side-wall case thickness [m] -casths = 0.05 +dx_tf_side_case = 0.05 * Max allowable TF ripple at plasma edge [%] ripmax = 0.6 diff --git a/tests/unit/test_build.py b/tests/unit/test_build.py index 0c1cddf74a..cd958524ce 100644 --- a/tests/unit/test_build.py +++ b/tests/unit/test_build.py @@ -69,7 +69,7 @@ class RippleAmplitudeParam(NamedTuple): dx_tf_inboard_out_toroidal: Any = None - casths: Any = None + dx_tf_side_case: Any = None dr_tf_wp: Any = None @@ -199,7 +199,7 @@ def test_divgeom(divgeomparam, monkeypatch, build): tinstf=0.0080000000000000019, n_tf_coils=16, dx_tf_inboard_out_toroidal=1, - casths=0.05000000000000001, + dx_tf_side_case=0.05000000000000001, dr_tf_wp=0.54261087836601019, dr_tf_nose_case=0.52465000000000006, casths_fraction=0.059999999999999998, @@ -220,7 +220,7 @@ def test_divgeom(divgeomparam, monkeypatch, build): tinstf=0.0080000000000000019, n_tf_coils=16, dx_tf_inboard_out_toroidal=1, - casths=0.05000000000000001, + dx_tf_side_case=0.05000000000000001, dr_tf_wp=0.54261087836601019, dr_tf_nose_case=0.52465000000000006, casths_fraction=0.059999999999999998, @@ -267,7 +267,9 @@ def test_ripple_amplitude(rippleamplitudeparam, monkeypatch, build): rippleamplitudeparam.dx_tf_inboard_out_toroidal, ) - monkeypatch.setattr(tfcoil_variables, "casths", rippleamplitudeparam.casths) + monkeypatch.setattr( + tfcoil_variables, "dx_tf_side_case", rippleamplitudeparam.dx_tf_side_case + ) monkeypatch.setattr(tfcoil_variables, "dr_tf_wp", rippleamplitudeparam.dr_tf_wp) diff --git a/tests/unit/test_sctfcoil.py b/tests/unit/test_sctfcoil.py index dd48ab3644..eb834093d5 100644 --- a/tests/unit/test_sctfcoil.py +++ b/tests/unit/test_sctfcoil.py @@ -502,7 +502,7 @@ class TfWpGeomParam(NamedTuple): dr_tf_nose_case: Any = None - casths: Any = None + dx_tf_side_case: Any = None wwp1: Any = None @@ -563,7 +563,7 @@ class TfWpGeomParam(NamedTuple): dr_tf_wp=0.54261087836601019, casthi=0.060000000000000012, dr_tf_nose_case=0.52465000000000006, - casths=0.05000000000000001, + dx_tf_side_case=0.05000000000000001, wwp1=0, wwp2=0, tinstf=0.0080000000000000019, @@ -596,7 +596,7 @@ class TfWpGeomParam(NamedTuple): dr_tf_wp=0.54261087836601019, casthi=0.060000000000000012, dr_tf_nose_case=0.52465000000000006, - casths=0.05000000000000001, + dx_tf_side_case=0.05000000000000001, wwp1=1.299782604942499, wwp2=0, tinstf=0.0080000000000000019, @@ -655,7 +655,9 @@ def test_tf_wp_geom(tfwpgeomparam, monkeypatch, sctfcoil): tfcoil_variables, "dr_tf_nose_case", tfwpgeomparam.dr_tf_nose_case ) - monkeypatch.setattr(tfcoil_variables, "casths", tfwpgeomparam.casths) + monkeypatch.setattr( + tfcoil_variables, "dx_tf_side_case", tfwpgeomparam.dx_tf_side_case + ) monkeypatch.setattr(tfcoil_variables, "wwp1", tfwpgeomparam.wwp1) @@ -733,7 +735,7 @@ class TfCaseGeomParam(NamedTuple): n_tf_coils: Any = None - casths: Any = None + dx_tf_side_case: Any = None casthi: Any = None @@ -783,7 +785,7 @@ class TfCaseGeomParam(NamedTuple): a_tf_leg_outboard=1.9805354702921749, a_tf_coil_inboard=27.308689677971632, n_tf_coils=16, - casths=0.05000000000000001, + dx_tf_side_case=0.05000000000000001, casthi=0.060000000000000012, dr_tf_wp=0.54261087836601019, r_tf_inboard_in=2.9939411851091102, @@ -810,7 +812,7 @@ class TfCaseGeomParam(NamedTuple): a_tf_leg_outboard=1.9805354702921749, a_tf_coil_inboard=27.308689677971632, n_tf_coils=16, - casths=0.05000000000000001, + dx_tf_side_case=0.05000000000000001, casthi=0.060000000000000012, dr_tf_wp=0.54261087836601019, r_tf_inboard_in=2.9939411851091102, @@ -860,7 +862,9 @@ def test_tf_case_geom(tfcasegeomparam, monkeypatch, sctfcoil): monkeypatch.setattr(tfcoil_variables, "n_tf_coils", tfcasegeomparam.n_tf_coils) - monkeypatch.setattr(tfcoil_variables, "casths", tfcasegeomparam.casths) + monkeypatch.setattr( + tfcoil_variables, "dx_tf_side_case", tfcasegeomparam.dx_tf_side_case + ) monkeypatch.setattr(tfcoil_variables, "casthi", tfcasegeomparam.casthi) diff --git a/tests/unit/test_tfcoil.py b/tests/unit/test_tfcoil.py index 58123224a8..c773406243 100644 --- a/tests/unit/test_tfcoil.py +++ b/tests/unit/test_tfcoil.py @@ -505,7 +505,7 @@ class TfCurrentParam(NamedTuple): tfc_sidewall_is_fraction: Any = None - casths: Any = None + dx_tf_side_case: Any = None casthi_is_fraction: Any = None @@ -560,7 +560,7 @@ class TfCurrentParam(NamedTuple): b_tf_inboard_peak=0, tfinsgap=0.01, tfc_sidewall_is_fraction=False, - casths=0.05000000000000001, + dx_tf_side_case=0.05000000000000001, casthi_is_fraction=False, casthi_fraction=0.050000000000000003, n_tf_coils=16, @@ -633,7 +633,9 @@ def test_tf_current(tfcurrentparam, monkeypatch, tfcoil): tfcurrentparam.tfc_sidewall_is_fraction, ) - monkeypatch.setattr(tfcoil_variables, "casths", tfcurrentparam.casths) + monkeypatch.setattr( + tfcoil_variables, "dx_tf_side_case", tfcurrentparam.dx_tf_side_case + ) monkeypatch.setattr( tfcoil_variables, "casthi_is_fraction", tfcurrentparam.casthi_is_fraction From 6fa5c2b91b91938d5ab5537cb1c8fe0641ea0a17 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 31 Mar 2025 15:49:25 +0100 Subject: [PATCH 17/21] =?UTF-8?q?=F0=9F=94=84=20Rename=20estotft=20to=20e?= =?UTF-8?q?=5Ftf=5Fmagnetic=5Fstored=5Ftotal=20for=20clarity=20and=20consi?= =?UTF-8?q?stency;=20update=20references=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/resistive_tf_coil.py | 4 ++-- process/superconducting_tf_coil.py | 16 +++++++++++----- process/tf_coil.py | 4 ++-- source/fortran/sctfcoil.f90 | 2 +- tests/integration/ref_dicts.json | 6 +++--- 5 files changed, 19 insertions(+), 13 deletions(-) diff --git a/process/resistive_tf_coil.py b/process/resistive_tf_coil.py index 352360e5e9..5426dd60d9 100644 --- a/process/resistive_tf_coil.py +++ b/process/resistive_tf_coil.py @@ -50,12 +50,12 @@ def run(self, output: bool): ) # Total TF coil stored magnetic energy [J] - sctfcoil_module.estotft = ( + sctfcoil_module.e_tf_magnetic_stored_total = ( 0.5e0 * tfcoil_variables.ind_tf_coil * tfcoil_variables.c_tf_total**2 ) # Total TF coil stored magnetic energy [Gigajoule] - tfcoil_variables.estotftgj = 1.0e-9 * sctfcoil_module.estotft + tfcoil_variables.estotftgj = 1.0e-9 * sctfcoil_module.e_tf_magnetic_stored_total self.tf_field_and_force() diff --git a/process/superconducting_tf_coil.py b/process/superconducting_tf_coil.py index 06a7647f60..383a82646c 100644 --- a/process/superconducting_tf_coil.py +++ b/process/superconducting_tf_coil.py @@ -76,12 +76,12 @@ def run(self, output: bool): ) # Total TF coil stored magnetic energy [J] - sctfcoil_module.estotft = ( + sctfcoil_module.e_tf_magnetic_stored_total = ( 0.5e0 * tfcoil_variables.ind_tf_coil * tfcoil_variables.c_tf_total**2 ) # Total TF coil stored magnetic energy [Gigajoule] - tfcoil_variables.estotftgj = 1.0e-9 * sctfcoil_module.estotft + tfcoil_variables.estotftgj = 1.0e-9 * sctfcoil_module.e_tf_magnetic_stored_total self.tf_field_and_force() @@ -276,7 +276,7 @@ def run(self, output: bool): tfcoil_variables.b_tf_inboard_peak, ) - tfes = sctfcoil_module.estotft / tfcoil_variables.n_tf_coils + tfes = sctfcoil_module.e_tf_magnetic_stored_total / tfcoil_variables.n_tf_coils # Cross-sectional area per turn aturn = tfcoil_variables.c_tf_total / ( tfcoil_variables.j_tf_wp @@ -332,7 +332,10 @@ def croco_voltage(self) -> float: croco_voltage = ( 2.0e0 / sctfcoil_module.time2 - * (sctfcoil_module.estotft / tfcoil_variables.n_tf_coils) + * ( + sctfcoil_module.e_tf_magnetic_stored_total + / tfcoil_variables.n_tf_coils + ) / tfcoil_variables.cpttf ) elif f2py_compatible_to_string(tfcoil_variables.quench_model) == "exponential": @@ -340,7 +343,10 @@ def croco_voltage(self) -> float: croco_voltage = ( 2.0e0 / sctfcoil_module.tau2 - * (sctfcoil_module.estotft / tfcoil_variables.n_tf_coils) + * ( + sctfcoil_module.e_tf_magnetic_stored_total + / tfcoil_variables.n_tf_coils + ) / tfcoil_variables.cpttf ) else: diff --git a/process/tf_coil.py b/process/tf_coil.py index eeebb50071..768dcb9270 100644 --- a/process/tf_coil.py +++ b/process/tf_coil.py @@ -63,12 +63,12 @@ def run(self, output): ) # Total TF coil stored magnetic energy [J] - sctfcoil_module.estotft = ( + sctfcoil_module.e_tf_magnetic_stored_total = ( 0.5e0 * tfcoil_variables.ind_tf_coil * tfcoil_variables.c_tf_total**2 ) # Total TF coil stored magnetic energy [Gigajoule] - tfcoil_variables.estotftgj = 1.0e-9 * sctfcoil_module.estotft + tfcoil_variables.estotftgj = 1.0e-9 * sctfcoil_module.e_tf_magnetic_stored_total self.tf_field_and_force() diff --git a/source/fortran/sctfcoil.f90 b/source/fortran/sctfcoil.f90 index 6de93a40f9..8943fd266b 100755 --- a/source/fortran/sctfcoil.f90 +++ b/source/fortran/sctfcoil.f90 @@ -162,7 +162,7 @@ module sctfcoil_module real(dp) :: conductor_area !! Area of cable space inside jacket - real(dp):: T1, time2, tau2, estotft + real(dp):: T1, time2, tau2, e_tf_magnetic_stored_total ! (OBSOLETE, but leave for moment) ! real (kind(1.0D0)) ::croco_quench_factor ! real(dp):: jwdgpro_1, jwdgpro_2, etamax diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 314be07405..a2b4d90d6e 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1761,7 +1761,7 @@ "error_type": null, "errors_on": ".false.", "esbldgm3": 1000.0, - "estotft": 0.0, + "e_tf_magnetic_stored_total": 0.0, "estotftgj": 0.0, "eta": null, "etacd": 0.0, @@ -9365,7 +9365,7 @@ "error_type": "", "errors_on": "", "esbldgm3": "volume of energy storage equipment building (m3) (not used if `i_pulsed_plant=0`)", - "estotft": "", + "e_tf_magnetic_stored_total": "", "estotftgj": "total stored energy in the toroidal field (GJ)", "eta": "", "etacd": "auxiliary power wall plug to injector efficiency", @@ -19271,7 +19271,7 @@ "T1", "time2", "tau2", - "estotft", + "e_tf_magnetic_stored_total", "is_leg_cp_temp_same" ], "stellarator_configuration": [], From ae4b1d53b222d5f3d67a12d3f76db8eefc53298d Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 8 Apr 2025 11:51:17 +0100 Subject: [PATCH 18/21] =?UTF-8?q?=F0=9F=94=84=20Update=20obsolete=5Fvars.p?= =?UTF-8?q?y=20to=20include=20renamed=20variables=20for=20clarity=20and=20?= =?UTF-8?q?consistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/io/obsolete_vars.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index b2089c164f..c9393c59af 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -291,6 +291,9 @@ "xparain": None, "zeffdiv": None, "divdum": None, + "casths": "dx_tf_side_case", + "thkcas": "dr_tf_nose_case", + "tmpcry": "temp_tf_cryo", } OBS_VARS_HELP = { From 04f1fa48dc5f493b3774d440dfe0c05e6a7dc2c0 Mon Sep 17 00:00:00 2001 From: Christopher Ashe <91618944+chris-ashe@users.noreply.github.com> Date: Wed, 9 Apr 2025 11:40:28 +0100 Subject: [PATCH 19/21] Update process/io/obsolete_vars.py Co-authored-by: Timothy <75321887+timothy-nunn@users.noreply.github.com> --- process/io/obsolete_vars.py | 1 + 1 file changed, 1 insertion(+) diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index c9393c59af..16770c25ea 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -19,6 +19,7 @@ "r_tf_inleg_mid": "r_tf_inboard_mid", "rtot": "r_tf_outboard_mid", "a_tf_inboard": "a_tf_coil_inboard", + "tfareain": "a_tf_coil_inboard", "r_tf_inleg_in": "r_tf_inleg_in", "r_tf_inleg_out": "r_tf_inleg_out", "a_tf_wp": "awpc", From 17868a03899793e9a8195ff1826e6dc8ac01dd16 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 9 Apr 2025 13:06:27 +0100 Subject: [PATCH 20/21] =?UTF-8?q?=F0=9F=94=84=20Rename=20variables=20for?= =?UTF-8?q?=20clarity=20and=20consistency.=20update=20references=20across?= =?UTF-8?q?=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/large_tokamak_once_through_IN.DAT | 6 ++--- process/superconducting_tf_coil.py | 8 +++---- process/tf_coil.py | 24 +++++++++---------- tests/integration/ref_dicts.json | 2 +- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/examples/data/large_tokamak_once_through_IN.DAT b/examples/data/large_tokamak_once_through_IN.DAT index 652c3be57f..47adbeb7bf 100644 --- a/examples/data/large_tokamak_once_through_IN.DAT +++ b/examples/data/large_tokamak_once_through_IN.DAT @@ -60,7 +60,7 @@ ixc = 37 * coheof ixc = 41 * fcohbop ixc = 44 * fvsbrnni ixc = 56 * tdmptf -ixc = 57 * thkcas +ixc = 57 * dr_tf_nose_case ixc = 58 * thwcndut boundl(58) = 0.008 ixc = 59 * fcutfsu @@ -408,7 +408,7 @@ i_pulsed_plant = 1 * Switch for reactor model; sig_tf_case_max = 7.5e8 * Allowable maximum shear stress (Tresca criterion) in TF coil case (Pa) sig_tf_wp_max = 7.5e8 * Allowable maximum shear stress (Tresca criterion) in TF coil conduit (Pa) casthi = 0.06 * inboard TF coil case plasma side thickness (m) (calculated for stellarators) -casths = 0.05 * inboard TF coil sidewall case thickness (m) (calculated for stellarators) +dx_tf_side_case = 0.05 * inboard TF coil sidewall case thickness (m) (calculated for stellarators) cpttf = 85462.67500253802 * TF coil current per turn (A); (calculated for stellarators) (calculated for dhecoil = 0.01 * diameter of central helium channel in TF winding (m) fcutfsu = 0.8231999768826475 * copper fraction of cable conductor (TF coils) @@ -417,7 +417,7 @@ 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_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_nose_case = 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) thwcndut = 0.008012110032981922 * TF coil conduit case thickness (m) (`iteration variable 58`) tinstf = 0.008 * Thickness of the ground insulation layer surrounding (m) diff --git a/process/superconducting_tf_coil.py b/process/superconducting_tf_coil.py index 383a82646c..c16356dbe6 100644 --- a/process/superconducting_tf_coil.py +++ b/process/superconducting_tf_coil.py @@ -3851,14 +3851,14 @@ def init_sctfcoil_module(): sctfcoil_module.tf_fit_t = 0.0 sctfcoil_module.tf_fit_z = 0.0 sctfcoil_module.tf_fit_y = 0.0 - sctfcoil_module.tfc_current = 0.0 + sctfcoil_module.c_tf_coil = 0.0 sctfcoil_module.awpc = 0.0 sctfcoil_module.awptf = 0.0 sctfcoil_module.a_tf_steel = 0.0 sctfcoil_module.a_tf_ins = 0.0 sctfcoil_module.f_tf_steel = 0.0 sctfcoil_module.f_tf_ins = 0.0 - sctfcoil_module.h_cp_top = 0.0 + sctfcoil_module.z_cp_top = 0.0 sctfcoil_module.r_tf_outboard_in = 0.0 sctfcoil_module.r_tf_outboard_out = 0.0 sctfcoil_module.r_wp_inner = 0.0 @@ -3877,7 +3877,7 @@ def init_sctfcoil_module(): sctfcoil_module.a_leg_ins = 0.0 sctfcoil_module.a_leg_gr_ins = 0.0 sctfcoil_module.a_leg_cond = 0.0 - sctfcoil_module.theta_coil = 0.0 + sctfcoil_module.rad_tf_coil_toroidal = 0.0 sctfcoil_module.tan_theta_coil = 0.0 sctfcoil_module.t_conductor_radial = 0.0 sctfcoil_module.t_conductor_toroidal = 0.0 @@ -3890,7 +3890,7 @@ def init_sctfcoil_module(): sctfcoil_module.t1 = 0.0 sctfcoil_module.time2 = 0.0 sctfcoil_module.tau2 = 0.0 - sctfcoil_module.estotft = 0.0 + sctfcoil_module.e_tf_magnetic_stored_total = 0.0 def init_rebco_variables(): diff --git a/process/tf_coil.py b/process/tf_coil.py index 768dcb9270..63dd10e94b 100644 --- a/process/tf_coil.py +++ b/process/tf_coil.py @@ -3727,7 +3727,7 @@ def init_tfcoil_variables(): tfv.acond = 0.0 tfv.acstf = 0.0 tfv.insulation_area = 0.0 - tfv.aiwp = 0.0 + tfv.a_tf_coil_wp_turn_insulation = 0.0 tfv.sig_tf_case_max = 6.0e8 tfv.sig_tf_wp_max = 6.0e8 tfv.a_tf_leg_outboard = 0.0 @@ -3735,13 +3735,13 @@ def init_tfcoil_variables(): tfv.avwp = 0.0 tfv.awphec = 0.0 tfv.bcritsc = 24.0 - tfv.bmaxtf = 0.0 + tfv.b_tf_inboard_peak = 0.0 tfv.bmaxtfrp = 0.0 tfv.casestr = 0.0 tfv.casthi = 0.0 tfv.casthi_fraction = 0.05 tfv.casthi_is_fraction = False - tfv.casths = 0.0 + tfv.dx_tf_side_case = 0.0 tfv.casths_fraction = 0.06 tfv.t_conductor = 0.0 tfv.t_cable_tf = 0.0 @@ -3799,7 +3799,7 @@ def init_tfcoil_variables(): ] tfv.jwdgcrt = 0.0 tfv.jwdgpro = 0.0 - tfv.jwptf = 0.0 + tfv.j_tf_wp = 0.0 tfv.oacdcp = 0.0 tfv.eyoung_ins = 1.0e8 tfv.eyoung_steel = 2.05e11 @@ -3814,7 +3814,7 @@ def init_tfcoil_variables(): tfv.poisson_ins = 0.34 tfv.poisson_cond_axial = 0.3 tfv.poisson_cond_trans = 0.3 - tfv.rbmax = 0.0 + tfv.r_b_tf_inboard_peak = 0.0 tfv.res_tf_leg = 0.0 tfv.toroidalgap = 1.0 # [m] tfv.ftoroidalgap = 1.0 @@ -3841,7 +3841,7 @@ def init_tfcoil_variables(): tfv.time1 = 0 tfv.tcritsc = 16.0 tfv.tdmptf = 10.0 - tfv.tfareain = 0.0 + tfv.a_tf_coil_inboard = 0.0 tfv.len_tf_bus = 300.0 tfv.m_tf_bus = 0.0 tfv.tfckw = 0.0 @@ -3850,7 +3850,7 @@ def init_tfcoil_variables(): tfv.tfjtsmw = 0.0 tfv.tfcryoarea = 0.0 tfv.tficrn = 0.0 - tfv.tfind = 0.0 + tfv.ind_tf_coil = 0.0 tfv.tfinsgap = 0.01 tfv.tflegmw = 0.0 tfv.rho_cp = 0.0 @@ -3870,10 +3870,10 @@ def init_tfcoil_variables(): tfv.tfsai = 0.0 tfv.tfsao = 0.0 tfv.tftmp = 4.5 - tfv.tftort = 1.0 + tfv.dx_tf_inboard_out_toroidal = 1.0 tfv.thicndut = 8e-4 tfv.layer_ins = 0.0 - tfv.thkcas = 0.3 + tfv.dr_tf_nose_case = 0.3 tfv.dr_tf_wp = 0.0 tfv.thwcndut = 8e-3 tfv.tinstf = 0.018 @@ -3885,7 +3885,7 @@ def init_tfcoil_variables(): tfv.tmaxpro = 150.0 tfv.tmax_croco = 200.0 tfv.croco_quench_temperature = 0.0 - tfv.tmpcry = 4.5 + tfv.temp_tf_cryo = 4.5 tfv.n_tf_turn = 0.0 tfv.vdalw = 20.0 tfv.vforce = 0.0 @@ -3901,9 +3901,9 @@ def init_tfcoil_variables(): tfv.whtconal = 0.0 tfv.whtconin = 0.0 tfv.whtconsc = 0.0 - tfv.whtconsh = 0.0 + tfv.m_tf_turn_steel = 0.0 tfv.whtgw = 0.0 - tfv.whttf = 0.0 + tfv.m_tf_coils_total = 0.0 tfv.wwp1 = 0.0 tfv.wwp2 = 0.0 tfv.dthet[:] = 0.0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index a2b4d90d6e..6888a04a82 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -9898,7 +9898,7 @@ "kh2o": "thermal conductivity of water (W/m/K)", "ki": "", "kron": "", - "lablcc": "lablcc(ipeqns) : labels describing constraint equations (corresponding itvs)
                      \n
                      \n
                    • ( 1) Beta (consistency equation) (itv 5)\n
                    • ( 2) Global power balance (consistency equation) (itv 10,1,2,3,4,6,11)\n
                    • ( 3) Ion power balance DEPRECATED (itv 10,1,2,3,4,6,11)\n
                    • ( 4) Electron power balance DEPRECATED (itv 10,1,2,3,4,6,11)\n
                    • ( 5) Density upper limit (itv 9,1,2,3,4,5,6)\n
                    • ( 6) (Epsilon x beta poloidal) upper limit (itv 8,1,2,3,4,6)\n
                    • ( 7) Beam ion density (NBI) (consistency equation) (itv 7)\n
                    • ( 8) Neutron wall load upper limit (itv 14,1,2,3,4,6)\n
                    • ( 9) Fusion power upper limit (itv 26,1,2,3,4,6)\n
                    • (10) Toroidal field 1/R (consistency equation) (itv 12,1,2,3,13 )\n
                    • (11) Radial build (consistency equation) (itv 3,1,13,16,29,42,61)\n
                    • (12) Volt second lower limit (STEADY STATE) (itv 15,1,2,3)\n
                    • (13) Burn time lower limit (PULSE) (itv 21,1,16,17,29,42,44,61)\n (itv 19,1,2,3,6)\n
                    • (14) Neutral beam decay lengths to plasma centre (NBI) (consistency equation)\n
                    • (15) LH power threshold limit (itv 103)\n
                    • (16) Net electric power lower limit (itv 25,1,2,3)\n
                    • (17) Radiation fraction upper limit (itv 28)\n
                    • (18) Divertor heat load upper limit (itv 27)\n
                    • (19) MVA upper limit (itv 30)\n
                    • (20) Neutral beam tangency radius upper limit (NBI) (itv 33,31,3,13)\n
                    • (21) Plasma minor radius lower limit (itv 32)\n
                    • (22) Divertor collisionality upper limit (itv 34,43)\n
                    • (23) Conducting shell to plasma minor radius ratio upper limit\n (itv 104,1,74)\n
                    • (24) Beta upper limit (itv 36,1,2,3,4,6,18)\n
                    • (25) Peak toroidal field upper limit (itv 35,3,13,29)\n
                    • (26) Central solenoid EOF current density upper limit (i_pf_conductor=0)\n (itv 38,37,41,12)\n
                    • (27) Central solenoid BOP current density upper limit (i_pf_conductor=0)\n (itv 39,37,41,12)\n
                    • (28) Fusion gain Q lower limit (itv 45,47,40)\n
                    • (29) Inboard radial build consistency (itv 3,1,13,16,29,42,61)\n
                    • (30) Injection power upper limit (itv 46,47,11)\n
                    • (31) TF coil case stress upper limit (SCTF) (itv 48,56,57,58,59,60,24)\n
                    • (32) TF coil conduit stress upper limit (SCTF) (itv 49,56,57,58,59,60,24)\n
                    • (33) I_op / I_critical (TF coil) (SCTF) (itv 50,56,57,58,59,60,24)\n
                    • (34) Dump voltage upper limit (SCTF) (itv 51,52,56,57,58,59,60,24)\n
                    • (35) J_winding pack/J_protection upper limit (SCTF) (itv 53,56,57,58,59,60,24)\n
                    • (36) TF coil temperature margin lower limit (SCTF) (itv 54,55,56,57,58,59,60,24)\n
                    • (37) Current drive gamma upper limit (itv 40,47)\n
                    • (38) First wall coolant temperature rise upper limit (itv 62)\n
                    • (39) First wall peak temperature upper limit (itv 63)\n
                    • (40) Start-up injection power lower limit (PULSE) (itv 64)\n
                    • (41) Plasma current ramp-up time lower limit (PULSE) (itv 66,65)\n
                    • (42) Cycle time lower limit (PULSE) (itv 17,67,65)\n
                    • (43) Average centrepost temperature\n (TART) (consistency equation) (itv 13,20,69,70)\n
                    • (44) Peak centrepost temperature upper limit (TART) (itv 68,69,70)\n
                    • (45) Edge safety factor lower limit (TART) (itv 71,1,2,3)\n
                    • (46) Equation for Ip/Irod upper limit (TART) (itv 72,2,60)\n
                    • (47) NOT USED\n
                    • (48) Poloidal beta upper limit (itv 79,2,3,18)\n
                    • (49) NOT USED\n
                    • (50) IFE repetition rate upper limit (IFE)\n
                    • (51) Startup volt-seconds consistency (PULSE) (itv 16,29,3,1)\n
                    • (52) Tritium breeding ratio lower limit (itv 89,90,91)\n
                    • (53) Neutron fluence on TF coil upper limit (itv 92,93,94)\n
                    • (54) Peak TF coil nuclear heating upper limit (itv 95,93,94)\n
                    • (55) Vacuum vessel helium concentration upper limit i_blanket_type =2 (itv 96,93,94)\n
                    • (56) Pseparatrix/Rmajor upper limit (itv 97,1,3)\n
                    • (57) NOT USED\n
                    • (58) NOT USED\n
                    • (59) Neutral beam shine-through fraction upper limit (NBI) (itv 105,6,19,4 )\n
                    • (60) Central solenoid temperature margin lower limit (SCTF) (itv 106)\n
                    • (61) Minimum availability value (itv 107)\n
                    • (62) f_alpha_energy_confinement the ratio of particle to energy confinement times (itv 110)\n
                    • (63) The number of ITER-like vacuum pumps niterpump < tfno (itv 111)\n
                    • (64) Zeff less than or equal to zeffmax (itv 112)\n
                    • (65) Dump time set by VV loads (itv 56, 113)\n
                    • (66) Limit on rate of change of energy in poloidal field\n (Use iteration variable 65(t_current_ramp_up), 115)\n
                    • (67) Simple Radiation Wall load limit (itv 116, 4,6)\n
                    • (68) Psep * Bt / qAR upper limit (itv 117)\n
                    • (69) ensure separatrix power = the value from Kallenbach divertor (itv 118)\n
                    • (70) ensure that teomp = separatrix temperature in the pedestal profile,\n (itv 119 (tesep))\n
                    • (71) ensure that neomp = separatrix density (nesep) x neratio\n
                    • (72) central solenoid shear stress limit (Tresca yield criterion) (itv 123 foh_stress)\n
                    • (73) Psep >= Plh + Paux (itv 137 (fplhsep))\n
                    • (74) TFC quench < tmax_croco (itv 141 (fcqt))\n
                    • (75) TFC current/copper area < Maximum (itv 143 f_coppera_m2)\n
                    • (76) Eich critical separatrix density\n
                    • (77) TF coil current per turn upper limit\n
                    • (78) Reinke criterion impurity fraction lower limit (itv 147 freinke)\n
                    • (79) Peak CS field upper limit (itv 149 fb_cs_limit_max)\n
                    • (80) Divertor power lower limit pdivt (itv 153 fpdivlim)\n
                    • (81) Ne(0) > ne(ped) constraint (itv 154 fne0)\n
                    • (82) toroidalgap > tftort constraint (itv 171 ftoroidalgap)\n
                    • (83) Radial build consistency for stellarators (itv 172 f_avspace)\n
                    • (84) Lower limit for beta (itv 173 fbeta_min)\n
                    • (85) Constraint for CP lifetime\n
                    • (86) Constraint for TF coil turn dimension\n
                    • (87) Constraint for cryogenic power\n
                    • (88) Constraint for TF coil strain absolute value\n
                    • (89) Constraint for CS coil quench protection\n
                    • (90) Checking if the design point is ECRH ignitable (itv 164 fecrh_ignition)
                    \n\n\n\n", + "lablcc": "lablcc(ipeqns) : labels describing constraint equations (corresponding itvs)
                      \n
                      \n
                    • ( 1) Beta (consistency equation) (itv 5)\n
                    • ( 2) Global power balance (consistency equation) (itv 10,1,2,3,4,6,11)\n
                    • ( 3) Ion power balance DEPRECATED (itv 10,1,2,3,4,6,11)\n
                    • ( 4) Electron power balance DEPRECATED (itv 10,1,2,3,4,6,11)\n
                    • ( 5) Density upper limit (itv 9,1,2,3,4,5,6)\n
                    • ( 6) (Epsilon x beta poloidal) upper limit (itv 8,1,2,3,4,6)\n
                    • ( 7) Beam ion density (NBI) (consistency equation) (itv 7)\n
                    • ( 8) Neutron wall load upper limit (itv 14,1,2,3,4,6)\n
                    • ( 9) Fusion power upper limit (itv 26,1,2,3,4,6)\n
                    • (10) Toroidal field 1/R (consistency equation) (itv 12,1,2,3,13 )\n
                    • (11) Radial build (consistency equation) (itv 3,1,13,16,29,42,61)\n
                    • (12) Volt second lower limit (STEADY STATE) (itv 15,1,2,3)\n
                    • (13) Burn time lower limit (PULSE) (itv 21,1,16,17,29,42,44,61)\n (itv 19,1,2,3,6)\n
                    • (14) Neutral beam decay lengths to plasma centre (NBI) (consistency equation)\n
                    • (15) LH power threshold limit (itv 103)\n
                    • (16) Net electric power lower limit (itv 25,1,2,3)\n
                    • (17) Radiation fraction upper limit (itv 28)\n
                    • (18) Divertor heat load upper limit (itv 27)\n
                    • (19) MVA upper limit (itv 30)\n
                    • (20) Neutral beam tangency radius upper limit (NBI) (itv 33,31,3,13)\n
                    • (21) Plasma minor radius lower limit (itv 32)\n
                    • (22) Divertor collisionality upper limit (itv 34,43)\n
                    • (23) Conducting shell to plasma minor radius ratio upper limit\n (itv 104,1,74)\n
                    • (24) Beta upper limit (itv 36,1,2,3,4,6,18)\n
                    • (25) Peak toroidal field upper limit (itv 35,3,13,29)\n
                    • (26) Central solenoid EOF current density upper limit (i_pf_conductor=0)\n (itv 38,37,41,12)\n
                    • (27) Central solenoid BOP current density upper limit (i_pf_conductor=0)\n (itv 39,37,41,12)\n
                    • (28) Fusion gain Q lower limit (itv 45,47,40)\n
                    • (29) Inboard radial build consistency (itv 3,1,13,16,29,42,61)\n
                    • (30) Injection power upper limit (itv 46,47,11)\n
                    • (31) TF coil case stress upper limit (SCTF) (itv 48,56,57,58,59,60,24)\n
                    • (32) TF coil conduit stress upper limit (SCTF) (itv 49,56,57,58,59,60,24)\n
                    • (33) I_op / I_critical (TF coil) (SCTF) (itv 50,56,57,58,59,60,24)\n
                    • (34) Dump voltage upper limit (SCTF) (itv 51,52,56,57,58,59,60,24)\n
                    • (35) J_winding pack/J_protection upper limit (SCTF) (itv 53,56,57,58,59,60,24)\n
                    • (36) TF coil temperature margin lower limit (SCTF) (itv 54,55,56,57,58,59,60,24)\n
                    • (37) Current drive gamma upper limit (itv 40,47)\n
                    • (38) First wall coolant temperature rise upper limit (itv 62)\n
                    • (39) First wall peak temperature upper limit (itv 63)\n
                    • (40) Start-up injection power lower limit (PULSE) (itv 64)\n
                    • (41) Plasma current ramp-up time lower limit (PULSE) (itv 66,65)\n
                    • (42) Cycle time lower limit (PULSE) (itv 17,67,65)\n
                    • (43) Average centrepost temperature\n (TART) (consistency equation) (itv 13,20,69,70)\n
                    • (44) Peak centrepost temperature upper limit (TART) (itv 68,69,70)\n
                    • (45) Edge safety factor lower limit (TART) (itv 71,1,2,3)\n
                    • (46) Equation for Ip/Irod upper limit (TART) (itv 72,2,60)\n
                    • (47) NOT USED\n
                    • (48) Poloidal beta upper limit (itv 79,2,3,18)\n
                    • (49) NOT USED\n
                    • (50) IFE repetition rate upper limit (IFE)\n
                    • (51) Startup volt-seconds consistency (PULSE) (itv 16,29,3,1)\n
                    • (52) Tritium breeding ratio lower limit (itv 89,90,91)\n
                    • (53) Neutron fluence on TF coil upper limit (itv 92,93,94)\n
                    • (54) Peak TF coil nuclear heating upper limit (itv 95,93,94)\n
                    • (55) Vacuum vessel helium concentration upper limit i_blanket_type =2 (itv 96,93,94)\n
                    • (56) Pseparatrix/Rmajor upper limit (itv 97,1,3)\n
                    • (57) NOT USED\n
                    • (58) NOT USED\n
                    • (59) Neutral beam shine-through fraction upper limit (NBI) (itv 105,6,19,4 )\n
                    • (60) Central solenoid temperature margin lower limit (SCTF) (itv 106)\n
                    • (61) Minimum availability value (itv 107)\n
                    • (62) f_alpha_energy_confinement the ratio of particle to energy confinement times (itv 110)\n
                    • (63) The number of ITER-like vacuum pumps niterpump < tfno (itv 111)\n
                    • (64) Zeff less than or equal to zeffmax (itv 112)\n
                    • (65) Dump time set by VV loads (itv 56, 113)\n
                    • (66) Limit on rate of change of energy in poloidal field\n (Use iteration variable 65(t_current_ramp_up), 115)\n
                    • (67) Simple Radiation Wall load limit (itv 116, 4,6)\n
                    • (68) Psep * Bt / qAR upper limit (itv 117)\n
                    • (69) ensure separatrix power = the value from Kallenbach divertor (itv 118)\n
                    • (70) ensure that teomp = separatrix temperature in the pedestal profile,\n (itv 119 (tesep))\n
                    • (71) ensure that neomp = separatrix density (nesep) x neratio\n
                    • (72) central solenoid shear stress limit (Tresca yield criterion) (itv 123 foh_stress)\n
                    • (73) Psep >= Plh + Paux (itv 137 (fplhsep))\n
                    • (74) TFC quench < tmax_croco (itv 141 (fcqt))\n
                    • (75) TFC current/copper area < Maximum (itv 143 f_coppera_m2)\n
                    • (76) Eich critical separatrix density\n
                    • (77) TF coil current per turn upper limit\n
                    • (78) Reinke criterion impurity fraction lower limit (itv 147 freinke)\n
                    • (79) Peak CS field upper limit (itv 149 fb_cs_limit_max)\n
                    • (80) Divertor power lower limit pdivt (itv 153 fpdivlim)\n
                    • (81) Ne(0) > ne(ped) constraint (itv 154 fne0)\n
                    • (82) toroidalgap > dx_tf_inboard_out_toroidal constraint (itv 171 ftoroidalgap)\n
                    • (83) Radial build consistency for stellarators (itv 172 f_avspace)\n
                    • (84) Lower limit for beta (itv 173 fbeta_min)\n
                    • (85) Constraint for CP lifetime\n
                    • (86) Constraint for TF coil turn dimension\n
                    • (87) Constraint for cryogenic power\n
                    • (88) Constraint for TF coil strain absolute value\n
                    • (89) Constraint for CS coil quench protection\n
                    • (90) Checking if the design point is ECRH ignitable (itv 164 fecrh_ignition)
                    \n\n\n\n", "lablmm": "lablmm(ipnfoms) : labels describing figures of merit:
                      \n
                      \n
                    • ( 1) major radius\n
                    • ( 2) not used\n
                    • ( 3) neutron wall load\n
                    • ( 4) P_tf + P_pf\n
                    • ( 5) fusion gain Q\n
                    • ( 6) cost of electricity\n
                    • ( 7) capital cost (direct cost if ireactor=0,\n constructed cost otherwise)\n
                    • ( 8) aspect ratio\n
                    • ( 9) divertor heat load\n
                    • (10) toroidal field\n
                    • (11) total injected power\n
                    • (12) hydrogen plant capital cost OBSOLETE\n
                    • (13) hydrogen production rate OBSOLETE\n
                    • (14) pulse length\n
                    • (15) plant availability factor (N.B. requires\n iavail=1 to be set)\n
                    • (16) linear combination of major radius (minimised) and pulse length (maximised)\n note: FoM should be minimised only!\n
                    • (17) net electrical output\n
                    • (18) Null Figure of Merit\n
                    • (19) linear combination of big Q and pulse length (maximised)\n note: FoM should be minimised only!
                    \n\n\n", "lablxc": "lablxc(ipnvars) : labels describing iteration variables
                      \n
                      \n
                    • ( 1) aspect\n
                    • ( 2) bt\n
                    • ( 3) rmajor\n
                    • ( 4) te\n
                    • ( 5) beta\n
                    • ( 6) dene\n
                    • ( 7) f_nd_beam_electron\n
                    • ( 8) fbeta_poloidal_eps (f-value for equation 6)\n
                    • ( 9) fdene (f-value for equation 5)\n
                    • (10) hfact\n
                    • (11) pheat\n
                    • (12) oacdcp\n
                    • (13) dr_tf_inboard (NOT RECOMMENDED)\n
                    • (14) fwalld (f-value for equation 8)\n
                    • (15) fvs (f-value for equation 12)\n
                    • (16) dr_cs\n
                    • (17) tdwell\n
                    • (18) q\n
                    • (19) beam_energy\n
                    • (20) temp_cp_average\n
                    • (21) ftburn (f-value for equation 13)\n
                    • (22) NOT USED\n
                    • (23) fcoolcp\n
                    • (24) NOT USED\n
                    • (25) fpnetel (f-value for equation 16)\n
                    • (26) ffuspow (f-value for equation 9)\n
                    • (27) fhldiv (f-value for equation 18)\n
                    • (28) fradpwr (f-value for equation 17), total radiation fraction\n
                    • (29) dr_bore\n
                    • (30) fmva (f-value for equation 19)\n
                    • (31) gapomin\n
                    • (32) frminor (f-value for equation 21)\n
                    • (33) fportsz (f-value for equation 20)\n
                    • (34) fdivcol (f-value for equation 22)\n
                    • (35) fpeakb (f-value for equation 25)\n
                    • (36) fbeta_max (f-value for equation 24)\n
                    • (37) j_cs_flat_top_end\n
                    • (38) fjohc (f-value for equation 26)\n
                    • (39) fjohc0 (f-value for equation 27)\n
                    • (40) fgamcd (f-value for equation 37)\n
                    • (41) f_j_cs_start_pulse_end_flat_top\n
                    • (42) dr_cs_tf_gap\n
                    • (43) NOT USED\n
                    • (44) fvsbrnni\n
                    • (45) fqval (f-value for equation 28)\n
                    • (46) fpinj (f-value for equation 30)\n
                    • (47) feffcd\n
                    • (48) fstrcase (f-value for equation 31)\n
                    • (49) fstrcond (f-value for equation 32)\n
                    • (50) fiooic (f-value for equation 33)\n
                    • (51) fvdump (f-value for equation 34)\n
                    • (52) vdalw\n
                    • (53) fjprot (f-value for equation 35)\n
                    • (54) ftmargtf (f-value for equation 36)\n
                    • (55) NOT USED\n
                    • (56) tdmptf\n
                    • (57) dr_tf_nose_case\n
                    • (58) thwcndut\n
                    • (59) fcutfsu\n
                    • (60) cpttf\n
                    • (61) dr_shld_vv_gap_inboard\n
                    • (62) fdtmp (f-value for equation 38)\n
                    • (63) ftpeak (f-value for equation 39)\n
                    • (64) fauxmn (f-value for equation 40)\n
                    • (65) tohs\n
                    • (66) ftohs (f-value for equation 41)\n
                    • (67) ftcycl (f-value for equation 42)\n
                    • (68) fptemp (f-value for equation 44)\n
                    • (69) rcool\n
                    • (70) vcool\n
                    • (71) fq (f-value for equation 45)\n
                    • (72) fipir (f-value for equation 46)\n
                    • (73) dr_fw_plasma_gap_inboard\n
                    • (74) dr_fw_plasma_gap_outboard\n
                    • (75) tfootfi\n
                    • (76) NOT USED\n
                    • (77) NOT USED\n
                    • (78) NOT USED\n
                    • (79) fbeta_poloidal (f-value for equation 48)\n
                    • (80) NOT USED\n
                    • (81) edrive\n
                    • (82) drveff\n
                    • (83) tgain\n
                    • (84) chrad\n
                    • (85) pdrive\n
                    • (86) frrmax (f-value for equation 50)\n
                    • (87) NOT USED\n
                    • (88) NOT USED\n
                    • (89) ftbr (f-value for equation 52)\n
                    • (90) blbuith\n
                    • (91) blbuoth\n
                    • (92) fflutf (f-value for equation 53)\n
                    • (93) dr_shld_inboard\n
                    • (94) dr_shld_outboard\n
                    • (95) fptfnuc (f-value for equation 54)\n
                    • (96) fvvhe (f-value for equation 55)\n
                    • (97) fpsepr (f-value for equation 56)\n
                    • (98) f_blkt_li6_enrichment\n
                    • (99) NOT USED\n
                    • (100) NOT USED\n
                    • (101) NOT USED\n
                    • (102) fimpvar\n
                    • (103) fl_h_threshold (f-value for equation 15)\n
                    • (104)fr_conducting_wall (f-value for equation 23)\n
                    • (105) fnbshinef (f-value for equation 59)\n
                    • (106) ftmargoh (f-value for equation 60)\n
                    • (107) favail (f-value for equation 61)\n
                    • (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)\n
                    • (109) f_nd_alpha_electron: thermal alpha density / electron density\n
                    • (110) falpha_energy_confinement: Lower limit on f_alpha_energy_confinement the ratio of alpha\n
                    • (111) fniterpump: f-value for constraint that number\n
                    • (112) fzeffmax: f-value for max Zeff (f-value for equation 64)\n
                    • (113) ftaucq: f-value for minimum quench time (f-value for equation 65)\n
                    • (114) len_fw_channel: Length of a single first wall channel\n
                    • (115) fpoloidalpower: f-value for max rate of change of\n
                    • (116) fradwall: f-value for radiation wall load limit (eq. 67)\n
                    • (117) fpsepbqar: f-value for Psep*Bt/qar upper limit (eq. 68)\n
                    • (118) fpsep: f-value to ensure separatrix power is less than\n
                    • (119) tesep: separatrix temperature calculated by the Kallenbach divertor model\n
                    • (120) ttarget: Plasma temperature adjacent to divertor sheath [eV]\n
                    • (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP\n
                    • (122) f_a_cs_steel : streel fraction of Central Solenoid\n
                    • (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72)\n
                    • (124) qtargettotal : Power density on target including surface recombination [W/m2]\n
                    • (125) fimp(3) : Beryllium density fraction relative to electron density\n
                    • (126) fimp(4) : Carbon density fraction relative to electron density\n
                    • (127) fimp(5) : Nitrogen fraction relative to electron density\n
                    • (128) fimp(6) : Oxygen density fraction relative to electron density\n
                    • (129) fimp(7) : Neon density fraction relative to electron density\n
                    • (130) fimp(8) : Silicon density fraction relative to electron density\n
                    • (131) fimp(9) : Argon density fraction relative to electron density\n
                    • (132) fimp(10) : Iron density fraction relative to electron density\n
                    • (133) fimp(11) : Nickel density fraction relative to electron density\n
                    • (134) fimp(12) : Krypton density fraction relative to electron density\n
                    • (135) fimp(13) : Xenon density fraction relative to electron density\n
                    • (136) fimp(14) : Tungsten density fraction relative to electron density\n
                    • (137) fplhsep (f-value for equation 73)\n
                    • (138) rebco_thickness : thickness of REBCO layer in tape (m)\n
                    • (139) copper_thick : thickness of copper layer in tape (m)\n
                    • (140) dr_tf_wp : radial thickness of TFC winding pack (m)\n
                    • (141) fcqt : TF coil quench temperature < tmax_croco (f-value for equation 74)\n
                    • (142) nesep : electron density at separatrix [m-3]\n
                    • (143) f_copperA_m2 : TF coil current / copper area < Maximum value\n
                    • (144) fnesep : Eich critical electron density at separatrix\n
                    • (145) fgwped : fraction of Greenwald density to set as pedestal-top density\n
                    • (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77)\n
                    • (147) freinke : F-value for Reinke detachment criterion (constraint equation 78)\n
                    • (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion\n
                    • (149) fb_cs_limit_max : F-value for max peak CS field (con. 79, itvar 149)\n
                    • (152) fb_cs_limit_max : Ratio of separatrix density to Greenwald density\n
                    • (153) fpdivlim : F-value for minimum pdivt (con. 80)\n
                    • (154) fne0 : F-value for ne(0) > ne(ped) (con. 81)\n
                    • (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only)\n
                    • (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only)\n
                    • (157) fvs_cs_pf_total_ramp : F-value for available to required start up flux (con. 51)\n
                    • (158) croco_thick : Thickness of CroCo copper tube (m)\n
                    • (159) ftoroidalgap : F-value for toroidalgap > dx_tf_inboard_out_toroidal constraint (con. 82)\n
                    • (160) f_avspace (f-value for equation 83)\n
                    • (161) fbeta_min (f-value for equation 84)\n
                    • (162) r_cp_top : Top outer radius of the centropost (ST only) (m)\n
                    • (163) f_t_turn_tf : f-value for TF coils WP trurn squared dimension constraint\n
                    • (164) f_crypmw : f-value for cryogenic plant power\n
                    • (165) fstr_wp : f-value for TF coil strain absolute value\n
                    • (166) f_copperaoh_m2 : CS coil current /copper area < Maximum value\n
                    • (167) fecrh_ignition: f-value for equation 90\n
                    • (168) EMPTY : Description\n
                    • (169) EMPTY : Description\n
                    • (170) EMPTY : Description\n
                    • (171) EMPTY : Description\n
                    • (172) EMPTY : Description\n
                    • (173) EMPTY : Description\n
                    • (174) EMPTY : Description\n
                    • (175) EMPTY : Description\n\n\n\n", "lablxc": "lablxc(ipnvars) : labels describing iteration variables
                        \n
                        \n
                      • ( 1) aspect\n
                      • ( 2) bt\n
                      • ( 3) rmajor\n
                      • ( 4) te\n
                      • ( 5) beta\n
                      • ( 6) dene\n
                      • ( 7) f_nd_beam_electron\n
                      • ( 8) fbeta_poloidal_eps (f-value for equation 6)\n
                      • ( 9) fdene (f-value for equation 5)\n
                      • (10) hfact\n
                      • (11) pheat\n
                      • (12) oacdcp\n
                      • (13) dr_tf_inboard (NOT RECOMMENDED)\n
                      • (14) fwalld (f-value for equation 8)\n
                      • (15) fvs (f-value for equation 12)\n
                      • (16) dr_cs\n
                      • (17) t_between_pulse\n
                      • (18) q\n
                      • (19) beam_energy\n
                      • (20) temp_cp_average\n
                      • (21) ft_burn (f-value for equation 13)\n
                      • (22) NOT USED\n
                      • (23) fcoolcp\n
                      • (24) NOT USED\n
                      • (25) fpnetel (f-value for equation 16)\n
                      • (26) ffuspow (f-value for equation 9)\n
                      • (27) fhldiv (f-value for equation 18)\n
                      • (28) fradpwr (f-value for equation 17), total radiation fraction\n
                      • (29) dr_bore\n
                      • (30) fmva (f-value for equation 19)\n
                      • (31) gapomin\n
                      • (32) frminor (f-value for equation 21)\n
                      • (33) fportsz (f-value for equation 20)\n
                      • (34) fdivcol (f-value for equation 22)\n
                      • (35) fpeakb (f-value for equation 25)\n
                      • (36) fbeta_max (f-value for equation 24)\n
                      • (37) j_cs_flat_top_end\n
                      • (38) fjohc (f-value for equation 26)\n
                      • (39) fjohc0 (f-value for equation 27)\n
                      • (40) fgamcd (f-value for equation 37)\n
                      • (41) f_j_cs_start_pulse_end_flat_top\n
                      • (42) dr_cs_tf_gap\n
                      • (43) NOT USED\n
                      • (44) fvsbrnni\n
                      • (45) fqval (f-value for equation 28)\n
                      • (46) fpinj (f-value for equation 30)\n
                      • (47) feffcd\n
                      • (48) fstrcase (f-value for equation 31)\n
                      • (49) fstrcond (f-value for equation 32)\n
                      • (50) fiooic (f-value for equation 33)\n
                      • (51) fvdump (f-value for equation 34)\n
                      • (52) vdalw\n
                      • (53) fjprot (f-value for equation 35)\n
                      • (54) ftmargtf (f-value for equation 36)\n
                      • (55) NOT USED\n
                      • (56) tdmptf\n
                      • (57) dr_tf_nose_case\n
                      • (58) thwcndut\n
                      • (59) fcutfsu\n
                      • (60) cpttf\n
                      • (61) dr_shld_vv_gap_inboard\n
                      • (62) fdtmp (f-value for equation 38)\n
                      • (63) ftpeak (f-value for equation 39)\n
                      • (64) fauxmn (f-value for equation 40)\n
                      • (65) t_current_ramp_up\n
                      • (66) ft_current_ramp_up (f-value for equation 41)\n
                      • (67) ftcycl (f-value for equation 42)\n
                      • (68) fptemp (f-value for equation 44)\n
                      • (69) rcool\n
                      • (70) vcool\n
                      • (71) fq (f-value for equation 45)\n
                      • (72) fipir (f-value for equation 46)\n
                      • (73) dr_fw_plasma_gap_inboard\n
                      • (74) dr_fw_plasma_gap_outboard\n
                      • (75) tfootfi\n
                      • (76) NOT USED\n
                      • (77) NOT USED\n
                      • (78) NOT USED\n
                      • (79) fbetap (f-value for equation 48)\n
                      • (80) NOT USED\n
                      • (81) edrive\n
                      • (82) drveff\n
                      • (83) tgain\n
                      • (84) chrad\n
                      • (85) pdrive\n
                      • (86) frrmax (f-value for equation 50)\n
                      • (87) NOT USED\n
                      • (88) NOT USED\n
                      • (89) ftbr (f-value for equation 52)\n
                      • (90) blbuith\n
                      • (91) blbuoth\n
                      • (92) fflutf (f-value for equation 53)\n
                      • (93) dr_shld_inboard\n
                      • (94) dr_shld_outboard\n
                      • (95) fptfnuc (f-value for equation 54)\n
                      • (96) fvvhe (f-value for equation 55)\n
                      • (97) fpsepr (f-value for equation 56)\n
                      • (98) f_blkt_li6_enrichment\n
                      • (99) NOT USED\n
                      • (100) NOT USED\n
                      • (101) NOT USED\n
                      • (102) fimpvar\n
                      • (103) fl_h_threshold (f-value for equation 15)\n
                      • (104)fr_conducting_wall (f-value for equation 23)\n
                      • (105) fnbshinef (f-value for equation 59)\n
                      • (106) ftmargoh (f-value for equation 60)\n
                      • (107) favail (f-value for equation 61)\n
                      • (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)\n
                      • (109) f_nd_alpha_electron: thermal alpha density / electron density\n
                      • (110) falpha_energy_confinement: Lower limit on f_alpha_energy_confinement the ratio of alpha\n
                      • (111) fniterpump: f-value for constraint that number\n
                      • (112) fzeffmax: f-value for max Zeff (f-value for equation 64)\n
                      • (113) ftaucq: f-value for minimum quench time (f-value for equation 65)\n
                      • (114) len_fw_channel: Length of a single first wall channel\n
                      • (115) fpoloidalpower: f-value for max rate of change of\n
                      • (116) fradwall: f-value for radiation wall load limit (eq. 67)\n
                      • (117) fpsepbqar: f-value for Psep*Bt/qar upper limit (eq. 68)\n
                      • (118) fpsep: f-value to ensure separatrix power is less than\n
                      • (119) tesep: separatrix temperature calculated by the Kallenbach divertor model\n
                      • (120) ttarget: Plasma temperature adjacent to divertor sheath [eV]\n
                      • (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP\n
                      • (122) f_a_cs_steel : streel fraction of Central Solenoid\n
                      • (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72)\n
                      • (124) qtargettotal : Power density on target including surface recombination [W/m2]\n
                      • (125) fimp(3) : Beryllium density fraction relative to electron density\n
                      • (126) fimp(4) : Carbon density fraction relative to electron density\n
                      • (127) fimp(5) : Nitrogen fraction relative to electron density\n
                      • (128) fimp(6) : Oxygen density fraction relative to electron density\n
                      • (129) fimp(7) : Neon density fraction relative to electron density\n
                      • (130) fimp(8) : Silicon density fraction relative to electron density\n
                      • (131) fimp(9) : Argon density fraction relative to electron density\n
                      • (132) fimp(10) : Iron density fraction relative to electron density\n
                      • (133) fimp(11) : Nickel density fraction relative to electron density\n
                      • (134) fimp(12) : Krypton density fraction relative to electron density\n
                      • (135) fimp(13) : Xenon density fraction relative to electron density\n
                      • (136) fimp(14) : Tungsten density fraction relative to electron density\n
                      • (137) fplhsep (f-value for equation 73)\n
                      • (138) rebco_thickness : thickness of REBCO layer in tape (m)\n
                      • (139) copper_thick : thickness of copper layer in tape (m)\n
                      • (140) dr_tf_wp : radial thickness of TFC winding pack (m)\n
                      • (141) fcqt : TF coil quench temperature < tmax_croco (f-value for equation 74)\n
                      • (142) nesep : electron density at separatrix [m-3]\n
                      • (143) f_copperA_m2 : TF coil current / copper area < Maximum value\n
                      • (144) fnesep : Eich critical electron density at separatrix\n
                      • (145) fgwped : fraction of Greenwald density to set as pedestal-top density\n
                      • (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77)\n
                      • (147) freinke : F-value for Reinke detachment criterion (constraint equation 78)\n
                      • (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion\n
                      • (149) fb_cs_limit_max : F-value for max peak CS field (con. 79, itvar 149)\n
                      • (152) fb_cs_limit_max : Ratio of separatrix density to Greenwald density\n
                      • (153) fpdivlim : F-value for minimum pdivt (con. 80)\n
                      • (154) fne0 : F-value for ne(0) > ne(ped) (con. 81)\n
                      • (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only)\n
                      • (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only)\n
                      • (157) fvs_cs_pf_total_ramp : F-value for available to required start up flux (con. 51)\n
                      • (158) croco_thick : Thickness of CroCo copper tube (m)\n
                      • (159) ftoroidalgap : F-value for toroidalgap > dx_tf_inboard_out_toroidal constraint (con. 82)\n
                      • (160) f_avspace (f-value for equation 83)\n
                      • (161) fbeta_min (f-value for equation 84)\n
                      • (162) r_cp_top : Top outer radius of the centropost (ST only) (m)\n
                      • (163) f_t_turn_tf : f-value for TF coils WP trurn squared dimension constraint\n
                      • (164) f_crypmw : f-value for cryogenic plant power\n
                      • (165) fstr_wp : f-value for TF coil strain absolute value\n
                      • (166) f_copperaoh_m2 : CS coil current /copper area < Maximum value\n
                      • (167) fecrh_ignition: f-value for equation 90\n
                      • (168) EMPTY : Description\n
                      • (169) EMPTY : Description\n
                      • (170) EMPTY : Description\n
                      • (171) EMPTY : Description\n
                      • (172) EMPTY : Description\n
                      • (173) EMPTY : Description\n
                      • (174) EMPTY : Description\n
                      • (175) EMPTY : Description\n\n\n\n", From b940ea7677691597b1ca025dbc0d3eb8fe7df905 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 10 Apr 2025 10:31:00 +0100 Subject: [PATCH 21/21] Update for new iteration python file --- process/iteration_variables.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/process/iteration_variables.py b/process/iteration_variables.py index 5d7f73f298..3dcc36d71b 100644 --- a/process/iteration_variables.py +++ b/process/iteration_variables.py @@ -90,7 +90,7 @@ class IterationVariable: 53: IterationVariable("fjprot", fortran.constraint_variables, 0.001, 1.0), 54: IterationVariable("ftmargtf", fortran.constraint_variables, 0.001, 1.0), 56: IterationVariable("tdmptf", fortran.tfcoil_variables, 0.1, 100.0), - 57: IterationVariable("thkcas", fortran.tfcoil_variables, 0.05, 1.0), + 57: IterationVariable("dr_tf_nose_case", fortran.tfcoil_variables, 0.05, 1.0), 58: IterationVariable("thwcndut", fortran.tfcoil_variables, 0.001, 0.1), 59: IterationVariable("fcutfsu", fortran.tfcoil_variables, 0.001, 1.0), 60: IterationVariable("cpttf", fortran.tfcoil_variables, 0.001, 4.0e4), @@ -293,7 +293,7 @@ class IterationVariable: ), 170: IterationVariable("beta_div", fortran.divertor_variables, 0.49, 5.01), 171: IterationVariable("casths_fraction", fortran.tfcoil_variables, 0.01, 0.99), - 172: IterationVariable("casths", fortran.tfcoil_variables, 0.001, 1.0), + 172: IterationVariable("dx_tf_side_case", fortran.tfcoil_variables, 0.001, 1.0), 173: IterationVariable("f_tritium", fortran.physics_variables, 0.000, 1.000), 174: IterationVariable("triang", fortran.physics_variables, 0.00, 1.00), 175: IterationVariable("kappa", fortran.physics_variables, 0.00, 10.00),