From b8e8e1db9833b3aa3842f3ac864f6f685b78d73a Mon Sep 17 00:00:00 2001 From: chris-ashe Date: Fri, 29 Nov 2024 22:30:28 +0000 Subject: [PATCH 01/29] :arrows_counterclockwise: Rename tfbusl to len_tf_bus for clarity and consistency across the codebase --- process/costs.py | 2 +- process/power.py | 26 ++++++++-------- source/fortran/tfcoil_variables.f90 | 4 +-- .../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_costs_1990.py | 8 ++--- 13 files changed, 53 insertions(+), 53 deletions(-) diff --git a/process/costs.py b/process/costs.py index 0ecdd4f835..24e7fe0954 100644 --- a/process/costs.py +++ b/process/costs.py @@ -1970,7 +1970,7 @@ def acc2251(self): 1.0e-6 * cost_variables.ucbus * tfcoil_variables.cpttf - * tfcoil_variables.tfbusl + * tfcoil_variables.len_tf_bus ) self.c22515 = cost_variables.fkind * self.c22515 diff --git a/process/power.py b/process/power.py index 6dd504f92f..a26ee73774 100644 --- a/process/power.py +++ b/process/power.py @@ -2480,7 +2480,7 @@ def tfpwr(self, output: bool): None """ if tfcoil_variables.i_tf_sup != 1: - tfcoil_variables.tfbusl = 300.0e0 + tfcoil_variables.len_tf_bus = 300.0e0 # Cross-sectional area of bus # tfcoil_variables.cpttf - current per TFC turn (A) @@ -2491,11 +2491,11 @@ def tfpwr(self, output: bool): # Bus resistivity (tfcoil_variables.rhotfbus) # Issue #1253: there was a fudge here to set the bus bar resistivity equal # to the TF conductor resistivity. I have removed this. - tfbusres = tfcoil_variables.rhotfbus * tfcoil_variables.tfbusl / abus + tfbusres = tfcoil_variables.rhotfbus * tfcoil_variables.len_tf_bus / abus # Bus mass (kg) tfcoil_variables.tfbusmas = ( - tfcoil_variables.tfbusl * abus * constants.dcopper + tfcoil_variables.len_tf_bus * abus * constants.dcopper ) # Total maximum impedance MDK actually just fixed resistance @@ -2561,8 +2561,8 @@ def tfpwr(self, output: bool): po.ovarre( self.outfile, "Bus length - all coils (m)", - "(tfbusl)", - tfcoil_variables.tfbusl, + "(len_tf_bus)", + tfcoil_variables.len_tf_bus, ) po.ovarre( self.outfile, @@ -2648,7 +2648,7 @@ def tfpwcall(self, output: bool): ( tfcoil_variables.tfckw, - tfcoil_variables.tfbusl, + tfcoil_variables.len_tf_bus, tfcoil_variables.drarea, buildings_variables.tfcbv, heat_transport_variables.tfacpd, @@ -2710,18 +2710,18 @@ def tfcpwr(self, output: bool, itfka, rmajor, ntfc, vtfskv, ettfmj, rptfc): albusa = itfka / djmka # Total TF system bus length, m - tfbusl = ( + len_tf_bus = ( 8.0e0 * np.pi * rmajor + (1.0e0 + ntfbkr) * (12.0e0 * rmajor + 80.0e0) + 0.2e0 * itfka * np.sqrt(ntfc * rptfc * 1000.0e0) ) # Aluminium bus weight, tonnes - albuswt = 2.7e0 * albusa * tfbusl / 1.0e4 + albuswt = 2.7e0 * albusa * len_tf_bus / 1.0e4 # Total resistance of TF bus, ohms - # rtfbus = 2.62e-4 * tfbusl / albusa - rtfbus = tfcoil_variables.rhotfbus * tfbusl / (albusa / 10000) + # rtfbus = 2.62e-4 * len_tf_bus / albusa + rtfbus = tfcoil_variables.rhotfbus * len_tf_bus / (albusa / 10000) # Total voltage drop across TF bus, volts vtfbus = 1000.0e0 * itfka * rtfbus @@ -2897,8 +2897,8 @@ def tfcpwr(self, output: bool, itfka, rmajor, ntfc, vtfskv, ettfmj, rptfc): po.ovarre( self.outfile, "Total length of TF coil bussing (m)", - "(tfbusl)", - tfbusl, + "(len_tf_bus)", + len_tf_bus, "OP ", ) po.ovarre( @@ -2951,4 +2951,4 @@ def tfcpwr(self, output: bool, itfka, rmajor, ntfc, vtfskv, ettfmj, rptfc): "OP ", ) - return (tfckw, tfbusl, drarea, tfcbv, tfacpd) + return (tfckw, len_tf_bus, drarea, tfcbv, tfacpd) diff --git a/source/fortran/tfcoil_variables.f90 b/source/fortran/tfcoil_variables.f90 index b215571ab2..59e6698319 100644 --- a/source/fortran/tfcoil_variables.f90 +++ b/source/fortran/tfcoil_variables.f90 @@ -502,7 +502,7 @@ module tfcoil_variables real(dp) :: tfareain !! Area of inboard midplane TF legs (m2) - real(dp) :: tfbusl + real(dp) :: len_tf_bus !! TF coil bus length (m) real(dp) :: tfbusmas @@ -956,7 +956,7 @@ subroutine init_tfcoil_variables tcritsc = 16.0D0 tdmptf = 10.0D0 tfareain = 0.0D0 - tfbusl = 0.0D0 + len_tf_bus = 0.0D0 tfbusmas = 0.0D0 tfckw = 0.0D0 tfcmw = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index d2aa3d84f4..8802d3c2e7 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -1013,7 +1013,7 @@ TF_coil_inductive_power_(MVA)___________________________________________ (xpower)______________________ 1.6891E+01 OP Aluminium_bus_current_density_(kA/cm2)__________________________________ (djmka)_______________________ 1.2500E-01 Aluminium_bus_cross-sectional_area_(cm2)________________________________ (albusa)______________________ 7.1836E+02 OP - Total_length_of_TF_coil_bussing_(m)_____________________________________ (tfbusl)______________________ 3.1931E+03 OP + Total_length_of_TF_coil_bussing_(m)_____________________________________ (len_tf_bus)______________________ 3.1931E+03 OP Aluminium_bus_weight_(tonnes)___________________________________________ (albuswt)_____________________ 6.1932E+02 OP Total_TF_coil_bus_resistance_(ohm)______________________________________ (rtfbus)______________________ 1.1646E-03 OP TF_coil_bus_voltage_drop_(V)____________________________________________ (vtfbus)______________________ 1.0457E+02 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index d2eba7fec3..ecda92ea4c 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -1014,7 +1014,7 @@ TF_coil_inductive_power_(MVA)___________________________________________ (xpower)______________________ 1.6891E+01 OP Aluminium_bus_current_density_(kA/cm2)__________________________________ (djmka)_______________________ 1.2500E-01 Aluminium_bus_cross-sectional_area_(cm2)________________________________ (albusa)______________________ 7.1836E+02 OP - Total_length_of_TF_coil_bussing_(m)_____________________________________ (tfbusl)______________________ 3.1931E+03 OP + Total_length_of_TF_coil_bussing_(m)_____________________________________ (len_tf_bus)______________________ 3.1931E+03 OP Aluminium_bus_weight_(tonnes)___________________________________________ (albuswt)_____________________ 6.1932E+02 OP Total_TF_coil_bus_resistance_(ohm)______________________________________ (rtfbus)______________________ 1.1646E-03 OP TF_coil_bus_voltage_drop_(V)____________________________________________ (vtfbus)______________________ 1.0457E+02 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 4cde49adbe..01411831cb 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -1014,7 +1014,7 @@ TF_coil_inductive_power_(MVA)___________________________________________ (xpower)______________________ 1.6891E+01 OP Aluminium_bus_current_density_(kA/cm2)__________________________________ (djmka)_______________________ 1.2500E-01 Aluminium_bus_cross-sectional_area_(cm2)________________________________ (albusa)______________________ 7.1836E+02 OP - Total_length_of_TF_coil_bussing_(m)_____________________________________ (tfbusl)______________________ 3.1931E+03 OP + Total_length_of_TF_coil_bussing_(m)_____________________________________ (len_tf_bus)______________________ 3.1931E+03 OP Aluminium_bus_weight_(tonnes)___________________________________________ (albuswt)_____________________ 6.1932E+02 OP Total_TF_coil_bus_resistance_(ohm)______________________________________ (rtfbus)______________________ 1.1646E-03 OP TF_coil_bus_voltage_drop_(V)____________________________________________ (vtfbus)______________________ 1.0457E+02 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index f1f7af53ae..503a1ef5e9 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -1014,7 +1014,7 @@ TF_coil_inductive_power_(MVA)___________________________________________ (xpower)______________________ 1.6891E+01 OP Aluminium_bus_current_density_(kA/cm2)__________________________________ (djmka)_______________________ 1.2500E-01 Aluminium_bus_cross-sectional_area_(cm2)________________________________ (albusa)______________________ 7.1836E+02 OP - Total_length_of_TF_coil_bussing_(m)_____________________________________ (tfbusl)______________________ 3.1931E+03 OP + Total_length_of_TF_coil_bussing_(m)_____________________________________ (len_tf_bus)______________________ 3.1931E+03 OP Aluminium_bus_weight_(tonnes)___________________________________________ (albuswt)_____________________ 6.1932E+02 OP Total_TF_coil_bus_resistance_(ohm)______________________________________ (rtfbus)______________________ 1.1646E-03 OP TF_coil_bus_voltage_drop_(V)____________________________________________ (vtfbus)______________________ 1.0457E+02 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index fe8238ad7b..f58d3487e6 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -1017,7 +1017,7 @@ TF_coil_inductive_power_(MVA)___________________________________________ (xpower)______________________ 1.7235E+01 OP Aluminium_bus_current_density_(kA/cm2)__________________________________ (djmka)_______________________ 1.2500E-01 Aluminium_bus_cross-sectional_area_(cm2)________________________________ (albusa)______________________ 7.0344E+02 OP - Total_length_of_TF_coil_bussing_(m)_____________________________________ (tfbusl)______________________ 3.1931E+03 OP + Total_length_of_TF_coil_bussing_(m)_____________________________________ (len_tf_bus)______________________ 3.1931E+03 OP Aluminium_bus_weight_(tonnes)___________________________________________ (albuswt)_____________________ 6.0645E+02 OP Total_TF_coil_bus_resistance_(ohm)______________________________________ (rtfbus)______________________ 1.1893E-03 OP TF_coil_bus_voltage_drop_(V)____________________________________________ (vtfbus)______________________ 1.0457E+02 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index e772741b55..8f073bd91e 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -1015,7 +1015,7 @@ TF_coil_inductive_power_(MVA)___________________________________________ (xpower)______________________ 1.6172E+01 OP Aluminium_bus_current_density_(kA/cm2)__________________________________ (djmka)_______________________ 1.2500E-01 Aluminium_bus_cross-sectional_area_(cm2)________________________________ (albusa)______________________ 7.0614E+02 OP - Total_length_of_TF_coil_bussing_(m)_____________________________________ (tfbusl)______________________ 3.1931E+03 OP + Total_length_of_TF_coil_bussing_(m)_____________________________________ (len_tf_bus)______________________ 3.1931E+03 OP Aluminium_bus_weight_(tonnes)___________________________________________ (albuswt)_____________________ 6.0878E+02 OP Total_TF_coil_bus_resistance_(ohm)______________________________________ (rtfbus)______________________ 1.1847E-03 OP TF_coil_bus_voltage_drop_(V)____________________________________________ (vtfbus)______________________ 1.0457E+02 OP @@ -2178,7 +2178,7 @@ TF_coil_inductive_power_(MVA)___________________________________________ (xpower)______________________ 1.5532E+01 OP Aluminium_bus_current_density_(kA/cm2)__________________________________ (djmka)_______________________ 1.2500E-01 Aluminium_bus_cross-sectional_area_(cm2)________________________________ (albusa)______________________ 7.0608E+02 OP - Total_length_of_TF_coil_bussing_(m)_____________________________________ (tfbusl)______________________ 3.1931E+03 OP + Total_length_of_TF_coil_bussing_(m)_____________________________________ (len_tf_bus)______________________ 3.1931E+03 OP Aluminium_bus_weight_(tonnes)___________________________________________ (albuswt)_____________________ 6.0873E+02 OP Total_TF_coil_bus_resistance_(ohm)______________________________________ (rtfbus)______________________ 1.1848E-03 OP TF_coil_bus_voltage_drop_(V)____________________________________________ (vtfbus)______________________ 1.0457E+02 OP @@ -3341,7 +3341,7 @@ TF_coil_inductive_power_(MVA)___________________________________________ (xpower)______________________ 1.4891E+01 OP Aluminium_bus_current_density_(kA/cm2)__________________________________ (djmka)_______________________ 1.2500E-01 Aluminium_bus_cross-sectional_area_(cm2)________________________________ (albusa)______________________ 7.0051E+02 OP - Total_length_of_TF_coil_bussing_(m)_____________________________________ (tfbusl)______________________ 3.1931E+03 OP + Total_length_of_TF_coil_bussing_(m)_____________________________________ (len_tf_bus)______________________ 3.1931E+03 OP Aluminium_bus_weight_(tonnes)___________________________________________ (albuswt)_____________________ 6.0393E+02 OP Total_TF_coil_bus_resistance_(ohm)______________________________________ (rtfbus)______________________ 1.1943E-03 OP TF_coil_bus_voltage_drop_(V)____________________________________________ (vtfbus)______________________ 1.0457E+02 OP @@ -4504,7 +4504,7 @@ TF_coil_inductive_power_(MVA)___________________________________________ (xpower)______________________ 1.4895E+01 OP Aluminium_bus_current_density_(kA/cm2)__________________________________ (djmka)_______________________ 1.2500E-01 Aluminium_bus_cross-sectional_area_(cm2)________________________________ (albusa)______________________ 7.0025E+02 OP - Total_length_of_TF_coil_bussing_(m)_____________________________________ (tfbusl)______________________ 3.1931E+03 OP + Total_length_of_TF_coil_bussing_(m)_____________________________________ (len_tf_bus)______________________ 3.1931E+03 OP Aluminium_bus_weight_(tonnes)___________________________________________ (albuswt)_____________________ 6.0371E+02 OP Total_TF_coil_bus_resistance_(ohm)______________________________________ (rtfbus)______________________ 1.1947E-03 OP TF_coil_bus_voltage_drop_(V)____________________________________________ (vtfbus)______________________ 1.0457E+02 OP @@ -5667,7 +5667,7 @@ TF_coil_inductive_power_(MVA)___________________________________________ (xpower)______________________ 1.5532E+01 OP Aluminium_bus_current_density_(kA/cm2)__________________________________ (djmka)_______________________ 1.2500E-01 Aluminium_bus_cross-sectional_area_(cm2)________________________________ (albusa)______________________ 7.0881E+02 OP - Total_length_of_TF_coil_bussing_(m)_____________________________________ (tfbusl)______________________ 3.1931E+03 OP + Total_length_of_TF_coil_bussing_(m)_____________________________________ (len_tf_bus)______________________ 3.1931E+03 OP Aluminium_bus_weight_(tonnes)___________________________________________ (albuswt)_____________________ 6.1108E+02 OP Total_TF_coil_bus_resistance_(ohm)______________________________________ (rtfbus)______________________ 1.1803E-03 OP TF_coil_bus_voltage_drop_(V)____________________________________________ (vtfbus)______________________ 1.0457E+02 OP @@ -6830,7 +6830,7 @@ TF_coil_inductive_power_(MVA)___________________________________________ (xpower)______________________ 1.6174E+01 OP Aluminium_bus_current_density_(kA/cm2)__________________________________ (djmka)_______________________ 1.2500E-01 Aluminium_bus_cross-sectional_area_(cm2)________________________________ (albusa)______________________ 7.1875E+02 OP - Total_length_of_TF_coil_bussing_(m)_____________________________________ (tfbusl)______________________ 3.1931E+03 OP + Total_length_of_TF_coil_bussing_(m)_____________________________________ (len_tf_bus)______________________ 3.1931E+03 OP Aluminium_bus_weight_(tonnes)___________________________________________ (albuswt)_____________________ 6.1966E+02 OP Total_TF_coil_bus_resistance_(ohm)______________________________________ (rtfbus)______________________ 1.1639E-03 OP TF_coil_bus_voltage_drop_(V)____________________________________________ (vtfbus)______________________ 1.0457E+02 OP @@ -7993,7 +7993,7 @@ TF_coil_inductive_power_(MVA)___________________________________________ (xpower)______________________ 1.6179E+01 OP Aluminium_bus_current_density_(kA/cm2)__________________________________ (djmka)_______________________ 1.2500E-01 Aluminium_bus_cross-sectional_area_(cm2)________________________________ (albusa)______________________ 7.1806E+02 OP - Total_length_of_TF_coil_bussing_(m)_____________________________________ (tfbusl)______________________ 3.1931E+03 OP + Total_length_of_TF_coil_bussing_(m)_____________________________________ (len_tf_bus)______________________ 3.1931E+03 OP Aluminium_bus_weight_(tonnes)___________________________________________ (albuswt)_____________________ 6.1906E+02 OP Total_TF_coil_bus_resistance_(ohm)______________________________________ (rtfbus)______________________ 1.1651E-03 OP TF_coil_bus_voltage_drop_(V)____________________________________________ (vtfbus)______________________ 1.0457E+02 OP @@ -9156,7 +9156,7 @@ TF_coil_inductive_power_(MVA)___________________________________________ (xpower)______________________ 1.5543E+01 OP Aluminium_bus_current_density_(kA/cm2)__________________________________ (djmka)_______________________ 1.2500E-01 Aluminium_bus_cross-sectional_area_(cm2)________________________________ (albusa)______________________ 7.1255E+02 OP - Total_length_of_TF_coil_bussing_(m)_____________________________________ (tfbusl)______________________ 3.1931E+03 OP + Total_length_of_TF_coil_bussing_(m)_____________________________________ (len_tf_bus)______________________ 3.1931E+03 OP Aluminium_bus_weight_(tonnes)___________________________________________ (albuswt)_____________________ 6.1431E+02 OP Total_TF_coil_bus_resistance_(ohm)______________________________________ (rtfbus)______________________ 1.1741E-03 OP TF_coil_bus_voltage_drop_(V)____________________________________________ (vtfbus)______________________ 1.0457E+02 OP @@ -10319,7 +10319,7 @@ TF_coil_inductive_power_(MVA)___________________________________________ (xpower)______________________ 1.4901E+01 OP Aluminium_bus_current_density_(kA/cm2)__________________________________ (djmka)_______________________ 1.2500E-01 Aluminium_bus_cross-sectional_area_(cm2)________________________________ (albusa)______________________ 7.0608E+02 OP - Total_length_of_TF_coil_bussing_(m)_____________________________________ (tfbusl)______________________ 3.1931E+03 OP + Total_length_of_TF_coil_bussing_(m)_____________________________________ (len_tf_bus)______________________ 3.1931E+03 OP Aluminium_bus_weight_(tonnes)___________________________________________ (albuswt)_____________________ 6.0873E+02 OP Total_TF_coil_bus_resistance_(ohm)______________________________________ (rtfbus)______________________ 1.1848E-03 OP TF_coil_bus_voltage_drop_(V)____________________________________________ (vtfbus)______________________ 1.0457E+02 OP @@ -11482,7 +11482,7 @@ TF_coil_inductive_power_(MVA)___________________________________________ (xpower)______________________ 1.4903E+01 OP Aluminium_bus_current_density_(kA/cm2)__________________________________ (djmka)_______________________ 1.2500E-01 Aluminium_bus_cross-sectional_area_(cm2)________________________________ (albusa)______________________ 7.0612E+02 OP - Total_length_of_TF_coil_bussing_(m)_____________________________________ (tfbusl)______________________ 3.1931E+03 OP + Total_length_of_TF_coil_bussing_(m)_____________________________________ (len_tf_bus)______________________ 3.1931E+03 OP Aluminium_bus_weight_(tonnes)___________________________________________ (albuswt)_____________________ 6.0876E+02 OP Total_TF_coil_bus_resistance_(ohm)______________________________________ (rtfbus)______________________ 1.1848E-03 OP TF_coil_bus_voltage_drop_(V)____________________________________________ (vtfbus)______________________ 1.0457E+02 OP @@ -12645,7 +12645,7 @@ TF_coil_inductive_power_(MVA)___________________________________________ (xpower)______________________ 1.5546E+01 OP Aluminium_bus_current_density_(kA/cm2)__________________________________ (djmka)_______________________ 1.2500E-01 Aluminium_bus_cross-sectional_area_(cm2)________________________________ (albusa)______________________ 7.1299E+02 OP - Total_length_of_TF_coil_bussing_(m)_____________________________________ (tfbusl)______________________ 3.1931E+03 OP + Total_length_of_TF_coil_bussing_(m)_____________________________________ (len_tf_bus)______________________ 3.1931E+03 OP Aluminium_bus_weight_(tonnes)___________________________________________ (albuswt)_____________________ 6.1469E+02 OP Total_TF_coil_bus_resistance_(ohm)______________________________________ (rtfbus)______________________ 1.1733E-03 OP TF_coil_bus_voltage_drop_(V)____________________________________________ (vtfbus)______________________ 1.0457E+02 OP @@ -13808,7 +13808,7 @@ TF_coil_inductive_power_(MVA)___________________________________________ (xpower)______________________ 1.6180E+01 OP Aluminium_bus_current_density_(kA/cm2)__________________________________ (djmka)_______________________ 1.2500E-01 Aluminium_bus_cross-sectional_area_(cm2)________________________________ (albusa)______________________ 7.1991E+02 OP - Total_length_of_TF_coil_bussing_(m)_____________________________________ (tfbusl)______________________ 3.1931E+03 OP + Total_length_of_TF_coil_bussing_(m)_____________________________________ (len_tf_bus)______________________ 3.1931E+03 OP Aluminium_bus_weight_(tonnes)___________________________________________ (albuswt)_____________________ 6.2065E+02 OP Total_TF_coil_bus_resistance_(ohm)______________________________________ (rtfbus)______________________ 1.1621E-03 OP TF_coil_bus_voltage_drop_(V)____________________________________________ (vtfbus)______________________ 1.0457E+02 OP @@ -14971,7 +14971,7 @@ TF_coil_inductive_power_(MVA)___________________________________________ (xpower)______________________ 1.6184E+01 OP Aluminium_bus_current_density_(kA/cm2)__________________________________ (djmka)_______________________ 1.2500E-01 Aluminium_bus_cross-sectional_area_(cm2)________________________________ (albusa)______________________ 7.1986E+02 OP - Total_length_of_TF_coil_bussing_(m)_____________________________________ (tfbusl)______________________ 3.1931E+03 OP + Total_length_of_TF_coil_bussing_(m)_____________________________________ (len_tf_bus)______________________ 3.1931E+03 OP Aluminium_bus_weight_(tonnes)___________________________________________ (albuswt)_____________________ 6.2061E+02 OP Total_TF_coil_bus_resistance_(ohm)______________________________________ (rtfbus)______________________ 1.1621E-03 OP TF_coil_bus_voltage_drop_(V)____________________________________________ (vtfbus)______________________ 1.0457E+02 OP @@ -16134,7 +16134,7 @@ TF_coil_inductive_power_(MVA)___________________________________________ (xpower)______________________ 1.5548E+01 OP Aluminium_bus_current_density_(kA/cm2)__________________________________ (djmka)_______________________ 1.2500E-01 Aluminium_bus_cross-sectional_area_(cm2)________________________________ (albusa)______________________ 7.1423E+02 OP - Total_length_of_TF_coil_bussing_(m)_____________________________________ (tfbusl)______________________ 3.1931E+03 OP + Total_length_of_TF_coil_bussing_(m)_____________________________________ (len_tf_bus)______________________ 3.1931E+03 OP Aluminium_bus_weight_(tonnes)___________________________________________ (albuswt)_____________________ 6.1575E+02 OP Total_TF_coil_bus_resistance_(ohm)______________________________________ (rtfbus)______________________ 1.1713E-03 OP TF_coil_bus_voltage_drop_(V)____________________________________________ (vtfbus)______________________ 1.0457E+02 OP @@ -17297,7 +17297,7 @@ TF_coil_inductive_power_(MVA)___________________________________________ (xpower)______________________ 1.4903E+01 OP Aluminium_bus_current_density_(kA/cm2)__________________________________ (djmka)_______________________ 1.2500E-01 Aluminium_bus_cross-sectional_area_(cm2)________________________________ (albusa)______________________ 7.0836E+02 OP - Total_length_of_TF_coil_bussing_(m)_____________________________________ (tfbusl)______________________ 3.1931E+03 OP + Total_length_of_TF_coil_bussing_(m)_____________________________________ (len_tf_bus)______________________ 3.1931E+03 OP Aluminium_bus_weight_(tonnes)___________________________________________ (albuswt)_____________________ 6.1070E+02 OP Total_TF_coil_bus_resistance_(ohm)______________________________________ (rtfbus)______________________ 1.1810E-03 OP TF_coil_bus_voltage_drop_(V)____________________________________________ (vtfbus)______________________ 1.0457E+02 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 900fdb9b8b..7de4706399 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -843,7 +843,7 @@ TF_coil_inductive_power_(MVA)___________________________________________ (xpower)______________________ 2.2656E+01 OP Aluminium_bus_current_density_(kA/cm2)__________________________________ (djmka)_______________________ 1.2500E-01 Aluminium_bus_cross-sectional_area_(cm2)________________________________ (albusa)______________________ 6.0413E+02 OP - Total_length_of_TF_coil_bussing_(m)_____________________________________ (tfbusl)______________________ 3.4630E+03 OP + Total_length_of_TF_coil_bussing_(m)_____________________________________ (len_tf_bus)______________________ 3.4630E+03 OP Aluminium_bus_weight_(tonnes)___________________________________________ (albuswt)_____________________ 5.6486E+02 OP Total_TF_coil_bus_resistance_(ohm)______________________________________ (rtfbus)______________________ 1.5018E-03 OP TF_coil_bus_voltage_drop_(V)____________________________________________ (vtfbus)______________________ 1.1341E+02 OP @@ -1838,7 +1838,7 @@ TF_coil_inductive_power_(MVA)___________________________________________ (xpower)______________________ 2.2656E+01 OP Aluminium_bus_current_density_(kA/cm2)__________________________________ (djmka)_______________________ 1.2500E-01 Aluminium_bus_cross-sectional_area_(cm2)________________________________ (albusa)______________________ 6.0413E+02 OP - Total_length_of_TF_coil_bussing_(m)_____________________________________ (tfbusl)______________________ 3.4630E+03 OP + Total_length_of_TF_coil_bussing_(m)_____________________________________ (len_tf_bus)______________________ 3.4630E+03 OP Aluminium_bus_weight_(tonnes)___________________________________________ (albuswt)_____________________ 5.6486E+02 OP Total_TF_coil_bus_resistance_(ohm)______________________________________ (rtfbus)______________________ 1.5018E-03 OP TF_coil_bus_voltage_drop_(V)____________________________________________ (vtfbus)______________________ 1.1341E+02 OP @@ -2833,7 +2833,7 @@ TF_coil_inductive_power_(MVA)___________________________________________ (xpower)______________________ 2.2656E+01 OP Aluminium_bus_current_density_(kA/cm2)__________________________________ (djmka)_______________________ 1.2500E-01 Aluminium_bus_cross-sectional_area_(cm2)________________________________ (albusa)______________________ 6.0413E+02 OP - Total_length_of_TF_coil_bussing_(m)_____________________________________ (tfbusl)______________________ 3.4630E+03 OP + Total_length_of_TF_coil_bussing_(m)_____________________________________ (len_tf_bus)______________________ 3.4630E+03 OP Aluminium_bus_weight_(tonnes)___________________________________________ (albuswt)_____________________ 5.6486E+02 OP Total_TF_coil_bus_resistance_(ohm)______________________________________ (rtfbus)______________________ 1.5018E-03 OP TF_coil_bus_voltage_drop_(V)____________________________________________ (vtfbus)______________________ 1.1341E+02 OP @@ -3828,7 +3828,7 @@ TF_coil_inductive_power_(MVA)___________________________________________ (xpower)______________________ 2.2656E+01 OP Aluminium_bus_current_density_(kA/cm2)__________________________________ (djmka)_______________________ 1.2500E-01 Aluminium_bus_cross-sectional_area_(cm2)________________________________ (albusa)______________________ 6.0413E+02 OP - Total_length_of_TF_coil_bussing_(m)_____________________________________ (tfbusl)______________________ 3.4630E+03 OP + Total_length_of_TF_coil_bussing_(m)_____________________________________ (len_tf_bus)______________________ 3.4630E+03 OP Aluminium_bus_weight_(tonnes)___________________________________________ (albuswt)_____________________ 5.6486E+02 OP Total_TF_coil_bus_resistance_(ohm)______________________________________ (rtfbus)______________________ 1.5018E-03 OP TF_coil_bus_voltage_drop_(V)____________________________________________ (vtfbus)______________________ 1.1341E+02 OP @@ -4823,7 +4823,7 @@ TF_coil_inductive_power_(MVA)___________________________________________ (xpower)______________________ 2.2656E+01 OP Aluminium_bus_current_density_(kA/cm2)__________________________________ (djmka)_______________________ 1.2500E-01 Aluminium_bus_cross-sectional_area_(cm2)________________________________ (albusa)______________________ 6.0413E+02 OP - Total_length_of_TF_coil_bussing_(m)_____________________________________ (tfbusl)______________________ 3.4630E+03 OP + Total_length_of_TF_coil_bussing_(m)_____________________________________ (len_tf_bus)______________________ 3.4630E+03 OP Aluminium_bus_weight_(tonnes)___________________________________________ (albuswt)_____________________ 5.6486E+02 OP Total_TF_coil_bus_resistance_(ohm)______________________________________ (rtfbus)______________________ 1.5018E-03 OP TF_coil_bus_voltage_drop_(V)____________________________________________ (vtfbus)______________________ 1.1341E+02 OP @@ -5818,7 +5818,7 @@ TF_coil_inductive_power_(MVA)___________________________________________ (xpower)______________________ 2.2656E+01 OP Aluminium_bus_current_density_(kA/cm2)__________________________________ (djmka)_______________________ 1.2500E-01 Aluminium_bus_cross-sectional_area_(cm2)________________________________ (albusa)______________________ 6.0413E+02 OP - Total_length_of_TF_coil_bussing_(m)_____________________________________ (tfbusl)______________________ 3.4630E+03 OP + Total_length_of_TF_coil_bussing_(m)_____________________________________ (len_tf_bus)______________________ 3.4630E+03 OP Aluminium_bus_weight_(tonnes)___________________________________________ (albuswt)_____________________ 5.6486E+02 OP Total_TF_coil_bus_resistance_(ohm)______________________________________ (rtfbus)______________________ 1.5018E-03 OP TF_coil_bus_voltage_drop_(V)____________________________________________ (vtfbus)______________________ 1.1341E+02 OP @@ -6813,7 +6813,7 @@ TF_coil_inductive_power_(MVA)___________________________________________ (xpower)______________________ 2.2656E+01 OP Aluminium_bus_current_density_(kA/cm2)__________________________________ (djmka)_______________________ 1.2500E-01 Aluminium_bus_cross-sectional_area_(cm2)________________________________ (albusa)______________________ 6.0413E+02 OP - Total_length_of_TF_coil_bussing_(m)_____________________________________ (tfbusl)______________________ 3.4630E+03 OP + Total_length_of_TF_coil_bussing_(m)_____________________________________ (len_tf_bus)______________________ 3.4630E+03 OP Aluminium_bus_weight_(tonnes)___________________________________________ (albuswt)_____________________ 5.6486E+02 OP Total_TF_coil_bus_resistance_(ohm)______________________________________ (rtfbus)______________________ 1.5018E-03 OP TF_coil_bus_voltage_drop_(V)____________________________________________ (vtfbus)______________________ 1.1341E+02 OP @@ -7808,7 +7808,7 @@ TF_coil_inductive_power_(MVA)___________________________________________ (xpower)______________________ 2.2656E+01 OP Aluminium_bus_current_density_(kA/cm2)__________________________________ (djmka)_______________________ 1.2500E-01 Aluminium_bus_cross-sectional_area_(cm2)________________________________ (albusa)______________________ 6.0413E+02 OP - Total_length_of_TF_coil_bussing_(m)_____________________________________ (tfbusl)______________________ 3.4630E+03 OP + Total_length_of_TF_coil_bussing_(m)_____________________________________ (len_tf_bus)______________________ 3.4630E+03 OP Aluminium_bus_weight_(tonnes)___________________________________________ (albuswt)_____________________ 5.6486E+02 OP Total_TF_coil_bus_resistance_(ohm)______________________________________ (rtfbus)______________________ 1.5018E-03 OP TF_coil_bus_voltage_drop_(V)____________________________________________ (vtfbus)______________________ 1.1341E+02 OP @@ -8803,7 +8803,7 @@ TF_coil_inductive_power_(MVA)___________________________________________ (xpower)______________________ 2.2656E+01 OP Aluminium_bus_current_density_(kA/cm2)__________________________________ (djmka)_______________________ 1.2500E-01 Aluminium_bus_cross-sectional_area_(cm2)________________________________ (albusa)______________________ 6.0413E+02 OP - Total_length_of_TF_coil_bussing_(m)_____________________________________ (tfbusl)______________________ 3.4630E+03 OP + Total_length_of_TF_coil_bussing_(m)_____________________________________ (len_tf_bus)______________________ 3.4630E+03 OP Aluminium_bus_weight_(tonnes)___________________________________________ (albuswt)_____________________ 5.6486E+02 OP Total_TF_coil_bus_resistance_(ohm)______________________________________ (rtfbus)______________________ 1.5018E-03 OP TF_coil_bus_voltage_drop_(V)____________________________________________ (vtfbus)______________________ 1.1341E+02 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index ea27099b35..232ffe1eef 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -7532,7 +7532,7 @@ 0.0, 0.0 ], - "tfbusl": 0.0, + "len_tf_bus": 0.0, "tfbusmas": 0.0, "tfc_current": 0.0, "tfc_nuc_heating": 0.0, @@ -10778,7 +10778,7 @@ "tfacpd": "total steady state TF coil AC power demand (MW)", "tfareain": "Area of inboard midplane TF legs (m2)", "tfb": "Vertical radius of inside edge of TF coil (m)", - "tfbusl": "TF coil bus length (m)", + "len_tf_bus": "TF coil bus length (m)", "tfbusmas": "TF coil bus mass (kg)", "tfc_current": "Current in each TF coil", "tfc_nuc_heating": "Unit nuclear heating in TF coil (W per W of fusion power)", @@ -19627,7 +19627,7 @@ "tcritsc", "tdmptf", "tfareain", - "tfbusl", + "len_tf_bus", "tfbusmas", "tfckw", "tfcmw", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index d6407457eb..e291dd06b5 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -1017,7 +1017,7 @@ TF_coil_inductive_power_(MVA)___________________________________________ (xpower)______________________ 1.7235E+01 OP Aluminium_bus_current_density_(kA/cm2)__________________________________ (djmka)_______________________ 1.2500E-01 Aluminium_bus_cross-sectional_area_(cm2)________________________________ (albusa)______________________ 7.0344E+02 OP - Total_length_of_TF_coil_bussing_(m)_____________________________________ (tfbusl)______________________ 3.1931E+03 OP + Total_length_of_TF_coil_bussing_(m)_____________________________________ (len_tf_bus)______________________ 3.1931E+03 OP Aluminium_bus_weight_(tonnes)___________________________________________ (albuswt)_____________________ 6.0645E+02 OP Total_TF_coil_bus_resistance_(ohm)______________________________________ (rtfbus)______________________ 1.1893E-03 OP TF_coil_bus_voltage_drop_(V)____________________________________________ (vtfbus)______________________ 1.0457E+02 OP diff --git a/tests/unit/test_costs_1990.py b/tests/unit/test_costs_1990.py index 292aa77b28..e31dbeeb8d 100644 --- a/tests/unit/test_costs_1990.py +++ b/tests/unit/test_costs_1990.py @@ -3234,7 +3234,7 @@ class Acc2251Param(NamedTuple): tfcmw: Any = None - tfbusl: Any = None + len_tf_bus: Any = None estotftgj: Any = None @@ -3289,7 +3289,7 @@ class Acc2251Param(NamedTuple): uctfbus=100, vtfskv=9.9882637896807953, tfcmw=0, - tfbusl=3397.0129827974288, + len_tf_bus=3397.0129827974288, estotftgj=152.78343648685947, i_tf_sup=1, tfbusmas=0, @@ -3320,7 +3320,7 @@ class Acc2251Param(NamedTuple): uctfbus=100, vtfskv=10.001287165953382, tfcmw=0, - tfbusl=3397.0129827974288, + len_tf_bus=3397.0129827974288, estotftgj=152.98264590137683, i_tf_sup=1, tfbusmas=0, @@ -3373,7 +3373,7 @@ def test_acc2251(acc2251param, monkeypatch, costs): monkeypatch.setattr(tfcoil_variables, "tfcmw", acc2251param.tfcmw) - monkeypatch.setattr(tfcoil_variables, "tfbusl", acc2251param.tfbusl) + monkeypatch.setattr(tfcoil_variables, "len_tf_bus", acc2251param.len_tf_bus) monkeypatch.setattr(tfcoil_variables, "estotftgj", acc2251param.estotftgj) From 7937f3413a28d2d16916f98dfd78386d49162d8b Mon Sep 17 00:00:00 2001 From: chris-ashe Date: Fri, 29 Nov 2024 22:38:06 +0000 Subject: [PATCH 02/29] :heavy_plus_sign: Add len_tf_bus as a input variable --- process/power.py | 1 - source/fortran/input.f90 | 6 +++++- source/fortran/tfcoil_variables.f90 | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/process/power.py b/process/power.py index a26ee73774..0a1b013a23 100644 --- a/process/power.py +++ b/process/power.py @@ -2480,7 +2480,6 @@ def tfpwr(self, output: bool): None """ if tfcoil_variables.i_tf_sup != 1: - tfcoil_variables.len_tf_bus = 300.0e0 # Cross-sectional area of bus # tfcoil_variables.cpttf - current per TFC turn (A) diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index b4f4695920..cf687a5866 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -343,7 +343,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) i_tf_turns_integer, n_rad_per_layer, b_crit_upper_nbti, t_crit_nbti, & i_cp_joints, n_tf_turn, f_t_turn_tf, t_turn_tf_max, t_cable_tf, & sig_tf_wp_max, eyoung_cond_trans, i_tf_cond_eyoung_axial, i_tf_cond_eyoung_trans, & - str_wp_max, str_tf_con_res, i_str_wp, max_vv_stress, theta1_coil, theta1_vv + str_wp_max, str_tf_con_res, i_str_wp, max_vv_stress, theta1_coil, theta1_vv, & + len_tf_bus use times_variables, only: t_current_ramp_up, pulsetimings, t_ramp_down, t_fusion_ramp, t_precharge, t_burn, & t_between_pulse, tohsin @@ -1808,6 +1809,9 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('vftf') call parse_real_variable('vftf', vftf, 0.0D0, 1.0D0, & 'Coolant fraction of TF coil leg') + case ('len_tf_bus') + call parse_real_variable('len_tf_bus', len_tf_bus, 0.01D0, 1.0D3, & + 'TF coil bus length (m)') ! PF coil settings diff --git a/source/fortran/tfcoil_variables.f90 b/source/fortran/tfcoil_variables.f90 index 59e6698319..fbd9d185e9 100644 --- a/source/fortran/tfcoil_variables.f90 +++ b/source/fortran/tfcoil_variables.f90 @@ -956,7 +956,7 @@ subroutine init_tfcoil_variables tcritsc = 16.0D0 tdmptf = 10.0D0 tfareain = 0.0D0 - len_tf_bus = 0.0D0 + len_tf_bus = 300.0D0 tfbusmas = 0.0D0 tfckw = 0.0D0 tfcmw = 0.0D0 From e692ea69e28d24be6cceca1e5ea63deddb9ab04f Mon Sep 17 00:00:00 2001 From: chris-ashe Date: Fri, 29 Nov 2024 23:21:49 +0000 Subject: [PATCH 03/29] :arrows_counterclockwise: Rename tfbusl to rho_tf_bus for clarity and consistency; Change initial value to that of GLIDCOP copper as the current value was that of Aluminium though the mass of copper was used for the bus bar --- process/power.py | 6 +++--- source/fortran/input.f90 | 6 +++--- source/fortran/tfcoil_variables.f90 | 6 +++--- tests/integration/ref_dicts.json | 10 +++++----- tests/regression/input_files/st_regression.IN.DAT | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/process/power.py b/process/power.py index 0a1b013a23..0342dc88b0 100644 --- a/process/power.py +++ b/process/power.py @@ -2487,10 +2487,10 @@ def tfpwr(self, output: bool): abus = tfcoil_variables.cpttf / tfcoil_variables.jbus # Bus resistance [ohm] - # Bus resistivity (tfcoil_variables.rhotfbus) + # Bus resistivity (tfcoil_variables.rho_tf_bus) # Issue #1253: there was a fudge here to set the bus bar resistivity equal # to the TF conductor resistivity. I have removed this. - tfbusres = tfcoil_variables.rhotfbus * tfcoil_variables.len_tf_bus / abus + tfbusres = tfcoil_variables.rho_tf_bus * tfcoil_variables.len_tf_bus / abus # Bus mass (kg) tfcoil_variables.tfbusmas = ( @@ -2720,7 +2720,7 @@ def tfcpwr(self, output: bool, itfka, rmajor, ntfc, vtfskv, ettfmj, rptfc): # Total resistance of TF bus, ohms # rtfbus = 2.62e-4 * len_tf_bus / albusa - rtfbus = tfcoil_variables.rhotfbus * len_tf_bus / (albusa / 10000) + rtfbus = tfcoil_variables.rho_tf_bus * len_tf_bus / (albusa / 10000) # Total voltage drop across TF bus, volts vtfbus = 1000.0e0 * itfka * rtfbus diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index cf687a5866..c02462780a 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -338,7 +338,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) eyoung_steel, eyoung_res_tf_buck, eyoung_cond_axial, f_vforce_inboard, & fcoolleg, frholeg, ftoroidalgap, i_tf_sc_mat, i_tf_shape, i_tf_bucking, & n_tf_graded_layers, n_tf_joints, n_tf_joints_contact, poisson_al, & - poisson_copper, poisson_steel, rho_tf_joints, rhotfbus, th_joint_contact,& + poisson_copper, poisson_steel, rho_tf_joints, rho_tf_bus, th_joint_contact,& i_tf_stress_model, eyoung_al, i_tf_wp_geom, i_tf_case_geom, & i_tf_turns_integer, n_rad_per_layer, b_crit_upper_nbti, t_crit_nbti, & i_cp_joints, n_tf_turn, f_t_turn_tf, t_turn_tf_max, t_cable_tf, & @@ -1732,8 +1732,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('tfinsgap') call parse_real_variable('tfinsgap', tfinsgap, 1.0D-10, 1.0D-1, & 'TF coil WP insertion gap (m)') - case ('rhotfbus') - call parse_real_variable('rhotfbus', rhotfbus, 0.0D0, 1.0D-5, & + case ('rho_tf_bus') + call parse_real_variable('rho_tf_bus', rho_tf_bus, 0.0D0, 1.0D-5, & 'TF coil bus (feeders) resistivity (ohm-m)') case ('n_tf') call parse_real_variable('n_tf', n_tf, 0.0D0, 100.0D0, & diff --git a/source/fortran/tfcoil_variables.f90 b/source/fortran/tfcoil_variables.f90 index fbd9d185e9..13f11cf287 100644 --- a/source/fortran/tfcoil_variables.f90 +++ b/source/fortran/tfcoil_variables.f90 @@ -542,8 +542,8 @@ module tfcoil_variables real(dp) :: rhotfleg !! Resistivity of a TF coil leg (Ohm-m) - real(dp) :: rhotfbus - !! Resistivity of a TF coil bus (Ohm-m). Default value takes the same res as the leg one + real(dp) :: rho_tf_bus + !! Resistivity of a TF coil bus (Ohm-m). Default values is for that of GLIDCOP Copper at 293K real(dp) :: frhocp !! Centrepost resistivity enhancement factor. For `itart=0`, this factor @@ -969,7 +969,7 @@ subroutine init_tfcoil_variables tflegmw = 0.0D0 rhocp = 0.0D0 rhotfleg = 0.0D0 - rhotfbus = 2.62D-8 !-1.0D0 ! 2.5D-8 + rho_tf_bus = 1.86D-8 frhocp = 1.0D0 frholeg = 1.0D0 rho_tf_joints = 2.5D-10 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 232ffe1eef..05f3b02625 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -4218,7 +4218,7 @@ "rhocp": 0.0, "rhopedn": 1.0, "rhopedt": 1.0, - "rhotfbus": -1.0, + "rho_tf_bus": -1.0, "rhotfleg": 0.0, "ric": 0.0, "ricpf": 0.0, @@ -10526,7 +10526,7 @@ "rhocp": "TF coil inboard leg resistivity [Ohm-m]. If `itart=0`, this variable is the\n average resistivity over the whole magnet", "rhopedn": "r/a of density pedestal (`ipedestal>=1`)", "rhopedt": "r/a of temperature pedestal (`ipedestal>=1`)", - "rhotfbus": "Resistivity of a TF coil bus (Ohm-m). Default value takes the same res as the leg one", + "rho_tf_bus": "Resistivity of a TF coil bus (Ohm-m). Default value takes the same res as the leg one", "rhotfleg": "Resistivity of a TF coil leg (Ohm-m)", "ric": "peak current in coil i (MA-turns)", "ricpf": "", @@ -14135,7 +14135,7 @@ "lb": 0.01, "ub": 1.0 }, - "rhotfbus": { + "rho_tf_bus": { "lb": 0.0, "ub": 1e-05 }, @@ -19640,7 +19640,7 @@ "tflegmw", "rhocp", "rhotfleg", - "rhotfbus", + "rho_tf_bus", "frhocp", "frholeg", "i_cp_joints", @@ -20667,7 +20667,7 @@ "rho_tf_joints": "real_variable", "rhopedn": "real_variable", "rhopedt": "real_variable", - "rhotfbus": "real_variable", + "rho_tf_bus": "real_variable", "rinboard": "real_variable", "ripmax": "real_variable", "rjconpf": "real_array", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 6f9b8892d7..6a7b873a16 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -1605,7 +1605,7 @@ tftmp = 20.0 *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Power Supplies ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ -* rhotfbus = +* rho_tf_bus = * DESCRIPTION: TF coil bus (feeders) resistivity (ohm-m) * JUSTIFICATION: Unknown, assuming default From 38fc7067075df491a617ed9d0a81904367904cd2 Mon Sep 17 00:00:00 2001 From: chris-ashe Date: Fri, 29 Nov 2024 23:23:50 +0000 Subject: [PATCH 04/29] :arrows_counterclockwise: Refactor tfbusmas to m_tf_bus for clarity and consistency --- process/costs.py | 2 +- process/power.py | 6 +++--- source/fortran/tfcoil_variables.f90 | 4 ++-- tests/integration/ref_dicts.json | 6 +++--- tests/unit/test_costs_1990.py | 8 ++++---- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/process/costs.py b/process/costs.py index 24e7fe0954..e474fb9f87 100644 --- a/process/costs.py +++ b/process/costs.py @@ -1964,7 +1964,7 @@ def acc2251(self): # Account 225.1.5 : TF coil bussing if tfcoil_variables.i_tf_sup != 1: - self.c22515 = 1.0e-6 * cost_variables.uctfbus * tfcoil_variables.tfbusmas + self.c22515 = 1.0e-6 * cost_variables.uctfbus * tfcoil_variables.m_tf_bus else: self.c22515 = ( 1.0e-6 diff --git a/process/power.py b/process/power.py index 0342dc88b0..72ab3c7a5f 100644 --- a/process/power.py +++ b/process/power.py @@ -2493,7 +2493,7 @@ def tfpwr(self, output: bool): tfbusres = tfcoil_variables.rho_tf_bus * tfcoil_variables.len_tf_bus / abus # Bus mass (kg) - tfcoil_variables.tfbusmas = ( + tfcoil_variables.m_tf_bus = ( tfcoil_variables.len_tf_bus * abus * constants.dcopper ) @@ -2566,8 +2566,8 @@ def tfpwr(self, output: bool): po.ovarre( self.outfile, "Bus mass (kg)", - "(tfbusmas)", - tfcoil_variables.tfbusmas, + "(m_tf_bus)", + tfcoil_variables.m_tf_bus, "OP ", ) # po.ovarre(outfile,'Maximum impedance (ohm)','(ztot)',ztot) diff --git a/source/fortran/tfcoil_variables.f90 b/source/fortran/tfcoil_variables.f90 index 13f11cf287..0a3f1466e1 100644 --- a/source/fortran/tfcoil_variables.f90 +++ b/source/fortran/tfcoil_variables.f90 @@ -505,7 +505,7 @@ module tfcoil_variables real(dp) :: len_tf_bus !! TF coil bus length (m) - real(dp) :: tfbusmas + real(dp) :: m_tf_bus !! TF coil bus mass (kg) real(dp) :: tfckw @@ -957,7 +957,7 @@ subroutine init_tfcoil_variables tdmptf = 10.0D0 tfareain = 0.0D0 len_tf_bus = 300.0D0 - tfbusmas = 0.0D0 + m_tf_bus = 0.0D0 tfckw = 0.0D0 tfcmw = 0.0D0 tfcpmw = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 05f3b02625..f58ef15635 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -7533,7 +7533,7 @@ 0.0 ], "len_tf_bus": 0.0, - "tfbusmas": 0.0, + "m_tf_bus": 0.0, "tfc_current": 0.0, "tfc_nuc_heating": 0.0, "tfc_sidewall_is_fraction": ".false.", @@ -10779,7 +10779,7 @@ "tfareain": "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)", - "tfbusmas": "TF coil bus mass (kg)", + "m_tf_bus": "TF coil bus mass (kg)", "tfc_current": "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`)", @@ -19628,7 +19628,7 @@ "tdmptf", "tfareain", "len_tf_bus", - "tfbusmas", + "m_tf_bus", "tfckw", "tfcmw", "tfcpmw", diff --git a/tests/unit/test_costs_1990.py b/tests/unit/test_costs_1990.py index e31dbeeb8d..ac97a67243 100644 --- a/tests/unit/test_costs_1990.py +++ b/tests/unit/test_costs_1990.py @@ -3240,7 +3240,7 @@ class Acc2251Param(NamedTuple): i_tf_sup: Any = None - tfbusmas: Any = None + m_tf_bus: Any = None tfckw: Any = None @@ -3292,7 +3292,7 @@ class Acc2251Param(NamedTuple): len_tf_bus=3397.0129827974288, estotftgj=152.78343648685947, i_tf_sup=1, - tfbusmas=0, + m_tf_bus=0, tfckw=32474.753636211804, n_tf=16, cpttf=74026.751437500003, @@ -3323,7 +3323,7 @@ class Acc2251Param(NamedTuple): len_tf_bus=3397.0129827974288, estotftgj=152.98264590137683, i_tf_sup=1, - tfbusmas=0, + m_tf_bus=0, tfckw=32505.257577809778, n_tf=16, cpttf=74026.751437500003, @@ -3379,7 +3379,7 @@ def test_acc2251(acc2251param, monkeypatch, costs): monkeypatch.setattr(tfcoil_variables, "i_tf_sup", acc2251param.i_tf_sup) - monkeypatch.setattr(tfcoil_variables, "tfbusmas", acc2251param.tfbusmas) + monkeypatch.setattr(tfcoil_variables, "m_tf_bus", acc2251param.m_tf_bus) monkeypatch.setattr(tfcoil_variables, "tfckw", acc2251param.tfckw) From 5d8eba9869b20fc36d734771e00d1b5e0980adf2 Mon Sep 17 00:00:00 2001 From: chris-ashe Date: Fri, 29 Nov 2024 23:34:17 +0000 Subject: [PATCH 05/29] :arrows_counterclockwise: Rename n_tf to n_tf_coils for clarity and consistency across the codebase --- documentation/proc-pages/development/numba.md | 2 +- .../proc-pages/eng-models/tf-coil.md | 2 +- .../data/csv_output_large_tokamak_MFILE.DAT | 12 +- examples/data/large_tokamak_1_MFILE.DAT | 12 +- examples/data/large_tokamak_2_MFILE.DAT | 12 +- examples/data/large_tokamak_3_MFILE.DAT | 12 +- examples/data/large_tokamak_4_MFILE.DAT | 12 +- examples/data/large_tokamak_IN.DAT | 2 +- examples/data/scan_MFILE.DAT | 92 +++++----- examples/data/scan_example_file_IN.DAT | 2 +- process/build.py | 16 +- process/buildings.py | 25 +-- process/costs.py | 14 +- process/costs_2015.py | 16 +- process/io/mfile_comparison.py | 4 +- process/io/obsolete_vars.py | 2 +- process/io/plot_proc.py | 24 +-- process/power.py | 18 +- process/sctfcoil.py | 172 ++++++++++-------- process/stellarator.py | 57 +++--- process/tfcoil.py | 2 +- process/vacuum.py | 8 +- source/fortran/constraint_equations.f90 | 8 +- source/fortran/input.f90 | 8 +- source/fortran/scan.f90 | 4 +- source/fortran/stellarator.f90 | 2 +- source/fortran/tfcoil_variables.f90 | 10 +- .../data/large_tokamak_1_MFILE.DAT | 12 +- .../data/large_tokamak_2_MFILE.DAT | 12 +- .../data/large_tokamak_3_MFILE.DAT | 12 +- .../data/large_tokamak_4_MFILE.DAT | 12 +- tests/integration/data/large_tokamak_IN.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 12 +- .../data/large_tokamak_once_through.IN.DAT | 2 +- tests/integration/data/ref_IN.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 152 ++++++++-------- tests/integration/data/scan_MFILE.DAT | 92 +++++----- .../data/uncertainties_nonopt_ref_IN.DAT | 2 +- .../integration/data/uncertainties_ref_IN.DAT | 2 +- tests/integration/ref_dicts.json | 16 +- .../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 | 12 +- tests/unit/test_build.py | 16 +- tests/unit/test_buildings.py | 16 +- tests/unit/test_costs_1990.py | 18 +- tests/unit/test_costs_2015.py | 18 +- tests/unit/test_power.py | 8 +- tests/unit/test_sctfcoil.py | 104 ++++++----- tests/unit/test_stellarator.py | 2 +- tests/unit/test_tfcoil.py | 2 +- tests/unit/test_vacuum.py | 6 +- tracking/tracking_data.py | 2 +- 56 files changed, 565 insertions(+), 529 deletions(-) diff --git a/documentation/proc-pages/development/numba.md b/documentation/proc-pages/development/numba.md index 89c1b40636..795a4f0e5a 100644 --- a/documentation/proc-pages/development/numba.md +++ b/documentation/proc-pages/development/numba.md @@ -50,7 +50,7 @@ from process.fortran import sctfcoil_variables as sctfv @njit def my_other_function(n): - return n + sctfv.n_tf + return n + sctfv.n_tf_coils ``` because Numba does not know what `sctfv` is. diff --git a/documentation/proc-pages/eng-models/tf-coil.md b/documentation/proc-pages/eng-models/tf-coil.md index 5cf767e21d..d5b1d4207b 100644 --- a/documentation/proc-pages/eng-models/tf-coil.md +++ b/documentation/proc-pages/eng-models/tf-coil.md @@ -1245,7 +1245,7 @@ Another subroutine, `tfspcall` is called outside `stfcoil` to estimate to check | Parameter | description | Default | | - | - | - | -| `n_tf` | Number of TF coils | 16 | +| `n_tf_coils` | Number of TF coils | 16 | | `i_tf_sup` | Swich selecting the conductor technology:
- 0 : Water cooled copper (GLIDCOP)
- 1 : Superconducting TF magnets
- 2 : Helium cooled Aluminium magnets | 1 | | `i_tf_sc_mat` | Swich for superconducting material
1 : Nb$_3$Sn superconductor, ITER critical surface parameterization[^1], standard critical values
2 : Bi-2212 high temperature superconductor
3 : NbTi superconductor
4 : Nb$_3$Sn superconductor, ITER critical surface parameterization[^1], user-defined critical parameters
5 : WST Nb$_3$Sn parameterization
6 : REBCO HTS tape in CroCo strand
7 : Durham Ginzburg-Landau critical surface model for Nb-Ti
8 : Durham Ginzburg-Landau critical surface model for REBCO
9 : Hazelton experimental data combined with Zhai conceptual model for REBCO | 1 | diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 9f75e96088..f550275a81 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -669,7 +669,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.1929E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4985E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 8.6482E-01 ITV @@ -689,9 +689,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.7350E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2056E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2056E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 6.9487E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.6240E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.6240E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.9707E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.0816E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -705,7 +705,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.0896E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.9252E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.9252E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.2577E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.9412E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.2482E-01 @@ -732,7 +732,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 9.1497E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.4504E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.5475E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 6.5696E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.5696E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0511E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1646E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0251E+02 OP @@ -1785,7 +1785,7 @@ casths = 0.05 ripmax = 0.6 * Number of TF coils -n_tf = 16 +n_tf_coils = 16 * Groundwall insulation thickness [m] tinstf = 0.008 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 40b059ade4..ddedb1c0a9 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -666,7 +666,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.1673E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4985E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 9.1597E-01 ITV @@ -686,9 +686,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.8229E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2853E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2853E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.0508E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.4752E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.4752E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.6493E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.6444E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -702,7 +702,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.0901E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.8217E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.8217E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.1550E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.7934E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.3656E-01 @@ -729,7 +729,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.9310E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.3777E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.5446E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 7.1402E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 7.1402E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.1424E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2178E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.1176E+02 OP @@ -1779,7 +1779,7 @@ casths = 0.05 ripmax = 0.6 * Number of TF coils -n_tf = 16 +n_tf_coils = 16 * Groundwall insulation thickness [m] tinstf = 0.008 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 60fac31f8a..bc048d4ddd 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -666,7 +666,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.1673E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4985E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 9.1597E-01 ITV @@ -686,9 +686,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.8229E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2853E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2853E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.0508E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.4752E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.4752E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.6493E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.6444E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -702,7 +702,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.0901E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.8217E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.8217E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.1550E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.7934E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.3656E-01 @@ -729,7 +729,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.9310E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.3777E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.5446E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 7.1402E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 7.1402E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.1424E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2178E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.1176E+02 OP @@ -1779,7 +1779,7 @@ casths = 0.05 ripmax = 0.6 * Number of TF coils -n_tf = 16 +n_tf_coils = 16 * Groundwall insulation thickness [m] tinstf = 0.008 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 3d9ad7a0ca..6ad12dcc49 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -666,7 +666,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.1673E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4985E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 9.1597E-01 ITV @@ -686,9 +686,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.8229E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2853E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2853E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.0508E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.4752E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.4752E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.6493E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.6444E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -702,7 +702,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.0901E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.8217E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.8217E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.1550E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.7934E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.3656E-01 @@ -729,7 +729,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.9310E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.3777E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.5446E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 7.1402E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 7.1402E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.1424E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2178E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.1176E+02 OP @@ -1780,7 +1780,7 @@ casths = 0.05 ripmax = 0.6 * Number of TF coils -n_tf = 16 +n_tf_coils = 16 * Groundwall insulation thickness [m] tinstf = 0.008 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index e8e1b49ddc..9962f31cb1 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -666,7 +666,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.1673E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4985E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 9.1597E-01 ITV @@ -686,9 +686,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.8229E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2853E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2853E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.0508E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.4752E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.4752E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.6493E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.6444E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -702,7 +702,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.0901E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.8217E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.8217E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.1550E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.7934E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.3656E-01 @@ -729,7 +729,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.9310E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.3777E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.5446E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 7.1402E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 7.1402E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.1424E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2178E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.1176E+02 OP @@ -1780,7 +1780,7 @@ casths = 0.05 ripmax = 0.6 * Number of TF coils -n_tf = 16 +n_tf_coils = 16 * Groundwall insulation thickness [m] tinstf = 0.008 diff --git a/examples/data/large_tokamak_IN.DAT b/examples/data/large_tokamak_IN.DAT index 954c779ae8..6d524b303e 100644 --- a/examples/data/large_tokamak_IN.DAT +++ b/examples/data/large_tokamak_IN.DAT @@ -590,7 +590,7 @@ casths = 0.05 ripmax = 0.6 * Number of TF coils -n_tf = 16 +n_tf_coils = 16 * Groundwall insulation thickness [m] tinstf = 0.008 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 7f888ab8d3..5149f946d6 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -513,7 +513,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 5 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.7793E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 1.4000E+00 ITV @@ -533,9 +533,9 @@ TF_coil_arc_point_5_R_(m)_______________________________________________ (xarc(5))_____________________ 4.4793E+00 TF_coil_arc_point_5_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.5468E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 3.3244E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 2.4635E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 2.4635E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.4102E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 2.3627E+00 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 2.3627E+00 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 7.1070E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5346E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -548,7 +548,7 @@ Winding_pack_toroidal_width_(m)_________________________________________ (wwp1)________________________ 1.2723E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 9.3795E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 9.3795E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 5.2140E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 1.0145E-01 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 3.7714E-01 @@ -577,7 +577,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3757E+05 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 1.0668E+04 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4640E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 1.5629E+06 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP @@ -1508,7 +1508,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 5 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.7793E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 1.4000E+00 ITV @@ -1528,9 +1528,9 @@ TF_coil_arc_point_5_R_(m)_______________________________________________ (xarc(5))_____________________ 4.4793E+00 TF_coil_arc_point_5_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.5468E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 3.3244E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 2.4635E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 2.4635E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.4102E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 2.3627E+00 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 2.3627E+00 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 7.1069E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5347E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -1543,7 +1543,7 @@ Winding_pack_toroidal_width_(m)_________________________________________ (wwp1)________________________ 1.2723E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 9.3792E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 9.3792E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 5.2139E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 1.0145E-01 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 3.7716E-01 @@ -1572,7 +1572,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3757E+05 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 1.0668E+04 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4640E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 1.5629E+06 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP @@ -2503,7 +2503,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 5 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.7793E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 1.4000E+00 ITV @@ -2523,9 +2523,9 @@ TF_coil_arc_point_5_R_(m)_______________________________________________ (xarc(5))_____________________ 4.4793E+00 TF_coil_arc_point_5_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.5468E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 3.3244E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 2.4634E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 2.4634E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.4101E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 2.3626E+00 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 2.3626E+00 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 7.1069E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5347E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -2538,7 +2538,7 @@ Winding_pack_toroidal_width_(m)_________________________________________ (wwp1)________________________ 1.2723E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 9.3789E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 9.3789E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 5.2137E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 1.0145E-01 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 3.7717E-01 @@ -2567,7 +2567,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3756E+05 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 1.0668E+04 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4640E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 1.5629E+06 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP @@ -3498,7 +3498,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 5 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.7793E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 1.4000E+00 ITV @@ -3518,9 +3518,9 @@ TF_coil_arc_point_5_R_(m)_______________________________________________ (xarc(5))_____________________ 4.4793E+00 TF_coil_arc_point_5_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.5468E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 3.3244E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 2.4634E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 2.4634E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.4101E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 2.3626E+00 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 2.3626E+00 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 7.1069E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5348E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -3533,7 +3533,7 @@ Winding_pack_toroidal_width_(m)_________________________________________ (wwp1)________________________ 1.2723E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 9.3786E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 9.3786E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 5.2136E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 1.0146E-01 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 3.7718E-01 @@ -3562,7 +3562,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3755E+05 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 1.0668E+04 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4639E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 1.5629E+06 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP @@ -4493,7 +4493,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 5 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.7793E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 1.4000E+00 ITV @@ -4513,9 +4513,9 @@ TF_coil_arc_point_5_R_(m)_______________________________________________ (xarc(5))_____________________ 4.4793E+00 TF_coil_arc_point_5_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.5468E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 3.3244E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 2.4634E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 2.4634E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.4100E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 2.3626E+00 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 2.3626E+00 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 7.1069E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5349E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -4528,7 +4528,7 @@ Winding_pack_toroidal_width_(m)_________________________________________ (wwp1)________________________ 1.2723E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 9.3783E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 9.3783E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 5.2135E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 1.0146E-01 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 3.7719E-01 @@ -4557,7 +4557,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3755E+05 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 1.0668E+04 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4639E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 1.5629E+06 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP @@ -5488,7 +5488,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 5 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.7793E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 1.4000E+00 ITV @@ -5508,9 +5508,9 @@ TF_coil_arc_point_5_R_(m)_______________________________________________ (xarc(5))_____________________ 4.4793E+00 TF_coil_arc_point_5_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.5468E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 3.3244E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 2.4634E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 2.4634E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.4100E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 2.3626E+00 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 2.3626E+00 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 7.1068E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5349E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -5523,7 +5523,7 @@ Winding_pack_toroidal_width_(m)_________________________________________ (wwp1)________________________ 1.2723E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 9.3781E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 9.3781E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 5.2134E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 1.0146E-01 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 3.7721E-01 @@ -5552,7 +5552,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3754E+05 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 1.0668E+04 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4639E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 1.5629E+06 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP @@ -6483,7 +6483,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 5 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.7793E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 1.4000E+00 ITV @@ -6503,9 +6503,9 @@ TF_coil_arc_point_5_R_(m)_______________________________________________ (xarc(5))_____________________ 4.4793E+00 TF_coil_arc_point_5_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.5468E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 3.3244E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 2.4634E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 2.4634E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.4099E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 2.3626E+00 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 2.3626E+00 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 7.1068E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5350E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -6518,7 +6518,7 @@ Winding_pack_toroidal_width_(m)_________________________________________ (wwp1)________________________ 1.2723E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 9.3779E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 9.3779E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 5.2133E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 1.0146E-01 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 3.7722E-01 @@ -6547,7 +6547,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3753E+05 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 1.0668E+04 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4638E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 1.5629E+06 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP @@ -7478,7 +7478,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 5 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.7793E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 1.4000E+00 ITV @@ -7498,9 +7498,9 @@ TF_coil_arc_point_5_R_(m)_______________________________________________ (xarc(5))_____________________ 4.4793E+00 TF_coil_arc_point_5_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.5468E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 3.3244E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 2.4634E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 2.4634E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.4099E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 2.3626E+00 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 2.3626E+00 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 7.1068E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5350E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -7513,7 +7513,7 @@ Winding_pack_toroidal_width_(m)_________________________________________ (wwp1)________________________ 1.2723E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 9.3776E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 9.3776E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 5.2132E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 1.0146E-01 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 3.7723E-01 @@ -7542,7 +7542,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3753E+05 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 1.0668E+04 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4638E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 1.5629E+06 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP @@ -8473,7 +8473,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 5 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.7793E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 1.4000E+00 ITV @@ -8493,9 +8493,9 @@ TF_coil_arc_point_5_R_(m)_______________________________________________ (xarc(5))_____________________ 4.4793E+00 TF_coil_arc_point_5_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.5468E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 3.3244E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 2.4634E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 2.4634E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.4098E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 2.3626E+00 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 2.3626E+00 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 7.1068E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5351E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -8508,7 +8508,7 @@ Winding_pack_toroidal_width_(m)_________________________________________ (wwp1)________________________ 1.2723E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 9.3774E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 9.3774E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 5.2131E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 1.0146E-01 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 3.7723E-01 @@ -8537,7 +8537,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3752E+05 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 1.0668E+04 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4638E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 1.5629E+06 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP @@ -9284,7 +9284,7 @@ casths = 0.05 * Inboard tf coil sidewall case thickness (m) cpttf = 6.5e+04 * Tf coil current per turn (a); ripmax = 0.6 * Maximum allowable toroidal field ripple amplitude tdmptf = 30.0 * Dump time for tf coil (s) -n_tf = 16 * Number of tf coils (default = 50 for stellarators) +n_tf_coils = 16 * Number of tf coils (default = 50 for stellarators) sig_tf_case_max = 5.8E8 * Allowable maximum shear stress in TF coil case (Tresca criterion) (Pa) sig_tf_wp_max = 5.8E8 * Allowable maximum shear stress in TF coil conduit (Tresca criterion) (Pa) dhecoil = 0.010 * diameter of He coil in TF winding (m) diff --git a/examples/data/scan_example_file_IN.DAT b/examples/data/scan_example_file_IN.DAT index c79826c230..a6d286a5ab 100644 --- a/examples/data/scan_example_file_IN.DAT +++ b/examples/data/scan_example_file_IN.DAT @@ -590,7 +590,7 @@ casths = 0.05 ripmax = 0.6 * Number of TF coils -n_tf = 16 +n_tf_coils = 16 * Groundwall insulation thickness [m] tinstf = 0.008 diff --git a/process/build.py b/process/build.py index d33b42d8f8..2c116b7aff 100644 --- a/process/build.py +++ b/process/build.py @@ -47,7 +47,7 @@ def portsz(self): # Toroidal angle between adjacent TF coils - omega = constants.twopi / tfcoil_variables.n_tf + omega = constants.twopi / tfcoil_variables.n_tf_coils # Half-width of outboard TF coil in toroidal direction (m) a = 0.5e0 * tfcoil_variables.tftort # (previously used inboard leg width) @@ -1508,7 +1508,7 @@ def ripple_amplitude(self, ripmax: float, r_tf_outboard_mid: float) -> float: Activated when i_tf_shape == 2 (picture frame) """ - n = float(tfcoil_variables.n_tf) + n = float(tfcoil_variables.n_tf_coils) if tfcoil_variables.i_tf_sup == 1: # Minimal inboard WP radius [m] r_wp_min = build_variables.r_tf_inboard_in + tfcoil_variables.thkcas @@ -1612,7 +1612,7 @@ def ripple_amplitude(self, ripmax: float, r_tf_outboard_mid: float) -> float: flag = 0 if (x < 0.737e0) or (x > 2.95e0): flag = 1 - if (tfcoil_variables.n_tf < 16) or (tfcoil_variables.n_tf > 20): + if (tfcoil_variables.n_tf_coils < 16) or (tfcoil_variables.n_tf_coils > 20): flag = 2 if ( (physics_variables.rmajor + physics_variables.rminor) @@ -1720,7 +1720,7 @@ def calculate_radial_build(self, output: bool) -> None: + tfcoil_variables.casthi + tfcoil_variables.thkcas ) / np.cos( - np.pi / tfcoil_variables.n_tf + np.pi / tfcoil_variables.n_tf_coils ) - build_variables.r_tf_inboard_in # Rounded resistive TF geometry @@ -1747,7 +1747,7 @@ def calculate_radial_build(self, output: bool) -> None: # SC magnets if tfcoil_variables.i_tf_sup == 1: tfcoil_variables.dr_tf_wp = ( - np.cos(np.pi / tfcoil_variables.n_tf) + np.cos(np.pi / tfcoil_variables.n_tf_coils) * build_variables.r_tf_inboard_out - build_variables.r_tf_inboard_in - tfcoil_variables.casthi @@ -1950,7 +1950,7 @@ def calculate_radial_build(self, output: bool) -> None: build_variables.dr_shld_vv_gap_outboard = build_variables.gapomin # Call tfcoil_variables.ripple calculation again with new build_variables.r_tf_outboard_mid/build_variables.dr_shld_vv_gap_outboard value - # call rippl(tfcoil_variables.ripmax,rmajor,rminor,r_tf_outboard_mid,n_tf,ripple,r_tf_outboard_midl) + # call rippl(tfcoil_variables.ripmax,rmajor,rminor,r_tf_outboard_mid,n_tf_coils,ripple,r_tf_outboard_midl) ( tfcoil_variables.ripple, r_tf_outboard_midl, @@ -2093,13 +2093,13 @@ def calculate_radial_build(self, output: bool) -> None: if self.ripflag == 1: error_handling.fdiags[0] = ( tfcoil_variables.wwp1 - * tfcoil_variables.n_tf + * tfcoil_variables.n_tf_coils / physics_variables.rmajor ) error_handling.report_error(141) elif self.ripflag == 2: # Convert to integer as idiags is integer array - error_handling.idiags[0] = int(tfcoil_variables.n_tf) + error_handling.idiags[0] = int(tfcoil_variables.n_tf_coils) error_handling.report_error(142) else: error_handling.fdiags[0] = ( diff --git a/process/buildings.py b/process/buildings.py index b18e73f779..c7046c903c 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 + tfmtn = 1.0e-3 * tfcoil_variables.whttf / tfcoil_variables.n_tf_coils # Calculate building areas and volumes @@ -80,7 +80,7 @@ def run(self, output: bool = False): tfri, tf_vertical_dim, tfmtn, - tfcoil_variables.n_tf, + tfcoil_variables.n_tf_coils, build_variables.rsldo, build_variables.rsldi, 2.0e0 * (build_variables.hmax - build_variables.vgap_vv_thermalshield) @@ -100,7 +100,7 @@ def bldgs( tfri, tfh, tfm, - n_tf, + n_tf_coils, shro, shri, shh, @@ -200,7 +200,7 @@ def bldgs( if buildings_variables.wgt > 1.0e0: wt = buildings_variables.wgt else: - wt = buildings_variables.shmf * shm / n_tf + wt = buildings_variables.shmf * shm / n_tf_coils wt = max(wt, 1.0e3 * pfm, 1.0e3 * tfm) # Crane height (m) @@ -268,7 +268,7 @@ def bldgs( if buildings_variables.wgt2 > 1.0e0: wgts = buildings_variables.wgt2 else: - wgts = buildings_variables.shmf * shm / n_tf + wgts = buildings_variables.shmf * shm / n_tf_coils cran = 9.41e-6 * wgts + 5.1e0 rmbh = ( @@ -527,7 +527,7 @@ def bldgs_sizes(self, output, tf_radial_dim, tf_vertical_dim): # Footprints and volumes required for storage include hot separation distance (buildings_variables.hot_sepdist). # Assumptions: - # tokomak is toroidally segmented based on number of TF coils (tfcoil_variables.n_tf); + # tokomak is toroidally segmented based on number of TF coils (tfcoil_variables.n_tf_coils); # component will be stored with the largest dimension oriented horizontally; # height is the largest dimension; # if a component lifetime == 0, that component is not in the current machine build. @@ -562,7 +562,7 @@ def bldgs_sizes(self, output, tf_radial_dim, tf_vertical_dim): + build_variables.dr_shld_inboard ) ) - ) / tfcoil_variables.n_tf + ) / tfcoil_variables.n_tf_coils # find footprint and volume for storing component hcomp_footprint = (hcomp_height + buildings_variables.hot_sepdist) * ( max(hcomp_rad_thk, hcomp_tor_thk) + buildings_variables.hot_sepdist @@ -573,7 +573,8 @@ def bldgs_sizes(self, output, tf_radial_dim, tf_vertical_dim): # required lifetime supply of components = # ( number in build * (plant lifetime / component lifetime) ) * quantity safety factor hcomp_req_supply = ( - tfcoil_variables.n_tf * (cost_variables.tlife / cost_variables.tlife) + tfcoil_variables.n_tf_coils + * (cost_variables.tlife / cost_variables.tlife) ) * buildings_variables.qnty_sfty_fac # total storage space for required supply of inboard shield-blanket-wall ib_hotcell_vol = hcomp_req_supply * hcomp_vol @@ -604,7 +605,7 @@ def bldgs_sizes(self, output, tf_radial_dim, tf_vertical_dim): + build_variables.dr_blkt_outboard + build_variables.dr_shld_outboard ) - ) / tfcoil_variables.n_tf + ) / tfcoil_variables.n_tf_coils hcomp_footprint = (hcomp_height + buildings_variables.hot_sepdist) * ( max(hcomp_rad_thk, hcomp_tor_thk) + buildings_variables.hot_sepdist ) @@ -612,7 +613,8 @@ def bldgs_sizes(self, output, tf_radial_dim, tf_vertical_dim): min(hcomp_rad_thk, hcomp_tor_thk) + buildings_variables.hot_sepdist ) hcomp_req_supply = ( - tfcoil_variables.n_tf * (cost_variables.tlife / cost_variables.tlife) + tfcoil_variables.n_tf_coils + * (cost_variables.tlife / cost_variables.tlife) ) * buildings_variables.qnty_sfty_fac # total storage space for required supply of outboard wall-blanket-shield ob_hotcell_vol = hcomp_req_supply * hcomp_vol @@ -633,7 +635,8 @@ def bldgs_sizes(self, output, tf_radial_dim, tf_vertical_dim): min(hcomp_rad_thk, hcomp_tor_thk) + buildings_variables.hot_sepdist ) hcomp_req_supply = ( - tfcoil_variables.n_tf * (cost_variables.tlife / cost_variables.divlife) + tfcoil_variables.n_tf_coils + * (cost_variables.tlife / cost_variables.divlife) ) * buildings_variables.qnty_sfty_fac # total storage space for required supply of divertor segments div_hotcell_vol = hcomp_req_supply * hcomp_vol diff --git a/process/costs.py b/process/costs.py index e474fb9f87..f9e2b48fb7 100644 --- a/process/costs.py +++ b/process/costs.py @@ -1481,7 +1481,7 @@ def acc2221(self): self.c22211 = ( 1.0e-6 * ctfconpm - * tfcoil_variables.n_tf + * tfcoil_variables.n_tf_coils * tfcoil_variables.tfleng * tfcoil_variables.n_tf_turn ) @@ -1494,7 +1494,7 @@ def acc2221(self): self.c22212 = ( 1.0e-6 * cost_variables.ucwindtf - * tfcoil_variables.n_tf + * tfcoil_variables.n_tf_coils * tfcoil_variables.tfleng * tfcoil_variables.n_tf_turn ) @@ -1507,7 +1507,7 @@ def acc2221(self): self.c22213 = ( 1.0e-6 * (tfcoil_variables.whtcas * cost_variables.uccase) - * tfcoil_variables.n_tf + * tfcoil_variables.n_tf_coils ) self.c22213 = ( cost_variables.fkind * self.c22213 * cmlsa[cost_variables.lsa - 1] @@ -1939,7 +1939,7 @@ def acc2251(self): if tfcoil_variables.i_tf_sup == 1: self.c22512 = 1.0e-6 * ( cost_variables.uctfbr - * tfcoil_variables.n_tf + * tfcoil_variables.n_tf_coils * (tfcoil_variables.cpttf * tfcoil_variables.vtfskv * 1.0e3) ** expel + cost_variables.uctfsw * tfcoil_variables.cpttf ) @@ -1952,13 +1952,15 @@ def acc2251(self): self.c22513 = 1.0e-6 * ( 1.0e9 * cost_variables.uctfdr * tfcoil_variables.estotftgj - + cost_variables.uctfgr * 0.5e0 * tfcoil_variables.n_tf + + cost_variables.uctfgr * 0.5e0 * tfcoil_variables.n_tf_coils ) self.c22513 = cost_variables.fkind * self.c22513 # Account 225.1.4 : TF coil instrumentation and control - self.c22514 = 1.0e-6 * cost_variables.uctfic * (30.0e0 * tfcoil_variables.n_tf) + self.c22514 = ( + 1.0e-6 * cost_variables.uctfic * (30.0e0 * tfcoil_variables.n_tf_coils) + ) self.c22514 = cost_variables.fkind * self.c22514 # Account 225.1.5 : TF coil bussing diff --git a/process/costs_2015.py b/process/costs_2015.py index 5e35bdfa23..71db479632 100644 --- a/process/costs_2015.py +++ b/process/costs_2015.py @@ -588,7 +588,7 @@ def calc_building_costs(self): self.s_label[5] = "Magnet power supplies and related buildings" self.s_cref[5] = 110000.0e0 * cost_variables.light_build_cost_per_vol # Scale with TF current per coil (MA) - self.s_k[5] = (tfcoil_variables.ritfc / tfcoil_variables.n_tf) / 1.0e6 + self.s_k[5] = (tfcoil_variables.ritfc / tfcoil_variables.n_tf_coils) / 1.0e6 self.s_kref[5] = 9.1e0 self.s_cost[5] = ( self.s_cost_factor[5] * self.s_cref[5] * (self.s_k[5] / self.s_kref[5]) @@ -711,7 +711,7 @@ def calc_tf_coil_costs(self): # ITER coil insertion and welding cost (2014 $) self.s_cref[13] = 258.0e6 # Scale with total TF coil length (m) - self.s_k[13] = tfcoil_variables.n_tf * tfcoil_variables.tfleng + self.s_k[13] = tfcoil_variables.n_tf_coils * tfcoil_variables.tfleng self.s_kref[13] = 18.0e0 * 34.1e0 self.s_cost[13] = ( self.s_cost_factor[13] @@ -725,7 +725,9 @@ def calc_tf_coil_costs(self): self.s_cref[15] = 414.0e6 # Scale with the total turn length (m) self.s_k[15] = ( - tfcoil_variables.n_tf * tfcoil_variables.tfleng * tfcoil_variables.n_tf_turn + tfcoil_variables.n_tf_coils + * tfcoil_variables.tfleng + * tfcoil_variables.n_tf_turn ) self.s_kref[15] = 82249.0e0 self.s_cost[15] = ( @@ -739,7 +741,7 @@ def calc_tf_coil_costs(self): # ITER Chromium plated Cu strand for TF SC cost (2014 $) self.s_cref[16] = 21.0e6 # Scale with total copper mass (kg) - self.s_k[16] = tfcoil_variables.whtconcu * tfcoil_variables.n_tf + self.s_k[16] = tfcoil_variables.whtconcu * tfcoil_variables.n_tf_coils self.s_kref[16] = 244.0e3 self.s_cost[16] = ( self.s_cost_factor[16] @@ -752,7 +754,7 @@ def calc_tf_coil_costs(self): # ITER Nb3Sn SC strands cost (2014 $) self.s_cref[17] = 526.0e6 # Scale with the total mass of Nb3Sn (kg) - self.s_k[17] = tfcoil_variables.whtconsc * tfcoil_variables.n_tf + self.s_k[17] = tfcoil_variables.whtconsc * tfcoil_variables.n_tf_coils self.s_kref[17] = 210.0e3 self.s_cost[17] = ( self.s_cost_factor[17] @@ -772,7 +774,9 @@ def calc_tf_coil_costs(self): self.s_cref[19] = 81.0e6 # Scale with total turn length. self.s_k[19] = ( - tfcoil_variables.n_tf * tfcoil_variables.tfleng * tfcoil_variables.n_tf_turn + tfcoil_variables.n_tf_coils + * tfcoil_variables.tfleng + * tfcoil_variables.n_tf_turn ) self.s_kref[19] = 82249.0e0 self.s_cost[19] = ( diff --git a/process/io/mfile_comparison.py b/process/io/mfile_comparison.py index 054127c07e..3ad46a4b40 100644 --- a/process/io/mfile_comparison.py +++ b/process/io/mfile_comparison.py @@ -52,7 +52,7 @@ "fimp(14", "a_plasma_surface", "vol_plasma", - "n_tf", + "n_tf_coils", "dr_shld_inboard", "dr_shld_outboard", "dr_blkt_inboard", @@ -109,7 +109,7 @@ "triang95", "a_plasma_surface", "vol_plasma", - "n_tf", + "n_tf_coils", "fusion_power", "plasma_current_MA", "bt", diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index 194ac88ed0..10c2e91722 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -14,7 +14,7 @@ OBS_VARS = { "snull": "i_single_null", - "tfno": "n_tf", + "tfno": "n_tf_coils", "itfsup": "i_tf_sup", "r_tf_inleg_mid": "r_tf_inboard_mid", "rtot": "r_tf_outboard_mid", diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index 139dfacd37..f96e0c77c3 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -497,8 +497,8 @@ def toroidal_cross_section(axis, mfile_data, scan, demo_ranges, colour_scheme): # Segment the TF coil inboard # Calculate centrelines - n = int(n_tf / 4) + 1 - spacing = 2 * np.pi / n_tf + n = int(n_tf_coils / 4) + 1 + spacing = 2 * np.pi / n_tf_coils i = np.arange(0, n) ang = i * spacing @@ -526,7 +526,7 @@ def toroidal_cross_section(axis, mfile_data, scan, demo_ranges, colour_scheme): TF_outboard( axis, item, - n_tf=n_tf, + n_tf_coils=n_tf_coils, r3=r3, r4=r4, w=w + nbshield, @@ -536,7 +536,7 @@ def toroidal_cross_section(axis, mfile_data, scan, demo_ranges, colour_scheme): TF_outboard( axis, item, - n_tf=n_tf, + n_tf_coils=n_tf_coils, r3=r3, r4=r4, w=w, @@ -583,8 +583,8 @@ def toroidal_cross_section(axis, mfile_data, scan, demo_ranges, colour_scheme): # --- -def TF_outboard(axis, item, n_tf, r3, r4, w, facecolor): - spacing = 2 * np.pi / n_tf +def TF_outboard(axis, item, n_tf_coils, r3, r4, w, facecolor): + spacing = 2 * np.pi / n_tf_coils ang = item * spacing dx = w * np.sin(ang) dy = w * np.cos(ang) @@ -2372,7 +2372,7 @@ def plot_geometry_info(axis, mfile_data, scan): ("a_plasma_surface", "Plasma surface area", "m$^2$"), ("a_plasma_poloidal", "Plasma cross-sectional area", "m$^2$"), ("vol_plasma", "Plasma volume", "m$^3$"), - ("n_tf", "No. of TF coils", ""), + ("n_tf_coils", "No. of TF coils", ""), (in_blanket_thk, "Inboard blanket+shield", "m"), ("dr_inboard_build", "Inboard build thickness", "m"), (out_blanket_thk, "Outboard blanket+shield", "m"), @@ -2552,11 +2552,11 @@ def plot_magnetics_info(axis, mfile_data, scan): ("tmargoh", "CS Temperature margin", "K"), (sig_cond, "TF Cond max TRESCA stress", "MPa"), (sig_case, "TF Case max TRESCA stress", "MPa"), - ("whttf/n_tf", "Mass per TF coil", "kg"), + ("whttf/n_tf_coils", "Mass per TF coil", "kg"), ] else: - n_tf = mfile_data.data["n_tf"].get_scan(scan) + n_tf_coils = mfile_data.data["n_tf_coils"].get_scan(scan) prescp = 1.0e-6 * mfile_data.data["prescp"].get_scan(scan) presleg = 1.0e-6 * mfile_data.data["presleg"].get_scan(scan) pres_joints = 1.0e-6 * mfile_data.data["pres_joints"].get_scan(scan) @@ -2580,7 +2580,7 @@ def plot_magnetics_info(axis, mfile_data, scan): (fcoolcp, "CP cooling fraction", "%"), ("vcool", "Maximum coolant flow speed", "ms$^{-1}$"), (prescp, "CP Resisitive heating", "MW"), - (presleg * n_tf, "legs Resisitive heating (all legs)", "MW"), + (presleg * n_tf_coils, "legs Resisitive heating (all legs)", "MW"), (pres_joints, "TF joints resisitive heating ", "MW"), ] @@ -3419,7 +3419,7 @@ def main(args=None): j_plasma_0 = m_file.data["j_plasma_0"].get_scan(scan) # Magnets related - global n_tf + global n_tf_coils global wwp1 global wwp2 global dr_tf_wp @@ -3427,7 +3427,7 @@ def main(args=None): global thkcas global casthi - n_tf = m_file.data["n_tf"].get_scan(scan) + n_tf_coils = m_file.data["n_tf_coils"].get_scan(scan) if i_tf_sup == 1: # If superconducting magnets wwp1 = m_file.data["wwp1"].get_scan(scan) if i_tf_wp_geom == 1: diff --git a/process/power.py b/process/power.py index 72ab3c7a5f..5ef0053e54 100644 --- a/process/power.py +++ b/process/power.py @@ -791,7 +791,7 @@ def power1(self): pf_power_variables.ensxpfm, times_variables.t_pulse_repetition, tfcoil_variables.cpttf, - tfcoil_variables.n_tf, + tfcoil_variables.n_tf_coils, ) # Use 13% of ideal Carnot efficiency to fit J. Miller estimate @@ -2268,7 +2268,7 @@ def cryo( ensxpfm, t_pulse_repetition, cpttf, - n_tf, + n_tf,_coils ): """ Calculates cryogenic loads @@ -2302,7 +2302,7 @@ def cryo( # Current leads if i_tf_sup == 1: - self.qcl = 13.6e-3 * n_tf * cpttf + self.qcl = 13.6e-3 * n_tf_coils * cpttf else: self.qcl = 0.0e0 @@ -2499,7 +2499,7 @@ def tfpwr(self, output: bool): # Total maximum impedance MDK actually just fixed resistance ztot = ( - tfcoil_variables.n_tf * tfcoil_variables.tflegres + tfcoil_variables.n_tf_coils * tfcoil_variables.tflegres + (tfcoil_variables.prescp / tfcoil_variables.ritfc**2) + tfbusres ) @@ -2507,7 +2507,7 @@ def tfpwr(self, output: bool): # No reactive portion of the voltage is included here - assume long ramp times # MDK This is steady state voltage, not "peak" voltage tfcoil_variables.vtfkv = ( - 1.0e-3 * ztot * tfcoil_variables.cpttf / tfcoil_variables.n_tf + 1.0e-3 * ztot * tfcoil_variables.cpttf / tfcoil_variables.n_tf_coils ) # Resistive powers (MW): @@ -2527,7 +2527,7 @@ def tfpwr(self, output: bool): # The TF coil can be ramped up as slowly as you like # (although this will affect the time to recover from a magnet quench). # tfreacmw = 1.0e-6 * 1.0e9 * estotf/(t_current_ramp_up + t_precharge) - # estotf(=estotftgj/tfcoil_variables.n_tf) has been removed (#199 #847) + # estotf(=estotftgj/tfcoil_variables.n_tf_coils) has been removed (#199 #847) tfreacmw = 0.0e0 # Total power consumption (MW) @@ -2639,7 +2639,7 @@ def tfpwcall(self, output: bool): the power conversion requirements for superconducting TF coils. None """ - ettfmj = tfcoil_variables.estotftgj / tfcoil_variables.n_tf * 1.0e3 + ettfmj = tfcoil_variables.estotftgj / tfcoil_variables.n_tf_coils * 1.0e3 # TF coil current (kA) @@ -2655,7 +2655,7 @@ def tfpwcall(self, output: bool): output, itfka, physics_variables.rmajor, - tfcoil_variables.n_tf, + tfcoil_variables.n_tf_coils, tfcoil_variables.vtfskv, ettfmj, tfcoil_variables.tflegres, @@ -2839,7 +2839,7 @@ def tfcpwr(self, output: bool, itfka, rmajor, ntfc, vtfskv, ettfmj, rptfc): rcoils, "OP ", ) - # MDK Remove this as it leads to confusion between (a) total inductance/n_tf, or (b) + # MDK Remove this as it leads to confusion between (a) total inductance/n_tf_coils, or (b) # self-inductance of one single coil # po.ovarre(outfile,'Inductance per TF coil (H)','(lptfcs)',lptfcs, 'OP ') po.ovarre(self.outfile, "TF coil charging voltage (V)", "(tfcv)", tfcv) diff --git a/process/sctfcoil.py b/process/sctfcoil.py index 3b71e85520..d23a48ce6e 100644 --- a/process/sctfcoil.py +++ b/process/sctfcoil.py @@ -39,10 +39,12 @@ def run(self, output: bool): """ Routine to call the superconductor module for the TF coils """ - tfes = sctfcoil_module.estotft / tfcoil_variables.n_tf + tfes = sctfcoil_module.estotft / tfcoil_variables.n_tf_coils # Cross-sectional area per turn aturn = tfcoil_variables.ritfc / ( - tfcoil_variables.jwptf * tfcoil_variables.n_tf * tfcoil_variables.n_tf_turn + tfcoil_variables.jwptf + * tfcoil_variables.n_tf_coils + * tfcoil_variables.n_tf_turn ) if tfcoil_variables.i_tf_sc_mat == 6: @@ -90,7 +92,7 @@ def croco_voltage(self) -> float: croco_voltage = ( 2.0e0 / sctfcoil_module.time2 - * (sctfcoil_module.estotft / tfcoil_variables.n_tf) + * (sctfcoil_module.estotft / tfcoil_variables.n_tf_coils) / tfcoil_variables.cpttf ) elif f2py_compatible_to_string(tfcoil_variables.quench_model) == "exponential": @@ -98,7 +100,7 @@ def croco_voltage(self) -> float: croco_voltage = ( 2.0e0 / sctfcoil_module.tau2 - * (sctfcoil_module.estotft / tfcoil_variables.n_tf) + * (sctfcoil_module.estotft / tfcoil_variables.n_tf_coils) / tfcoil_variables.cpttf ) else: @@ -1206,7 +1208,7 @@ def sctfcoil(self, output: bool): # Rem : as resistive magnets are axisymmetric, no inboard ripple is present if tfcoil_variables.i_tf_sup == 1: tfcoil_variables.bmaxtfrp, peaktfflag = self.peak_tf_with_ripple( - tfcoil_variables.n_tf, + tfcoil_variables.n_tf_coils, tfcoil_variables.wwp1, tfcoil_variables.dr_tf_wp - 2.0e0 * (tfcoil_variables.tinstf + tfcoil_variables.tfinsgap), @@ -1487,7 +1489,7 @@ def tf_global_geometry(self): - Winding Pack NOT included """ - sctfcoil_module.theta_coil = np.pi / tfcoil_variables.n_tf + sctfcoil_module.theta_coil = np.pi / tfcoil_variables.n_tf_coils sctfcoil_module.tan_theta_coil = np.tan(sctfcoil_module.theta_coil) # TF coil inboard legs mid-plane cross-section area (WP + casing ) [m2] @@ -1499,7 +1501,7 @@ def tf_global_geometry(self): else: # Straight front case tfcoil_variables.tfareain = ( - tfcoil_variables.n_tf + tfcoil_variables.n_tf_coils * np.sin(sctfcoil_module.theta_coil) * np.cos(sctfcoil_module.theta_coil) * build_variables.r_tf_inboard_out**2 @@ -1567,7 +1569,7 @@ def tf_current(self): tfcoil_variables.casths = ( tfcoil_variables.casths_fraction * (build_variables.r_tf_inboard_in + tfcoil_variables.thkcas) - * np.tan(np.pi / tfcoil_variables.n_tf) + * np.tan(np.pi / tfcoil_variables.n_tf_coils) ) # Radial position of peak toroidal field [m] @@ -1602,7 +1604,9 @@ def tf_current(self): ) # Current per TF coil [A] - sctfcoil_module.tfc_current = tfcoil_variables.ritfc / tfcoil_variables.n_tf + sctfcoil_module.tfc_current = ( + tfcoil_variables.ritfc / tfcoil_variables.n_tf_coils + ) # Global inboard leg average current in TF coils [A/m2] tfcoil_variables.oacdcp = tfcoil_variables.ritfc / tfcoil_variables.tfareain @@ -1856,7 +1860,7 @@ def tf_res_heating(self): tfcoil_variables.ritfc, tfcoil_variables.rhocp, tfcoil_variables.fcoolcp, - tfcoil_variables.n_tf, + tfcoil_variables.n_tf_coils, ) # Leg cross-section areas @@ -1897,7 +1901,7 @@ def tf_res_heating(self): tfcoil_variables.presleg = ( tfcoil_variables.tflegres * tfcoil_variables.ritfc**2 - / tfcoil_variables.n_tf + / tfcoil_variables.n_tf_coils ) # --- @@ -1908,7 +1912,7 @@ def tf_res_heating(self): n_contact_tot = ( tfcoil_variables.n_tf_joints_contact * np.round(tfcoil_variables.n_tf_turn) - * np.round(tfcoil_variables.n_tf) + * np.round(tfcoil_variables.n_tf_coils) ) # Area of joint contact (all legs) @@ -1939,7 +1943,7 @@ def tf_res_heating(self): tfcoil_variables.rhocp * tfcoil_variables.ritfc**2 * tfcoil_variables.tfleng - / (sctfcoil_module.a_leg_cond * tfcoil_variables.n_tf) + / (sctfcoil_module.a_leg_cond * tfcoil_variables.n_tf_coils) ) # tfcoil_variables.prescp containts the the total resistive power losses @@ -1964,7 +1968,7 @@ def cpost( curr, rho, fcool, - n_tf, + n_tf_coils, ): """ author: P J Knight, CCFE, Culham Science Centre @@ -2035,7 +2039,7 @@ def cpost( # Mid-plane area calculations # --------------------------- # Total number of CP turns - n_turns_tot = n_tf * n_tf_turn + n_turns_tot = n_tf_coils * n_tf_turn # Area of the innner TF central hole [m2] a_tfin_hole = np.pi * r_tfin_inleg**2 @@ -2048,7 +2052,7 @@ def cpost( # Mid-plane outter ground insulation thickness [m2] a_cp_gr_ins = ( np.pi * ((rmid + gr_ins_th) ** 2 - rmid**2) - + 2.0e0 * gr_ins_th * (rmid - r_tfin_inleg) * n_tf + + 2.0e0 * gr_ins_th * (rmid - r_tfin_inleg) * n_tf_coils ) # Mid-plane turn layer cross-section area [m2] @@ -2061,7 +2065,7 @@ def cpost( # Cooling pipes cross-section per coil [m2] a_cp_cool = fcool * ( - (np.pi * rmid**2 - a_tfin_hole - a_cp_ins) / n_tf + (np.pi * rmid**2 - a_tfin_hole - a_cp_ins) / n_tf_coils - 2.0e0 * gr_ins_th * (rmid - r_tfin_inleg) ) # Wedge ground insulation # --------------------------- @@ -2087,7 +2091,7 @@ def cpost( if np.abs(rmid - rtop) < EPS: # Exact conductor cross-section a_cond_midplane = ( - np.pi * rmid**2 - a_tfin_hole - n_tf * a_cp_cool - a_cp_ins + np.pi * rmid**2 - a_tfin_hole - n_tf_coils * a_cp_cool - a_cp_ins ) # Volumes and resisitive losses calculations @@ -2156,15 +2160,15 @@ def cpost( yy_cond[ii] = ( np.pi * r**2 - a_tfin_hole - - n_tf * a_cp_cool + - n_tf_coils * a_cp_cool - yy_ins[ii] - - 2.0e0 * n_tf * gr_ins_th * (r - r_tfin_inleg) + - 2.0e0 * n_tf_coils * gr_ins_th * (r - r_tfin_inleg) ) # Wedge ground insulation # Outer ground insulation area at z yy_gr_ins[ii] = np.pi * ( (r + gr_ins_th) ** 2 - r**2 - ) + 2.0e0 * n_tf * gr_ins_th * (r - r_tfin_inleg) + ) + 2.0e0 * n_tf_coils * gr_ins_th * (r - r_tfin_inleg) # Outer casing Cross-sectional area at z yy_casout[ii] = np.pi * ( @@ -2203,7 +2207,7 @@ def cpost( # Ground insulation layer cross-section at CP top [m2] a_cp_gr_ins = ( np.pi * ((rtop + gr_ins_th) ** 2 - rtop**2) - + 2.0e0 * gr_ins_th * (rtop - r_tfin_inleg) * n_tf + + 2.0e0 * gr_ins_th * (rtop - r_tfin_inleg) * n_tf_coils ) # Outer casing cross-section area at CP top [m2] @@ -2218,8 +2222,8 @@ def cpost( np.pi * rtop**2 - a_tfin_hole - a_cp_ins - - n_tf * a_cp_cool - - 2.0e0 * n_tf * gr_ins_th * (rtop - r_tfin_inleg) + - n_tf_coils * a_cp_cool + - 2.0e0 * n_tf_coils * gr_ins_th * (rtop - r_tfin_inleg) ) # subtracting ground insulation wedge separation # Resistive power losses in taped section (variable radius section) [W] @@ -2257,8 +2261,8 @@ def cpost( np.pi * rtop**2 - a_tfin_hole - a_cp_ins - - n_tf * a_cp_cool - - 2.0e0 * n_tf * gr_ins_th * (rtop - r_tfin_inleg) + - n_tf_coils * a_cp_cool + - 2.0e0 * n_tf_coils * gr_ins_th * (rtop - r_tfin_inleg) ) ) ) # ground insulation separation @@ -2336,7 +2340,7 @@ def vv_stress_on_quench(self): rm_vv=rm_vv, theta1_vv=tfcoil_variables.theta1_vv, # TF properties - n_tf=tfcoil_variables.n_tf, + n_tf_coils=tfcoil_variables.n_tf_coils, n_tf_turn=tfcoil_variables.n_tf_turn, # Area of the radial plate taken to be the area of steel in the WP # TODO: value clipped due to #1883 @@ -2383,7 +2387,7 @@ def tf_field_and_force(self): 0.5e0 * tfcoil_variables.bmaxtf * tfcoil_variables.ritfc - / tfcoil_variables.n_tf + / tfcoil_variables.n_tf_coils ) # Vertical force per coil [N] @@ -2411,7 +2415,7 @@ def tf_field_and_force(self): vforce_tot = ( 0.5e0 * (physics_variables.bt * physics_variables.rmajor * tfcoil_variables.ritfc) - / (tfcoil_variables.n_tf * dr_wp**2) + / (tfcoil_variables.n_tf_coils * dr_wp**2) * ( r_out_wp**2 * np.log(r_out_wp / r_in_wp) + r_in_outwp**2 * np.log((r_in_outwp + dr_wp) / r_in_outwp) @@ -2437,7 +2441,7 @@ def tf_field_and_force(self): * physics_variables.rmajor * tfcoil_variables.ritfc ) - / (tfcoil_variables.n_tf * dr_wp**2) + / (tfcoil_variables.n_tf_coils * dr_wp**2) * ( 2.0e0 * r_out_wp**2 * np.log(r_out_wp / r_in_wp) + 2.0e0 * dr_wp**2 * np.log(build_variables.r_cp_top / r_in_wp) @@ -2467,7 +2471,7 @@ def tf_field_and_force(self): # Total vertical force sctfcoil_module.vforce_inboard_tot = ( - tfcoil_variables.vforce * tfcoil_variables.n_tf + tfcoil_variables.vforce * tfcoil_variables.n_tf_coils ) @staticmethod @@ -2684,7 +2688,7 @@ def tf_coil_area_and_masses(self): tfcoil_variables.whtcas + tfcoil_variables.whtcon + tfcoil_variables.whtgw - ) * tfcoil_variables.n_tf + ) * tfcoil_variables.n_tf_coils # If spherical tokamak, distribute between centrepost and outboard legs # (in this case, total TF coil length = inboard `cplen` + outboard `tfleng`) @@ -2716,7 +2720,8 @@ def tf_coil_area_and_masses(self): # Total TF conductor volume [m3] vol_cond = ( - tfcoil_variables.vol_cond_cp + tfcoil_variables.n_tf * vol_cond_leg + tfcoil_variables.vol_cond_cp + + tfcoil_variables.n_tf_coils * vol_cond_leg ) # Outboard leg TF turn insulation layer volume (per leg) [m3] @@ -2724,7 +2729,8 @@ def tf_coil_area_and_masses(self): # Total turn insulation layer volume [m3] vol_ins = ( - sctfcoil_module.vol_ins_cp + tfcoil_variables.n_tf * vol_ins_leg + sctfcoil_module.vol_ins_cp + + tfcoil_variables.n_tf_coils * vol_ins_leg ) # Ouboard leg TF ground insulation layer volume (per leg) [m3] @@ -2733,7 +2739,7 @@ def tf_coil_area_and_masses(self): # Total ground insulation layer volume [m3] vol_gr_ins = ( sctfcoil_module.vol_gr_ins_cp - + tfcoil_variables.n_tf * vol_gr_ins_leg + + tfcoil_variables.n_tf_coils * vol_gr_ins_leg ) # Total volume of the CP casing [m3] @@ -2747,28 +2753,28 @@ def tf_coil_area_and_masses(self): vol_cond = ( tfcoil_variables.tfleng * sctfcoil_module.a_leg_cond - * tfcoil_variables.n_tf + * tfcoil_variables.n_tf_coils ) # Total turn insulation layer volume [m3] vol_ins = ( tfcoil_variables.tfleng * sctfcoil_module.a_leg_ins - * tfcoil_variables.n_tf + * tfcoil_variables.n_tf_coils ) # Total ground insulation volume [m3] vol_gr_ins = ( tfcoil_variables.tfleng * sctfcoil_module.a_leg_gr_ins - * tfcoil_variables.n_tf + * tfcoil_variables.n_tf_coils ) # Total case volume [m3] vol_case = ( tfcoil_variables.tfleng * tfcoil_variables.acasetf - * tfcoil_variables.n_tf + * tfcoil_variables.n_tf_coils ) # --- @@ -2777,17 +2783,17 @@ def tf_coil_area_and_masses(self): # Copper magnets casing/conductor weights per coil [kg] if tfcoil_variables.i_tf_sup == 0: tfcoil_variables.whtcas = ( - fwbs_variables.denstl * vol_case / tfcoil_variables.n_tf + fwbs_variables.denstl * vol_case / tfcoil_variables.n_tf_coils ) # Per TF leg, no casing for outer leg tfcoil_variables.whtconcu = ( - constants.dcopper * vol_cond / tfcoil_variables.n_tf + constants.dcopper * vol_cond / tfcoil_variables.n_tf_coils ) tfcoil_variables.whtconal = 0.0e0 # Outer legs/CP weights if physics_variables.itart == 1: # Weight of all the TF legs - tfcoil_variables.whttflgs = tfcoil_variables.n_tf * ( + tfcoil_variables.whttflgs = tfcoil_variables.n_tf_coils * ( constants.dcopper * vol_cond_leg + tfcoil_variables.dcondins * (vol_ins_leg + vol_gr_ins_leg) ) @@ -2805,17 +2811,17 @@ def tf_coil_area_and_masses(self): elif tfcoil_variables.i_tf_sup == 2: # Casing weight (CP only if physics_variables.itart = 1)bper leg/coil tfcoil_variables.whtcas = ( - constants.dalu * vol_case / tfcoil_variables.n_tf + constants.dalu * vol_case / tfcoil_variables.n_tf_coils ) tfcoil_variables.whtconcu = 0.0e0 tfcoil_variables.whtconal = ( - constants.dalu * vol_cond / tfcoil_variables.n_tf + constants.dalu * vol_cond / tfcoil_variables.n_tf_coils ) # Outer legs/CP weights if physics_variables.itart == 1: # Weight of all the TF legs - tfcoil_variables.whttflgs = tfcoil_variables.n_tf * ( + tfcoil_variables.whttflgs = tfcoil_variables.n_tf_coils * ( constants.dalu * vol_cond_leg + tfcoil_variables.dcondins * (vol_ins_leg + vol_gr_ins_leg) ) @@ -2830,12 +2836,12 @@ def tf_coil_area_and_masses(self): # Turn insulation mass [kg] tfcoil_variables.whtconin = ( - tfcoil_variables.dcondins * vol_ins / tfcoil_variables.n_tf + tfcoil_variables.dcondins * vol_ins / tfcoil_variables.n_tf_coils ) # Ground wall insulation layer weight tfcoil_variables.whtgw = ( - tfcoil_variables.dcondins * vol_gr_ins / tfcoil_variables.n_tf + tfcoil_variables.dcondins * vol_gr_ins / tfcoil_variables.n_tf_coils ) # Total weight @@ -2845,9 +2851,9 @@ def tf_coil_area_and_masses(self): + tfcoil_variables.whtconal + tfcoil_variables.whtconin + tfcoil_variables.whtgw - ) * tfcoil_variables.n_tf + ) * tfcoil_variables.n_tf_coils - def peak_tf_with_ripple(self, n_tf, wwp1, dr_tf_wp, tfin, bmaxtf): + def peak_tf_with_ripple(self, n_tf_coils, wwp1, dr_tf_wp, tfin, bmaxtf): """Peak toroidal field on the conductor author: P J Knight, CCFE, Culham Science Centre This subroutine calculates the peak toroidal field at the @@ -2861,8 +2867,8 @@ def peak_tf_with_ripple(self, n_tf, wwp1, dr_tf_wp, tfin, bmaxtf): M. Kovari, Toroidal Field Coils - Maximum Field and Ripple - Parametric Calculation, July 2014 - :param n_tf: number of TF coils - :type n_tf: float + :param n_tf_coils: number of TF coils + :type n_tf_coils: float :param wwp1: width of plasma-facing face of winding pack (m) :type wwp1: float :param dr_tf_wp: radial thickness of winding pack (m) @@ -2884,7 +2890,7 @@ def peak_tf_with_ripple(self, n_tf, wwp1, dr_tf_wp, tfin, bmaxtf): # Set fitting coefficients for different numbers of TF coils - int_n_tf = np.round(n_tf) + int_n_tf = np.round(n_tf_coils) if int_n_tf == 16: a[0] = 0.28101e0 @@ -2909,7 +2915,7 @@ def peak_tf_with_ripple(self, n_tf, wwp1, dr_tf_wp, tfin, bmaxtf): # Maximum winding pack width before adjacent packs touch # (ignoring the external case and ground wall thicknesses) - wmax = (2.0e0 * tfin + dr_tf_wp) * np.tan(np.pi / n_tf) + wmax = (2.0e0 * tfin + dr_tf_wp) * np.tan(np.pi / n_tf_coils) # Dimensionless winding pack width @@ -2973,7 +2979,7 @@ def res_tf_internal_geom(self): sctfcoil_module.awpc = ( np.pi * (sctfcoil_module.r_wp_outer**2 - sctfcoil_module.r_wp_inner**2) - / tfcoil_variables.n_tf + / tfcoil_variables.n_tf_coils ) # Area of the front case, the plasma-facing case of the inner TF coil [m2] @@ -2983,14 +2989,14 @@ def res_tf_internal_geom(self): (sctfcoil_module.r_wp_outer + tfcoil_variables.casthi) ** 2 - sctfcoil_module.r_wp_outer**2 ) - / tfcoil_variables.n_tf + / tfcoil_variables.n_tf_coils ) # WP mid-plane cross-section excluding ground insulation per coil [m2] sctfcoil_module.awptf = np.pi * ( (sctfcoil_module.r_wp_outer - tfcoil_variables.tinstf) ** 2 - (sctfcoil_module.r_wp_inner + tfcoil_variables.tinstf) ** 2 - ) / tfcoil_variables.n_tf - 2.0e0 * tfcoil_variables.tinstf * ( + ) / tfcoil_variables.n_tf_coils - 2.0e0 * tfcoil_variables.tinstf * ( tfcoil_variables.dr_tf_wp - 2.0e0 * tfcoil_variables.tinstf ) @@ -3011,7 +3017,7 @@ def res_tf_internal_geom(self): + tfcoil_variables.thicndut ) ** 2 - ) / tfcoil_variables.n_tf - ( + ) / tfcoil_variables.n_tf_coils - ( tfcoil_variables.dr_tf_wp - 2.0e0 * (tfcoil_variables.tinstf + tfcoil_variables.thicndut) ) * 2.0e0 * ( @@ -3030,19 +3036,21 @@ def res_tf_internal_geom(self): # Insulation fraction [-] sctfcoil_module.f_tf_ins = ( - tfcoil_variables.n_tf * sctfcoil_module.a_tf_ins / tfcoil_variables.tfareain + tfcoil_variables.n_tf_coils + * sctfcoil_module.a_tf_ins + / tfcoil_variables.tfareain ) # Total cross-sectional area of the bucking cylindre and the outer support # support structure per coil [m2] # physics_variables.itart = 1 : Only valid at mid-plane tfcoil_variables.acasetf = ( - tfcoil_variables.tfareain / tfcoil_variables.n_tf + tfcoil_variables.tfareain / tfcoil_variables.n_tf_coils ) - sctfcoil_module.awpc # Current per turn tfcoil_variables.cpttf = tfcoil_variables.ritfc / ( - tfcoil_variables.n_tf_turn * tfcoil_variables.n_tf + tfcoil_variables.n_tf_turn * tfcoil_variables.n_tf_coils ) # Exact current density on TF oubard legs @@ -3155,7 +3163,7 @@ def sc_tf_internal_geom(self, i_tf_wp_geom, i_tf_case_geom, i_tf_turns_integer): # Inboard coil steel fraction [-] sctfcoil_module.f_tf_steel = ( - tfcoil_variables.n_tf + tfcoil_variables.n_tf_coils * sctfcoil_module.a_tf_steel / tfcoil_variables.tfareain ) @@ -3165,7 +3173,9 @@ def sc_tf_internal_geom(self, i_tf_wp_geom, i_tf_case_geom, i_tf_turns_integer): # Inboard coil insulation fraction [-] sctfcoil_module.f_tf_ins = ( - tfcoil_variables.n_tf * sctfcoil_module.a_tf_ins / tfcoil_variables.tfareain + tfcoil_variables.n_tf_coils + * sctfcoil_module.a_tf_ins + / tfcoil_variables.tfareain ) # Negative areas or fractions error reporting @@ -3356,7 +3366,7 @@ def tf_case_geom(self, i_tf_wp_geom, i_tf_case_geom): Setting the case geometry and area for SC magnets """ tfcoil_variables.acasetf = ( - tfcoil_variables.tfareain / tfcoil_variables.n_tf + tfcoil_variables.tfareain / tfcoil_variables.n_tf_coils ) - sctfcoil_module.awpc # Outboard leg cross-sectional area of surrounding case [m2] @@ -3526,7 +3536,8 @@ def tf_wp_currents(self): """ tfcoil_variables.jwptf = max( 1.0e0, - tfcoil_variables.ritfc / (tfcoil_variables.n_tf * sctfcoil_module.awptf), + tfcoil_variables.ritfc + / (tfcoil_variables.n_tf_coils * sctfcoil_module.awptf), ) @staticmethod @@ -4526,7 +4537,10 @@ def outtf(self, peaktfflag): # TF coil geometry po.osubhd(self.outfile, "TF coil Geometry :") po.ovarin( - self.outfile, "Number of TF coils", "(n_tf)", int(tfcoil_variables.n_tf) + self.outfile, + "Number of TF coils", + "(n_tf_coils)", + int(tfcoil_variables.n_tf_coils), ) po.ovarre( self.outfile, @@ -4715,8 +4729,8 @@ def outtf(self, peaktfflag): po.ovarre( self.outfile, "Total steel cross-section (m2)", - "(a_tf_steel*n_tf)", - sctfcoil_module.a_tf_steel * tfcoil_variables.n_tf, + "(a_tf_steel*n_tf_coils)", + sctfcoil_module.a_tf_steel * tfcoil_variables.n_tf_coils, ) po.ovarre( self.outfile, @@ -4727,8 +4741,8 @@ def outtf(self, peaktfflag): po.ovarre( self.outfile, "Total Insulation cross-section (total) (m2)", - "(a_tf_ins*n_tf)", - sctfcoil_module.a_tf_ins * tfcoil_variables.n_tf, + "(a_tf_ins*n_tf_coils)", + sctfcoil_module.a_tf_ins * tfcoil_variables.n_tf_coils, ) po.ovarre( self.outfile, @@ -4834,8 +4848,8 @@ def outtf(self, peaktfflag): po.ovarre( self.outfile, "Steel WP cross-section (total) (m2)", - "(aswp*n_tf)", - tfcoil_variables.aswp * tfcoil_variables.n_tf, + "(aswp*n_tf_coils)", + tfcoil_variables.aswp * tfcoil_variables.n_tf_coils, ) po.ovarre( self.outfile, @@ -5221,8 +5235,8 @@ def outtf(self, peaktfflag): po.ovarre( self.outfile, "Mass of each TF coil (kg)", - "(whttf/n_tf)", - tfcoil_variables.whttf / tfcoil_variables.n_tf, + "(whttf/n_tf_coils)", + tfcoil_variables.whttf / tfcoil_variables.n_tf_coils, "OP ", ) po.ovarre( @@ -5597,7 +5611,7 @@ def outtf(self, peaktfflag): "(casthi)", ) - radius = radius / np.cos(np.pi / tfcoil_variables.n_tf) + radius = radius / np.cos(np.pi / tfcoil_variables.n_tf_coils) po.obuild( self.outfile, "Plasma side case max radius", @@ -7191,7 +7205,7 @@ def vv_stress_on_quench( rm_vv, theta1_vv, # TF properties - n_tf, + n_tf_coils, n_tf_turn, s_rp, s_cc, @@ -7232,7 +7246,7 @@ def vv_stress_on_quench( joined to another circular arc in the approximation to the VV CCL, using an arbitrary origin of coordinates (Rc2, Zc2). - :param n_tf: the number of TF coils + :param n_tf_coils: the number of TF coils :param n_tf_turn: the number of turns per TF coil :param s_rp: the cross-sectional area of the radial plates of the TF coil :param s_cc: the cross-sectional area of the TF coil case @@ -7258,7 +7272,7 @@ def vv_stress_on_quench( Plasma and Fusion Research. 15. 1405078-1405078. 10.1585/pfr.15.1405078. """ # Poloidal loop resistance (PLR) in ohms - plr_coil = ((0.5 * ccl_length_coil) / (n_tf * (s_cc + s_rp))) * 1e-6 + plr_coil = ((0.5 * ccl_length_coil) / (n_tf_coils * (s_cc + s_rp))) * 1e-6 plr_vv = ((0.84 / d_vv) * 0.94) * 1e-6 # relevant self-inductances in henry (H) @@ -7284,7 +7298,7 @@ def vv_stress_on_quench( i0 = i_op * np.exp(-lambda0 * tmaxforce) i1 = ( lambda0 - * n_tf + * n_tf_coils * n_tf_turn * i_op * ( @@ -7295,7 +7309,7 @@ def vv_stress_on_quench( i2 = (lambda1 / lambda2) * i1 a_vv = (ro_vv + ri_vv) / (ro_vv - ri_vv) - b_vvi = (constants.rmu0 * (n_tf * n_tf_turn * i0 + i1 + (i2 / 2))) / ( + b_vvi = (constants.rmu0 * (n_tf_coils * n_tf_turn * i0 + i1 + (i2 / 2))) / ( 2 * np.pi * ri_vv ) j_vvi = i2 / (2 * np.pi * d_vv * ri_vv) diff --git a/process/stellarator.py b/process/stellarator.py index d549b477ef..bc69924d56 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -215,10 +215,10 @@ def stnewconfig(self): physics_variables.rminor = physics_variables.rmajor / physics_variables.aspect physics_variables.eps = 1.0e0 / physics_variables.aspect - tfcoil_variables.n_tf = ( + tfcoil_variables.n_tf_coils = ( stellarator_configuration.stella_config_coilspermodule * stellarator_configuration.stella_config_symmetry - ) # This overwrites tfcoil_variables.n_tf in input file. + ) # This overwrites tfcoil_variables.n_tf_coils in input file. # Factors used to scale the reference point. st.f_r = ( @@ -234,7 +234,7 @@ def stnewconfig(self): physics_variables.aspect / stellarator_configuration.stella_config_aspect_ref ) - st.f_n = tfcoil_variables.n_tf / ( + st.f_n = tfcoil_variables.n_tf_coils / ( stellarator_configuration.stella_config_coilspermodule * stellarator_configuration.stella_config_symmetry ) # Coil number factor @@ -1049,7 +1049,7 @@ def blanket_neutronics(self): + 0.75 * tfcoil_variables.tfleng * tfcoil_variables.arealeg - * tfcoil_variables.n_tf + * tfcoil_variables.n_tf_coils ) fwbs_variables.ptfnucpm3 = fwbs_variables.ptfnuc / tf_volume @@ -2516,7 +2516,7 @@ def stcoil(self, output: bool): b_max_k[k] = self.bmax_from_awp( wp_width_r[k], coilcurrent, - tfcoil_variables.n_tf, + tfcoil_variables.n_tf_coils, r_coil_major, r_coil_minor, ) @@ -2571,7 +2571,7 @@ def stcoil(self, output: bool): tfcoil_variables.bmaxtf = self.bmax_from_awp( wp_width_r_min, coilcurrent, - tfcoil_variables.n_tf, + tfcoil_variables.n_tf_coils, r_coil_major, r_coil_minor, ) @@ -2725,7 +2725,7 @@ def stcoil(self, output: bool): # [m^2] Total surface area of coil side facing plasma: inboard region tfcoil_variables.tfsai = ( - tfcoil_variables.n_tf + tfcoil_variables.n_tf_coils * tfcoil_variables.tftort * 0.5e0 * tfcoil_variables.tfleng @@ -2750,10 +2750,10 @@ def stcoil(self, output: bool): # Variables for ALL coils. tfcoil_variables.tfareain = ( - tfcoil_variables.n_tf * tfcoil_variables.arealeg + tfcoil_variables.n_tf_coils * tfcoil_variables.arealeg ) # [m^2] Total area of all coil legs (midplane) tfcoil_variables.ritfc = ( - tfcoil_variables.n_tf * coilcurrent * 1.0e6 + tfcoil_variables.n_tf_coils * coilcurrent * 1.0e6 ) # [A] Total current in ALL coils tfcoil_variables.oacdcp = ( tfcoil_variables.ritfc / tfcoil_variables.tfareain @@ -2780,7 +2780,7 @@ def stcoil(self, output: bool): ** 2 * st.f_n**2 ) - * (tfcoil_variables.ritfc / tfcoil_variables.n_tf) ** 2 + * (tfcoil_variables.ritfc / tfcoil_variables.n_tf_coils) ** 2 * 1.0e-9 ) # [GJ] Total magnetic energy @@ -2804,7 +2804,7 @@ def stcoil(self, output: bool): tfcoil_variables.tfleng = ( stellarator_configuration.stella_config_coillength * (r_coil_minor / stellarator_configuration.stella_config_coil_rminor) - / tfcoil_variables.n_tf + / tfcoil_variables.n_tf_coils ) # [m] estimated average length of a coil # [m^2] Total surface area of toroidal shells covering coils @@ -2882,7 +2882,7 @@ def stcoil(self, output: bool): # [kg] Total coil mass tfcoil_variables.whttf = ( tfcoil_variables.whtcas + tfcoil_variables.whtcon + tfcoil_variables.whtgw - ) * tfcoil_variables.n_tf + ) * tfcoil_variables.n_tf_coils # End of general coil geometry values ####################################################################################### @@ -2944,10 +2944,10 @@ def stcoil(self, output: bool): # the conductor fraction is meant of the cable space# # This is the old routine which is being replaced for now by the new one below # protect(aio, tfes, acs, aturn, tdump, fcond, fcu, tba, tmax ,ajwpro, vd) - # call protect(cpttf,estotftgj/tfcoil_variables.n_tf*1.0e9,acstf, tfcoil_variables.t_turn_tf**2 ,tdmptf,1-vftf,fcutfsu,tftmp,tmaxpro,jwdgpro2,vd) + # call protect(cpttf,estotftgj/tfcoil_variables.n_tf_coils*1.0e9,acstf, tfcoil_variables.t_turn_tf**2 ,tdmptf,1-vftf,fcutfsu,tftmp,tmaxpro,jwdgpro2,vd) vd = self.u_max_protect_v( - tfcoil_variables.estotftgj / tfcoil_variables.n_tf * 1.0e9, + tfcoil_variables.estotftgj / tfcoil_variables.n_tf_coils * 1.0e9, tfcoil_variables.tdmptf, tfcoil_variables.cpttf, ) @@ -3026,7 +3026,7 @@ def stcoil(self, output: bool): * tfcoil_variables.bmaxtf / stellarator_configuration.stella_config_wp_bmax * stellarator_configuration.stella_config_coillength - / tfcoil_variables.n_tf + / tfcoil_variables.n_tf_coils / tfcoil_variables.tfleng ) centering_force_min_mn = ( @@ -3036,7 +3036,7 @@ def stcoil(self, output: bool): * tfcoil_variables.bmaxtf / stellarator_configuration.stella_config_wp_bmax * stellarator_configuration.stella_config_coillength - / tfcoil_variables.n_tf + / tfcoil_variables.n_tf_coils / tfcoil_variables.tfleng ) centering_force_avg_mn = ( @@ -3046,7 +3046,7 @@ def stcoil(self, output: bool): * tfcoil_variables.bmaxtf / stellarator_configuration.stella_config_wp_bmax * stellarator_configuration.stella_config_coillength - / tfcoil_variables.n_tf + / tfcoil_variables.n_tf_coils / tfcoil_variables.tfleng ) # @@ -3271,7 +3271,9 @@ def jcrit_frommaterial( return j_crit_sc * 1e-6 - def bmax_from_awp(self, wp_width_radial, current, n_tf, r_coil_major, r_coil_minor): + def bmax_from_awp( + self, wp_width_radial, current, n_tf_coils, r_coil_major, r_coil_minor + ): """Returns a fitted function for bmax for stellarators author: J Lion, IPP Greifswald @@ -3283,7 +3285,7 @@ def bmax_from_awp(self, wp_width_radial, current, n_tf, r_coil_major, r_coil_min return ( 2e-1 * current - * n_tf + * n_tf_coils / (r_coil_major - r_coil_minor) * ( stellarator_configuration.stella_config_a1 @@ -3580,7 +3582,10 @@ def stcoil_output( po.osubhd(self.outfile, "General Coil Parameters :") po.ovarre( - self.outfile, "Number of modular coils", "(n_tf)", tfcoil_variables.n_tf + self.outfile, + "Number of modular coils", + "(n_tf_coils)", + tfcoil_variables.n_tf_coils, ) po.ovarre(self.outfile, "Av. coil major radius", "(coil_r)", r_coil_major) po.ovarre(self.outfile, "Av. coil minor radius", "(coil_a)", r_coil_minor) @@ -3594,8 +3599,8 @@ def stcoil_output( po.ovarre( self.outfile, "Cross-sectional area per coil (m2)", - "(tfarea/n_tf)", - tfcoil_variables.tfareain / tfcoil_variables.n_tf, + "(tfarea/n_tf_coils)", + tfcoil_variables.tfareain / tfcoil_variables.n_tf_coils, ) po.ovarre( self.outfile, @@ -3657,8 +3662,8 @@ def stcoil_output( po.ovarre( self.outfile, "Current per coil(MA)", - "(ritfc/n_tf)", - 1.0e-6 * tfcoil_variables.ritfc / tfcoil_variables.n_tf, + "(ritfc/n_tf_coils)", + 1.0e-6 * tfcoil_variables.ritfc / tfcoil_variables.n_tf_coils, ) po.ovarre( self.outfile, @@ -3847,14 +3852,14 @@ def stcoil_output( "(ritfc/acond)", 1.0e-6 * tfcoil_variables.ritfc - / tfcoil_variables.n_tf + / tfcoil_variables.n_tf_coils / tfcoil_variables.acond, ) po.ovarre( self.outfile, "Current density in SC area (A/m2)", "(ritfc/acond/f_scu)", - 1.0e-6 * tfcoil_variables.ritfc / tfcoil_variables.n_tf / ap / f_scu, + 1.0e-6 * tfcoil_variables.ritfc / tfcoil_variables.n_tf_coils / ap / f_scu, ) po.ovarre(self.outfile, "Superconductor faction of WP (1)", "(f_scu)", f_scu) diff --git a/process/tfcoil.py b/process/tfcoil.py index 05eaecd4c0..d983c936ef 100644 --- a/process/tfcoil.py +++ b/process/tfcoil.py @@ -67,7 +67,7 @@ def cntrpst(self): n_tcool_it = 20 # Coolant channels: - acool = tfv.a_cp_cool * tfv.n_tf # Cooling cross-sectional area + acool = tfv.a_cp_cool * tfv.n_tf_coils # Cooling cross-sectional area dcool = 2.0e0 * tfv.rcool # Diameter lcool = 2.0e0 * (bv.hmax + bv.dr_tf_outboard) # Length tfv.ncool = acool / (constants.pi * tfv.rcool**2) # Number diff --git a/process/vacuum.py b/process/vacuum.py index 7490cd4baf..1ce2273d5e 100644 --- a/process/vacuum.py +++ b/process/vacuum.py @@ -62,7 +62,7 @@ def run(self, output: bool) -> None: buv.dr_shld_inboard, buv.dr_tf_inboard, buv.rsldi - buv.dr_shld_vv_gap_inboard - buv.dr_vv_inboard, - tfv.n_tf, + tfv.n_tf_coils, tv.t_between_pulse, pv.dene, pv.idivrt, @@ -104,7 +104,7 @@ def vacuum_simple(self, output) -> float: * vacv.pumpareafraction * vacv.pumpspeedfactor * pv.a_plasma_surface - / tfv.n_tf + / tfv.n_tf_coils ) wallarea = (pv.a_plasma_surface / 1084.0e0) * 2000.0e0 @@ -186,7 +186,7 @@ def vacuum( thshldi, thtf, ritf, - n_tf, + n_tf_coils, t_between_pulse, nplasma, ndiv, @@ -272,7 +272,7 @@ def vacuum( # (9.0 for N2, 5.0 for He and 25. for DT) pfus = pfusmw * 1.0e6 # Fusion power (W) - ntf = int(n_tf) + ntf = int(n_tf_coils) # Feed rate (gas load) of D-T into chamber (pellets + gas puffing + # NBI + ...) = load from fueller + load from NBI diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index 3ab65fdea9..3f3d4d8ef9 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -2490,7 +2490,7 @@ subroutine constraint_eqn_063(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! tfno : input real : number of TF coils (default = 50 for stellarators) !! niterpump : input real : number of high vacuum pumps (real number), each with the throughput use constraint_variables, only: fniterpump - use tfcoil_variables, only: n_tf + use tfcoil_variables, only: n_tf_coils use vacuum_variables, only: niterpump implicit none real(dp), intent(out) :: tmp_cc @@ -2499,9 +2499,9 @@ subroutine constraint_eqn_063(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) character(len=1), intent(out) :: tmp_symbol character(len=10), intent(out) :: tmp_units - tmp_cc = 1.0D0 - fniterpump * n_tf / niterpump - tmp_con = n_tf - tmp_err = n_tf * tmp_cc + tmp_cc = 1.0D0 - fniterpump * n_tf_coils / niterpump + tmp_con = n_tf_coils + tmp_err = n_tf_coils * tmp_cc tmp_symbol = '<' tmp_units = '' diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index c02462780a..f2209baff9 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -330,7 +330,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) casthi, n_pancake, bcritsc, i_tf_sup, str_pf_con_res, thwcndut, & thicndut, tftmp, oacdcp, tmax_croco, ptempalw, tmargmin_tf, tmpcry, & sig_tf_case_max, dztop, dcond, str_cs_con_res, etapump, drtop, vcool, dcondins, & - i_tf_tresca, dhecoil, tmaxpro, n_tf, tcpav, fcutfsu, jbus, & + i_tf_tresca, dhecoil, tmaxpro, n_tf_coils, tcpav, fcutfsu, jbus, & casthi_fraction, tmargmin_cs, vdalw, dcase, t_turn_tf,& cpttf_max, tdmptf, casths, i_tf_turns_integer, quench_model, & tcritsc, layer_ins, tinstf, n_layer, tcoolin, ripmax, frhocp, & @@ -1735,8 +1735,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('rho_tf_bus') call parse_real_variable('rho_tf_bus', rho_tf_bus, 0.0D0, 1.0D-5, & 'TF coil bus (feeders) resistivity (ohm-m)') - case ('n_tf') - call parse_real_variable('n_tf', n_tf, 0.0D0, 100.0D0, & + case ('n_tf_coils') + call parse_real_variable('n_tf_coils', n_tf_coils, 0.0D0, 100.0D0, & 'Number of TF coils') case ('n_tf_turn') call parse_real_variable('n_tf_turn', n_tf_turn, 0.0D0, 100.0D0, & @@ -1811,7 +1811,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) 'Coolant fraction of TF coil leg') case ('len_tf_bus') call parse_real_variable('len_tf_bus', len_tf_bus, 0.01D0, 1.0D3, & - 'TF coil bus length (m)') + 'TF coil bus length (m)') ! PF coil settings diff --git a/source/fortran/scan.f90 b/source/fortran/scan.f90 index 71f80dc436..ccaf1aa326 100644 --- a/source/fortran/scan.f90 +++ b/source/fortran/scan.f90 @@ -192,7 +192,7 @@ subroutine scan_1d_store_output(iscan, ifail, noutvars_, ipnscns_, outvar) use process_output, only: oblnkl use numerics, only: sqsumsq use tfcoil_variables, only: tfareain, wwp2, sig_tf_wp, tfcmw, tcpmax, oacdcp, & - tfcpmw, fcutfsu, acond, fcoolcp, rcool, whttf, ppump, vcool, wwp1, n_tf, & + tfcpmw, fcutfsu, acond, fcoolcp, rcool, whttf, ppump, vcool, wwp1, n_tf_coils, & dr_tf_wp, b_crit_upper_nbti use fwbs_variables, only: tpeak use physics_variables, only: q, aspect, p_plasma_rad_mw, dene, fusion_power, btot, tesep, & @@ -273,7 +273,7 @@ subroutine scan_1d_store_output(iscan, ifail, noutvars_, ipnscns_, outvar) outvar(54,iscan) = fcutfsu outvar(55,iscan) = (wwp1+wwp2)*dr_tf_wp outvar(56,iscan) = acond - outvar(57,iscan) = tfareain/n_tf + outvar(57,iscan) = tfareain/n_tf_coils outvar(58,iscan) = f_alpha_energy_confinement_min outvar(66,iscan) = f_nd_alpha_electron outvar(69,iscan) = fimp(1) diff --git a/source/fortran/stellarator.f90 b/source/fortran/stellarator.f90 index 081dabba3d..83abff24c6 100644 --- a/source/fortran/stellarator.f90 +++ b/source/fortran/stellarator.f90 @@ -58,7 +58,7 @@ subroutine stinit triang, hfac, labels_confinement_scalings use numerics, only: boundl, boundu use stellarator_variables, only: istell - use tfcoil_variables, only: n_tf + use tfcoil_variables, only: n_tf_coils use times_variables, only: t_burn, t_cycle, tdown, t_between_pulse, t_fusion_ramp, t_current_ramp_up, & t_pulse_repetition, t_ramp_down, t_precharge use global_variables, only: icase diff --git a/source/fortran/tfcoil_variables.f90 b/source/fortran/tfcoil_variables.f90 index 0a3f1466e1..e2946aee2c 100644 --- a/source/fortran/tfcoil_variables.f90 +++ b/source/fortran/tfcoil_variables.f90 @@ -586,7 +586,7 @@ module tfcoil_variables !! - i_tf_sup = 1 : SC magnet, eff_tf_cryo = 0.13 (ITER design) !! - i_tf_sup = 2 : Cryo-aluminium, eff_tf_cryo = 0.4 - real(dp) :: n_tf + real(dp) :: n_tf_coils !! Number of TF coils (default = 50 for stellarators). Number of TF coils outer legs for ST real(dp) :: tfocrn @@ -686,15 +686,15 @@ module tfcoil_variables real(dp) :: whtcon !! TF coil conductor mass per coil (kg/coil). - !! For `itart=1`, coil is return limb plus centrepost/n_tf + !! For `itart=1`, coil is return limb plus centrepost/n_tf_coils real(dp) :: whtconcu !! copper mass in TF coil conductor (kg/coil). - !! For `itart=1`, coil is return limb plus centrepost/n_tf + !! For `itart=1`, coil is return limb plus centrepost/n_tf_coils real(dp) :: whtconal !! Aluminium mass in TF coil conductor (kg/coil). - !! For `itart=1`, coil is return limb plus centrepost/n_tf + !! For `itart=1`, coil is return limb plus centrepost/n_tf_coils real(dp) :: whtconin !! conduit insulation mass in TF coil conductor (kg/coil) @@ -979,7 +979,7 @@ subroutine init_tfcoil_variables pres_joints = 0.0D0 tfleng = 0.0D0 eff_tf_cryo = -1.0D0 - n_tf = 16.0D0 + n_tf_coils = 16.0D0 tfocrn = 0.0D0 tfsai = 0.0D0 tfsao = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 8802d3c2e7..77611eb8b9 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -665,7 +665,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.1673E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4985E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 9.1597E-01 ITV @@ -685,9 +685,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.8229E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2853E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2853E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.0508E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.4752E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.4752E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.6493E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.6444E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -701,7 +701,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.0901E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.8217E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.8217E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.1550E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.7934E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.3656E-01 @@ -728,7 +728,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.9310E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.3777E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.5446E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 7.1402E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 7.1402E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.1424E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2178E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.1176E+02 OP @@ -1778,7 +1778,7 @@ casths = 0.05 ripmax = 0.6 * Number of TF coils -n_tf = 16 +n_tf_coils = 16 * Groundwall insulation thickness [m] tinstf = 0.008 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index ecda92ea4c..e32266d1f4 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -666,7 +666,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.1673E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4985E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 9.1597E-01 ITV @@ -686,9 +686,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.8229E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2853E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2853E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.0508E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.4752E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.4752E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.6493E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.6444E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -702,7 +702,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.0901E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.8217E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.8217E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.1550E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.7934E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.3656E-01 @@ -729,7 +729,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.9310E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.3777E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.5446E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 7.1402E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 7.1402E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.1424E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2178E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.1176E+02 OP @@ -1779,7 +1779,7 @@ casths = 0.05 ripmax = 0.6 * Number of TF coils -n_tf = 16 +n_tf_coils = 16 * Groundwall insulation thickness [m] tinstf = 0.008 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 01411831cb..c231495efa 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -666,7 +666,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.1673E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4985E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 9.1597E-01 ITV @@ -686,9 +686,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.8229E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2853E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2853E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.0508E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.4752E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.4752E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.6493E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.6444E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -702,7 +702,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.0901E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.8217E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.8217E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.1550E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.7934E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.3656E-01 @@ -729,7 +729,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.9310E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.3777E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.5446E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 7.1402E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 7.1402E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.1424E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2178E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.1176E+02 OP @@ -1779,7 +1779,7 @@ casths = 0.05 ripmax = 0.6 * Number of TF coils -n_tf = 16 +n_tf_coils = 16 * Groundwall insulation thickness [m] tinstf = 0.008 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 503a1ef5e9..df32479d9d 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -666,7 +666,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.1673E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4985E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 9.1597E-01 ITV @@ -686,9 +686,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.8229E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2853E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2853E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.0508E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.4752E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.4752E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.6493E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.6444E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -702,7 +702,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.0901E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.8217E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.8217E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.1550E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.7934E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.3656E-01 @@ -729,7 +729,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.9310E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.3777E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.5446E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 7.1402E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 7.1402E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.1424E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2178E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.1176E+02 OP @@ -1779,7 +1779,7 @@ casths = 0.05 ripmax = 0.6 * Number of TF coils -n_tf = 16 +n_tf_coils = 16 * Groundwall insulation thickness [m] tinstf = 0.008 diff --git a/tests/integration/data/large_tokamak_IN.DAT b/tests/integration/data/large_tokamak_IN.DAT index 550b519893..67db2769fd 100644 --- a/tests/integration/data/large_tokamak_IN.DAT +++ b/tests/integration/data/large_tokamak_IN.DAT @@ -589,7 +589,7 @@ casths = 0.05 ripmax = 0.6 * Number of TF coils -n_tf = 16 +n_tf_coils = 16 * Groundwall insulation thickness [m] tinstf = 0.008 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index f58d3487e6..872434ce7d 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -664,7 +664,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.1606E+00 OP Inboard_leg_inner_radius_(m)____________________________________________ (r_tf_inboard_in)_____________ 2.6958E+00 OP Inboard_leg_outer_radius_(m)____________________________________________ (r_tf_inboard_out)____________ 3.6253E+00 OP @@ -689,9 +689,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.8459E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.3045E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.3045E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.0671E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.5858E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.5858E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.6514E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.7164E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -705,7 +705,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.0872E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.8986E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.8986E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.1865E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.8392E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.3296E-01 @@ -732,7 +732,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 9.1170E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.4319E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.5648E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 7.2486E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 7.2486E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.1598E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2296E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.1381E+02 OP @@ -1780,7 +1780,7 @@ casths = 0.05 ripmax = 0.6 * Number of TF coils -n_tf = 16 +n_tf_coils = 16 * Groundwall insulation thickness [m] tinstf = 0.008 diff --git a/tests/integration/data/large_tokamak_once_through.IN.DAT b/tests/integration/data/large_tokamak_once_through.IN.DAT index 4ed427dd3f..26bbfd8fec 100644 --- a/tests/integration/data/large_tokamak_once_through.IN.DAT +++ b/tests/integration/data/large_tokamak_once_through.IN.DAT @@ -415,7 +415,7 @@ fcutfsu = 0.8231999768826475 * copper fraction of cable conductor (TF coils) i_tf_sc_mat = 1 * Switch for superconductor material in TF coils; ripmax = 0.6 * aximum allowable toroidal field ripple amplitude at plasma edge (%) tdmptf = 17.97282589344206 * fast discharge time for TF coil in event of quench (s) (`iteration variable 56`) -n_tf = 16 * Number of TF coils (default = 50 for stellarators); Number of TF coils outer legs for ST +n_tf_coils = 16 * Number of TF coils (default = 50 for stellarators); Number of TF coils outer legs for ST tftmp = 4.75 * peak helium coolant temperature in TF coils and PF coils (K) thkcas = 0.2816873221155309 * inboard TF coil case outer (non-plasma side) thickness (m) (`iteration variable 57`) dr_tf_wp = 0.5153787768966674 * radial thickness of winding pack (m) (`iteration variable 140`) (issue #514) diff --git a/tests/integration/data/ref_IN.DAT b/tests/integration/data/ref_IN.DAT index 424924ace1..65f2faf0a1 100644 --- a/tests/integration/data/ref_IN.DAT +++ b/tests/integration/data/ref_IN.DAT @@ -305,7 +305,7 @@ casths = 0.05 * Inboard tf coil sidewall case thickness (m) cpttf = 6.5e+04 * Tf coil current per turn (a); ripmax = 0.6 * Maximum allowable toroidal field ripple amplitude tdmptf = 30.0 * Dump time for tf coil (s) -n_tf = 16 * Number of tf coils (default = 50 for stellarators) +n_tf_coils = 16 * Number of tf coils (default = 50 for stellarators) alstrtf = 5.8E8 * allowable stress in TF coil (Pa) dhecoil = 0.010 * diameter of He coil in TF winding (m) tftmp = 4.750 * Peak helium coolant temperature in tf coils and pf coils (k) diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 8f073bd91e..955285a050 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -667,7 +667,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.1879E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 8.7479E-01 ITV @@ -687,9 +687,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.7522E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2447E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2447E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.1032E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.3156E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.3156E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.7457E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.4632E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -703,7 +703,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.1005E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.7055E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.7055E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.2197E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.8925E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.2910E-01 @@ -730,7 +730,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.6415E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.3121E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4642E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 6.8257E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.8257E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0921E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1962E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0800E+02 OP @@ -1830,7 +1830,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.1962E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 8.5817E-01 ITV @@ -1850,9 +1850,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.7234E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2248E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2248E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.1070E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.2321E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.2321E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.7766E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.3536E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -1866,7 +1866,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.1033E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.6827E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.6827E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.2483E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.8742E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.2643E-01 @@ -1893,7 +1893,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.5813E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.2720E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4464E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 6.6839E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.6839E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0694E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1732E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0400E+02 OP @@ -2993,7 +2993,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.2030E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 8.4468E-01 ITV @@ -3013,9 +3013,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.6999E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2093E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2093E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.1139E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.1642E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.1642E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.8027E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.2777E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -3029,7 +3029,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.1061E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.6486E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.6486E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.2651E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.8744E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.2475E-01 @@ -3056,7 +3056,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.4962E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.2408E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4272E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 6.5756E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.5756E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0521E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1502E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0000E+02 OP @@ -4156,7 +4156,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.2023E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 8.4602E-01 ITV @@ -4176,9 +4176,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.7023E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2109E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2109E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.1136E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.1709E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.1709E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.8000E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.2827E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -4192,7 +4192,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.1057E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.6570E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.6570E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.2670E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.8713E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.2458E-01 @@ -4219,7 +4219,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.5162E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.2436E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4304E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 6.5855E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.5855E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0537E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1502E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0000E+02 OP @@ -5319,7 +5319,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.1962E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 8.5817E-01 ITV @@ -5339,9 +5339,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.7234E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2244E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2244E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.1042E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.2348E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.2348E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.7782E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.3358E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -5355,7 +5355,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.1026E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.7063E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.7063E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.2616E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.8578E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.2526E-01 @@ -5382,7 +5382,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.6364E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.2718E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4530E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 6.6756E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.6756E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0681E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1732E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0400E+02 OP @@ -6482,7 +6482,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.1876E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 8.7538E-01 ITV @@ -6502,9 +6502,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.7533E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2448E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2448E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.0998E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.3058E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.3058E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.7373E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.4242E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -6518,7 +6518,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.0987E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.7690E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.7690E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.2569E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.8321E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.2599E-01 @@ -6545,7 +6545,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.7899E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.3025E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4821E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 6.8120E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.8120E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0899E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1962E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0800E+02 OP @@ -7645,7 +7645,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.1868E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 8.7704E-01 ITV @@ -7665,9 +7665,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.7561E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2467E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2467E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.0990E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.3152E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.3152E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.7350E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.4300E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -7681,7 +7681,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.0982E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.7788E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.7788E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.2586E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.8296E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.2584E-01 @@ -7708,7 +7708,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.8136E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.3066E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4861E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 6.8240E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.8240E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0918E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1962E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0800E+02 OP @@ -8808,7 +8808,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.1942E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 8.6229E-01 ITV @@ -8828,9 +8828,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.7306E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2293E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2293E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.1031E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.2402E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.2402E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.7615E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.3537E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -8844,7 +8844,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.1015E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.7266E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.7266E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.2639E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.8345E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.2527E-01 @@ -8871,7 +8871,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.6855E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.2726E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4625E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 6.7080E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.7080E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0733E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1732E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0400E+02 OP @@ -9971,7 +9971,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.2012E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 8.4832E-01 ITV @@ -9991,9 +9991,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.7063E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2127E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2127E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.1075E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.1680E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.1680E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.7870E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.2844E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -10007,7 +10007,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.1048E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.6723E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.6723E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.2663E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.8421E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.2495E-01 @@ -10034,7 +10034,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.5529E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.2401E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4388E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 6.5997E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.5997E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0560E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1502E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0000E+02 OP @@ -11134,7 +11134,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.2008E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 8.4911E-01 ITV @@ -11154,9 +11154,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.7077E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2137E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2137E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.1073E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.1713E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.1713E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.7851E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.2875E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -11170,7 +11170,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.1045E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.6770E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.6770E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.2673E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.8397E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.2487E-01 @@ -11197,7 +11197,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.5641E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.2414E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4407E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 6.6056E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.6056E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0569E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1502E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0000E+02 OP @@ -12297,7 +12297,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.1937E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 8.6318E-01 ITV @@ -12317,9 +12317,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.7321E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2302E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2302E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.1023E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.2448E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.2448E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.7599E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.3536E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -12333,7 +12333,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.1011E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.7364E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.7364E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.2674E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.8292E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.2496E-01 @@ -12360,7 +12360,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.7086E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.2742E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4659E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 6.7129E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.7129E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0741E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1732E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0400E+02 OP @@ -13460,7 +13460,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.1865E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 8.7762E-01 ITV @@ -13480,9 +13480,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.7571E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2466E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2466E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.0947E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.3158E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.3158E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.7326E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.4262E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -13496,7 +13496,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.0978E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.7844E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.7844E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.2573E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.8196E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.2608E-01 @@ -13523,7 +13523,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.8270E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.3061E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4895E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 6.8254E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.8254E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0921E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1962E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0800E+02 OP @@ -14623,7 +14623,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.1860E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 8.7862E-01 ITV @@ -14643,9 +14643,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.7588E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2478E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2478E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.0945E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.3202E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.3202E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.7305E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.4299E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -14659,7 +14659,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.0975E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.7903E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.7903E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.2585E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.8170E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.2598E-01 @@ -14686,7 +14686,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.8412E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.3079E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4918E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 6.8328E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.8328E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0933E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1962E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0800E+02 OP @@ -15786,7 +15786,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.1935E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 8.6375E-01 ITV @@ -15806,9 +15806,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.7331E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2304E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2304E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.0994E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.2421E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.2421E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.7556E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.3582E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -15822,7 +15822,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.1011E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.7308E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.7308E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.2599E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.8245E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.2576E-01 @@ -15849,7 +15849,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.6959E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.2727E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4662E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 6.7183E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.7183E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0749E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1732E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0400E+02 OP @@ -16949,7 +16949,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.2009E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.4984E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 8.4888E-01 ITV @@ -16969,9 +16969,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.7073E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.2128E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.2128E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.1039E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.1641E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.1641E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.7820E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.2861E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -16985,7 +16985,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.1046E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.6704E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.6704E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.2606E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.8326E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.2561E-01 @@ -17012,7 +17012,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 8.5488E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.2376E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.4403E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 6.6037E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.6037E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0566E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1502E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0000E+02 OP @@ -18066,7 +18066,7 @@ casths = 0.05 ripmax = 0.6 * Number of TF coils -n_tf = 16 +n_tf_coils = 16 * Groundwall insulation thickness [m] tinstf = 0.008 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 7de4706399..780f5aab54 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -513,7 +513,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 5 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.7793E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 1.4000E+00 ITV @@ -533,9 +533,9 @@ TF_coil_arc_point_5_R_(m)_______________________________________________ (xarc(5))_____________________ 4.4793E+00 TF_coil_arc_point_5_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.5468E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 3.3244E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 2.4635E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 2.4635E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.4102E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 2.3627E+00 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 2.3627E+00 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 7.1070E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5346E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -548,7 +548,7 @@ Winding_pack_toroidal_width_(m)_________________________________________ (wwp1)________________________ 1.2723E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 9.3795E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 9.3795E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 5.2140E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 1.0145E-01 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 3.7714E-01 @@ -577,7 +577,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3757E+05 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 1.0668E+04 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4640E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 1.5629E+06 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP @@ -1508,7 +1508,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 5 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.7793E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 1.4000E+00 ITV @@ -1528,9 +1528,9 @@ TF_coil_arc_point_5_R_(m)_______________________________________________ (xarc(5))_____________________ 4.4793E+00 TF_coil_arc_point_5_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.5468E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 3.3244E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 2.4635E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 2.4635E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.4102E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 2.3627E+00 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 2.3627E+00 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 7.1069E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5347E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -1543,7 +1543,7 @@ Winding_pack_toroidal_width_(m)_________________________________________ (wwp1)________________________ 1.2723E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 9.3792E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 9.3792E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 5.2139E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 1.0145E-01 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 3.7716E-01 @@ -1572,7 +1572,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3757E+05 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 1.0668E+04 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4640E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 1.5629E+06 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP @@ -2503,7 +2503,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 5 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.7793E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 1.4000E+00 ITV @@ -2523,9 +2523,9 @@ TF_coil_arc_point_5_R_(m)_______________________________________________ (xarc(5))_____________________ 4.4793E+00 TF_coil_arc_point_5_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.5468E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 3.3244E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 2.4634E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 2.4634E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.4101E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 2.3626E+00 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 2.3626E+00 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 7.1069E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5347E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -2538,7 +2538,7 @@ Winding_pack_toroidal_width_(m)_________________________________________ (wwp1)________________________ 1.2723E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 9.3789E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 9.3789E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 5.2137E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 1.0145E-01 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 3.7717E-01 @@ -2567,7 +2567,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3756E+05 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 1.0668E+04 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4640E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 1.5629E+06 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP @@ -3498,7 +3498,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 5 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.7793E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 1.4000E+00 ITV @@ -3518,9 +3518,9 @@ TF_coil_arc_point_5_R_(m)_______________________________________________ (xarc(5))_____________________ 4.4793E+00 TF_coil_arc_point_5_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.5468E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 3.3244E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 2.4634E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 2.4634E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.4101E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 2.3626E+00 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 2.3626E+00 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 7.1069E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5348E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -3533,7 +3533,7 @@ Winding_pack_toroidal_width_(m)_________________________________________ (wwp1)________________________ 1.2723E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 9.3786E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 9.3786E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 5.2136E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 1.0146E-01 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 3.7718E-01 @@ -3562,7 +3562,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3755E+05 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 1.0668E+04 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4639E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 1.5629E+06 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP @@ -4493,7 +4493,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 5 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.7793E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 1.4000E+00 ITV @@ -4513,9 +4513,9 @@ TF_coil_arc_point_5_R_(m)_______________________________________________ (xarc(5))_____________________ 4.4793E+00 TF_coil_arc_point_5_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.5468E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 3.3244E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 2.4634E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 2.4634E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.4100E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 2.3626E+00 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 2.3626E+00 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 7.1069E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5349E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -4528,7 +4528,7 @@ Winding_pack_toroidal_width_(m)_________________________________________ (wwp1)________________________ 1.2723E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 9.3783E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 9.3783E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 5.2135E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 1.0146E-01 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 3.7719E-01 @@ -4557,7 +4557,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3755E+05 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 1.0668E+04 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4639E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 1.5629E+06 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP @@ -5488,7 +5488,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 5 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.7793E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 1.4000E+00 ITV @@ -5508,9 +5508,9 @@ TF_coil_arc_point_5_R_(m)_______________________________________________ (xarc(5))_____________________ 4.4793E+00 TF_coil_arc_point_5_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.5468E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 3.3244E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 2.4634E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 2.4634E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.4100E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 2.3626E+00 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 2.3626E+00 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 7.1068E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5349E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -5523,7 +5523,7 @@ Winding_pack_toroidal_width_(m)_________________________________________ (wwp1)________________________ 1.2723E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 9.3781E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 9.3781E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 5.2134E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 1.0146E-01 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 3.7721E-01 @@ -5552,7 +5552,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3754E+05 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 1.0668E+04 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4639E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 1.5629E+06 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP @@ -6483,7 +6483,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 5 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.7793E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 1.4000E+00 ITV @@ -6503,9 +6503,9 @@ TF_coil_arc_point_5_R_(m)_______________________________________________ (xarc(5))_____________________ 4.4793E+00 TF_coil_arc_point_5_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.5468E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 3.3244E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 2.4634E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 2.4634E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.4099E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 2.3626E+00 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 2.3626E+00 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 7.1068E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5350E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -6518,7 +6518,7 @@ Winding_pack_toroidal_width_(m)_________________________________________ (wwp1)________________________ 1.2723E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 9.3779E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 9.3779E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 5.2133E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 1.0146E-01 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 3.7722E-01 @@ -6547,7 +6547,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3753E+05 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 1.0668E+04 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4638E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 1.5629E+06 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP @@ -7478,7 +7478,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 5 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.7793E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 1.4000E+00 ITV @@ -7498,9 +7498,9 @@ TF_coil_arc_point_5_R_(m)_______________________________________________ (xarc(5))_____________________ 4.4793E+00 TF_coil_arc_point_5_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.5468E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 3.3244E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 2.4634E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 2.4634E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.4099E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 2.3626E+00 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 2.3626E+00 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 7.1068E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5350E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -7513,7 +7513,7 @@ Winding_pack_toroidal_width_(m)_________________________________________ (wwp1)________________________ 1.2723E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 9.3776E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 9.3776E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 5.2132E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 1.0146E-01 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 3.7723E-01 @@ -7542,7 +7542,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3753E+05 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 1.0668E+04 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4638E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 1.5629E+06 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP @@ -8473,7 +8473,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 5 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.7793E+00 OP Outboard_leg_centre_radius_(m)__________________________________________ (r_tf_outboard_mid)___________ 1.7061E+01 OP Total_inboard_leg_radial_thickness_(m)__________________________________ (dr_tf_inboard)_______________________ 1.4000E+00 ITV @@ -8493,9 +8493,9 @@ TF_coil_arc_point_5_R_(m)_______________________________________________ (xarc(5))_____________________ 4.4793E+00 TF_coil_arc_point_5_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.5468E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 3.3244E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 2.4634E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 2.4634E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.4098E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 2.3626E+00 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 2.3626E+00 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 7.1068E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 9.5351E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -8508,7 +8508,7 @@ Winding_pack_toroidal_width_(m)_________________________________________ (wwp1)________________________ 1.2723E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 9.3774E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 9.3774E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 5.2131E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 1.0146E-01 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 3.7723E-01 @@ -8537,7 +8537,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 2.3752E+05 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 1.0668E+04 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 3.4638E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 1.5629E+06 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP @@ -9284,7 +9284,7 @@ casths = 0.05 * Inboard tf coil sidewall case thickness (m) cpttf = 6.5e+04 * Tf coil current per turn (a); ripmax = 0.6 * Maximum allowable toroidal field ripple amplitude tdmptf = 30.0 * Dump time for tf coil (s) -n_tf = 16 * Number of tf coils (default = 50 for stellarators) +n_tf_coils = 16 * Number of tf coils (default = 50 for stellarators) sig_tf_case_max = 5.8E8 * Allowable maximum shear stress in TF coil case (Tresca criterion) (Pa) sig_tf_wp_max = 5.8E8 * Allowable maximum shear stress in TF coil conduit (Tresca criterion) (Pa) dhecoil = 0.010 * diameter of He coil in TF winding (m) diff --git a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT index 8502c1a43e..effeeabc65 100644 --- a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT +++ b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT @@ -305,7 +305,7 @@ casths = 0.05 * Inboard tf coil sidewall case thickness (m) cpttf = 6.5e+04 * Tf coil current per turn (a); ripmax = 0.6 * Maximum allowable toroidal field ripple amplitude tdmptf = 30.0 * Dump time for tf coil (s) -n_tf = 16 * Number of tf coils (default = 50 for stellarators) +n_tf_coils = 16 * Number of tf coils (default = 50 for stellarators) alstrtf = 5.8E8 * allowable stress in TF coil (Pa) dhecoil = 0.010 * diameter of He coil in TF winding (m) tftmp = 4.750 * Peak helium coolant temperature in tf coils and pf coils (k) diff --git a/tests/integration/data/uncertainties_ref_IN.DAT b/tests/integration/data/uncertainties_ref_IN.DAT index bb32cbe88c..677bcd813a 100644 --- a/tests/integration/data/uncertainties_ref_IN.DAT +++ b/tests/integration/data/uncertainties_ref_IN.DAT @@ -305,7 +305,7 @@ casths = 0.05 * Inboard tf coil sidewall case thickness (m) cpttf = 6.5e+04 * Tf coil current per turn (a); ripmax = 0.6 * Maximum allowable toroidal field ripple amplitude tdmptf = 30.0 * Dump time for tf coil (s) -n_tf = 16 * Number of tf coils (default = 50 for stellarators) +n_tf_coils = 16 * Number of tf coils (default = 50 for stellarators) alstrtf = 5.8E8 * allowable stress in TF coil (Pa) dhecoil = 0.010 * diameter of He coil in TF winding (m) tftmp = 4.750 * Peak helium coolant temperature in tf coils and pf coils (k) diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index f58ef15635..21d15abe77 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3333,7 +3333,7 @@ "n_rad_per_layer": 100.0, "n_radial_array": 50.0, "n_res": 5.0, - "n_tf": 16.0, + "n_tf_coils": 16.0, "n_tf_graded_layers": 1.0, "n_tf_joints": 4.0, "n_tf_joints_contact": 6.0, @@ -10107,7 +10107,7 @@ "n_rad_per_layer": "Size of the arrays per layers storing the radial dependent stress\n quantities (stresses, strain displacement etc..)", "n_radial_array": "Size of the radial distribution arrays per layers\n used for stress, strain and displacement distibution", "n_res": "toroidal resonance number (1)", - "n_tf": "Number of TF coils (default = 50 for stellarators). Number of TF coils outer legs for ST", + "n_tf_coils": "Number of TF coils (default = 50 for stellarators). Number of TF coils outer legs for ST", "n_tf_graded_layers": "Number of layers of different stress properties in the WP. If `n_tf_graded_layers > 1`,\n a graded coil is condidered", "n_tf_joints": "Number of joints\n Ex: n_tf_joints = 2 for top and bottom CP joints", "n_tf_joints_contact": "Number of contact per turn", @@ -11161,9 +11161,9 @@ "whtbltibe12": "mass of titanium beryllide in blanket (kg) (`iblanket=1,3` (CCFE HCPB))", "whtblvd": "mass of blanket - vanadium part (kg)", "whtcas": "mass per coil of external case (kg)", - "whtcon": "TF coil conductor mass per coil (kg/coil).\n For `itart=1`, coil is return limb plus centrepost/n_tf", - "whtconal": "Aluminium mass in TF coil conductor (kg/coil).\n For `itart=1`, coil is return limb plus centrepost/n_tf", - "whtconcu": "copper mass in TF coil conductor (kg/coil).\n For `itart=1`, coil is return limb plus centrepost/n_tf", + "whtcon": "TF coil conductor mass per coil (kg/coil).\n For `itart=1`, coil is return limb plus centrepost/n_tf_coils", + "whtconal": "Aluminium mass in TF coil conductor (kg/coil).\n For `itart=1`, coil is return limb plus centrepost/n_tf_coils", + "whtconcu": "copper mass in TF coil conductor (kg/coil).\n For `itart=1`, coil is return limb plus centrepost/n_tf_coils", "whtconin": "conduit insulation mass in TF coil conductor (kg/coil)", "whtconsc": "superconductor mass in TF coil cable (kg/coil)", "whtconsh": "steel conduit mass in TF coil conductor (kg/coil)", @@ -13727,7 +13727,7 @@ "lb": 3, "ub": 6 }, - "n_tf": { + "n_tf_coils": { "lb": 0.0, "ub": 100.0 }, @@ -19651,7 +19651,7 @@ "pres_joints", "tfleng", "eff_tf_cryo", - "n_tf", + "n_tf_coils", "tfocrn", "tfsai", "tfsao", @@ -20557,7 +20557,7 @@ "n_pancake": "int_variable", "n_rad_per_layer": "int_variable", "n_res": "int_variable", - "n_tf": "real_variable", + "n_tf_coils": "real_variable", "n_tf_graded_layers": "int_variable", "n_tf_joints": "int_variable", "n_tf_joints_contact": "int_variable", diff --git a/tests/regression/input_files/large_tokamak.IN.DAT b/tests/regression/input_files/large_tokamak.IN.DAT index 6a65d375bc..c6bf754780 100644 --- a/tests/regression/input_files/large_tokamak.IN.DAT +++ b/tests/regression/input_files/large_tokamak.IN.DAT @@ -592,7 +592,7 @@ casths = 0.05 ripmax = 0.6 * Number of TF coils -n_tf = 16 +n_tf_coils = 16 * Groundwall insulation thickness [m] tinstf = 0.008 diff --git a/tests/regression/input_files/large_tokamak_nof.IN.DAT b/tests/regression/input_files/large_tokamak_nof.IN.DAT index 26c75bbcc9..3817b91f1a 100644 --- a/tests/regression/input_files/large_tokamak_nof.IN.DAT +++ b/tests/regression/input_files/large_tokamak_nof.IN.DAT @@ -571,7 +571,7 @@ casths = 0.05 ripmax = 0.6 * Number of TF coils -n_tf = 16 +n_tf_coils = 16 * Groundwall insulation thickness [m] tinstf = 0.008 diff --git a/tests/regression/input_files/large_tokamak_once_through.IN.DAT b/tests/regression/input_files/large_tokamak_once_through.IN.DAT index 21603dfa0b..1739a1eca8 100644 --- a/tests/regression/input_files/large_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/large_tokamak_once_through.IN.DAT @@ -415,7 +415,7 @@ fcutfsu = 0.8231999768826475 * copper fraction of cable conductor (TF coils) i_tf_sc_mat = 1 * Switch for superconductor material in TF coils; ripmax = 0.6 * aximum allowable toroidal field ripple amplitude at plasma edge (%) tdmptf = 17.97282589344206 * fast discharge time for TF coil in event of quench (s) (`iteration variable 56`) -n_tf = 16 * Number of TF coils (default = 50 for stellarators); Number of TF coils outer legs for ST +n_tf_coils = 16 * Number of TF coils (default = 50 for stellarators); Number of TF coils outer legs for ST tftmp = 4.75 * peak helium coolant temperature in TF coils and PF coils (K) thkcas = 0.2816873221155309 * inboard TF coil case outer (non-plasma side) thickness (m) (`iteration variable 57`) dr_tf_wp = 0.5153787768966674 * radial thickness of winding pack (m) (`iteration variable 140`) (issue #514) diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 6a7b873a16..5ebfe63fd6 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -902,7 +902,7 @@ boundu(97) = 1.0 *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ General settings ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ -n_tf = 12 +n_tf_coils = 12 * DESCRIPTION: Number of TF Coils * JUSTIFICATION: diff --git a/tests/unit/data/large_tokamak_IN.DAT b/tests/unit/data/large_tokamak_IN.DAT index 4a63fddb86..1a966fa5f5 100644 --- a/tests/unit/data/large_tokamak_IN.DAT +++ b/tests/unit/data/large_tokamak_IN.DAT @@ -590,7 +590,7 @@ casths = 0.05 ripmax = 0.6 * Number of TF coils -n_tf = 16 +n_tf_coils = 16 * Groundwall insulation thickness [m] tinstf = 0.008 diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index e291dd06b5..1ca61b4609 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -664,7 +664,7 @@ Superconductor_material_________________________________________________ (i_tf_sc_mat)_________________ 1 Presence_of_TF_demountable_joints_______________________________________ (itart)_______________________ 0 TF_inboard_leg_support_strategy_________________________________________ (i_tf_bucking)________________ 1 - Number_of_TF_coils______________________________________________________ (n_tf)________________________ 16 + Number_of_TF_coils______________________________________________________ (n_tf_coils)________________________ 16 Inboard_leg_centre_radius_(m)___________________________________________ (r_tf_inboard_mid)____________ 3.1606E+00 OP Inboard_leg_inner_radius_(m)____________________________________________ (r_tf_inboard_in)_____________ 2.6958E+00 OP Inboard_leg_outer_radius_(m)____________________________________________ (r_tf_inboard_out)____________ 3.6253E+00 OP @@ -689,9 +689,9 @@ TF_coil_arc_point_4_R_(m)_______________________________________________ (xarc(5))_____________________ 3.6253E+00 TF_coil_arc_point_4_Z_(m)_______________________________________________ (yarc(5))_____________________ -5.2909E+00 TF_cross-section_(total)_(m2)___________________________________________ (tfareain)____________________ 1.8459E+01 - Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf)_____________ 1.3045E+01 + Total_steel_cross-section_(m2)__________________________________________ (a_tf_steel*n_tf_coils)_____________ 1.3045E+01 Total_steel_TF_fraction_________________________________________________ (f_tf_steel)__________________ 7.0671E-01 - Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf)_______________ 8.5858E-01 + Total_Insulation_cross-section_(total)_(m2)_____________________________ (a_tf_ins*n_tf_coils)_______________ 8.5858E-01 Total_Insulation_fraction_______________________________________________ (f_tf_ins)____________________ 4.6514E-02 Casing_cross_section_area_(per_leg)_(m2)________________________________ (acasetf)_____________________ 5.7164E-01 Inboard_leg_case_plasma_side_wall_thickness_(m)_________________________ (casthi)______________________ 6.0000E-02 @@ -705,7 +705,7 @@ Winding_pack_toroidal_width_2_(m)_______________________________________ (wwp2)________________________ 1.0872E+00 OP Ground_wall_insulation_thickness_(m)____________________________________ (tinstf)______________________ 8.0000E-03 Winding_pack_insertion_gap_(m)__________________________________________ (tfinsgap)____________________ 1.0000E-02 - Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf)___________________ 3.8986E+00 + Steel_WP_cross-section_(total)_(m2)_____________________________________ (aswp*n_tf_coils)___________________ 3.8986E+00 Steel_WP_fraction_______________________________________________________ (aswp/awpc)___________________ 4.1865E-01 Insulation_WP_fraction__________________________________________________ (aiwp/awpc)___________________ 4.8392E-02 Cable_WP_fraction_______________________________________________________ ((awpc-aswp-aiwp)/awpc)_______ 5.3296E-01 @@ -732,7 +732,7 @@ Steel_conduit_mass_per_coil_(kg)________________________________________ (whtconsh)____________________ 9.1170E+04 OP Conduit_insulation_mass_per_coil_(kg)___________________________________ (whtconin)____________________ 2.4319E+03 OP Total_conduit_mass_per_coil_(kg)________________________________________ (whtcon)______________________ 1.5648E+05 OP - Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf)__________________ 7.2486E+05 OP + Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 7.2486E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.1598E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2296E+01 OP Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.1381E+02 OP @@ -1781,7 +1781,7 @@ casths = 0.05 ripmax = 0.6 * Number of TF coils -n_tf = 16 +n_tf_coils = 16 * Groundwall insulation thickness [m] tinstf = 0.008 diff --git a/tests/unit/test_build.py b/tests/unit/test_build.py index 0f8321a258..abe370b44f 100644 --- a/tests/unit/test_build.py +++ b/tests/unit/test_build.py @@ -65,7 +65,7 @@ class RippleAmplitudeParam(NamedTuple): tinstf: Any = None - n_tf: Any = None + n_tf_coils: Any = None tftort: Any = None @@ -197,7 +197,7 @@ def test_divgeom(divgeomparam, monkeypatch, build): rminor=2.8677741935483869, rmajor=8.8901000000000003, tinstf=0.0080000000000000019, - n_tf=16, + n_tf_coils=16, tftort=1, casths=0.05000000000000001, dr_tf_wp=0.54261087836601019, @@ -218,7 +218,7 @@ def test_divgeom(divgeomparam, monkeypatch, build): rminor=2.8677741935483869, rmajor=8.8901000000000003, tinstf=0.0080000000000000019, - n_tf=16, + n_tf_coils=16, tftort=1, casths=0.05000000000000001, dr_tf_wp=0.54261087836601019, @@ -259,7 +259,7 @@ def test_ripple_amplitude(rippleamplitudeparam, monkeypatch, build): monkeypatch.setattr(tfcoil_variables, "tinstf", rippleamplitudeparam.tinstf) - monkeypatch.setattr(tfcoil_variables, "n_tf", rippleamplitudeparam.n_tf) + monkeypatch.setattr(tfcoil_variables, "n_tf_coils", rippleamplitudeparam.n_tf_coils) monkeypatch.setattr(tfcoil_variables, "tftort", rippleamplitudeparam.tftort) @@ -324,7 +324,7 @@ class PortszParam(NamedTuple): tftort: Any = None - n_tf: Any = None + n_tf_coils: Any = None expected_rtanbeam: Any = None @@ -344,7 +344,7 @@ class PortszParam(NamedTuple): frbeam=1.05, rmajor=8.8901000000000003, tftort=1.6395161177915356, - n_tf=16, + n_tf_coils=16, expected_rtanbeam=9.3346050000000016, expected_rtanmax=14.735821603386416, ), @@ -358,7 +358,7 @@ class PortszParam(NamedTuple): frbeam=1.05, rmajor=8.8901000000000003, tftort=1.6395161177915356, - n_tf=16, + n_tf_coils=16, expected_rtanbeam=9.3346050000000016, expected_rtanmax=14.735821603386416, ), @@ -400,7 +400,7 @@ def test_portsz(portszparam, monkeypatch, build): monkeypatch.setattr(tfcoil_variables, "tftort", portszparam.tftort) - monkeypatch.setattr(tfcoil_variables, "n_tf", portszparam.n_tf) + monkeypatch.setattr(tfcoil_variables, "n_tf_coils", portszparam.n_tf_coils) build.portsz() diff --git a/tests/unit/test_buildings.py b/tests/unit/test_buildings.py index 33b9598b2c..04fd52bb03 100644 --- a/tests/unit/test_buildings.py +++ b/tests/unit/test_buildings.py @@ -131,7 +131,7 @@ class BldgsSizesParam(NamedTuple): hotcell_h: Any hot_sepdist: Any iefrf: Any - n_tf: Any + n_tf_coils: Any i_tf_sup: Any pfrmax: Any tlife: Any @@ -274,7 +274,7 @@ class BldgsSizesParam(NamedTuple): hotcell_h=12, hot_sepdist=2, iefrf=10, - n_tf=16, + n_tf_coils=16, i_tf_sup=1, pfrmax=18.98258241468535, tlife=40, @@ -413,7 +413,7 @@ class BldgsSizesParam(NamedTuple): hotcell_h=12, hot_sepdist=2, iefrf=10, - n_tf=16, + n_tf_coils=16, i_tf_sup=1, pfrmax=18.982980877139834, tlife=40, @@ -672,7 +672,7 @@ def test_bldgs_sizes(buildings, bldgssizesparam, monkeypatch): monkeypatch.setattr(buildings_variables, "hotcell_h", bldgssizesparam.hotcell_h) monkeypatch.setattr(buildings_variables, "hot_sepdist", bldgssizesparam.hot_sepdist) monkeypatch.setattr(current_drive_variables, "iefrf", bldgssizesparam.iefrf) - monkeypatch.setattr(tfcoil_variables, "n_tf", bldgssizesparam.n_tf) + monkeypatch.setattr(tfcoil_variables, "n_tf_coils", bldgssizesparam.n_tf_coils) monkeypatch.setattr(tfcoil_variables, "i_tf_sup", bldgssizesparam.i_tf_sup) monkeypatch.setattr(pfcoil_variables, "pfrmax", bldgssizesparam.pfrmax) monkeypatch.setattr(cost_variables, "tlife", bldgssizesparam.tlife) @@ -786,7 +786,7 @@ class BldgsParam(NamedTuple): tfri: Any tfh: Any tfm: Any - n_tf: Any + n_tf_coils: Any shro: Any shri: Any shh: Any @@ -850,7 +850,7 @@ class BldgsParam(NamedTuple): tfri=2.9939411851091102, tfh=20.562180043124066, tfm=1327.1818597762153, - n_tf=16, + n_tf_coils=16, shro=13.764874193548387, shri=4.7423258064516141, shh=17.446180043124063, @@ -910,7 +910,7 @@ class BldgsParam(NamedTuple): tfri=2.9939411851091102, tfh=20.562180043124066, tfm=1327.9750836697808, - n_tf=16, + n_tf_coils=16, shro=13.782874193548388, shri=4.7243258064516143, shh=17.446180043124063, @@ -975,7 +975,7 @@ def test_bldgs(buildings, bldgsparam, monkeypatch): tfri=bldgsparam.tfri, tfh=bldgsparam.tfh, tfm=bldgsparam.tfm, - n_tf=bldgsparam.n_tf, + n_tf_coils=bldgsparam.n_tf_coils, shro=bldgsparam.shro, shri=bldgsparam.shri, shh=bldgsparam.shh, diff --git a/tests/unit/test_costs_1990.py b/tests/unit/test_costs_1990.py index ac97a67243..6a3f66fc3f 100644 --- a/tests/unit/test_costs_1990.py +++ b/tests/unit/test_costs_1990.py @@ -1742,7 +1742,7 @@ class Acc2221Param(NamedTuple): whtcas: Any = None - n_tf: Any = None + n_tf_coils: Any = None whttflgs: Any = None @@ -1804,7 +1804,7 @@ class Acc2221Param(NamedTuple): whtconcu=58744.465423173802, whtconsc=5802.5700395134345, whtcas=1034021.9996272125, - n_tf=16, + n_tf_coils=16, whttflgs=0, whtcp=0, i_tf_sup=1, @@ -1845,7 +1845,7 @@ class Acc2221Param(NamedTuple): whtconcu=58779.575542593491, whtconsc=5806.038092640837, whtcas=1034699.2182961091, - n_tf=16, + n_tf_coils=16, whttflgs=0, whtcp=0, i_tf_sup=1, @@ -1886,7 +1886,7 @@ class Acc2221Param(NamedTuple): whtconcu=58779.575542593491, whtconsc=5806.038092640837, whtcas=1034699.2182961091, - n_tf=16, + n_tf_coils=16, whttflgs=0, whtcp=0, i_tf_sup=1, @@ -1956,7 +1956,7 @@ def test_acc2221(acc2221param, monkeypatch, costs): monkeypatch.setattr(tfcoil_variables, "whtcas", acc2221param.whtcas) - monkeypatch.setattr(tfcoil_variables, "n_tf", acc2221param.n_tf) + monkeypatch.setattr(tfcoil_variables, "n_tf_coils", acc2221param.n_tf_coils) monkeypatch.setattr(tfcoil_variables, "whttflgs", acc2221param.whttflgs) @@ -3244,7 +3244,7 @@ class Acc2251Param(NamedTuple): tfckw: Any = None - n_tf: Any = None + n_tf_coils: Any = None cpttf: Any = None @@ -3294,7 +3294,7 @@ class Acc2251Param(NamedTuple): i_tf_sup=1, m_tf_bus=0, tfckw=32474.753636211804, - n_tf=16, + n_tf_coils=16, cpttf=74026.751437500003, c22=0, c225=0, @@ -3325,7 +3325,7 @@ class Acc2251Param(NamedTuple): i_tf_sup=1, m_tf_bus=0, tfckw=32505.257577809778, - n_tf=16, + n_tf_coils=16, cpttf=74026.751437500003, c22=3474.7391916096453, c225=185.05656643685359, @@ -3383,7 +3383,7 @@ def test_acc2251(acc2251param, monkeypatch, costs): monkeypatch.setattr(tfcoil_variables, "tfckw", acc2251param.tfckw) - monkeypatch.setattr(tfcoil_variables, "n_tf", acc2251param.n_tf) + monkeypatch.setattr(tfcoil_variables, "n_tf_coils", acc2251param.n_tf_coils) monkeypatch.setattr(tfcoil_variables, "cpttf", acc2251param.cpttf) diff --git a/tests/unit/test_costs_2015.py b/tests/unit/test_costs_2015.py index 1681bc3b00..80e3e38ada 100644 --- a/tests/unit/test_costs_2015.py +++ b/tests/unit/test_costs_2015.py @@ -42,7 +42,7 @@ class CalcBuildingCostsParam(NamedTuple): ritfc: Any = None - n_tf: Any = None + n_tf_coils: Any = None estotftgj: Any = None @@ -87,7 +87,7 @@ class CalcBuildingCostsParam(NamedTuple): psechtmw=311.54038043019023, helpow=142703.41458500578, ritfc=234156150, - n_tf=18, + n_tf_coils=18, estotftgj=130.10721529398921, r_cryostat_inboard=18.314040399601147, z_cryostat_half_inside=15.118436894660423, @@ -1187,7 +1187,7 @@ class CalcBuildingCostsParam(NamedTuple): psechtmw=640.27066522894324, helpow=823308.59959198488, ritfc=234156150, - n_tf=18, + n_tf_coils=18, estotftgj=129.99240835373195, r_cryostat_inboard=18.31462428923539, z_cryostat_half_inside=15.165858901796364, @@ -2308,7 +2308,9 @@ def test_calc_building_costs(calcbuildingcostsparam, monkeypatch, costs2015): monkeypatch.setattr(tfcoil_variables, "ritfc", calcbuildingcostsparam.ritfc) - monkeypatch.setattr(tfcoil_variables, "n_tf", calcbuildingcostsparam.n_tf) + monkeypatch.setattr( + tfcoil_variables, "n_tf_coils", calcbuildingcostsparam.n_tf_coils + ) monkeypatch.setattr(tfcoil_variables, "estotftgj", calcbuildingcostsparam.estotftgj) @@ -4643,7 +4645,7 @@ def test_calc_land_costs(calclandcostsparam, monkeypatch, costs2015): class CalcTfCoilCostsParam(NamedTuple): - n_tf: Any = None + n_tf_coils: Any = None tfleng: Any = None @@ -4682,7 +4684,7 @@ class CalcTfCoilCostsParam(NamedTuple): "calctfcoilcostsparam", ( CalcTfCoilCostsParam( - n_tf=18, + n_tf_coils=18, tfleng=46.64605032553105, n_tf_turn=200.13346153846152, whtconcu=31746.02769109578, @@ -5771,7 +5773,7 @@ class CalcTfCoilCostsParam(NamedTuple): ).transpose(), ), CalcTfCoilCostsParam( - n_tf=18, + n_tf_coils=18, tfleng=46.6270502920285, n_tf_turn=200.13346153846155, whtconcu=24895.07929687943, @@ -6874,7 +6876,7 @@ def test_calc_tf_coil_costs(calctfcoilcostsparam, monkeypatch, costs2015): :type monkeypatch: _pytest.monkeypatch.monkeypatch """ - monkeypatch.setattr(tfcoil_variables, "n_tf", calctfcoilcostsparam.n_tf) + monkeypatch.setattr(tfcoil_variables, "n_tf_coils", calctfcoilcostsparam.n_tf_coils) monkeypatch.setattr(tfcoil_variables, "tfleng", calctfcoilcostsparam.tfleng) diff --git a/tests/unit/test_power.py b/tests/unit/test_power.py index 8c0380e58d..8e4ad74d29 100644 --- a/tests/unit/test_power.py +++ b/tests/unit/test_power.py @@ -55,7 +55,7 @@ class CryoParam(NamedTuple): ptfnuc: Any = None - n_tf: Any = None + n_tf_coils: Any = None tfcryoarea: Any = None @@ -87,7 +87,7 @@ class CryoParam(NamedTuple): cpttf=74026.751437500003, ensxpfm=37429.525515086898, ptfnuc=0.044178296011112193, - n_tf=16, + n_tf_coils=16, tfcryoarea=0, t_pulse_repetition=10364.426139387357, expected_qss=20361.633927097802, @@ -108,7 +108,7 @@ class CryoParam(NamedTuple): cpttf=74026.751437500003, ensxpfm=37427.228965055205, ptfnuc=0.045535131445547841, - n_tf=16, + n_tf_coils=16, tfcryoarea=0, t_pulse_repetition=364.42613938735633, expected_qss=20342.863776957758, @@ -150,7 +150,7 @@ def test_cryo(cryoparam, monkeypatch, power): cpttf=cryoparam.cpttf, ensxpfm=cryoparam.ensxpfm, ptfnuc=cryoparam.ptfnuc, - n_tf=cryoparam.n_tf, + n_tf_coils=cryoparam.n_tf_coils, tfcryoarea=cryoparam.tfcryoarea, t_pulse_repetition=cryoparam.t_pulse_repetition, ) diff --git a/tests/unit/test_sctfcoil.py b/tests/unit/test_sctfcoil.py index 5c2a4ea9e9..ef55ffd3f8 100644 --- a/tests/unit/test_sctfcoil.py +++ b/tests/unit/test_sctfcoil.py @@ -101,7 +101,7 @@ def test_protect(protectparam, sctfcoil): class SuperconParam(NamedTuple): tmargmin_tf: Any = None - n_tf: Any = None + n_tf_coils: Any = None temp_margin: Any = None @@ -181,7 +181,7 @@ class SuperconParam(NamedTuple): ( SuperconParam( tmargmin_tf=1.5, - n_tf=16, + n_tf_coils=16, temp_margin=0, jwdgpro=0, dhecoil=0.010000000000000002, @@ -221,7 +221,7 @@ class SuperconParam(NamedTuple): ), SuperconParam( tmargmin_tf=1.5, - n_tf=16, + n_tf_coils=16, temp_margin=2.3431632224075836, jwdgpro=17475706.393616617, dhecoil=0.010000000000000002, @@ -261,7 +261,7 @@ class SuperconParam(NamedTuple): ), SuperconParam( tmargmin_tf=1.5, - n_tf=16, + n_tf_coils=16, temp_margin=2.3431632224075836, jwdgpro=17475706.393616617, dhecoil=0.010000000000000002, @@ -319,7 +319,7 @@ def test_supercon(superconparam, monkeypatch, sctfcoil): monkeypatch.setattr(tfcoil_variables, "tmargmin_tf", superconparam.tmargmin_tf) - monkeypatch.setattr(tfcoil_variables, "n_tf", superconparam.n_tf) + monkeypatch.setattr(tfcoil_variables, "n_tf_coils", superconparam.n_tf_coils) monkeypatch.setattr(tfcoil_variables, "temp_margin", superconparam.temp_margin) @@ -412,7 +412,7 @@ class TfCurrentParam(NamedTuple): casthi_fraction: Any = None - n_tf: Any = None + n_tf_coils: Any = None thicndut: Any = None @@ -464,7 +464,7 @@ class TfCurrentParam(NamedTuple): casths=0.05000000000000001, casthi_is_fraction=False, casthi_fraction=0.050000000000000003, - n_tf=16, + n_tf_coils=16, thicndut=0.002, thkcas=0.52465000000000006, oacdcp=8673900, @@ -536,7 +536,7 @@ def test_tf_current(tfcurrentparam, monkeypatch, sctfcoil): tfcoil_variables, "casthi_fraction", tfcurrentparam.casthi_fraction ) - monkeypatch.setattr(tfcoil_variables, "n_tf", tfcurrentparam.n_tf) + monkeypatch.setattr(tfcoil_variables, "n_tf_coils", tfcurrentparam.n_tf_coils) monkeypatch.setattr(tfcoil_variables, "thicndut", tfcurrentparam.thicndut) @@ -596,7 +596,7 @@ class TfGlobalGeometryParam(NamedTuple): tftort: Any = None - n_tf: Any = None + n_tf_coils: Any = None arealeg: Any = None @@ -649,7 +649,7 @@ class TfGlobalGeometryParam(NamedTuple): tfareain=0, ritfc=0, tftort=1, - n_tf=16, + n_tf_coils=16, arealeg=0, i_tf_sup=1, dztop=0, @@ -679,7 +679,7 @@ class TfGlobalGeometryParam(NamedTuple): tfareain=35.703669036223495, ritfc=241812532.66279837, tftort=1.7488698442633552, - n_tf=16, + n_tf_coils=16, arealeg=2.6728635794409041, i_tf_sup=1, dztop=0, @@ -742,7 +742,9 @@ def test_tf_global_geometry(tfglobalgeometryparam, monkeypatch, sctfcoil): monkeypatch.setattr(tfcoil_variables, "tftort", tfglobalgeometryparam.tftort) - monkeypatch.setattr(tfcoil_variables, "n_tf", tfglobalgeometryparam.n_tf) + monkeypatch.setattr( + tfcoil_variables, "n_tf_coils", tfglobalgeometryparam.n_tf_coils + ) monkeypatch.setattr(tfcoil_variables, "arealeg", tfglobalgeometryparam.arealeg) @@ -866,7 +868,7 @@ class ResTfInternalGeomParam(NamedTuple): tinstf: Any = None - n_tf: Any = None + n_tf_coils: Any = None dr_tf_outboard: Any = None @@ -910,7 +912,7 @@ class TfResHeatingParam(NamedTuple): pres_joints: Any = None n_tf_joints_contact: Any = None n_tf_joints: Any = None - n_tf: Any = None + n_tf_coils: Any = None i_tf_sup: Any = None frholeg: Any = None frhocp: Any = None @@ -958,7 +960,7 @@ class TfResHeatingParam(NamedTuple): aiwp=0, acasetf=0, tinstf=0, - n_tf=12, + n_tf_coils=12, dr_tf_outboard=0.15483000000000002, r_tf_inboard_in=0, r_tf_inboard_out=0.15483000000000002, @@ -985,7 +987,7 @@ class TfResHeatingParam(NamedTuple): aiwp=0.00030678028680367151, acasetf=0.00061190425043863676, tinstf=0, - n_tf=12, + n_tf_coils=12, dr_tf_outboard=0.15483000000000002, r_tf_inboard_in=0, r_tf_inboard_out=0.15483000000000002, @@ -1043,7 +1045,9 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): monkeypatch.setattr(tfcoil_variables, "tinstf", restfinternalgeomparam.tinstf) - monkeypatch.setattr(tfcoil_variables, "n_tf", restfinternalgeomparam.n_tf) + monkeypatch.setattr( + tfcoil_variables, "n_tf_coils", restfinternalgeomparam.n_tf_coils + ) monkeypatch.setattr( build_variables, "dr_tf_outboard", restfinternalgeomparam.dr_tf_outboard @@ -1124,7 +1128,7 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): pres_joints=0, n_tf_joints_contact=6, n_tf_joints=4, - n_tf=12, + n_tf_coils=12, i_tf_sup=0, frholeg=1, frhocp=1, @@ -1174,7 +1178,7 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): pres_joints=1944336.7995005273, n_tf_joints_contact=6, n_tf_joints=4, - n_tf=12, + n_tf_coils=12, i_tf_sup=0, frholeg=1, frhocp=1, @@ -1264,7 +1268,7 @@ def test_tf_res_heating(tfresheatingparam, monkeypatch, sctfcoil): monkeypatch.setattr(tfcoil_variables, "n_tf_joints", tfresheatingparam.n_tf_joints) - monkeypatch.setattr(tfcoil_variables, "n_tf", tfresheatingparam.n_tf) + monkeypatch.setattr(tfcoil_variables, "n_tf_coils", tfresheatingparam.n_tf_coils) monkeypatch.setattr(tfcoil_variables, "i_tf_sup", tfresheatingparam.i_tf_sup) @@ -1346,7 +1350,7 @@ def test_tf_res_heating(tfresheatingparam, monkeypatch, sctfcoil): class CpostParam(NamedTuple): - n_tf: Any = None + n_tf_coils: Any = None hmax: Any = None @@ -1393,7 +1397,7 @@ class CpostParam(NamedTuple): "cpostparam", ( CpostParam( - n_tf=12, + n_tf_coils=12, hmax=4.4214285714285717, r_tf_inboard_in=0, r_tf_inboard_out=0.15483000000000002, @@ -1416,7 +1420,7 @@ class CpostParam(NamedTuple): expected_a_cp_cool=0.00068328705812121333, ), CpostParam( - n_tf=12, + n_tf_coils=12, hmax=4.4214285714285717, r_tf_inboard_in=0, r_tf_inboard_out=0.15483000000000002, @@ -1476,7 +1480,7 @@ def test_cpost(cpostparam, monkeypatch, sctfcoil): curr=cpostparam.curr, rho=cpostparam.rho, fcool=cpostparam.fcool, - n_tf=cpostparam.n_tf, + n_tf_coils=cpostparam.n_tf_coils, ) assert vol_ins_cp == pytest.approx(cpostparam.expected_vol_ins_cp) @@ -1511,7 +1515,7 @@ class TfFieldAndForceParam(NamedTuple): vforce: Any = None - n_tf: Any = None + n_tf_coils: Any = None taucq: Any = None @@ -1573,7 +1577,7 @@ class TfFieldAndForceParam(NamedTuple): r_tf_inboard_mid=0.077415000000000012, r_cp_top=0.87643571428571443, vforce=0, - n_tf=12, + n_tf_coils=12, taucq=30, sigvvall=93000000, cforce=0, @@ -1608,7 +1612,7 @@ class TfFieldAndForceParam(NamedTuple): r_tf_inboard_mid=0.077415000000000012, r_cp_top=0.85843571428571441, vforce=12380916.66459452, - n_tf=12, + n_tf_coils=12, taucq=30, sigvvall=93000000, cforce=37041530.947408713, @@ -1672,7 +1676,7 @@ def test_tf_field_and_force(tffieldandforceparam, monkeypatch, sctfcoil): monkeypatch.setattr(tfcoil_variables, "vforce", tffieldandforceparam.vforce) - monkeypatch.setattr(tfcoil_variables, "n_tf", tffieldandforceparam.n_tf) + monkeypatch.setattr(tfcoil_variables, "n_tf_coils", tffieldandforceparam.n_tf_coils) monkeypatch.setattr(tfcoil_variables, "cforce", tffieldandforceparam.cforce) @@ -1883,7 +1887,7 @@ class TfCoilAreaAndMassesParam(NamedTuple): n_tf_turn: Any = None - n_tf: Any = None + n_tf_coils: Any = None aiwp: Any = None @@ -1997,7 +2001,7 @@ class TfCoilAreaAndMassesParam(NamedTuple): dcase=8000, acndttf=0.0014685061538103825, n_tf_turn=200, - n_tf=16, + n_tf_coils=16, aiwp=0.087880174466980876, acasetfo=1.2752592893394648, acasetf=1.0015169239205168, @@ -2069,7 +2073,7 @@ class TfCoilAreaAndMassesParam(NamedTuple): dcase=8000, acndttf=0.0014685061538103825, n_tf_turn=200, - n_tf=16, + n_tf_coils=16, aiwp=0.087880174466980876, acasetfo=1.2752592893394648, acasetf=1.0015169239205168, @@ -2194,7 +2198,9 @@ def test_tf_coil_area_and_masses(tfcoilareaandmassesparam, monkeypatch, sctfcoil tfcoil_variables, "n_tf_turn", tfcoilareaandmassesparam.n_tf_turn ) - monkeypatch.setattr(tfcoil_variables, "n_tf", tfcoilareaandmassesparam.n_tf) + monkeypatch.setattr( + tfcoil_variables, "n_tf_coils", tfcoilareaandmassesparam.n_tf_coils + ) monkeypatch.setattr(tfcoil_variables, "aiwp", tfcoilareaandmassesparam.aiwp) @@ -2324,7 +2330,7 @@ class PeakTfWithRippleParam(NamedTuple): tf_fit_y: Any = None - n_tf: Any = None + n_tf_coils: Any = None wwp1: Any = None @@ -2352,7 +2358,7 @@ class PeakTfWithRippleParam(NamedTuple): tf_fit_t=0, tf_fit_z=0, tf_fit_y=0, - n_tf=16, + n_tf_coils=16, wwp1=1.299782604942499, dr_tf_wp=0.50661087836601015, tfin=3.789896624292115, @@ -2367,7 +2373,7 @@ class PeakTfWithRippleParam(NamedTuple): tf_fit_t=0.80807838916035957, tf_fit_z=0.3149613642807837, tf_fit_y=1.0658869305062604, - n_tf=16, + n_tf_coils=16, wwp1=1.299782604942499, dr_tf_wp=0.50661087836601015, tfin=3.789896624292115, @@ -2400,7 +2406,7 @@ def test_peak_tf_with_ripple(peaktfwithrippleparam, monkeypatch, sctfcoil): monkeypatch.setattr(sctfcoil_module, "tf_fit_y", peaktfwithrippleparam.tf_fit_y) bmaxtfrp, flag = sctfcoil.peak_tf_with_ripple( - n_tf=peaktfwithrippleparam.n_tf, + n_tf_coils=peaktfwithrippleparam.n_tf_coils, wwp1=peaktfwithrippleparam.wwp1, dr_tf_wp=peaktfwithrippleparam.dr_tf_wp, tfin=peaktfwithrippleparam.tfin, @@ -2662,7 +2668,7 @@ class TfCaseGeomParam(NamedTuple): tfareain: Any = None - n_tf: Any = None + n_tf_coils: Any = None casths: Any = None @@ -2713,7 +2719,7 @@ class TfCaseGeomParam(NamedTuple): acasetfo=0, arealeg=1.9805354702921749, tfareain=27.308689677971632, - n_tf=16, + n_tf_coils=16, casths=0.05000000000000001, casthi=0.060000000000000012, dr_tf_wp=0.54261087836601019, @@ -2740,7 +2746,7 @@ class TfCaseGeomParam(NamedTuple): acasetfo=1.2752592893394648, arealeg=1.9805354702921749, tfareain=27.308689677971632, - n_tf=16, + n_tf_coils=16, casths=0.05000000000000001, casthi=0.060000000000000012, dr_tf_wp=0.54261087836601019, @@ -2785,7 +2791,7 @@ def test_tf_case_geom(tfcasegeomparam, monkeypatch, sctfcoil): monkeypatch.setattr(tfcoil_variables, "tfareain", tfcasegeomparam.tfareain) - monkeypatch.setattr(tfcoil_variables, "n_tf", tfcasegeomparam.n_tf) + monkeypatch.setattr(tfcoil_variables, "n_tf_coils", tfcasegeomparam.n_tf_coils) monkeypatch.setattr(tfcoil_variables, "casths", tfcasegeomparam.casths) @@ -3358,7 +3364,7 @@ def test_tf_averaged_turn_geom(tfaveragedturngeomparam, monkeypatch, sctfcoil): class TfWpCurrentsParam(NamedTuple): ritfc: Any = None - n_tf: Any = None + n_tf_coils: Any = None jwptf: Any = None @@ -3372,14 +3378,14 @@ class TfWpCurrentsParam(NamedTuple): ( TfWpCurrentsParam( ritfc=256500000.00000003, - n_tf=16, + n_tf_coils=16, jwptf=0, awptf=0.60510952642236249, expected_jwptf=26493137.688284047, ), TfWpCurrentsParam( ritfc=256500000.00000003, - n_tf=16, + n_tf_coils=16, jwptf=26493137.688284047, awptf=0.60510952642236249, expected_jwptf=26493137.688284047, @@ -3401,7 +3407,7 @@ def test_tf_wp_currents(tfwpcurrentsparam, monkeypatch, sctfcoil): monkeypatch.setattr(tfcoil_variables, "ritfc", tfwpcurrentsparam.ritfc) - monkeypatch.setattr(tfcoil_variables, "n_tf", tfwpcurrentsparam.n_tf) + monkeypatch.setattr(tfcoil_variables, "n_tf_coils", tfwpcurrentsparam.n_tf_coils) monkeypatch.setattr(tfcoil_variables, "jwptf", tfwpcurrentsparam.jwptf) @@ -3499,7 +3505,7 @@ class StressclParam(NamedTuple): cpttf: Any = None - n_tf: Any = None + n_tf_coils: Any = None i_tf_stress_model: Any = None @@ -3641,7 +3647,7 @@ class StressclParam(NamedTuple): aiwp=0.087880174466980876, aswp=0.29370123076207649, cpttf=74026.751437500003, - n_tf=16, + n_tf_coils=16, i_tf_stress_model=1, sig_tf_wp_max=580000000, i_tf_turns_integer=1, @@ -3764,7 +3770,7 @@ class StressclParam(NamedTuple): aiwp=0.087880174466980876, aswp=0.29370123076207649, cpttf=74026.751437500003, - n_tf=16, + n_tf_coils=16, i_tf_stress_model=1, sig_tf_wp_max=580000000, i_tf_turns_integer=1, @@ -14026,7 +14032,7 @@ def test_vv_stress_on_quench(): rm_vv=7.88, theta1_vv=1, # TF properties - n_tf=18, + n_tf_coils=18, n_tf_turn=192, s_rp=0.55, s_cc=0.94, @@ -14090,7 +14096,7 @@ def test_vv_stress_on_quench_integration(sctfcoil, monkeypatch): monkeypatch.setattr( tfcoil_variables, "tfa", [3.41, 7.77, 7.77, 3.41] ) # chosen to achieve Rm_coil in Table 2 - monkeypatch.setattr(tfcoil_variables, "n_tf", 18) # Section 3 + monkeypatch.setattr(tfcoil_variables, "n_tf_coils", 18) # Section 3 monkeypatch.setattr(tfcoil_variables, "n_tf_turn", 192) # Section 3 monkeypatch.setattr(tfcoil_variables, "tdmptf", 30) # Figure 6 monkeypatch.setattr(sctfcoil_module, "tfc_current", 83200 * 192) # Section 3 diff --git a/tests/unit/test_stellarator.py b/tests/unit/test_stellarator.py index 5feada7bfc..2d28e1f50a 100644 --- a/tests/unit/test_stellarator.py +++ b/tests/unit/test_stellarator.py @@ -861,7 +861,7 @@ def test_bmax_from_awp(stellarator, monkeypatch): assert stellarator.bmax_from_awp( wp_width_radial=0.11792792792792792, current=12.711229086229087, - n_tf=50, + n_tf_coils=50, r_coil_major=22.237837837837837, r_coil_minor=4.7171171171171169, ) == pytest.approx(39.193416982177489) diff --git a/tests/unit/test_tfcoil.py b/tests/unit/test_tfcoil.py index 839377dfce..e596c09fa9 100644 --- a/tests/unit/test_tfcoil.py +++ b/tests/unit/test_tfcoil.py @@ -210,7 +210,7 @@ def test_cntrpst(cntrpst_asset, monkeypatch, reinitialise_error_module, tfcoil): :type tfcoil: tests.unit.test_tfcoil.tfcoil (functional fixture) """ monkeypatch.setattr(tfv, "a_cp_cool", 1) - monkeypatch.setattr(tfv, "n_tf", 16) + monkeypatch.setattr(tfv, "n_tf_coils", 16) monkeypatch.setattr(tfv, "rcool", 0.005) monkeypatch.setattr(tfv, "vcool", 20.0) monkeypatch.setattr(tfv, "vol_cond_cp", 2) diff --git a/tests/unit/test_vacuum.py b/tests/unit/test_vacuum.py index cc07394bac..8835588bfb 100644 --- a/tests/unit/test_vacuum.py +++ b/tests/unit/test_vacuum.py @@ -31,7 +31,7 @@ def test_simple_model(self, monkeypatch, vacuum): """ monkeypatch.setattr(pv, "qfuel", 7.5745668997694112e22) monkeypatch.setattr(pv, "a_plasma_surface", 1500.3146527709359) - monkeypatch.setattr(tfv, "n_tf", 18) + monkeypatch.setattr(tfv, "n_tf_coils", 18) monkeypatch.setattr(tv, "t_between_pulse", 500) monkeypatch.setattr(vacv, "outgasfactor", 0.0235) monkeypatch.setattr(vacv, "outgasindex", 1) @@ -71,7 +71,7 @@ def test_old_model(self, monkeypatch, vacuum): thshldi = 0.12000000000000001 thtf = 0.63812000000000002 ritf = 3.6371848450794664 - n_tf = 18 + n_tf_coils = 18 t_between_pulse = 1800 nplasma = 7.2834e19 qtorus = 0 @@ -93,7 +93,7 @@ def test_old_model(self, monkeypatch, vacuum): thshldi, thtf, ritf, - n_tf, + n_tf_coils, t_between_pulse, nplasma, ndiv, diff --git a/tracking/tracking_data.py b/tracking/tracking_data.py index c5cf8bd48d..bec6b7e29a 100644 --- a/tracking/tracking_data.py +++ b/tracking/tracking_data.py @@ -151,7 +151,7 @@ class ProcessTracker: "etath", "pgrossmw", "tftmp", - "n_tf", + "n_tf_coils", "bmaxtf", "vstot", "nd_ions_total", From 3b0818af7c104069ff4994ba126619f7b9d8d25e Mon Sep 17 00:00:00 2001 From: chris-ashe Date: Fri, 29 Nov 2024 23:42:26 +0000 Subject: [PATCH 06/29] :arrows_counterclockwise: Rename jbus to j_tf_bus for clarity and consistency; --- process/power.py | 6 +++--- source/fortran/input.f90 | 6 +++--- source/fortran/tfcoil_variables.f90 | 4 ++-- tests/integration/ref_dicts.json | 10 +++++----- tests/regression/input_files/st_regression.IN.DAT | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/process/power.py b/process/power.py index 5ef0053e54..a1179f927d 100644 --- a/process/power.py +++ b/process/power.py @@ -2483,8 +2483,8 @@ def tfpwr(self, output: bool): # Cross-sectional area of bus # tfcoil_variables.cpttf - current per TFC turn (A) - # tfcoil_variables.jbus - bus current density (A/m2) - abus = tfcoil_variables.cpttf / tfcoil_variables.jbus + # tfcoil_variables.j_tf_bus - bus current density (A/m2) + abus = tfcoil_variables.cpttf / tfcoil_variables.j_tf_bus # Bus resistance [ohm] # Bus resistivity (tfcoil_variables.rho_tf_bus) @@ -2555,7 +2555,7 @@ def tfpwr(self, output: bool): po.oheadr(self.outfile, "Resistive TF Coil Power Conversion") po.ovarre(self.outfile, "Bus resistance (ohm)", "(tfbusres)", tfbusres, "OP ") po.ovarre( - self.outfile, "Bus current density (A/m2)", "(jbus)", tfcoil_variables.jbus + self.outfile, "Bus current density (A/m2)", "(j_tf_bus)", tfcoil_variables.j_tf_bus ) po.ovarre( self.outfile, diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index f2209baff9..6b824a343b 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -330,7 +330,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) casthi, n_pancake, bcritsc, i_tf_sup, str_pf_con_res, thwcndut, & thicndut, tftmp, oacdcp, tmax_croco, ptempalw, tmargmin_tf, tmpcry, & sig_tf_case_max, dztop, dcond, str_cs_con_res, etapump, drtop, vcool, dcondins, & - i_tf_tresca, dhecoil, tmaxpro, n_tf_coils, tcpav, fcutfsu, jbus, & + i_tf_tresca, dhecoil, tmaxpro, n_tf_coils, tcpav, fcutfsu, j_tf_bus, & casthi_fraction, tmargmin_cs, vdalw, dcase, t_turn_tf,& cpttf_max, tdmptf, casths, i_tf_turns_integer, quench_model, & tcritsc, layer_ins, tinstf, n_layer, tcoolin, ripmax, frhocp, & @@ -1659,8 +1659,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('i_str_wp') call parse_int_variable('i_str_wp', i_str_wp, 0, 1, & 'Switch for the TF coil strain behavior') - case ('jbus') - call parse_real_variable('jbus', jbus, 1.0D4, 1.0D8, & + case ('j_tf_bus') + call parse_real_variable('j_tf_bus', j_tf_bus, 1.0D4, 1.0D8, & 'TF coil bus current density (A/m2)') case ('n_pancake') call parse_int_variable('n_pancake', n_pancake, 1, 100, & diff --git a/source/fortran/tfcoil_variables.f90 b/source/fortran/tfcoil_variables.f90 index e2946aee2c..551ad35b8b 100644 --- a/source/fortran/tfcoil_variables.f90 +++ b/source/fortran/tfcoil_variables.f90 @@ -305,7 +305,7 @@ module tfcoil_variables !! stress analysis. This is the layers of one turn, not the entire WP. !! Default: 5. void, conductor, copper, conduit, insulation. - real(dp) :: jbus + real(dp) :: j_tf_bus !! bussing current density (A/m2) real(dp) :: j_crit_str_tf @@ -903,7 +903,7 @@ subroutine init_tfcoil_variables n_tf_graded_layers = 1 n_tf_stress_layers = 0 n_tf_wp_layers = 5 - jbus = 1.25D6 + j_tf_bus = 1.25D6 j_crit_str_tf = 0.0D0 j_crit_str_0 = & (/596905475.80390120D0,1925501534.8512938D0,& diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 21d15abe77..0d447b79cb 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -2867,7 +2867,7 @@ "j_plus_ib": 0.237, "j_plus_ob": 0.686, "jacket": null, - "jbus": 1250000.0, + "j_tf_bus": 1250000.0, "jscoh_bop": 0.0, "jscoh_eof": 0.0, "jcableoh_bop": 0.0, @@ -9929,7 +9929,7 @@ "j_plus_ib": "", "j_plus_ob": "", "jacket": "", - "jbus": "bussing current density (A/m2)", + "j_tf_bus": "bussing current density (A/m2)", "jscoh_bop": "central solenoid superconductor critical current density (A/m2) at beginning-of-pulse", "jscoh_eof": "central solenoid superconductor critical current density (A/m2) at end-of-flattop", "jcableoh_bop": "central solenoid cable critical current density (A/m2) at beginning-of-pulse", @@ -13535,7 +13535,7 @@ "lb": 1, "ub": 2 }, - "jbus": { + "j_tf_bus": { "lb": 10000.0, "ub": 100000000.0 }, @@ -19578,7 +19578,7 @@ "n_tf_graded_layers", "n_tf_stress_layers", "n_tf_wp_layers", - "jbus", + "j_tf_bus", "jwdgcrt", "jwdgpro", "jwptf", @@ -20508,7 +20508,7 @@ "itcycl": "int_variable", "iwalld": "int_variable", "ixc": "int_array", - "jbus": "real_variable", + "j_tf_bus": "real_variable", "kallenbach_scan_end": "real_variable", "kallenbach_scan_num": "int_variable", "kallenbach_scan_start": "real_variable", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 5ebfe63fd6..a2f364df63 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -1609,7 +1609,7 @@ tftmp = 20.0 * DESCRIPTION: TF coil bus (feeders) resistivity (ohm-m) * JUSTIFICATION: Unknown, assuming default -* jbus = +* j_tf_bus = * DESCRIPTION: Bussing Current Density (A/m2) * JUSTIFICATION: Unknown From a16f2321d109fae7e227b431c02e5f36951d3283 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 2 Dec 2024 09:42:41 +0000 Subject: [PATCH 07/29] =?UTF-8?q?=F0=9F=94=84=20Refactor=20tflegres=20to?= =?UTF-8?q?=20res=5Ftf=5Fleg=20for=20clarity=20and=20consistency=20across?= =?UTF-8?q?=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/power.py | 4 ++-- process/sctfcoil.py | 8 ++++---- source/fortran/tfcoil_variables.f90 | 4 ++-- tests/integration/ref_dicts.json | 6 +++--- tests/unit/test_sctfcoil.py | 10 +++++----- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/process/power.py b/process/power.py index a1179f927d..1cdc4ec07a 100644 --- a/process/power.py +++ b/process/power.py @@ -2499,7 +2499,7 @@ def tfpwr(self, output: bool): # Total maximum impedance MDK actually just fixed resistance ztot = ( - tfcoil_variables.n_tf_coils * tfcoil_variables.tflegres + tfcoil_variables.n_tf_coils * tfcoil_variables.res_tf_leg + (tfcoil_variables.prescp / tfcoil_variables.ritfc**2) + tfbusres ) @@ -2658,7 +2658,7 @@ def tfpwcall(self, output: bool): tfcoil_variables.n_tf_coils, tfcoil_variables.vtfskv, ettfmj, - tfcoil_variables.tflegres, + tfcoil_variables.res_tf_leg, ) def tfcpwr(self, output: bool, itfka, rmajor, ntfc, vtfskv, ettfmj, rptfc): diff --git a/process/sctfcoil.py b/process/sctfcoil.py index d23a48ce6e..94b7c8a024 100644 --- a/process/sctfcoil.py +++ b/process/sctfcoil.py @@ -1891,7 +1891,7 @@ def tf_res_heating(self): # Outer leg resistive power loss # --- # TF outboard leg's resistance calculation (per leg) [ohm] - tfcoil_variables.tflegres = ( + tfcoil_variables.res_tf_leg = ( tfcoil_variables.rhotfleg * tfcoil_variables.tfleng / sctfcoil_module.a_leg_cond @@ -1899,7 +1899,7 @@ def tf_res_heating(self): # TF outer leg resistive power (TOTAL) [W] tfcoil_variables.presleg = ( - tfcoil_variables.tflegres + tfcoil_variables.res_tf_leg * tfcoil_variables.ritfc**2 / tfcoil_variables.n_tf_coils ) @@ -5385,8 +5385,8 @@ def outtf(self, peaktfflag): po.ovarre( self.outfile, "Outboard leg resistance per coil (ohm)", - "(tflegres)", - tfcoil_variables.tflegres, + "(res_tf_leg)", + tfcoil_variables.res_tf_leg, ) po.ovarre( self.outfile, diff --git a/source/fortran/tfcoil_variables.f90 b/source/fortran/tfcoil_variables.f90 index 551ad35b8b..4d5692ae3b 100644 --- a/source/fortran/tfcoil_variables.f90 +++ b/source/fortran/tfcoil_variables.f90 @@ -381,7 +381,7 @@ module tfcoil_variables real(dp) :: rbmax !! Radius of maximum TF B-field (m) - real(dp) :: tflegres + real(dp) :: res_tf_leg !! TF coil leg resistance (ohm) real(dp) :: toroidalgap @@ -929,7 +929,7 @@ subroutine init_tfcoil_variables poisson_cond_axial = 0.3 poisson_cond_trans = 0.3 rbmax = 0.0D0 - tflegres = 0.0D0 + res_tf_leg = 0.0D0 toroidalgap = 1.0D0 ![m] ftoroidalgap = 1.0D0 ripmax = 1.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 0d447b79cb..f6dfb87fce 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -7548,7 +7548,7 @@ "tfinsgap": 0.01, "tfjtsmw": 0.0, "tflegmw": 0.0, - "tflegres": 0.0, + "res_tf_leg": 0.0, "tfleng": 0.0, "tfocrn": 0.0, "tfoffset": 0.0, @@ -10794,7 +10794,7 @@ "tfinsgap": "TF coil WP insertion gap (m)", "tfjtsmw": "TF joints resistive power losses (MW)", "tflegmw": "TF coil outboard leg resistive power (MW)", - "tflegres": "TF coil leg resistance (ohm)", + "res_tf_leg": "TF coil leg resistance (ohm)", "tfleng": "TF coil circumference (m)", "tfocrn": "TF coil half-width - outer dr_bore (m)", "tfoffset": "vertical distance between centre of TF coils and centre of plasma (m)", @@ -19597,7 +19597,7 @@ "poisson_cond_axial", "poisson_cond_trans", "rbmax", - "tflegres", + "res_tf_leg", "toroidalgap", "ftoroidalgap", "ripmax", diff --git a/tests/unit/test_sctfcoil.py b/tests/unit/test_sctfcoil.py index ef55ffd3f8..b360524380 100644 --- a/tests/unit/test_sctfcoil.py +++ b/tests/unit/test_sctfcoil.py @@ -902,7 +902,7 @@ class TfResHeatingParam(NamedTuple): thkcas: Any = None tftort: Any = None tfleng: Any = None - tflegres: Any = None + res_tf_leg: Any = None tcpav: Any = None arealeg: Any = None ritfc: Any = None @@ -1118,7 +1118,7 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): thkcas=0, tftort=0.45367650933034859, tfleng=15.582502857142856, - tflegres=0, + res_tf_leg=0, tcpav=347.13, arealeg=0.070242733939617885, ritfc=25500000, @@ -1168,7 +1168,7 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): thkcas=0, tftort=0.44435902370665786, tfleng=15.654502857142857, - tflegres=6.1387543007600344e-06, + res_tf_leg=6.1387543007600344e-06, tcpav=347.13, arealeg=0.068800107640501845, ritfc=25500000, @@ -1244,7 +1244,7 @@ def test_tf_res_heating(tfresheatingparam, monkeypatch, sctfcoil): monkeypatch.setattr(tfcoil_variables, "tfleng", tfresheatingparam.tfleng) - monkeypatch.setattr(tfcoil_variables, "tflegres", tfresheatingparam.tflegres) + monkeypatch.setattr(tfcoil_variables, "res_tf_leg", tfresheatingparam.res_tf_leg) monkeypatch.setattr(tfcoil_variables, "tcpav", tfresheatingparam.tcpav) @@ -1328,7 +1328,7 @@ def test_tf_res_heating(tfresheatingparam, monkeypatch, sctfcoil): tfresheatingparam.expected_vol_cond_cp ) - assert tfcoil_variables.tflegres == pytest.approx( + assert tfcoil_variables.res_tf_leg == pytest.approx( tfresheatingparam.expected_tflegres ) From c1f5f3398ab9ac13c6e1423e5b8314eb2e511a17 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 2 Dec 2024 09:45:19 +0000 Subject: [PATCH 08/29] :arrows_counterclockwise: Rename presleg to p_tf_leg_resistive for clarity and consistency; --- process/io/plot_proc.py | 4 ++-- process/power.py | 4 ++-- process/sctfcoil.py | 8 ++++---- source/fortran/tfcoil_variables.f90 | 4 ++-- tests/integration/ref_dicts.json | 6 +++--- tests/unit/test_sctfcoil.py | 10 +++++----- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index f96e0c77c3..8478940dd6 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -2558,7 +2558,7 @@ def plot_magnetics_info(axis, mfile_data, scan): else: n_tf_coils = mfile_data.data["n_tf_coils"].get_scan(scan) prescp = 1.0e-6 * mfile_data.data["prescp"].get_scan(scan) - presleg = 1.0e-6 * mfile_data.data["presleg"].get_scan(scan) + p_tf_leg_resistive = 1.0e-6 * mfile_data.data["p_tf_leg_resistive"].get_scan(scan) pres_joints = 1.0e-6 * mfile_data.data["pres_joints"].get_scan(scan) fcoolcp = 100.0 * mfile_data.data["fcoolcp"].get_scan(scan) @@ -2580,7 +2580,7 @@ def plot_magnetics_info(axis, mfile_data, scan): (fcoolcp, "CP cooling fraction", "%"), ("vcool", "Maximum coolant flow speed", "ms$^{-1}$"), (prescp, "CP Resisitive heating", "MW"), - (presleg * n_tf_coils, "legs Resisitive heating (all legs)", "MW"), + (p_tf_leg_resistive * n_tf_coils, "legs Resisitive heating (all legs)", "MW"), (pres_joints, "TF joints resisitive heating ", "MW"), ] diff --git a/process/power.py b/process/power.py index 1cdc4ec07a..c88ea83828 100644 --- a/process/power.py +++ b/process/power.py @@ -814,7 +814,7 @@ def power1(self): # Heat removal power at cryogenic temperature tfcoil_variables.tcoolin (W) heat_transport_variables.helpow_cryal = ( tfcoil_variables.prescp - + tfcoil_variables.presleg + + tfcoil_variables.p_tf_leg_resistive + tfcoil_variables.pres_joints + fwbs_variables.pnuc_cp_tf * 1.0e6 ) @@ -2515,7 +2515,7 @@ def tfpwr(self, output: bool): 1.0e-6 * tfcoil_variables.prescp ) # inboard legs (called centrepost, CP for tart design) tfcoil_variables.tflegmw = ( - 1.0e-6 * tfcoil_variables.presleg + 1.0e-6 * tfcoil_variables.p_tf_leg_resistive ) # outboard legs tfcoil_variables.tfjtsmw = 1.0e-6 * tfcoil_variables.pres_joints # Joints tfbusmw = ( diff --git a/process/sctfcoil.py b/process/sctfcoil.py index 94b7c8a024..d970fbc769 100644 --- a/process/sctfcoil.py +++ b/process/sctfcoil.py @@ -1898,7 +1898,7 @@ def tf_res_heating(self): ) # TF outer leg resistive power (TOTAL) [W] - tfcoil_variables.presleg = ( + tfcoil_variables.p_tf_leg_resistive = ( tfcoil_variables.res_tf_leg * tfcoil_variables.ritfc**2 / tfcoil_variables.n_tf_coils @@ -1947,7 +1947,7 @@ def tf_res_heating(self): ) # tfcoil_variables.prescp containts the the total resistive power losses - tfcoil_variables.presleg = 0.0e0 + tfcoil_variables.p_tf_leg_resistive = 0.0e0 # No joints if physics_variables.itart = 0 tfcoil_variables.pres_joints = 0.0e0 @@ -5373,8 +5373,8 @@ def outtf(self, peaktfflag): po.ovarre( self.outfile, "Leg resitive power loss, (per leg) (W)", - "(presleg)", - tfcoil_variables.presleg, + "(p_tf_leg_resistive)", + tfcoil_variables.p_tf_leg_resistive, ) po.ovarre( self.outfile, diff --git a/source/fortran/tfcoil_variables.f90 b/source/fortran/tfcoil_variables.f90 index 4d5692ae3b..fe363bcb7a 100644 --- a/source/fortran/tfcoil_variables.f90 +++ b/source/fortran/tfcoil_variables.f90 @@ -779,7 +779,7 @@ module tfcoil_variables !! resistive power in the centrepost (itart=1) [W]. !! If `itart=0`, this variable is the ressitive power on the whole magnet - real(dp) :: presleg + real(dp) :: p_tf_leg_resistive !! Summed resistive power in the TF coil legs [W]. Remain 0 if `itart=0`. real(dp) :: ptempalw @@ -1037,7 +1037,7 @@ subroutine init_tfcoil_variables ncool = 0.0D0 ppump = 0.0D0 prescp = 0.0D0 - presleg = 0.0D0 + p_tf_leg_resistive = 0.0D0 ptempalw = 473.15D0 ! 200 C rcool = 0.005D0 tcoolin = 313.15D0 ! 40 C diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index f6dfb87fce..dbb98ee68a 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3617,7 +3617,7 @@ "dr_cs_precomp": 0.0, "pres_joints": 0.0, "prescp": 0.0, - "presleg": 0.0, + "p_tf_leg_resistive": 0.0, "pressure0": 0.0, "priheat": 0.0, "primary_pumping": 2.0, @@ -10370,7 +10370,7 @@ "dr_cs_precomp": "CS coil precompression structure thickness (m)", "pres_joints": "Calculated TF joints resistive power losses [W]", "prescp": "resistive power in the centrepost (itart=1) [W].\n If `itart=0`, this variable is the ressitive power on the whole magnet", - "presleg": "Summed resistive power in the TF coil legs [W]. Remain 0 if `itart=0`.", + "p_tf_leg_resistive": "Summed resistive power in the TF coil legs [W]. Remain 0 if `itart=0`.", "pressure0": "Total plasma pressure near target (thermal+dynamic) [Pa]", "priheat": "total thermal power removed from fusion core (MW)", "primary_pumping": "Switch for pumping power for primary coolant (mechanical power only and peak first wall\n temperature is only calculated if `primary_pumping=2`):\n
    \n
  • =0 User sets pump power directly (htpmw_blkt, htpmw_fw, htpmw_div, htpmw_shld)
    • \n
  • =1 User sets pump power as a fraction of thermal power (fpumpblkt, fpumpfw, fpumpdiv, fpumpshld)
    • \n
  • =2 Mechanical pumping power is calculated
    • \n
  • =3 Mechanical pumping power is calculated using specified pressure drop
    • \n
", @@ -19709,7 +19709,7 @@ "ncool", "ppump", "prescp", - "presleg", + "p_tf_leg_resistive", "ptempalw", "rcool", "tcoolin", diff --git a/tests/unit/test_sctfcoil.py b/tests/unit/test_sctfcoil.py index b360524380..ba2735940f 100644 --- a/tests/unit/test_sctfcoil.py +++ b/tests/unit/test_sctfcoil.py @@ -907,7 +907,7 @@ class TfResHeatingParam(NamedTuple): arealeg: Any = None ritfc: Any = None rho_tf_joints: Any = None - presleg: Any = None + p_tf_leg_resistive: Any = None prescp: Any = None pres_joints: Any = None n_tf_joints_contact: Any = None @@ -1123,7 +1123,7 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): arealeg=0.070242733939617885, ritfc=25500000, rho_tf_joints=2.5000000000000002e-10, - presleg=0, + p_tf_leg_resistive=0, prescp=0, pres_joints=0, n_tf_joints_contact=6, @@ -1173,7 +1173,7 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): arealeg=0.068800107640501845, ritfc=25500000, rho_tf_joints=2.5000000000000002e-10, - presleg=332643748.67243439, + p_tf_leg_resistive=332643748.67243439, prescp=470083798.99090022, pres_joints=1944336.7995005273, n_tf_joints_contact=6, @@ -1256,7 +1256,7 @@ def test_tf_res_heating(tfresheatingparam, monkeypatch, sctfcoil): tfcoil_variables, "rho_tf_joints", tfresheatingparam.rho_tf_joints ) - monkeypatch.setattr(tfcoil_variables, "presleg", tfresheatingparam.presleg) + monkeypatch.setattr(tfcoil_variables, "p_tf_leg_resistive", tfresheatingparam.p_tf_leg_resistive) monkeypatch.setattr(tfcoil_variables, "prescp", tfresheatingparam.prescp) @@ -1332,7 +1332,7 @@ def test_tf_res_heating(tfresheatingparam, monkeypatch, sctfcoil): tfresheatingparam.expected_tflegres ) - assert tfcoil_variables.presleg == pytest.approx(tfresheatingparam.expected_presleg) + assert tfcoil_variables.p_tf_leg_resistive == pytest.approx(tfresheatingparam.expected_presleg) assert tfcoil_variables.prescp == pytest.approx(tfresheatingparam.expected_prescp) From fbbc5dda517b4d92895307788bd89e2189ce3186 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 2 Dec 2024 09:55:22 +0000 Subject: [PATCH 09/29] :bug: Fix TF resistive power calc that used the total TF current instead of that for an individual coil --- process/sctfcoil.py | 3 +-- tests/unit/test_sctfcoil.py | 16 ++++++++-------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/process/sctfcoil.py b/process/sctfcoil.py index d970fbc769..6b975fe78f 100644 --- a/process/sctfcoil.py +++ b/process/sctfcoil.py @@ -1900,8 +1900,7 @@ def tf_res_heating(self): # TF outer leg resistive power (TOTAL) [W] tfcoil_variables.p_tf_leg_resistive = ( tfcoil_variables.res_tf_leg - * tfcoil_variables.ritfc**2 - / tfcoil_variables.n_tf_coils + * (tfcoil_variables.ritfc / tfcoil_variables.n_tf_coils)**2 ) # --- diff --git a/tests/unit/test_sctfcoil.py b/tests/unit/test_sctfcoil.py index ba2735940f..c40cdaf531 100644 --- a/tests/unit/test_sctfcoil.py +++ b/tests/unit/test_sctfcoil.py @@ -934,8 +934,8 @@ class TfResHeatingParam(NamedTuple): expected_rhocp: Any = None expected_rhotfleg: Any = None expected_vol_cond_cp: Any = None - expected_tflegres: Any = None - expected_presleg: Any = None + expected_res_tf_leg: Any = None + expected_p_tf_leg_resistive: Any = None expected_prescp: Any = None expected_pres_joints: Any = None expected_a_cp_cool: Any = None @@ -1150,8 +1150,8 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): expected_rhocp=2.1831760869565221e-08, expected_rhotfleg=2.1831760869565221e-08, expected_vol_cond_cp=12.020160732580297, - expected_tflegres=6.1387543007600344e-06, - expected_presleg=332643748.67243439, + expected_res_tf_leg=6.1387543007600344e-06, + expected_p_tf_leg_resistive=27720312.38936953, expected_prescp=470083798.99090022, expected_pres_joints=1944336.7995005273, expected_a_cp_cool=0.00068328705812121333, @@ -1200,8 +1200,8 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): expected_rhocp=2.1831760869565221e-08, expected_rhotfleg=2.1831760869565221e-08, expected_vol_cond_cp=11.545770024935592, - expected_tflegres=6.2969005770928158e-06, - expected_presleg=341213300.02121693, + expected_res_tf_leg=6.2969005770928158e-06, + expected_p_tf_leg_resistive=28434441.66843475, expected_prescp=475710489.56122422, expected_pres_joints=1944336.7995005273, expected_a_cp_cool=0.00068328705812121333, @@ -1329,10 +1329,10 @@ def test_tf_res_heating(tfresheatingparam, monkeypatch, sctfcoil): ) assert tfcoil_variables.res_tf_leg == pytest.approx( - tfresheatingparam.expected_tflegres + tfresheatingparam.expected_res_tf_leg ) - assert tfcoil_variables.p_tf_leg_resistive == pytest.approx(tfresheatingparam.expected_presleg) + assert tfcoil_variables.p_tf_leg_resistive == pytest.approx(tfresheatingparam.expected_p_tf_leg_resistive) assert tfcoil_variables.prescp == pytest.approx(tfresheatingparam.expected_prescp) From fe659471ca3152f9e9ab47a0484463a54d142d09 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 3 Dec 2024 09:04:40 +0000 Subject: [PATCH 10/29] =?UTF-8?q?=F0=9F=94=84=20Rename=20ztot=20to=20res?= =?UTF-8?q?=5Ftf=5Fsystem=5Ftotal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/power.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/process/power.py b/process/power.py index c88ea83828..c17eb25e72 100644 --- a/process/power.py +++ b/process/power.py @@ -2484,21 +2484,21 @@ def tfpwr(self, output: bool): # Cross-sectional area of bus # tfcoil_variables.cpttf - current per TFC turn (A) # tfcoil_variables.j_tf_bus - bus current density (A/m2) - abus = tfcoil_variables.cpttf / tfcoil_variables.j_tf_bus + a_tf_bus = tfcoil_variables.cpttf / tfcoil_variables.j_tf_bus # Bus resistance [ohm] # Bus resistivity (tfcoil_variables.rho_tf_bus) # Issue #1253: there was a fudge here to set the bus bar resistivity equal # to the TF conductor resistivity. I have removed this. - tfbusres = tfcoil_variables.rho_tf_bus * tfcoil_variables.len_tf_bus / abus + tfbusres = tfcoil_variables.rho_tf_bus * tfcoil_variables.len_tf_bus / a_tf_bus # Bus mass (kg) tfcoil_variables.m_tf_bus = ( - tfcoil_variables.len_tf_bus * abus * constants.dcopper + tfcoil_variables.len_tf_bus * a_tf_bus * constants.dcopper ) # Total maximum impedance MDK actually just fixed resistance - ztot = ( + res_tf_system_total = ( tfcoil_variables.n_tf_coils * tfcoil_variables.res_tf_leg + (tfcoil_variables.prescp / tfcoil_variables.ritfc**2) + tfbusres @@ -2507,7 +2507,7 @@ def tfpwr(self, output: bool): # No reactive portion of the voltage is included here - assume long ramp times # MDK This is steady state voltage, not "peak" voltage tfcoil_variables.vtfkv = ( - 1.0e-3 * ztot * tfcoil_variables.cpttf / tfcoil_variables.n_tf_coils + 1.0e-3 * res_tf_system_total * tfcoil_variables.cpttf / tfcoil_variables.n_tf_coils ) # Resistive powers (MW): @@ -2574,8 +2574,8 @@ def tfpwr(self, output: bool): po.ovarre( self.outfile, "Total resistance for TF coil set (ohm)", - "(ztot)", - ztot, + "(res_tf_system_total)", + res_tf_system_total, "OP ", ) # po.ovarre(outfile,'Peak voltage per coil (kV)','(vtfkv)',vtfkv) From d897db6b9a83f1c2a23f3ecbcd28c0e6fe56407b Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 3 Dec 2024 09:06:16 +0000 Subject: [PATCH 11/29] :arrows_counterclockwise: Rename prescp to p_cp_resistive for clarity and consistency across the codebase --- process/io/plot_proc.py | 4 ++-- process/power.py | 6 +++--- process/sctfcoil.py | 16 ++++++++-------- process/tfcoil.py | 6 +++--- source/fortran/tfcoil_variables.f90 | 4 ++-- tests/integration/ref_dicts.json | 6 +++--- tests/unit/test_sctfcoil.py | 16 ++++++++-------- tests/unit/test_tfcoil.py | 2 +- 8 files changed, 30 insertions(+), 30 deletions(-) diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index 8478940dd6..ca7ec54bd0 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -2557,7 +2557,7 @@ def plot_magnetics_info(axis, mfile_data, scan): else: n_tf_coils = mfile_data.data["n_tf_coils"].get_scan(scan) - prescp = 1.0e-6 * mfile_data.data["prescp"].get_scan(scan) + p_cp_resistive = 1.0e-6 * mfile_data.data["p_cp_resistive"].get_scan(scan) p_tf_leg_resistive = 1.0e-6 * mfile_data.data["p_tf_leg_resistive"].get_scan(scan) pres_joints = 1.0e-6 * mfile_data.data["pres_joints"].get_scan(scan) fcoolcp = 100.0 * mfile_data.data["fcoolcp"].get_scan(scan) @@ -2579,7 +2579,7 @@ def plot_magnetics_info(axis, mfile_data, scan): (sig_case, "TF bucking max TRESCA stress", "MPa"), (fcoolcp, "CP cooling fraction", "%"), ("vcool", "Maximum coolant flow speed", "ms$^{-1}$"), - (prescp, "CP Resisitive heating", "MW"), + (p_cp_resistive, "CP Resisitive heating", "MW"), (p_tf_leg_resistive * n_tf_coils, "legs Resisitive heating (all legs)", "MW"), (pres_joints, "TF joints resisitive heating ", "MW"), ] diff --git a/process/power.py b/process/power.py index c17eb25e72..9d4d182605 100644 --- a/process/power.py +++ b/process/power.py @@ -813,7 +813,7 @@ def power1(self): if tfcoil_variables.i_tf_sup == 2: # Heat removal power at cryogenic temperature tfcoil_variables.tcoolin (W) heat_transport_variables.helpow_cryal = ( - tfcoil_variables.prescp + tfcoil_variables.p_cp_resistive + tfcoil_variables.p_tf_leg_resistive + tfcoil_variables.pres_joints + fwbs_variables.pnuc_cp_tf * 1.0e6 @@ -2500,7 +2500,7 @@ def tfpwr(self, output: bool): # Total maximum impedance MDK actually just fixed resistance res_tf_system_total = ( tfcoil_variables.n_tf_coils * tfcoil_variables.res_tf_leg - + (tfcoil_variables.prescp / tfcoil_variables.ritfc**2) + + (tfcoil_variables.p_cp_resistive / tfcoil_variables.ritfc**2) + tfbusres ) @@ -2512,7 +2512,7 @@ def tfpwr(self, output: bool): # Resistive powers (MW): tfcoil_variables.tfcpmw = ( - 1.0e-6 * tfcoil_variables.prescp + 1.0e-6 * tfcoil_variables.p_cp_resistive ) # inboard legs (called centrepost, CP for tart design) tfcoil_variables.tflegmw = ( 1.0e-6 * tfcoil_variables.p_tf_leg_resistive diff --git a/process/sctfcoil.py b/process/sctfcoil.py index 6b975fe78f..dbfb11ce5a 100644 --- a/process/sctfcoil.py +++ b/process/sctfcoil.py @@ -1842,7 +1842,7 @@ def tf_res_heating(self): ( tfcoil_variables.a_cp_cool, tfcoil_variables.vol_cond_cp, - tfcoil_variables.prescp, + tfcoil_variables.p_cp_resistive, sctfcoil_module.vol_ins_cp, sctfcoil_module.vol_case_cp, sctfcoil_module.vol_gr_ins_cp, @@ -1938,14 +1938,14 @@ def tf_res_heating(self): # *** else: # TF resistive powers - tfcoil_variables.prescp = ( + tfcoil_variables.p_cp_resistive = ( tfcoil_variables.rhocp * tfcoil_variables.ritfc**2 * tfcoil_variables.tfleng / (sctfcoil_module.a_leg_cond * tfcoil_variables.n_tf_coils) ) - # tfcoil_variables.prescp containts the the total resistive power losses + # tfcoil_variables.p_cp_resistive containts the the total resistive power losses tfcoil_variables.p_tf_leg_resistive = 0.0e0 # No joints if physics_variables.itart = 0 @@ -5366,8 +5366,8 @@ def outtf(self, peaktfflag): po.ovarre( self.outfile, "CP resistive power loss (W)", - "(prescp)", - tfcoil_variables.prescp, + "(p_cp_resistive)", + tfcoil_variables.p_cp_resistive, ) po.ovarre( self.outfile, @@ -5404,14 +5404,14 @@ def outtf(self, peaktfflag): po.ovarre( self.outfile, "TF resistivity (ohm.m)", - "(prescp)", + "(p_cp_resistive)", tfcoil_variables.rhocp, ) po.ovarre( self.outfile, "TF coil resistive power less (total) (ohm.m)", - "(prescp)", - tfcoil_variables.prescp, + "(p_cp_resistive)", + tfcoil_variables.p_cp_resistive, ) po.ovarre( self.outfile, diff --git a/process/tfcoil.py b/process/tfcoil.py index d983c936ef..5417b7174d 100644 --- a/process/tfcoil.py +++ b/process/tfcoil.py @@ -77,7 +77,7 @@ def cntrpst(self): ro = (acpav / (constants.pi * tfv.ncool)) ** 0.5 # Inner legs total heating power (to be removed by coolant) - ptot = tfv.prescp + fwbsv.pnuc_cp_tf * 1.0e6 + ptot = tfv.p_cp_resistive + fwbsv.pnuc_cp_tf * 1.0e6 # Temperature calculations # ------------------------- @@ -304,8 +304,8 @@ def cntrpst(self): po.ovarre( self.outfile, "Resistive heating (MW)", - "(prescp/1.0e6)", - tfv.prescp / 1.0e6, + "(p_cp_resistive/1.0e6)", + tfv.p_cp_resistive / 1.0e6, ) po.ovarre( self.outfile, "Nuclear heating (MW)", "(pnuc_cp_tf)", fwbsv.pnuc_cp_tf diff --git a/source/fortran/tfcoil_variables.f90 b/source/fortran/tfcoil_variables.f90 index fe363bcb7a..2f54db069e 100644 --- a/source/fortran/tfcoil_variables.f90 +++ b/source/fortran/tfcoil_variables.f90 @@ -775,7 +775,7 @@ module tfcoil_variables real(dp) :: ppump !! centrepost coolant pump power (W) - real(dp) :: prescp + real(dp) :: p_cp_resistive !! resistive power in the centrepost (itart=1) [W]. !! If `itart=0`, this variable is the ressitive power on the whole magnet @@ -1036,7 +1036,7 @@ subroutine init_tfcoil_variables a_cp_cool = 0.0D0 ncool = 0.0D0 ppump = 0.0D0 - prescp = 0.0D0 + p_cp_resistive = 0.0D0 p_tf_leg_resistive = 0.0D0 ptempalw = 473.15D0 ! 200 C rcool = 0.005D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index dbb98ee68a..9afdd7aa67 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3616,7 +3616,7 @@ "precircmw": 0.0, "dr_cs_precomp": 0.0, "pres_joints": 0.0, - "prescp": 0.0, + "p_cp_resistive": 0.0, "p_tf_leg_resistive": 0.0, "pressure0": 0.0, "priheat": 0.0, @@ -10369,7 +10369,7 @@ "precircmw": "recirculating electric power (MW)", "dr_cs_precomp": "CS coil precompression structure thickness (m)", "pres_joints": "Calculated TF joints resistive power losses [W]", - "prescp": "resistive power in the centrepost (itart=1) [W].\n If `itart=0`, this variable is the ressitive power on the whole magnet", + "p_cp_resistive": "resistive power in the centrepost (itart=1) [W].\n If `itart=0`, this variable is the ressitive power on the whole magnet", "p_tf_leg_resistive": "Summed resistive power in the TF coil legs [W]. Remain 0 if `itart=0`.", "pressure0": "Total plasma pressure near target (thermal+dynamic) [Pa]", "priheat": "total thermal power removed from fusion core (MW)", @@ -19708,7 +19708,7 @@ "a_cp_cool", "ncool", "ppump", - "prescp", + "p_cp_resistive", "p_tf_leg_resistive", "ptempalw", "rcool", diff --git a/tests/unit/test_sctfcoil.py b/tests/unit/test_sctfcoil.py index c40cdaf531..234ae01a24 100644 --- a/tests/unit/test_sctfcoil.py +++ b/tests/unit/test_sctfcoil.py @@ -908,7 +908,7 @@ class TfResHeatingParam(NamedTuple): ritfc: Any = None rho_tf_joints: Any = None p_tf_leg_resistive: Any = None - prescp: Any = None + p_cp_resistive: Any = None pres_joints: Any = None n_tf_joints_contact: Any = None n_tf_joints: Any = None @@ -936,7 +936,7 @@ class TfResHeatingParam(NamedTuple): expected_vol_cond_cp: Any = None expected_res_tf_leg: Any = None expected_p_tf_leg_resistive: Any = None - expected_prescp: Any = None + expected_p_cp_resistive: Any = None expected_pres_joints: Any = None expected_a_cp_cool: Any = None expected_is_leg_cp_temp_same: Any = None @@ -1124,7 +1124,7 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): ritfc=25500000, rho_tf_joints=2.5000000000000002e-10, p_tf_leg_resistive=0, - prescp=0, + p_cp_resistive=0, pres_joints=0, n_tf_joints_contact=6, n_tf_joints=4, @@ -1152,7 +1152,7 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): expected_vol_cond_cp=12.020160732580297, expected_res_tf_leg=6.1387543007600344e-06, expected_p_tf_leg_resistive=27720312.38936953, - expected_prescp=470083798.99090022, + expected_p_cp_resistive=470083798.99090022, expected_pres_joints=1944336.7995005273, expected_a_cp_cool=0.00068328705812121333, expected_is_leg_cp_temp_same=1, @@ -1174,7 +1174,7 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): ritfc=25500000, rho_tf_joints=2.5000000000000002e-10, p_tf_leg_resistive=332643748.67243439, - prescp=470083798.99090022, + p_cp_resistive=470083798.99090022, pres_joints=1944336.7995005273, n_tf_joints_contact=6, n_tf_joints=4, @@ -1202,7 +1202,7 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): expected_vol_cond_cp=11.545770024935592, expected_res_tf_leg=6.2969005770928158e-06, expected_p_tf_leg_resistive=28434441.66843475, - expected_prescp=475710489.56122422, + expected_p_cp_resistive=475710489.56122422, expected_pres_joints=1944336.7995005273, expected_a_cp_cool=0.00068328705812121333, expected_is_leg_cp_temp_same=1, @@ -1258,7 +1258,7 @@ def test_tf_res_heating(tfresheatingparam, monkeypatch, sctfcoil): monkeypatch.setattr(tfcoil_variables, "p_tf_leg_resistive", tfresheatingparam.p_tf_leg_resistive) - monkeypatch.setattr(tfcoil_variables, "prescp", tfresheatingparam.prescp) + monkeypatch.setattr(tfcoil_variables, "p_cp_resistive", tfresheatingparam.p_cp_resistive) monkeypatch.setattr(tfcoil_variables, "pres_joints", tfresheatingparam.pres_joints) @@ -1334,7 +1334,7 @@ def test_tf_res_heating(tfresheatingparam, monkeypatch, sctfcoil): assert tfcoil_variables.p_tf_leg_resistive == pytest.approx(tfresheatingparam.expected_p_tf_leg_resistive) - assert tfcoil_variables.prescp == pytest.approx(tfresheatingparam.expected_prescp) + assert tfcoil_variables.p_cp_resistive == pytest.approx(tfresheatingparam.expected_p_cp_resistive) assert tfcoil_variables.pres_joints == pytest.approx( tfresheatingparam.expected_pres_joints diff --git a/tests/unit/test_tfcoil.py b/tests/unit/test_tfcoil.py index e596c09fa9..0a400ee3d8 100644 --- a/tests/unit/test_tfcoil.py +++ b/tests/unit/test_tfcoil.py @@ -214,7 +214,7 @@ def test_cntrpst(cntrpst_asset, monkeypatch, reinitialise_error_module, tfcoil): monkeypatch.setattr(tfv, "rcool", 0.005) monkeypatch.setattr(tfv, "vcool", 20.0) monkeypatch.setattr(tfv, "vol_cond_cp", 2) - monkeypatch.setattr(tfv, "prescp", 1) + monkeypatch.setattr(tfv, "p_cp_resistive", 1) monkeypatch.setattr(tfv, "i_tf_sup", cntrpst_asset.i_tf_sup) monkeypatch.setattr(tfv, "tcoolin", cntrpst_asset.tcoolin) monkeypatch.setattr(fwbsv, "pnuc_cp_tf", 1) From 6b923d20a355cadc2393bbd7e02bca2cc95f7a80 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 13 Jan 2025 15:24:35 +0000 Subject: [PATCH 12/29] :bug: Remove 0.92 fudge value to frholeg --- process/io/plot_proc.py | 10 ++++++++-- process/power.py | 15 +++++++++++---- process/sctfcoil.py | 4 ++-- tests/unit/test_sctfcoil.py | 32 ++++++++++++++++++++------------ 4 files changed, 41 insertions(+), 20 deletions(-) diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index ca7ec54bd0..e22cb358d4 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -2558,7 +2558,9 @@ def plot_magnetics_info(axis, mfile_data, scan): else: n_tf_coils = mfile_data.data["n_tf_coils"].get_scan(scan) p_cp_resistive = 1.0e-6 * mfile_data.data["p_cp_resistive"].get_scan(scan) - p_tf_leg_resistive = 1.0e-6 * mfile_data.data["p_tf_leg_resistive"].get_scan(scan) + p_tf_leg_resistive = 1.0e-6 * mfile_data.data["p_tf_leg_resistive"].get_scan( + scan + ) pres_joints = 1.0e-6 * mfile_data.data["pres_joints"].get_scan(scan) fcoolcp = 100.0 * mfile_data.data["fcoolcp"].get_scan(scan) @@ -2580,7 +2582,11 @@ def plot_magnetics_info(axis, mfile_data, scan): (fcoolcp, "CP cooling fraction", "%"), ("vcool", "Maximum coolant flow speed", "ms$^{-1}$"), (p_cp_resistive, "CP Resisitive heating", "MW"), - (p_tf_leg_resistive * n_tf_coils, "legs Resisitive heating (all legs)", "MW"), + ( + p_tf_leg_resistive * n_tf_coils, + "legs Resisitive heating (all legs)", + "MW", + ), (pres_joints, "TF joints resisitive heating ", "MW"), ] diff --git a/process/power.py b/process/power.py index 9d4d182605..51b0d15b51 100644 --- a/process/power.py +++ b/process/power.py @@ -2480,7 +2480,6 @@ def tfpwr(self, output: bool): None """ if tfcoil_variables.i_tf_sup != 1: - # Cross-sectional area of bus # tfcoil_variables.cpttf - current per TFC turn (A) # tfcoil_variables.j_tf_bus - bus current density (A/m2) @@ -2490,7 +2489,9 @@ def tfpwr(self, output: bool): # Bus resistivity (tfcoil_variables.rho_tf_bus) # Issue #1253: there was a fudge here to set the bus bar resistivity equal # to the TF conductor resistivity. I have removed this. - tfbusres = tfcoil_variables.rho_tf_bus * tfcoil_variables.len_tf_bus / a_tf_bus + tfbusres = ( + tfcoil_variables.rho_tf_bus * tfcoil_variables.len_tf_bus / a_tf_bus + ) # Bus mass (kg) tfcoil_variables.m_tf_bus = ( @@ -2507,7 +2508,10 @@ def tfpwr(self, output: bool): # No reactive portion of the voltage is included here - assume long ramp times # MDK This is steady state voltage, not "peak" voltage tfcoil_variables.vtfkv = ( - 1.0e-3 * res_tf_system_total * tfcoil_variables.cpttf / tfcoil_variables.n_tf_coils + 1.0e-3 + * res_tf_system_total + * tfcoil_variables.cpttf + / tfcoil_variables.n_tf_coils ) # Resistive powers (MW): @@ -2555,7 +2559,10 @@ def tfpwr(self, output: bool): po.oheadr(self.outfile, "Resistive TF Coil Power Conversion") po.ovarre(self.outfile, "Bus resistance (ohm)", "(tfbusres)", tfbusres, "OP ") po.ovarre( - self.outfile, "Bus current density (A/m2)", "(j_tf_bus)", tfcoil_variables.j_tf_bus + self.outfile, + "Bus current density (A/m2)", + "(j_tf_bus)", + tfcoil_variables.j_tf_bus, ) po.ovarre( self.outfile, diff --git a/process/sctfcoil.py b/process/sctfcoil.py index dbfb11ce5a..6bf17bdfde 100644 --- a/process/sctfcoil.py +++ b/process/sctfcoil.py @@ -1822,7 +1822,7 @@ def tf_res_heating(self): # Leg resistivity (different leg temperature as separate cooling channels) if tfcoil_variables.i_tf_sup == 0: tfcoil_variables.rhotfleg = ( - (tfcoil_variables.frholeg / 0.92e0) + tfcoil_variables.frholeg * (1.72e0 + 0.0039e0 * (tfcoil_variables.tlegav - 273.15e0)) * 1.0e-8 ) @@ -1900,7 +1900,7 @@ def tf_res_heating(self): # TF outer leg resistive power (TOTAL) [W] tfcoil_variables.p_tf_leg_resistive = ( tfcoil_variables.res_tf_leg - * (tfcoil_variables.ritfc / tfcoil_variables.n_tf_coils)**2 + * (tfcoil_variables.ritfc / tfcoil_variables.n_tf_coils) ** 2 ) # --- diff --git a/tests/unit/test_sctfcoil.py b/tests/unit/test_sctfcoil.py index 234ae01a24..227a647d44 100644 --- a/tests/unit/test_sctfcoil.py +++ b/tests/unit/test_sctfcoil.py @@ -1148,10 +1148,10 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): h_cp_top=2.6714285714285717, is_leg_cp_temp_same=0, expected_rhocp=2.1831760869565221e-08, - expected_rhotfleg=2.1831760869565221e-08, + expected_rhotfleg=2.008522e-08, expected_vol_cond_cp=12.020160732580297, - expected_res_tf_leg=6.1387543007600344e-06, - expected_p_tf_leg_resistive=27720312.38936953, + expected_res_tf_leg=5.647653956699231e-06, + expected_p_tf_leg_resistive=25502687.398219965, expected_p_cp_resistive=470083798.99090022, expected_pres_joints=1944336.7995005273, expected_a_cp_cool=0.00068328705812121333, @@ -1162,13 +1162,13 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): tlegav=-1, thicndut=0.00080000000000000004, th_joint_contact=0.029999999999999999, - rhotfleg=2.1831760869565221e-08, + rhotfleg=2.008522e-08, vol_cond_cp=12.020160732580297, n_tf_turn=1, thkcas=0, tftort=0.44435902370665786, tfleng=15.654502857142857, - res_tf_leg=6.1387543007600344e-06, + res_tf_leg=5.647653956699231e-06, tcpav=347.13, arealeg=0.068800107640501845, ritfc=25500000, @@ -1198,10 +1198,10 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): h_cp_top=2.6714285714285717, is_leg_cp_temp_same=1, expected_rhocp=2.1831760869565221e-08, - expected_rhotfleg=2.1831760869565221e-08, + expected_rhotfleg=2.008522e-08, expected_vol_cond_cp=11.545770024935592, - expected_res_tf_leg=6.2969005770928158e-06, - expected_p_tf_leg_resistive=28434441.66843475, + expected_res_tf_leg=5.79314853092539e-06, + expected_p_tf_leg_resistive=26159686.334959965, expected_p_cp_resistive=475710489.56122422, expected_pres_joints=1944336.7995005273, expected_a_cp_cool=0.00068328705812121333, @@ -1256,9 +1256,13 @@ def test_tf_res_heating(tfresheatingparam, monkeypatch, sctfcoil): tfcoil_variables, "rho_tf_joints", tfresheatingparam.rho_tf_joints ) - monkeypatch.setattr(tfcoil_variables, "p_tf_leg_resistive", tfresheatingparam.p_tf_leg_resistive) + monkeypatch.setattr( + tfcoil_variables, "p_tf_leg_resistive", tfresheatingparam.p_tf_leg_resistive + ) - monkeypatch.setattr(tfcoil_variables, "p_cp_resistive", tfresheatingparam.p_cp_resistive) + monkeypatch.setattr( + tfcoil_variables, "p_cp_resistive", tfresheatingparam.p_cp_resistive + ) monkeypatch.setattr(tfcoil_variables, "pres_joints", tfresheatingparam.pres_joints) @@ -1332,9 +1336,13 @@ def test_tf_res_heating(tfresheatingparam, monkeypatch, sctfcoil): tfresheatingparam.expected_res_tf_leg ) - assert tfcoil_variables.p_tf_leg_resistive == pytest.approx(tfresheatingparam.expected_p_tf_leg_resistive) + assert tfcoil_variables.p_tf_leg_resistive == pytest.approx( + tfresheatingparam.expected_p_tf_leg_resistive + ) - assert tfcoil_variables.p_cp_resistive == pytest.approx(tfresheatingparam.expected_p_cp_resistive) + assert tfcoil_variables.p_cp_resistive == pytest.approx( + tfresheatingparam.expected_p_cp_resistive + ) assert tfcoil_variables.pres_joints == pytest.approx( tfresheatingparam.expected_pres_joints From 773a76bb0ffbf8a4e44d0a535897ae7cb7c37aa0 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 13 Jan 2025 15:38:24 +0000 Subject: [PATCH 13/29] :bug: Remove 0.92 fudge value from frhocp --- process/sctfcoil.py | 2 +- tests/unit/test_sctfcoil.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/process/sctfcoil.py b/process/sctfcoil.py index 6bf17bdfde..230afea97d 100644 --- a/process/sctfcoil.py +++ b/process/sctfcoil.py @@ -1796,7 +1796,7 @@ def tf_res_heating(self): """ if tfcoil_variables.i_tf_sup == 0: tfcoil_variables.rhocp = ( - (tfcoil_variables.frhocp / 0.92e0) + tfcoil_variables.frhocp * (1.72e0 + 0.0039e0 * (tfcoil_variables.tcpav - 273.15e0)) * 1.0e-8 ) diff --git a/tests/unit/test_sctfcoil.py b/tests/unit/test_sctfcoil.py index 227a647d44..0c7d34bab4 100644 --- a/tests/unit/test_sctfcoil.py +++ b/tests/unit/test_sctfcoil.py @@ -1147,18 +1147,18 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): itart=1, h_cp_top=2.6714285714285717, is_leg_cp_temp_same=0, - expected_rhocp=2.1831760869565221e-08, + expected_rhocp=2.008522e-08, expected_rhotfleg=2.008522e-08, expected_vol_cond_cp=12.020160732580297, expected_res_tf_leg=5.647653956699231e-06, expected_p_tf_leg_resistive=25502687.398219965, - expected_p_cp_resistive=470083798.99090022, + expected_p_cp_resistive=432477095.0716282, expected_pres_joints=1944336.7995005273, expected_a_cp_cool=0.00068328705812121333, expected_is_leg_cp_temp_same=1, ), TfResHeatingParam( - rhocp=2.1831760869565221e-08, + rhocp=2.008522e-08, tlegav=-1, thicndut=0.00080000000000000004, th_joint_contact=0.029999999999999999, @@ -1174,7 +1174,7 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): ritfc=25500000, rho_tf_joints=2.5000000000000002e-10, p_tf_leg_resistive=332643748.67243439, - p_cp_resistive=470083798.99090022, + p_cp_resistive=432477095.0716282, pres_joints=1944336.7995005273, n_tf_joints_contact=6, n_tf_joints=4, @@ -1197,12 +1197,12 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): itart=1, h_cp_top=2.6714285714285717, is_leg_cp_temp_same=1, - expected_rhocp=2.1831760869565221e-08, + expected_rhocp=2.008522e-08, expected_rhotfleg=2.008522e-08, expected_vol_cond_cp=11.545770024935592, expected_res_tf_leg=5.79314853092539e-06, expected_p_tf_leg_resistive=26159686.334959965, - expected_p_cp_resistive=475710489.56122422, + expected_p_cp_resistive=437653650.39632624, expected_pres_joints=1944336.7995005273, expected_a_cp_cool=0.00068328705812121333, expected_is_leg_cp_temp_same=1, From 23f5c4ff00972aa4ebffd3c2da44eb5c41a6de5a Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 13 Jan 2025 16:02:50 +0000 Subject: [PATCH 14/29] =?UTF-8?q?=F0=9F=94=84=20Rename=20'ritfc'=20to=20'c?= =?UTF-8?q?=5Ftf=5Ftotal'=20for=20consistency=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 | 2 +- .../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/costs_2015.py | 4 +- process/io/plot_proc.py | 2 +- process/io/variable_metadata.py | 2 +- process/power.py | 2 +- process/sctfcoil.py | 50 +++++++------- process/stellarator.py | 28 ++++---- process/utilities/errorlist.json | 2 +- source/fortran/constraint_equations.f90 | 8 +-- 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 +- .../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_costs_2015.py | 10 +-- tests/unit/test_sctfcoil.py | 66 ++++++++++--------- 27 files changed, 191 insertions(+), 171 deletions(-) diff --git a/documentation/proc-pages/eng-models/tf-coil.md b/documentation/proc-pages/eng-models/tf-coil.md index d5b1d4207b..6cc9b659e3 100644 --- a/documentation/proc-pages/eng-models/tf-coil.md +++ b/documentation/proc-pages/eng-models/tf-coil.md @@ -19,7 +19,7 @@ Two major types of toroidal field (TF) coils can be considered in PROCESS: Resis This section presents the PROCESS TF coil models and how to use them. The associated module computes first the coil current from the plasma major radius and toroidal magnetic field. The inboard leg mid-plane cross-section geometry is then set up to the conductor level. The vertical geometry is defined and the TF components masses are deduced. The inboard mid-plane stress distributions, the coil inductance and the toroidal field ripple are then estimated. Finally, the resistive heating (if resistive coil) and the ratio between the critical current density and the conductor current density (superconducting coil) is estimated. ## TF coil currents -The total current flowing in the TF coil set \( I_\mathrm{TF}^\mathrm{tot} \) (`ritfc`) is calculated using the approximation of axisymmetry from the vacuum toroidal field at the plasma geometric centre \( B_\mathrm{T} \) (`bt`) and the plasma geometric major radius $ R_0 $ (`rmajor`): +The total current flowing in the TF coil set \( I_\mathrm{TF}^\mathrm{tot} \) (`c_tf_total`) is calculated using the approximation of axisymmetry from the vacuum toroidal field at the plasma geometric centre \( B_\mathrm{T} \) (`bt`) and the plasma geometric major radius $ R_0 $ (`rmajor`):

$$ diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index f550275a81..abc1f0c99f 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -735,8 +735,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.5696E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0511E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1646E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0251E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.0251E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1672E+07 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index ddedb1c0a9..48f7f3d5b9 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -732,8 +732,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 7.1402E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.1424E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2178E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.1176E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.1176E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1617E+07 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index bc048d4ddd..7d0eaa2c52 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -732,8 +732,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 7.1402E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.1424E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2178E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.1176E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.1176E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1617E+07 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 6ad12dcc49..2440ee06fb 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -732,8 +732,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 7.1402E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.1424E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2178E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.1176E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.1176E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1617E+07 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 9962f31cb1..89ca16bfd2 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -732,8 +732,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 7.1402E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.1424E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2178E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.1176E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.1176E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1617E+07 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 5149f946d6..37adc1a692 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -580,8 +580,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.4165E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 7.2690E+06 @@ -1575,8 +1575,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.4165E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 7.2690E+06 @@ -2570,8 +2570,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.4165E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 7.2690E+06 @@ -3565,8 +3565,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.4165E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 7.2690E+06 @@ -4560,8 +4560,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.4165E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 7.2690E+06 @@ -5555,8 +5555,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.4165E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 7.2690E+06 @@ -6550,8 +6550,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.4165E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 7.2690E+06 @@ -7545,8 +7545,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.4165E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 7.2690E+06 @@ -8540,8 +8540,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.4165E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 7.2690E+06 diff --git a/process/costs_2015.py b/process/costs_2015.py index 71db479632..16a87a75f4 100644 --- a/process/costs_2015.py +++ b/process/costs_2015.py @@ -588,7 +588,9 @@ def calc_building_costs(self): self.s_label[5] = "Magnet power supplies and related buildings" self.s_cref[5] = 110000.0e0 * cost_variables.light_build_cost_per_vol # Scale with TF current per coil (MA) - self.s_k[5] = (tfcoil_variables.ritfc / tfcoil_variables.n_tf_coils) / 1.0e6 + self.s_k[5] = ( + tfcoil_variables.c_tf_total / tfcoil_variables.n_tf_coils + ) / 1.0e6 self.s_kref[5] = 9.1e0 self.s_cost[5] = ( self.s_cost_factor[5] * self.s_cref[5] * (self.s_k[5] / self.s_kref[5]) diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index e22cb358d4..8226f67a20 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -2574,7 +2574,7 @@ def plot_magnetics_info(axis, mfile_data, scan): ("", "", ""), (f"#TF coil type is {tftype}", "", ""), ("bmaxtf", "Peak field at conductor (w. rip.)", "T"), - ("ritfc", "TF coil currents sum", "A"), + ("c_tf_total", "TF coil currents sum", "A"), ("", "", ""), ("#TF coil forces/stresses", "", ""), (sig_cond, "TF conductor max TRESCA stress", "MPa"), diff --git a/process/io/variable_metadata.py b/process/io/variable_metadata.py index 3093b52cd3..fc1cf2ab98 100644 --- a/process/io/variable_metadata.py +++ b/process/io/variable_metadata.py @@ -84,7 +84,7 @@ class VariableMetadata: description="Mean peak field at TF coil", units="T", ), - "ritfc": VariableMetadata( + "c_tf_total": VariableMetadata( latex=r"$I_\mathrm{TF}^\mathrm{tot}$ [$A$]", description="Total TF coil current", units="A", diff --git a/process/power.py b/process/power.py index 51b0d15b51..e8619b5c80 100644 --- a/process/power.py +++ b/process/power.py @@ -2501,7 +2501,7 @@ def tfpwr(self, output: bool): # Total maximum impedance MDK actually just fixed resistance res_tf_system_total = ( tfcoil_variables.n_tf_coils * tfcoil_variables.res_tf_leg - + (tfcoil_variables.p_cp_resistive / tfcoil_variables.ritfc**2) + + (tfcoil_variables.p_cp_resistive / tfcoil_variables.c_tf_total**2) + tfbusres ) diff --git a/process/sctfcoil.py b/process/sctfcoil.py index 230afea97d..19665ec170 100644 --- a/process/sctfcoil.py +++ b/process/sctfcoil.py @@ -41,7 +41,7 @@ def run(self, output: bool): """ tfes = sctfcoil_module.estotft / tfcoil_variables.n_tf_coils # Cross-sectional area per turn - aturn = tfcoil_variables.ritfc / ( + aturn = tfcoil_variables.c_tf_total / ( tfcoil_variables.jwptf * tfcoil_variables.n_tf_coils * tfcoil_variables.n_tf_turn @@ -1194,7 +1194,7 @@ def sctfcoil(self, output: bool): # Total TF coil stored magnetic energy [J] sctfcoil_module.estotft = ( - 0.5e0 * tfcoil_variables.tfind * tfcoil_variables.ritfc**2 + 0.5e0 * tfcoil_variables.tfind * tfcoil_variables.c_tf_total**2 ) # Total TF coil stored magnetic energy [Gigajoule] @@ -1318,7 +1318,7 @@ def sctfcoil(self, output: bool): tfcoil_variables.poisson_al, tfcoil_variables.fcoolcp, tfcoil_variables.n_tf_graded_layers, - tfcoil_variables.ritfc, + tfcoil_variables.c_tf_total, tfcoil_variables.casthi, tfcoil_variables.i_tf_stress_model, sctfcoil_module.vforce_inboard_tot, @@ -1599,17 +1599,19 @@ def tf_current(self): # Total current in TF coils [A] # rem SK : ritcf is no longer an input - tfcoil_variables.ritfc = ( + tfcoil_variables.c_tf_total = ( tfcoil_variables.bmaxtf * tfcoil_variables.rbmax * 5.0e6 ) # Current per TF coil [A] sctfcoil_module.tfc_current = ( - tfcoil_variables.ritfc / tfcoil_variables.n_tf_coils + tfcoil_variables.c_tf_total / tfcoil_variables.n_tf_coils ) # Global inboard leg average current in TF coils [A/m2] - tfcoil_variables.oacdcp = tfcoil_variables.ritfc / tfcoil_variables.tfareain + tfcoil_variables.oacdcp = ( + tfcoil_variables.c_tf_total / tfcoil_variables.tfareain + ) def coilshap(self): """Calculates the TF coil shape @@ -1857,7 +1859,7 @@ def tf_res_heating(self): tfcoil_variables.tinstf, tfcoil_variables.thicndut, tfcoil_variables.n_tf_turn, - tfcoil_variables.ritfc, + tfcoil_variables.c_tf_total, tfcoil_variables.rhocp, tfcoil_variables.fcoolcp, tfcoil_variables.n_tf_coils, @@ -1900,7 +1902,7 @@ def tf_res_heating(self): # TF outer leg resistive power (TOTAL) [W] tfcoil_variables.p_tf_leg_resistive = ( tfcoil_variables.res_tf_leg - * (tfcoil_variables.ritfc / tfcoil_variables.n_tf_coils) ** 2 + * (tfcoil_variables.c_tf_total / tfcoil_variables.n_tf_coils) ** 2 ) # --- @@ -1925,7 +1927,7 @@ def tf_res_heating(self): tfcoil_variables.pres_joints = ( tfcoil_variables.n_tf_joints * tfcoil_variables.rho_tf_joints - * tfcoil_variables.ritfc**2 + * tfcoil_variables.c_tf_total**2 / a_joints ) else: @@ -1940,7 +1942,7 @@ def tf_res_heating(self): # TF resistive powers tfcoil_variables.p_cp_resistive = ( tfcoil_variables.rhocp - * tfcoil_variables.ritfc**2 + * tfcoil_variables.c_tf_total**2 * tfcoil_variables.tfleng / (sctfcoil_module.a_leg_cond * tfcoil_variables.n_tf_coils) ) @@ -2385,7 +2387,7 @@ def tf_field_and_force(self): tfcoil_variables.cforce = ( 0.5e0 * tfcoil_variables.bmaxtf - * tfcoil_variables.ritfc + * tfcoil_variables.c_tf_total / tfcoil_variables.n_tf_coils ) @@ -2413,7 +2415,11 @@ def tf_field_and_force(self): # May the force be with you vforce_tot = ( 0.5e0 - * (physics_variables.bt * physics_variables.rmajor * tfcoil_variables.ritfc) + * ( + physics_variables.bt + * physics_variables.rmajor + * tfcoil_variables.c_tf_total + ) / (tfcoil_variables.n_tf_coils * dr_wp**2) * ( r_out_wp**2 * np.log(r_out_wp / r_in_wp) @@ -2438,7 +2444,7 @@ def tf_field_and_force(self): * ( physics_variables.bt * physics_variables.rmajor - * tfcoil_variables.ritfc + * tfcoil_variables.c_tf_total ) / (tfcoil_variables.n_tf_coils * dr_wp**2) * ( @@ -3048,12 +3054,12 @@ def res_tf_internal_geom(self): ) - sctfcoil_module.awpc # Current per turn - tfcoil_variables.cpttf = tfcoil_variables.ritfc / ( + tfcoil_variables.cpttf = tfcoil_variables.c_tf_total / ( tfcoil_variables.n_tf_turn * tfcoil_variables.n_tf_coils ) # Exact current density on TF oubard legs - tfcoil_variables.cdtfleg = tfcoil_variables.ritfc / ( + tfcoil_variables.cdtfleg = tfcoil_variables.c_tf_total / ( (1.0e0 - tfcoil_variables.fcoolcp) * ( tfcoil_variables.tftort @@ -3535,7 +3541,7 @@ def tf_wp_currents(self): """ tfcoil_variables.jwptf = max( 1.0e0, - tfcoil_variables.ritfc + tfcoil_variables.c_tf_total / (tfcoil_variables.n_tf_coils * sctfcoil_module.awptf), ) @@ -3601,7 +3607,7 @@ def stresscl( poisson_al, fcoolcp, n_tf_graded_layers, - ritfc, + c_tf_total, casthi, i_tf_stress_model, vforce_inboard_tot, @@ -4070,7 +4076,7 @@ def stresscl( for ii in range(np.intc(n_tf_graded_layers)): # Homogeneous current in (super)conductor - jeff[n_tf_bucking + ii] = ritfc / ( + jeff[n_tf_bucking + ii] = c_tf_total / ( np.pi * (r_wp_outer_eff**2 - r_wp_inner_eff**2) ) @@ -5258,15 +5264,15 @@ def outtf(self, peaktfflag): po.ovarre( self.outfile, "Total current in all TF coils (MA)", - "(ritfc/1.D6)", - 1.0e-6 * tfcoil_variables.ritfc, + "(c_tf_total/1.D6)", + 1.0e-6 * tfcoil_variables.c_tf_total, "OP ", ) po.ovarre( self.outfile, "TF coil current (summed over all coils) (A)", - "(ritfc)", - tfcoil_variables.ritfc, + "(c_tf_total)", + tfcoil_variables.c_tf_total, ) if tfcoil_variables.i_tf_sup == 1: po.ovarre( diff --git a/process/stellarator.py b/process/stellarator.py index bc69924d56..0fbce7cc1e 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -2752,11 +2752,11 @@ def stcoil(self, output: bool): tfcoil_variables.tfareain = ( tfcoil_variables.n_tf_coils * tfcoil_variables.arealeg ) # [m^2] Total area of all coil legs (midplane) - tfcoil_variables.ritfc = ( + tfcoil_variables.c_tf_total = ( tfcoil_variables.n_tf_coils * coilcurrent * 1.0e6 ) # [A] Total current in ALL coils tfcoil_variables.oacdcp = ( - tfcoil_variables.ritfc / tfcoil_variables.tfareain + tfcoil_variables.c_tf_total / tfcoil_variables.tfareain ) # [A / m^2] overall current density tfcoil_variables.rbmax = ( r_coil_major - r_coil_minor + awp_rad @@ -2780,7 +2780,7 @@ def stcoil(self, output: bool): ** 2 * st.f_n**2 ) - * (tfcoil_variables.ritfc / tfcoil_variables.n_tf_coils) ** 2 + * (tfcoil_variables.c_tf_total / tfcoil_variables.n_tf_coils) ** 2 * 1.0e-9 ) # [GJ] Total magnetic energy @@ -2920,7 +2920,7 @@ def stcoil(self, output: bool): / (1e0 * 5.2e0 * 0.014e0) * ( physics_variables.bt - * tfcoil_variables.ritfc + * tfcoil_variables.c_tf_total * physics_variables.rminor**2 / ( (build_variables.dr_vv_inboard + build_variables.dr_vv_outboard) @@ -3656,14 +3656,14 @@ def stcoil_output( po.ovarre( self.outfile, "Total current (MA)", - "(ritfc)", - 1.0e-6 * tfcoil_variables.ritfc, + "(c_tf_total)", + 1.0e-6 * tfcoil_variables.c_tf_total, ) po.ovarre( self.outfile, "Current per coil(MA)", - "(ritfc/n_tf_coils)", - 1.0e-6 * tfcoil_variables.ritfc / tfcoil_variables.n_tf_coils, + "(c_tf_total/n_tf_coils)", + 1.0e-6 * tfcoil_variables.c_tf_total / tfcoil_variables.n_tf_coils, ) po.ovarre( self.outfile, @@ -3849,17 +3849,21 @@ def stcoil_output( po.ovarre( self.outfile, "Current density in conductor area (A/m2)", - "(ritfc/acond)", + "(c_tf_total/acond)", 1.0e-6 - * tfcoil_variables.ritfc + * tfcoil_variables.c_tf_total / tfcoil_variables.n_tf_coils / tfcoil_variables.acond, ) po.ovarre( self.outfile, "Current density in SC area (A/m2)", - "(ritfc/acond/f_scu)", - 1.0e-6 * tfcoil_variables.ritfc / tfcoil_variables.n_tf_coils / ap / f_scu, + "(c_tf_total/acond/f_scu)", + 1.0e-6 + * tfcoil_variables.c_tf_total + / tfcoil_variables.n_tf_coils + / ap + / f_scu, ) po.ovarre(self.outfile, "Superconductor faction of WP (1)", "(f_scu)", f_scu) diff --git a/process/utilities/errorlist.json b/process/utilities/errorlist.json index 8c8d066782..a80428b097 100644 --- a/process/utilities/errorlist.json +++ b/process/utilities/errorlist.json @@ -493,7 +493,7 @@ { "no": 97, "level": 2, - "message": "SCTFCOIL: Negative TF coil current; ritfc forced to be positive..." + "message": "SCTFCOIL: Negative TF coil current; c_tf_total forced to be positive..." }, { "no": 98, diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index 3f3d4d8ef9..8648972365 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -2021,14 +2021,14 @@ subroutine constraint_eqn_046(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! Logic change during pre-factoring: err, symbol, units will be assigned only if present. !! eps : input real : inverse aspect ratio !! fipir : input real : f-value for Ip/Irod upper limit - !! ritfc : input real : total (summed) current in TF coils (A) + !! c_tf_total : input real : total (summed) current in TF coils (A) !! plasma_current : input real : plasma current (A) !! itart : input integer : switch for spherical tokamak (ST) models:
    !!
  • = 0 use conventional aspect ratio models; !!
  • = 1 use spherical tokamak models
use physics_variables, only: eps, plasma_current, itart use constraint_variables, only: fipir - use tfcoil_variables, only: ritfc + use tfcoil_variables, only: c_tf_total implicit none ! cratmx : local real : maximum ratio of plasma current to centrepost current real(dp) :: cratmx @@ -2041,9 +2041,9 @@ subroutine constraint_eqn_046(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) ! if the machine isn't a ST then report error if (itart == 0) call report_error(10) cratmx = 1.0D0 + 4.91D0*(eps-0.62D0) - tmp_cc = 1.0D0 - fipir * cratmx * ritfc/plasma_current + tmp_cc = 1.0D0 - fipir * cratmx * c_tf_total/plasma_current tmp_con = cratmx * (1.0D0 - tmp_cc) - tmp_err = plasma_current/ritfc * tmp_cc + tmp_err = plasma_current/c_tf_total * tmp_cc tmp_symbol = '<' tmp_units = '' diff --git a/source/fortran/tfcoil_variables.f90 b/source/fortran/tfcoil_variables.f90 index 2f54db069e..5841114b86 100644 --- a/source/fortran/tfcoil_variables.f90 +++ b/source/fortran/tfcoil_variables.f90 @@ -396,7 +396,7 @@ module tfcoil_variables real(dp) :: ripple !! peak/average toroidal field ripple at plasma edge (%) - real(dp) :: ritfc + real(dp) :: c_tf_total !! total (summed) current in TF coils (A) integer, parameter :: n_radial_array = 50 @@ -934,7 +934,7 @@ subroutine init_tfcoil_variables ftoroidalgap = 1.0D0 ripmax = 1.0D0 ripple = 0.0D0 - ritfc = 0.0D0 + c_tf_total = 0.0D0 radial_array = 0.0D0 sig_tf_r = 0.0D0 sig_tf_t = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 77611eb8b9..d67b6279de 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -731,8 +731,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 7.1402E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.1424E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2178E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.1176E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.1176E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1617E+07 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index e32266d1f4..7b0dc6c278 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -732,8 +732,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 7.1402E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.1424E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2178E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.1176E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.1176E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1617E+07 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index c231495efa..0bff8b4c6d 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -732,8 +732,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 7.1402E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.1424E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2178E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.1176E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.1176E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1617E+07 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index df32479d9d..f75fc5128a 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -732,8 +732,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 7.1402E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.1424E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2178E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.1176E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.1176E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1617E+07 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 872434ce7d..fd69195216 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -735,8 +735,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 7.2486E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.1598E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2296E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.1381E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.1381E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1583E+07 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 955285a050..5d0ca1e5b9 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -733,8 +733,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.8257E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0921E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1962E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0800E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.0800E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1870E+07 @@ -1896,8 +1896,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.6839E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0694E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1732E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0400E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.0400E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1837E+07 @@ -3059,8 +3059,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.5756E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0521E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1502E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0000E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.0000E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1765E+07 @@ -4222,8 +4222,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.5855E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0537E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1502E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0000E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.0000E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1749E+07 @@ -5385,8 +5385,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.6756E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0681E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1732E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0400E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.0400E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1837E+07 @@ -6548,8 +6548,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.8120E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0899E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1962E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0800E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.0800E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1864E+07 @@ -7711,8 +7711,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.8240E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0918E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1962E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0800E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.0800E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1844E+07 @@ -8874,8 +8874,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.7080E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0733E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1732E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0400E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.0400E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1788E+07 @@ -10037,8 +10037,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.5997E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0560E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1502E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0000E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.0000E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1721E+07 @@ -11200,8 +11200,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.6056E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0569E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1502E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0000E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.0000E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1712E+07 @@ -12363,8 +12363,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.7129E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0741E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1732E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0400E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.0400E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1777E+07 @@ -13526,8 +13526,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.8254E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0921E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1962E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0800E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.0800E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1837E+07 @@ -14689,8 +14689,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.8328E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0933E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1962E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0800E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.0800E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1826E+07 @@ -15852,8 +15852,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.7183E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0749E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1732E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0400E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.0400E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1771E+07 @@ -17015,8 +17015,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 6.6037E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.0566E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1502E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.0000E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.0000E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1715E+07 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 780f5aab54..d477074459 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -580,8 +580,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.4165E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 7.2690E+06 @@ -1575,8 +1575,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.4165E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 7.2690E+06 @@ -2570,8 +2570,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.4165E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 7.2690E+06 @@ -3565,8 +3565,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.4165E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 7.2690E+06 @@ -4560,8 +4560,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.4165E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 7.2690E+06 @@ -5555,8 +5555,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.4165E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 7.2690E+06 @@ -6550,8 +6550,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.4165E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 7.2690E+06 @@ -7545,8 +7545,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.4165E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 7.2690E+06 @@ -8540,8 +8540,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 1.5629E+06 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 2.5007E+07 Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.1200E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.4165E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.4165E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 7.2690E+06 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 9afdd7aa67..145b1d6f25 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -4226,7 +4226,7 @@ "ripflag": 0, "ripmax": 1.0, "ripple": 0.0, - "ritfc": 0.0, + "c_tf_total": 0.0, "rjconpf": 30000000.0, "rjohc": 0.0, "rjohc0": 0.0, @@ -10534,7 +10534,7 @@ "ripflag": "", "ripmax": "aximum allowable toroidal field ripple amplitude at plasma edge (%)", "ripple": "peak/average toroidal field ripple at plasma edge (%)", - "ritfc": "total (summed) current in TF coils (A)", + "c_tf_total": "total (summed) current in TF coils (A)", "rjconpf": "average winding pack current density of PF coil i (A/m2) at time of peak\n current in that coil (calculated for `ipfloc=1` coils)", "rjohc": "allowable central solenoid current density at end of flat-top (A/m2)", "rjohc0": "allowable central solenoid current density at beginning of pulse (A/m2)", @@ -19602,7 +19602,7 @@ "ftoroidalgap", "ripmax", "ripple", - "ritfc", + "c_tf_total", "n_radial_array", "radial_array", "sig_tf_r", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 1ca61b4609..a5c6dab764 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -735,8 +735,8 @@ Mass_of_each_TF_coil_(kg)_______________________________________________ (whttf/n_tf_coils)__________________ 7.2486E+05 OP Total_TF_coil_mass_(kg)_________________________________________________ (whttf)_______________________ 1.1598E+07 OP Nominal_peak_field_assuming_toroidal_symmetry_(T)_______________________ (bmaxtf)______________________ 1.2296E+01 OP - Total_current_in_all_TF_coils_(MA)______________________________________ (ritfc/1.D6)__________________ 2.1381E+02 OP - TF_coil_current_(summed_over_all_coils)_(A)_____________________________ (ritfc)_______________________ 2.1381E+08 + 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 Inboard_leg_mid-plane_conductor_current_density_(A/m2)__________________ (oacdcp)______________________ 1.1583E+07 diff --git a/tests/unit/test_costs_2015.py b/tests/unit/test_costs_2015.py index 80e3e38ada..15a3701f16 100644 --- a/tests/unit/test_costs_2015.py +++ b/tests/unit/test_costs_2015.py @@ -40,7 +40,7 @@ class CalcBuildingCostsParam(NamedTuple): helpow: Any = None - ritfc: Any = None + c_tf_total: Any = None n_tf_coils: Any = None @@ -86,7 +86,7 @@ class CalcBuildingCostsParam(NamedTuple): pthermmw=2112.8165753998965, psechtmw=311.54038043019023, helpow=142703.41458500578, - ritfc=234156150, + c_tf_total=234156150, n_tf_coils=18, estotftgj=130.10721529398921, r_cryostat_inboard=18.314040399601147, @@ -1186,7 +1186,7 @@ class CalcBuildingCostsParam(NamedTuple): pthermmw=2111.8102173541502, psechtmw=640.27066522894324, helpow=823308.59959198488, - ritfc=234156150, + c_tf_total=234156150, n_tf_coils=18, estotftgj=129.99240835373195, r_cryostat_inboard=18.31462428923539, @@ -2306,7 +2306,9 @@ def test_calc_building_costs(calcbuildingcostsparam, monkeypatch, costs2015): heat_transport_variables, "helpow", calcbuildingcostsparam.helpow ) - monkeypatch.setattr(tfcoil_variables, "ritfc", calcbuildingcostsparam.ritfc) + monkeypatch.setattr( + tfcoil_variables, "c_tf_total", calcbuildingcostsparam.c_tf_total + ) monkeypatch.setattr( tfcoil_variables, "n_tf_coils", calcbuildingcostsparam.n_tf_coils diff --git a/tests/unit/test_sctfcoil.py b/tests/unit/test_sctfcoil.py index 0c7d34bab4..635d92e5be 100644 --- a/tests/unit/test_sctfcoil.py +++ b/tests/unit/test_sctfcoil.py @@ -388,7 +388,7 @@ def test_supercon(superconparam, monkeypatch, sctfcoil): class TfCurrentParam(NamedTuple): casthi: Any = None - ritfc: Any = None + c_tf_total: Any = None rbmax: Any = None @@ -436,7 +436,7 @@ class TfCurrentParam(NamedTuple): theta_coil: Any = None - expected_ritfc: Any = None + expected_c_tf_total: Any = None expected_rbmax: Any = None @@ -452,7 +452,7 @@ class TfCurrentParam(NamedTuple): ( TfCurrentParam( casthi=0.060000000000000012, - ritfc=0, + c_tf_total=0, rbmax=0, i_tf_sup=1, casths_fraction=0.059999999999999998, @@ -476,7 +476,7 @@ class TfCurrentParam(NamedTuple): rmajor=8.8901000000000003, tfc_current=0, theta_coil=0.19634954084936207, - expected_ritfc=236885604.60000002, + expected_c_tf_total=236885604.60000002, expected_rbmax=4.0432020634751211, expected_bmaxtf=11.717722779177526, expected_oacdcp=8674367.2945641987, @@ -502,7 +502,7 @@ def test_tf_current(tfcurrentparam, monkeypatch, sctfcoil): monkeypatch.setattr(tfcoil_variables, "casthi", tfcurrentparam.casthi) - monkeypatch.setattr(tfcoil_variables, "ritfc", tfcurrentparam.ritfc) + monkeypatch.setattr(tfcoil_variables, "c_tf_total", tfcurrentparam.c_tf_total) monkeypatch.setattr(tfcoil_variables, "rbmax", tfcurrentparam.rbmax) @@ -566,7 +566,9 @@ def test_tf_current(tfcurrentparam, monkeypatch, sctfcoil): sctfcoil.tf_current() - assert tfcoil_variables.ritfc == pytest.approx(tfcurrentparam.expected_ritfc) + assert tfcoil_variables.c_tf_total == pytest.approx( + tfcurrentparam.expected_c_tf_total + ) assert tfcoil_variables.rbmax == pytest.approx(tfcurrentparam.expected_rbmax) @@ -592,7 +594,7 @@ class TfGlobalGeometryParam(NamedTuple): tfareain: Any = None - ritfc: Any = None + c_tf_total: Any = None tftort: Any = None @@ -647,7 +649,7 @@ class TfGlobalGeometryParam(NamedTuple): r_tf_inboard_out=4.20194118510911, dr_tf_outboard=1.208, tfareain=0, - ritfc=0, + c_tf_total=0, tftort=1, n_tf_coils=16, arealeg=0, @@ -677,7 +679,7 @@ class TfGlobalGeometryParam(NamedTuple): r_tf_inboard_out=4.4822055399518357, dr_tf_outboard=1.5283376222698528, tfareain=35.703669036223495, - ritfc=241812532.66279837, + c_tf_total=241812532.66279837, tftort=1.7488698442633552, n_tf_coils=16, arealeg=2.6728635794409041, @@ -738,7 +740,9 @@ def test_tf_global_geometry(tfglobalgeometryparam, monkeypatch, sctfcoil): monkeypatch.setattr(tfcoil_variables, "tfareain", tfglobalgeometryparam.tfareain) - monkeypatch.setattr(tfcoil_variables, "ritfc", tfglobalgeometryparam.ritfc) + monkeypatch.setattr( + tfcoil_variables, "c_tf_total", tfglobalgeometryparam.c_tf_total + ) monkeypatch.setattr(tfcoil_variables, "tftort", tfglobalgeometryparam.tftort) @@ -852,7 +856,7 @@ class ResTfInternalGeomParam(NamedTuple): tfareain: Any = None - ritfc: Any = None + c_tf_total: Any = None fcoolcp: Any = None @@ -905,7 +909,7 @@ class TfResHeatingParam(NamedTuple): res_tf_leg: Any = None tcpav: Any = None arealeg: Any = None - ritfc: Any = None + c_tf_total: Any = None rho_tf_joints: Any = None p_tf_leg_resistive: Any = None p_cp_resistive: Any = None @@ -952,7 +956,7 @@ class TfResHeatingParam(NamedTuple): dr_tf_wp=0.15483000000000002, tftort=0.45367650933034859, tfareain=0.0753112923616783, - ritfc=25500000, + c_tf_total=25500000, fcoolcp=0.12725, cpttf=70000, cdtfleg=0, @@ -979,7 +983,7 @@ class TfResHeatingParam(NamedTuple): dr_tf_wp=0.14708850000000001, tftort=0.44435902370665786, tfareain=0.0753112923616783, - ritfc=25500000, + c_tf_total=25500000, fcoolcp=0.12725, cpttf=2125000, cdtfleg=421788350.27812088, @@ -1029,7 +1033,9 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): monkeypatch.setattr(tfcoil_variables, "tfareain", restfinternalgeomparam.tfareain) - monkeypatch.setattr(tfcoil_variables, "ritfc", restfinternalgeomparam.ritfc) + monkeypatch.setattr( + tfcoil_variables, "c_tf_total", restfinternalgeomparam.c_tf_total + ) monkeypatch.setattr(tfcoil_variables, "fcoolcp", restfinternalgeomparam.fcoolcp) @@ -1121,7 +1127,7 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): res_tf_leg=0, tcpav=347.13, arealeg=0.070242733939617885, - ritfc=25500000, + c_tf_total=25500000, rho_tf_joints=2.5000000000000002e-10, p_tf_leg_resistive=0, p_cp_resistive=0, @@ -1171,7 +1177,7 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): res_tf_leg=5.647653956699231e-06, tcpav=347.13, arealeg=0.068800107640501845, - ritfc=25500000, + c_tf_total=25500000, rho_tf_joints=2.5000000000000002e-10, p_tf_leg_resistive=332643748.67243439, p_cp_resistive=432477095.0716282, @@ -1250,7 +1256,7 @@ def test_tf_res_heating(tfresheatingparam, monkeypatch, sctfcoil): monkeypatch.setattr(tfcoil_variables, "arealeg", tfresheatingparam.arealeg) - monkeypatch.setattr(tfcoil_variables, "ritfc", tfresheatingparam.ritfc) + monkeypatch.setattr(tfcoil_variables, "c_tf_total", tfresheatingparam.c_tf_total) monkeypatch.setattr( tfcoil_variables, "rho_tf_joints", tfresheatingparam.rho_tf_joints @@ -1531,7 +1537,7 @@ class TfFieldAndForceParam(NamedTuple): cforce: Any = None - ritfc: Any = None + c_tf_total: Any = None bmaxtf: Any = None @@ -1589,7 +1595,7 @@ class TfFieldAndForceParam(NamedTuple): taucq=30, sigvvall=93000000, cforce=0, - ritfc=25500000, + c_tf_total=25500000, bmaxtf=34.862617362267024, i_tf_sup=0, f_vforce_inboard=0.5, @@ -1624,7 +1630,7 @@ class TfFieldAndForceParam(NamedTuple): taucq=30, sigvvall=93000000, cforce=37041530.947408713, - ritfc=25500000, + c_tf_total=25500000, bmaxtf=34.862617362267024, i_tf_sup=0, f_vforce_inboard=0.59539634897566385, @@ -1688,7 +1694,7 @@ def test_tf_field_and_force(tffieldandforceparam, monkeypatch, sctfcoil): monkeypatch.setattr(tfcoil_variables, "cforce", tffieldandforceparam.cforce) - monkeypatch.setattr(tfcoil_variables, "ritfc", tffieldandforceparam.ritfc) + monkeypatch.setattr(tfcoil_variables, "c_tf_total", tffieldandforceparam.c_tf_total) monkeypatch.setattr(tfcoil_variables, "bmaxtf", tffieldandforceparam.bmaxtf) @@ -3370,7 +3376,7 @@ def test_tf_averaged_turn_geom(tfaveragedturngeomparam, monkeypatch, sctfcoil): class TfWpCurrentsParam(NamedTuple): - ritfc: Any = None + c_tf_total: Any = None n_tf_coils: Any = None @@ -3385,14 +3391,14 @@ class TfWpCurrentsParam(NamedTuple): "tfwpcurrentsparam", ( TfWpCurrentsParam( - ritfc=256500000.00000003, + c_tf_total=256500000.00000003, n_tf_coils=16, jwptf=0, awptf=0.60510952642236249, expected_jwptf=26493137.688284047, ), TfWpCurrentsParam( - ritfc=256500000.00000003, + c_tf_total=256500000.00000003, n_tf_coils=16, jwptf=26493137.688284047, awptf=0.60510952642236249, @@ -3413,7 +3419,7 @@ def test_tf_wp_currents(tfwpcurrentsparam, monkeypatch, sctfcoil): :type monkeypatch: _pytest.monkeypatch.monkeypatch """ - monkeypatch.setattr(tfcoil_variables, "ritfc", tfwpcurrentsparam.ritfc) + monkeypatch.setattr(tfcoil_variables, "c_tf_total", tfwpcurrentsparam.c_tf_total) monkeypatch.setattr(tfcoil_variables, "n_tf_coils", tfwpcurrentsparam.n_tf_coils) @@ -3455,7 +3461,7 @@ class StressclParam(NamedTuple): vforce: Any = None - ritfc: Any = None + c_tf_total: Any = None jwptf: Any = None @@ -3626,7 +3632,7 @@ class StressclParam(NamedTuple): i_tf_tresca=0, acstf=0.001293323051622732, vforce=250545611.13801825, - ritfc=236885604.60000002, + c_tf_total=236885604.60000002, jwptf=23124470.793774806, sig_tf_cs_bucked=0, sig_tf_case=0, @@ -3749,7 +3755,7 @@ class StressclParam(NamedTuple): i_tf_tresca=0, acstf=0.001293323051622732, vforce=250545611.13801825, - ritfc=236885604.60000002, + c_tf_total=236885604.60000002, jwptf=23124470.793774806, sig_tf_cs_bucked=0, sig_tf_case=543381805.25001633, @@ -3967,7 +3973,7 @@ def test_stresscl(stressclparam, monkeypatch, sctfcoil): stressclparam.poisson_al, stressclparam.fcoolcp, stressclparam.n_tf_graded_layers, - stressclparam.ritfc, + stressclparam.c_tf_total, stressclparam.casthi, stressclparam.i_tf_stress_model, stressclparam.vforce_inboard_tot, From f5eee9a313b0f8d1d5aef210517ff8d4cf8a7cf9 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 13 Jan 2025 16:31:11 +0000 Subject: [PATCH 15/29] =?UTF-8?q?=F0=9F=94=84=20Update=20comment=20for=20r?= =?UTF-8?q?ho=5Ftf=5Fbus=20to=20specify=20GLIDCOP=20AL-15=20as=20the=20def?= =?UTF-8?q?ault=20material?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/fortran/tfcoil_variables.f90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/fortran/tfcoil_variables.f90 b/source/fortran/tfcoil_variables.f90 index 5841114b86..c70a8c1992 100644 --- a/source/fortran/tfcoil_variables.f90 +++ b/source/fortran/tfcoil_variables.f90 @@ -543,7 +543,7 @@ module tfcoil_variables !! Resistivity of a TF coil leg (Ohm-m) real(dp) :: rho_tf_bus - !! Resistivity of a TF coil bus (Ohm-m). Default values is for that of GLIDCOP Copper at 293K + !! Resistivity of a TF coil bus (Ohm-m). Default values is for that of GLIDCOP AL-15 (C15715) at 293K real(dp) :: frhocp !! Centrepost resistivity enhancement factor. For `itart=0`, this factor From f79e7e7141330b782c7f90a4346c88090f6832e0 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 13 Jan 2025 17:09:01 +0000 Subject: [PATCH 16/29] :bug: Refactor TF leg resistive power calculations to account for all legs --- process/io/plot_proc.py | 3 +-- process/sctfcoil.py | 4 ++-- tests/unit/test_sctfcoil.py | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index 8226f67a20..6bd5127b06 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -2556,7 +2556,6 @@ def plot_magnetics_info(axis, mfile_data, scan): ] else: - n_tf_coils = mfile_data.data["n_tf_coils"].get_scan(scan) p_cp_resistive = 1.0e-6 * mfile_data.data["p_cp_resistive"].get_scan(scan) p_tf_leg_resistive = 1.0e-6 * mfile_data.data["p_tf_leg_resistive"].get_scan( scan @@ -2583,7 +2582,7 @@ def plot_magnetics_info(axis, mfile_data, scan): ("vcool", "Maximum coolant flow speed", "ms$^{-1}$"), (p_cp_resistive, "CP Resisitive heating", "MW"), ( - p_tf_leg_resistive * n_tf_coils, + p_tf_leg_resistive, "legs Resisitive heating (all legs)", "MW", ), diff --git a/process/sctfcoil.py b/process/sctfcoil.py index 19665ec170..92429c727e 100644 --- a/process/sctfcoil.py +++ b/process/sctfcoil.py @@ -1903,7 +1903,7 @@ def tf_res_heating(self): tfcoil_variables.p_tf_leg_resistive = ( tfcoil_variables.res_tf_leg * (tfcoil_variables.c_tf_total / tfcoil_variables.n_tf_coils) ** 2 - ) + ) * tfcoil_variables.n_tf_coils # --- # Sliding joints resistive heating @@ -5377,7 +5377,7 @@ def outtf(self, peaktfflag): ) po.ovarre( self.outfile, - "Leg resitive power loss, (per leg) (W)", + "Total legs resitive power loss, (W)", "(p_tf_leg_resistive)", tfcoil_variables.p_tf_leg_resistive, ) diff --git a/tests/unit/test_sctfcoil.py b/tests/unit/test_sctfcoil.py index 635d92e5be..1fd3b2ed37 100644 --- a/tests/unit/test_sctfcoil.py +++ b/tests/unit/test_sctfcoil.py @@ -1157,7 +1157,7 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): expected_rhotfleg=2.008522e-08, expected_vol_cond_cp=12.020160732580297, expected_res_tf_leg=5.647653956699231e-06, - expected_p_tf_leg_resistive=25502687.398219965, + expected_p_tf_leg_resistive=306032248.77863955, expected_p_cp_resistive=432477095.0716282, expected_pres_joints=1944336.7995005273, expected_a_cp_cool=0.00068328705812121333, @@ -1207,7 +1207,7 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): expected_rhotfleg=2.008522e-08, expected_vol_cond_cp=11.545770024935592, expected_res_tf_leg=5.79314853092539e-06, - expected_p_tf_leg_resistive=26159686.334959965, + expected_p_tf_leg_resistive=313916236.01951957, expected_p_cp_resistive=437653650.39632624, expected_pres_joints=1944336.7995005273, expected_a_cp_cool=0.00068328705812121333, From 6324d4e086ea94c492bc979c0e9219034b8c0903 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 13 Jan 2025 17:17:58 +0000 Subject: [PATCH 17/29] =?UTF-8?q?=F0=9F=94=84=20Rename=20'tfleng'=20to=20'?= =?UTF-8?q?len=5Ftf=5Fcoil'=20for=20consistency=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/costs.py | 8 +- process/costs_2015.py | 6 +- process/sctfcoil.py | 84 ++++++++++--------- process/stellarator.py | 42 +++++----- source/fortran/tfcoil_variables.f90 | 4 +- .../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_costs_1990.py | 10 +-- tests/unit/test_costs_2015.py | 10 ++- tests/unit/test_sctfcoil.py | 20 +++-- 23 files changed, 144 insertions(+), 134 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index abc1f0c99f..33b7e4e7be 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -676,7 +676,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 8.6482E-01 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 4.7815E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7815E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_0_R_(m)_______________________________________________ (xarc(1))_____________________ 3.6253E+00 TF_coil_arc_point_0_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.5506E+00 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 48f7f3d5b9..0061be523f 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -673,7 +673,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 9.1597E-01 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 4.7937E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7937E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_0_R_(m)_______________________________________________ (xarc(1))_____________________ 3.6253E+00 TF_coil_arc_point_0_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.5506E+00 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 7d0eaa2c52..3434b15605 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -673,7 +673,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 9.1597E-01 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 4.7937E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7937E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_0_R_(m)_______________________________________________ (xarc(1))_____________________ 3.6253E+00 TF_coil_arc_point_0_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.5506E+00 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 2440ee06fb..d2f0646255 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -673,7 +673,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 9.1597E-01 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 4.7937E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7937E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_0_R_(m)_______________________________________________ (xarc(1))_____________________ 3.6253E+00 TF_coil_arc_point_0_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.5506E+00 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 89ca16bfd2..81fe6a4213 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -673,7 +673,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 9.1597E-01 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 4.7937E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7937E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_0_R_(m)_______________________________________________ (xarc(1))_____________________ 3.6253E+00 TF_coil_arc_point_0_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.5506E+00 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 37adc1a692..e2215e84e6 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -520,7 +520,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 1.4000E+00 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.7477E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 9.2447E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 5.1957E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 5.1957E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_1_R_(m)_______________________________________________ (xarc(1))_____________________ 4.4793E+00 TF_coil_arc_point_1_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.6366E+00 @@ -1515,7 +1515,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 1.4000E+00 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.7477E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 9.2447E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 5.1957E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 5.1957E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_1_R_(m)_______________________________________________ (xarc(1))_____________________ 4.4793E+00 TF_coil_arc_point_1_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.6366E+00 @@ -2510,7 +2510,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 1.4000E+00 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.7477E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 9.2447E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 5.1957E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 5.1957E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_1_R_(m)_______________________________________________ (xarc(1))_____________________ 4.4793E+00 TF_coil_arc_point_1_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.6366E+00 @@ -3505,7 +3505,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 1.4000E+00 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.7477E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 9.2447E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 5.1957E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 5.1957E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_1_R_(m)_______________________________________________ (xarc(1))_____________________ 4.4793E+00 TF_coil_arc_point_1_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.6366E+00 @@ -4500,7 +4500,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 1.4000E+00 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.7477E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 9.2447E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 5.1957E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 5.1957E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_1_R_(m)_______________________________________________ (xarc(1))_____________________ 4.4793E+00 TF_coil_arc_point_1_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.6366E+00 @@ -5495,7 +5495,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 1.4000E+00 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.7477E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 9.2447E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 5.1957E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 5.1957E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_1_R_(m)_______________________________________________ (xarc(1))_____________________ 4.4793E+00 TF_coil_arc_point_1_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.6366E+00 @@ -6490,7 +6490,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 1.4000E+00 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.7477E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 9.2447E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 5.1957E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 5.1957E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_1_R_(m)_______________________________________________ (xarc(1))_____________________ 4.4793E+00 TF_coil_arc_point_1_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.6366E+00 @@ -7485,7 +7485,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 1.4000E+00 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.7477E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 9.2447E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 5.1957E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 5.1957E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_1_R_(m)_______________________________________________ (xarc(1))_____________________ 4.4793E+00 TF_coil_arc_point_1_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.6366E+00 @@ -8480,7 +8480,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 1.4000E+00 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.7477E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 9.2447E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 5.1957E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 5.1957E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_1_R_(m)_______________________________________________ (xarc(1))_____________________ 4.4793E+00 TF_coil_arc_point_1_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.6366E+00 diff --git a/process/costs.py b/process/costs.py index f9e2b48fb7..09cdee0e16 100644 --- a/process/costs.py +++ b/process/costs.py @@ -1451,7 +1451,7 @@ def acc2221(self): costtfsc = ( cost_variables.ucsc[tfcoil_variables.i_tf_sc_mat - 1] * tfcoil_variables.whtconsc - / (tfcoil_variables.tfleng * tfcoil_variables.n_tf_turn) + / (tfcoil_variables.len_tf_coil * tfcoil_variables.n_tf_turn) ) else: costtfsc = ( @@ -1465,7 +1465,7 @@ def acc2221(self): costtfcu = ( cost_variables.uccu * tfcoil_variables.whtconcu - / (tfcoil_variables.tfleng * tfcoil_variables.n_tf_turn) + / (tfcoil_variables.len_tf_coil * tfcoil_variables.n_tf_turn) ) # Total cost/metre of superconductor and copper wire @@ -1482,7 +1482,7 @@ def acc2221(self): 1.0e-6 * ctfconpm * tfcoil_variables.n_tf_coils - * tfcoil_variables.tfleng + * tfcoil_variables.len_tf_coil * tfcoil_variables.n_tf_turn ) self.c22211 = ( @@ -1495,7 +1495,7 @@ def acc2221(self): 1.0e-6 * cost_variables.ucwindtf * tfcoil_variables.n_tf_coils - * tfcoil_variables.tfleng + * tfcoil_variables.len_tf_coil * tfcoil_variables.n_tf_turn ) self.c22212 = ( diff --git a/process/costs_2015.py b/process/costs_2015.py index 16a87a75f4..09fdc5ea7d 100644 --- a/process/costs_2015.py +++ b/process/costs_2015.py @@ -713,7 +713,7 @@ def calc_tf_coil_costs(self): # ITER coil insertion and welding cost (2014 $) self.s_cref[13] = 258.0e6 # Scale with total TF coil length (m) - self.s_k[13] = tfcoil_variables.n_tf_coils * tfcoil_variables.tfleng + self.s_k[13] = tfcoil_variables.n_tf_coils * tfcoil_variables.len_tf_coil self.s_kref[13] = 18.0e0 * 34.1e0 self.s_cost[13] = ( self.s_cost_factor[13] @@ -728,7 +728,7 @@ def calc_tf_coil_costs(self): # Scale with the total turn length (m) self.s_k[15] = ( tfcoil_variables.n_tf_coils - * tfcoil_variables.tfleng + * tfcoil_variables.len_tf_coil * tfcoil_variables.n_tf_turn ) self.s_kref[15] = 82249.0e0 @@ -777,7 +777,7 @@ def calc_tf_coil_costs(self): # Scale with total turn length. self.s_k[19] = ( tfcoil_variables.n_tf_coils - * tfcoil_variables.tfleng + * tfcoil_variables.len_tf_coil * tfcoil_variables.n_tf_turn ) self.s_kref[19] = 82249.0e0 diff --git a/process/sctfcoil.py b/process/sctfcoil.py index 92429c727e..21b4ad4d47 100644 --- a/process/sctfcoil.py +++ b/process/sctfcoil.py @@ -1659,8 +1659,8 @@ def coilshap(self): # Horizontal and vertical radii of inside edge of TF coil # Arcs are numbered clockwise: # 1=upper inboard, 2=upper outboard, 3=lower ouboard, 4=lower inboard - # 'tfleng' is the length of the coil midline. - tfcoil_variables.tfleng = ( + # 'len_tf_coil' is the length of the coil midline. + tfcoil_variables.len_tf_coil = ( tfcoil_variables.yarc[0] - tfcoil_variables.yarc[4] ) for ii in range(4): @@ -1673,10 +1673,10 @@ def coilshap(self): # Radii and length of midline of coil segments aa = tfcoil_variables.tfa[ii] + 0.5e0 * build_variables.dr_tf_inboard bb = tfcoil_variables.tfb[ii] + 0.5e0 * build_variables.dr_tf_inboard - tfcoil_variables.tfleng = ( - tfcoil_variables.tfleng + 0.25e0 * self.circumference(aa, bb) + tfcoil_variables.len_tf_coil = ( + tfcoil_variables.len_tf_coil + 0.25e0 * self.circumference(aa, bb) ) - # note: final tfcoil_variables.tfleng includes inboard leg length; eq(22) + # note: final tfcoil_variables.len_tf_coil includes inboard leg length; eq(22) # Centrepost with D-shaped # --- @@ -1702,7 +1702,7 @@ def coilshap(self): tfcoil_variables.yarc[4] = -build_variables.hmax # TF middle circumference - tfcoil_variables.tfleng = 2 * ( + tfcoil_variables.len_tf_coil = 2 * ( tfcoil_variables.xarc[1] - tfcoil_variables.xarc[0] ) @@ -1717,10 +1717,10 @@ def coilshap(self): # Radii and length of midline of coil segments aa = tfcoil_variables.tfa[ii] + 0.5e0 * build_variables.dr_tf_outboard bb = tfcoil_variables.tfb[ii] + 0.5e0 * build_variables.dr_tf_outboard - tfcoil_variables.tfleng = ( - tfcoil_variables.tfleng + 0.25e0 * self.circumference(aa, bb) + tfcoil_variables.len_tf_coil = ( + tfcoil_variables.len_tf_coil + 0.25e0 * self.circumference(aa, bb) ) - # IMPORTANT : THE CENTREPOST LENGTH IS NOT INCLUDED IN TFLENG FOR TART; eq(24) + # IMPORTANT : THE CENTREPOST LENGTH IS NOT INCLUDED IN len_tf_coil FOR TART; eq(24) # --- # Picture frame coil @@ -1748,16 +1748,16 @@ def coilshap(self): tfcoil_variables.yarc[4] = -build_variables.hmax # TF middle circumference - # IMPORTANT : THE CENTREPOST LENGTH IS NOT INCLUDED IN TFLENG FOR TART + # IMPORTANT : THE CENTREPOST LENGTH IS NOT INCLUDED IN len_tf_coil FOR TART if physics_variables.itart == 0: - tfcoil_variables.tfleng = 2.0e0 * ( + tfcoil_variables.len_tf_coil = 2.0e0 * ( 2.0e0 * build_variables.hmax + build_variables.dr_tf_inboard + build_variables.r_tf_outboard_mid - build_variables.r_tf_inboard_mid ) # eq(25) elif physics_variables.itart == 1: - tfcoil_variables.tfleng = ( + tfcoil_variables.len_tf_coil = ( build_variables.hmax + build_variables.hpfu + 2.0e0 @@ -1895,7 +1895,7 @@ def tf_res_heating(self): # TF outboard leg's resistance calculation (per leg) [ohm] tfcoil_variables.res_tf_leg = ( tfcoil_variables.rhotfleg - * tfcoil_variables.tfleng + * tfcoil_variables.len_tf_coil / sctfcoil_module.a_leg_cond ) @@ -1943,7 +1943,7 @@ def tf_res_heating(self): tfcoil_variables.p_cp_resistive = ( tfcoil_variables.rhocp * tfcoil_variables.c_tf_total**2 - * tfcoil_variables.tfleng + * tfcoil_variables.len_tf_coil / (sctfcoil_module.a_leg_cond * tfcoil_variables.n_tf_coils) ) @@ -2332,7 +2332,7 @@ def vv_stress_on_quench(self): ri_coil=ri_coil, ro_coil=ro_coil, rm_coil=rm_coil, - ccl_length_coil=tfcoil_variables.tfleng, + ccl_length_coil=tfcoil_variables.len_tf_coil, theta1_coil=tfcoil_variables.theta1_coil, # VV shape H_vv=H_vv, @@ -2587,7 +2587,7 @@ def tf_coil_area_and_masses(self): # = 2 * centroid coil length * 2 pi R, where R is average of i/b and o/b centres tfcoil_variables.tfcryoarea = ( 2.0e0 - * tfcoil_variables.tfleng + * tfcoil_variables.len_tf_coil * constants.twopi * 0.5e0 * (build_variables.r_tf_inboard_mid + build_variables.r_tf_outboard_mid) @@ -2602,7 +2602,7 @@ def tf_coil_area_and_masses(self): # Mass of ground-wall insulation [kg] # (assumed to be same density/material as turn insulation) tfcoil_variables.whtgw = ( - tfcoil_variables.tfleng + tfcoil_variables.len_tf_coil * (sctfcoil_module.awpc - sctfcoil_module.awptf) * tfcoil_variables.dcondins ) @@ -2616,13 +2616,13 @@ def tf_coil_area_and_masses(self): # The 2.2 factor is used as a scaling factor to fit # to the ITER-FDR value of 450 tonnes; see CCFE note T&M/PKNIGHT/PROCESS/026 if physics_variables.itart == 1: - # tfcoil_variables.tfleng does not include inboard leg ('centrepost') length in TART + # tfcoil_variables.len_tf_coil does not include inboard leg ('centrepost') length in TART tfcoil_variables.whtcas = ( 2.2e0 * tfcoil_variables.dcase * ( tfcoil_variables.cplen * tfcoil_variables.acasetf - + tfcoil_variables.tfleng * tfcoil_variables.acasetfo + + tfcoil_variables.len_tf_coil * tfcoil_variables.acasetfo ) ) else: @@ -2631,7 +2631,7 @@ def tf_coil_area_and_masses(self): * tfcoil_variables.dcase * ( tfcoil_variables.cplen * tfcoil_variables.acasetf - + (tfcoil_variables.tfleng - tfcoil_variables.cplen) + + (tfcoil_variables.len_tf_coil - tfcoil_variables.cplen) * tfcoil_variables.acasetfo ) ) @@ -2643,29 +2643,29 @@ def tf_coil_area_and_masses(self): # Superconductor mass [kg] # Includes space allowance for central helium channel, area tfcoil_variables.awphec tfcoil_variables.whtconsc = ( - tfcoil_variables.tfleng + tfcoil_variables.len_tf_coil * tfcoil_variables.n_tf_turn * tfcoil_variables.acstf * (1.0e0 - tfcoil_variables.vftf) * (1.0e0 - tfcoil_variables.fcutfsu) - - tfcoil_variables.tfleng * tfcoil_variables.awphec + - tfcoil_variables.len_tf_coil * tfcoil_variables.awphec ) * tfcoil_variables.dcond[tfcoil_variables.i_tf_sc_mat - 1] # Copper mass [kg] tfcoil_variables.whtconcu = ( - tfcoil_variables.tfleng + tfcoil_variables.len_tf_coil * tfcoil_variables.n_tf_turn * tfcoil_variables.acstf * (1.0e0 - tfcoil_variables.vftf) * tfcoil_variables.fcutfsu - - tfcoil_variables.tfleng * tfcoil_variables.awphec + - tfcoil_variables.len_tf_coil * tfcoil_variables.awphec ) * constants.dcopper if tfcoil_variables.whtconcu <= 0.0e0: tfcoil_variables.whtconcu = 0.0e0 # Steel conduit (sheath) mass [kg] tfcoil_variables.whtconsh = ( - tfcoil_variables.tfleng + tfcoil_variables.len_tf_coil * tfcoil_variables.n_tf_turn * tfcoil_variables.acndttf * fwbs_variables.denstl @@ -2674,7 +2674,7 @@ def tf_coil_area_and_masses(self): # Conduit insulation mass [kg] # (tfcoil_variables.aiwp already contains tfcoil_variables.n_tf_turn) tfcoil_variables.whtconin = ( - tfcoil_variables.tfleng + tfcoil_variables.len_tf_coil * tfcoil_variables.aiwp * tfcoil_variables.dcondins ) @@ -2696,14 +2696,14 @@ def tf_coil_area_and_masses(self): ) * tfcoil_variables.n_tf_coils # If spherical tokamak, distribute between centrepost and outboard legs - # (in this case, total TF coil length = inboard `cplen` + outboard `tfleng`) + # (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.tfleng + tfleng_sph = tfcoil_variables.cplen + tfcoil_variables.len_tf_coil tfcoil_variables.whtcp = tfcoil_variables.whttf * ( tfcoil_variables.cplen / tfleng_sph ) tfcoil_variables.whttflgs = tfcoil_variables.whttf * ( - tfcoil_variables.tfleng / tfleng_sph + tfcoil_variables.len_tf_coil / tfleng_sph ) # Resitivive magnets weights @@ -2717,11 +2717,11 @@ def tf_coil_area_and_masses(self): if physics_variables.itart == 1: # Total volume of one outerleg [m3] tfcoil_variables.voltfleg = ( - tfcoil_variables.tfleng * tfcoil_variables.arealeg + tfcoil_variables.len_tf_coil * tfcoil_variables.arealeg ) # Outboard leg TF conductor volume [m3] - vol_cond_leg = tfcoil_variables.tfleng * sctfcoil_module.a_leg_cond + vol_cond_leg = tfcoil_variables.len_tf_coil * sctfcoil_module.a_leg_cond # Total TF conductor volume [m3] vol_cond = ( @@ -2730,7 +2730,7 @@ def tf_coil_area_and_masses(self): ) # Outboard leg TF turn insulation layer volume (per leg) [m3] - vol_ins_leg = tfcoil_variables.tfleng * sctfcoil_module.a_leg_ins + vol_ins_leg = tfcoil_variables.len_tf_coil * sctfcoil_module.a_leg_ins # Total turn insulation layer volume [m3] vol_ins = ( @@ -2739,7 +2739,9 @@ def tf_coil_area_and_masses(self): ) # Ouboard leg TF ground insulation layer volume (per leg) [m3] - vol_gr_ins_leg = tfcoil_variables.tfleng * sctfcoil_module.a_leg_gr_ins + vol_gr_ins_leg = ( + tfcoil_variables.len_tf_coil * sctfcoil_module.a_leg_gr_ins + ) # Total ground insulation layer volume [m3] vol_gr_ins = ( @@ -2756,28 +2758,28 @@ def tf_coil_area_and_masses(self): else: # Total TF outer leg conductor volume [m3] vol_cond = ( - tfcoil_variables.tfleng + tfcoil_variables.len_tf_coil * sctfcoil_module.a_leg_cond * tfcoil_variables.n_tf_coils ) # Total turn insulation layer volume [m3] vol_ins = ( - tfcoil_variables.tfleng + tfcoil_variables.len_tf_coil * sctfcoil_module.a_leg_ins * tfcoil_variables.n_tf_coils ) # Total ground insulation volume [m3] vol_gr_ins = ( - tfcoil_variables.tfleng + tfcoil_variables.len_tf_coil * sctfcoil_module.a_leg_gr_ins * tfcoil_variables.n_tf_coils ) # Total case volume [m3] vol_case = ( - tfcoil_variables.tfleng + tfcoil_variables.len_tf_coil * tfcoil_variables.acasetf * tfcoil_variables.n_tf_coils ) @@ -4625,8 +4627,8 @@ def outtf(self, peaktfflag): po.ovarre( self.outfile, "Mean coil circumference (inboard leg not included) (m)", - "(tfleng)", - tfcoil_variables.tfleng, + "(len_tf_coil)", + tfcoil_variables.len_tf_coil, "OP ", ) po.ovarre( @@ -4640,8 +4642,8 @@ def outtf(self, peaktfflag): po.ovarre( self.outfile, "Mean coil circumference (including inboard leg length) (m)", - "(tfleng)", - tfcoil_variables.tfleng, + "(len_tf_coil)", + tfcoil_variables.len_tf_coil, "OP ", ) diff --git a/process/stellarator.py b/process/stellarator.py index 0fbce7cc1e..b21e48366b 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -1045,9 +1045,9 @@ 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.tfleng * tfcoil_variables.tfareain + 0.25 * tfcoil_variables.len_tf_coil * tfcoil_variables.tfareain + 0.75 - * tfcoil_variables.tfleng + * tfcoil_variables.len_tf_coil * tfcoil_variables.arealeg * tfcoil_variables.n_tf_coils ) @@ -2728,7 +2728,7 @@ def stcoil(self, output: bool): tfcoil_variables.n_tf_coils * tfcoil_variables.tftort * 0.5e0 - * tfcoil_variables.tfleng + * tfcoil_variables.len_tf_coil ) # [m^2] Total surface area of coil side facing plasma: outboard region tfcoil_variables.tfsao = ( @@ -2801,7 +2801,7 @@ def stcoil(self, output: bool): tfborev = 2.0e0 * build_variables.hmax # [m] estimated vertical coil dr_bore - tfcoil_variables.tfleng = ( + tfcoil_variables.len_tf_coil = ( stellarator_configuration.stella_config_coillength * (r_coil_minor / stellarator_configuration.stella_config_coil_rminor) / tfcoil_variables.n_tf_coils @@ -2830,47 +2830,51 @@ def stcoil(self, output: bool): # # [kg] Mass of case # (no need for correction factors as is the case for tokamaks) - # This is only correct if the winding pack is 'thin' (tfleng>>sqrt(tfcoil_variables.acasetf)). + # This is only correct if the winding pack is 'thin' (len_tf_coil>>sqrt(tfcoil_variables.acasetf)). tfcoil_variables.whtcas = ( - tfcoil_variables.tfleng * tfcoil_variables.acasetf * tfcoil_variables.dcase + tfcoil_variables.len_tf_coil + * tfcoil_variables.acasetf + * tfcoil_variables.dcase ) # Mass of ground-wall insulation [kg] # (assumed to be same density/material as conduit insulation) tfcoil_variables.whtgw = ( - tfcoil_variables.tfleng * (awpc - awptf) * tfcoil_variables.dcondins + tfcoil_variables.len_tf_coil * (awpc - awptf) * tfcoil_variables.dcondins ) # [kg] mass of Superconductor tfcoil_variables.whtconsc = ( - tfcoil_variables.tfleng + tfcoil_variables.len_tf_coil * tfcoil_variables.n_tf_turn * tfcoil_variables.acstf * (1.0e0 - tfcoil_variables.vftf) * (1.0e0 - tfcoil_variables.fcutfsu) - - tfcoil_variables.tfleng * tfcoil_variables.awphec + - tfcoil_variables.len_tf_coil * tfcoil_variables.awphec ) * tfcoil_variables.dcond[ tfcoil_variables.i_tf_sc_mat - 1 ] # awphec is 0 for a stellarator. but keep this term for now. # [kg] mass of Copper in conductor tfcoil_variables.whtconcu = ( - tfcoil_variables.tfleng + tfcoil_variables.len_tf_coil * tfcoil_variables.n_tf_turn * tfcoil_variables.acstf * (1.0e0 - tfcoil_variables.vftf) * tfcoil_variables.fcutfsu - - tfcoil_variables.tfleng * tfcoil_variables.awphec + - tfcoil_variables.len_tf_coil * tfcoil_variables.awphec ) * constants.dcopper # [kg] mass of Steel conduit (sheath) tfcoil_variables.whtconsh = ( - tfcoil_variables.tfleng + 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.tfleng* fwbs_variables.denstl + # 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.whtconin = ( - tfcoil_variables.tfleng * tfcoil_variables.aiwp * tfcoil_variables.dcondins + tfcoil_variables.len_tf_coil + * tfcoil_variables.aiwp + * tfcoil_variables.dcondins ) # [kg] Total conductor mass tfcoil_variables.whtcon = ( @@ -3027,7 +3031,7 @@ def stcoil(self, output: bool): / stellarator_configuration.stella_config_wp_bmax * stellarator_configuration.stella_config_coillength / tfcoil_variables.n_tf_coils - / tfcoil_variables.tfleng + / tfcoil_variables.len_tf_coil ) centering_force_min_mn = ( stellarator_configuration.stella_config_centering_force_min_mn @@ -3037,7 +3041,7 @@ def stcoil(self, output: bool): / stellarator_configuration.stella_config_wp_bmax * stellarator_configuration.stella_config_coillength / tfcoil_variables.n_tf_coils - / tfcoil_variables.tfleng + / tfcoil_variables.len_tf_coil ) centering_force_avg_mn = ( stellarator_configuration.stella_config_centering_force_avg_mn @@ -3047,7 +3051,7 @@ def stcoil(self, output: bool): / stellarator_configuration.stella_config_wp_bmax * stellarator_configuration.stella_config_coillength / tfcoil_variables.n_tf_coils - / tfcoil_variables.tfleng + / tfcoil_variables.len_tf_coil ) # #################################### @@ -3650,8 +3654,8 @@ def stcoil_output( po.ovarre( self.outfile, "Mean coil circumference (m)", - "(tfleng)", - tfcoil_variables.tfleng, + "(len_tf_coil)", + tfcoil_variables.len_tf_coil, ) po.ovarre( self.outfile, diff --git a/source/fortran/tfcoil_variables.f90 b/source/fortran/tfcoil_variables.f90 index c70a8c1992..a0e31a4749 100644 --- a/source/fortran/tfcoil_variables.f90 +++ b/source/fortran/tfcoil_variables.f90 @@ -576,7 +576,7 @@ module tfcoil_variables real(dp) :: pres_joints !! Calculated TF joints resistive power losses [W] - real(dp) :: tfleng + real(dp) :: len_tf_coil !! TF coil circumference (m) real(dp) :: eff_tf_cryo @@ -977,7 +977,7 @@ subroutine init_tfcoil_variables n_tf_joints = 4 th_joint_contact = 0.03D0 pres_joints = 0.0D0 - tfleng = 0.0D0 + len_tf_coil = 0.0D0 eff_tf_cryo = -1.0D0 n_tf_coils = 16.0D0 tfocrn = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index d67b6279de..dd51b1c0bc 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -672,7 +672,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 9.1597E-01 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 4.7937E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7937E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_0_R_(m)_______________________________________________ (xarc(1))_____________________ 3.6253E+00 TF_coil_arc_point_0_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.5506E+00 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 7b0dc6c278..e5ea02a7b1 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -673,7 +673,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 9.1597E-01 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 4.7937E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7937E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_0_R_(m)_______________________________________________ (xarc(1))_____________________ 3.6253E+00 TF_coil_arc_point_0_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.5506E+00 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 0bff8b4c6d..615c76af47 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -673,7 +673,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 9.1597E-01 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 4.7937E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7937E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_0_R_(m)_______________________________________________ (xarc(1))_____________________ 3.6253E+00 TF_coil_arc_point_0_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.5506E+00 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index f75fc5128a..ff5ea8a8c9 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -673,7 +673,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 9.1597E-01 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 4.7937E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7937E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_0_R_(m)_______________________________________________ (xarc(1))_____________________ 3.6253E+00 TF_coil_arc_point_0_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.5506E+00 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index fd69195216..3c35abe1a7 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -676,7 +676,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 9.2950E-01 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 4.7969E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7969E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_0_R_(m)_______________________________________________ (xarc(1))_____________________ 3.6253E+00 TF_coil_arc_point_0_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.5506E+00 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 5d0ca1e5b9..09e027a952 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -674,7 +674,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 8.7479E-01 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 4.7838E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7838E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_0_R_(m)_______________________________________________ (xarc(1))_____________________ 3.6253E+00 TF_coil_arc_point_0_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.5506E+00 @@ -1837,7 +1837,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 8.5817E-01 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 4.7798E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7798E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_0_R_(m)_______________________________________________ (xarc(1))_____________________ 3.6253E+00 TF_coil_arc_point_0_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.5506E+00 @@ -3000,7 +3000,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 8.4468E-01 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 4.7766E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7766E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_0_R_(m)_______________________________________________ (xarc(1))_____________________ 3.6253E+00 TF_coil_arc_point_0_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.5506E+00 @@ -4163,7 +4163,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 8.4602E-01 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 4.7769E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7769E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_0_R_(m)_______________________________________________ (xarc(1))_____________________ 3.6253E+00 TF_coil_arc_point_0_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.5506E+00 @@ -5326,7 +5326,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 8.5817E-01 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 4.7798E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7798E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_0_R_(m)_______________________________________________ (xarc(1))_____________________ 3.6253E+00 TF_coil_arc_point_0_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.5506E+00 @@ -6489,7 +6489,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 8.7538E-01 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 4.7840E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7840E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_0_R_(m)_______________________________________________ (xarc(1))_____________________ 3.6253E+00 TF_coil_arc_point_0_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.5506E+00 @@ -7652,7 +7652,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 8.7704E-01 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 4.7844E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7844E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_0_R_(m)_______________________________________________ (xarc(1))_____________________ 3.6253E+00 TF_coil_arc_point_0_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.5506E+00 @@ -8815,7 +8815,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 8.6229E-01 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 4.7808E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7808E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_0_R_(m)_______________________________________________ (xarc(1))_____________________ 3.6253E+00 TF_coil_arc_point_0_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.5506E+00 @@ -9978,7 +9978,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 8.4832E-01 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 4.7775E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7775E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_0_R_(m)_______________________________________________ (xarc(1))_____________________ 3.6253E+00 TF_coil_arc_point_0_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.5506E+00 @@ -11141,7 +11141,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 8.4911E-01 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 4.7777E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7777E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_0_R_(m)_______________________________________________ (xarc(1))_____________________ 3.6253E+00 TF_coil_arc_point_0_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.5506E+00 @@ -12304,7 +12304,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 8.6318E-01 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 4.7810E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7810E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_0_R_(m)_______________________________________________ (xarc(1))_____________________ 3.6253E+00 TF_coil_arc_point_0_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.5506E+00 @@ -13467,7 +13467,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 8.7762E-01 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 4.7845E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7845E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_0_R_(m)_______________________________________________ (xarc(1))_____________________ 3.6253E+00 TF_coil_arc_point_0_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.5506E+00 @@ -14630,7 +14630,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 8.7862E-01 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 4.7847E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7847E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_0_R_(m)_______________________________________________ (xarc(1))_____________________ 3.6253E+00 TF_coil_arc_point_0_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.5506E+00 @@ -15793,7 +15793,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 8.6375E-01 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 4.7812E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7812E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_0_R_(m)_______________________________________________ (xarc(1))_____________________ 3.6253E+00 TF_coil_arc_point_0_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.5506E+00 @@ -16956,7 +16956,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 8.4888E-01 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 4.7776E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7776E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_0_R_(m)_______________________________________________ (xarc(1))_____________________ 3.6253E+00 TF_coil_arc_point_0_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.5506E+00 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index d477074459..f99c4b0b12 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -520,7 +520,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 1.4000E+00 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.7477E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 9.2447E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 5.1957E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 5.1957E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_1_R_(m)_______________________________________________ (xarc(1))_____________________ 4.4793E+00 TF_coil_arc_point_1_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.6366E+00 @@ -1515,7 +1515,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 1.4000E+00 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.7477E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 9.2447E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 5.1957E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 5.1957E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_1_R_(m)_______________________________________________ (xarc(1))_____________________ 4.4793E+00 TF_coil_arc_point_1_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.6366E+00 @@ -2510,7 +2510,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 1.4000E+00 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.7477E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 9.2447E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 5.1957E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 5.1957E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_1_R_(m)_______________________________________________ (xarc(1))_____________________ 4.4793E+00 TF_coil_arc_point_1_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.6366E+00 @@ -3505,7 +3505,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 1.4000E+00 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.7477E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 9.2447E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 5.1957E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 5.1957E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_1_R_(m)_______________________________________________ (xarc(1))_____________________ 4.4793E+00 TF_coil_arc_point_1_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.6366E+00 @@ -4500,7 +4500,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 1.4000E+00 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.7477E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 9.2447E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 5.1957E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 5.1957E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_1_R_(m)_______________________________________________ (xarc(1))_____________________ 4.4793E+00 TF_coil_arc_point_1_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.6366E+00 @@ -5495,7 +5495,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 1.4000E+00 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.7477E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 9.2447E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 5.1957E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 5.1957E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_1_R_(m)_______________________________________________ (xarc(1))_____________________ 4.4793E+00 TF_coil_arc_point_1_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.6366E+00 @@ -6490,7 +6490,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 1.4000E+00 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.7477E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 9.2447E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 5.1957E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 5.1957E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_1_R_(m)_______________________________________________ (xarc(1))_____________________ 4.4793E+00 TF_coil_arc_point_1_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.6366E+00 @@ -7485,7 +7485,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 1.4000E+00 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.7477E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 9.2447E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 5.1957E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 5.1957E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_1_R_(m)_______________________________________________ (xarc(1))_____________________ 4.4793E+00 TF_coil_arc_point_1_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.6366E+00 @@ -8480,7 +8480,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 1.4000E+00 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.7477E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 9.2447E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 5.1957E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 5.1957E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_1_R_(m)_______________________________________________ (xarc(1))_____________________ 4.4793E+00 TF_coil_arc_point_1_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.6366E+00 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 145b1d6f25..55f4cee561 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -7549,7 +7549,7 @@ "tfjtsmw": 0.0, "tflegmw": 0.0, "res_tf_leg": 0.0, - "tfleng": 0.0, + "len_tf_coil": 0.0, "tfocrn": 0.0, "tfoffset": 0.0, "tfootfi": 1.19, @@ -10795,7 +10795,7 @@ "tfjtsmw": "TF joints resistive power losses (MW)", "tflegmw": "TF coil outboard leg resistive power (MW)", "res_tf_leg": "TF coil leg resistance (ohm)", - "tfleng": "TF coil circumference (m)", + "len_tf_coil": "TF coil circumference (m)", "tfocrn": "TF coil half-width - outer dr_bore (m)", "tfoffset": "vertical distance between centre of TF coils and centre of plasma (m)", "tfootfi": "TF coil outboard leg / inboard leg radial thickness\n ratio (`i_tf_sup=0` only) (`iteration variable 75`)", @@ -19649,7 +19649,7 @@ "n_tf_joints", "th_joint_contact", "pres_joints", - "tfleng", + "len_tf_coil", "eff_tf_cryo", "n_tf_coils", "tfocrn", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index a5c6dab764..a0083b5dee 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -676,7 +676,7 @@ Total_outboard_leg_radial_thickness_(m)_________________________________ (dr_tf_outboard)______________________ 9.2950E-01 Outboard_leg_toroidal_thickness_(m)_____________________________________ (tftort)______________________ 1.4145E+00 OP Maximum_inboard_edge_height_(m)_________________________________________ (hmax)________________________ 8.8182E+00 OP - Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (tfleng)______________________ 4.7969E+01 OP + Mean_coil_circumference_(including_inboard_leg_length)_(m)______________ (len_tf_coil)______________________ 4.7969E+01 OP Vertical_TF_shape_______________________________________________________ (i_tf_shape)__________________ 1 TF_coil_arc_point_0_R_(m)_______________________________________________ (xarc(1))_____________________ 3.6253E+00 TF_coil_arc_point_0_Z_(m)_______________________________________________ (yarc(1))_____________________ 4.5506E+00 diff --git a/tests/unit/test_costs_1990.py b/tests/unit/test_costs_1990.py index 6a3f66fc3f..e3a553eac1 100644 --- a/tests/unit/test_costs_1990.py +++ b/tests/unit/test_costs_1990.py @@ -1756,7 +1756,7 @@ class Acc2221Param(NamedTuple): n_tf_turn: Any = None - tfleng: Any = None + len_tf_coil: Any = None i_tf_sc_mat: Any = None @@ -1811,7 +1811,7 @@ class Acc2221Param(NamedTuple): supercond_cost_model=0, j_crit_str_tf=300.0, n_tf_turn=200, - tfleng=50.483843027201402, + len_tf_coil=50.483843027201402, i_tf_sc_mat=5, c22=0, c2221=0, @@ -1852,7 +1852,7 @@ class Acc2221Param(NamedTuple): supercond_cost_model=0, j_crit_str_tf=300.0, n_tf_turn=200, - tfleng=50.514015976170839, + len_tf_coil=50.514015976170839, i_tf_sc_mat=5, c22=3474.7391916096453, c2221=1122.5144544988982, @@ -1893,7 +1893,7 @@ class Acc2221Param(NamedTuple): supercond_cost_model=1, j_crit_str_tf=300.0, n_tf_turn=200, - tfleng=50.514015976170839, + len_tf_coil=50.514015976170839, i_tf_sc_mat=5, c22=3474.7391916096453, c2221=1122.5144544988982, @@ -1972,7 +1972,7 @@ def test_acc2221(acc2221param, monkeypatch, costs): monkeypatch.setattr(tfcoil_variables, "n_tf_turn", acc2221param.n_tf_turn) - monkeypatch.setattr(tfcoil_variables, "tfleng", acc2221param.tfleng) + monkeypatch.setattr(tfcoil_variables, "len_tf_coil", acc2221param.len_tf_coil) monkeypatch.setattr(tfcoil_variables, "i_tf_sc_mat", acc2221param.i_tf_sc_mat) diff --git a/tests/unit/test_costs_2015.py b/tests/unit/test_costs_2015.py index 15a3701f16..f0e1849c36 100644 --- a/tests/unit/test_costs_2015.py +++ b/tests/unit/test_costs_2015.py @@ -4649,7 +4649,7 @@ def test_calc_land_costs(calclandcostsparam, monkeypatch, costs2015): class CalcTfCoilCostsParam(NamedTuple): n_tf_coils: Any = None - tfleng: Any = None + len_tf_coil: Any = None n_tf_turn: Any = None @@ -4687,7 +4687,7 @@ class CalcTfCoilCostsParam(NamedTuple): ( CalcTfCoilCostsParam( n_tf_coils=18, - tfleng=46.64605032553105, + len_tf_coil=46.64605032553105, n_tf_turn=200.13346153846152, whtconcu=31746.02769109578, whtconsc=10284.64237165747, @@ -5776,7 +5776,7 @@ class CalcTfCoilCostsParam(NamedTuple): ), CalcTfCoilCostsParam( n_tf_coils=18, - tfleng=46.6270502920285, + len_tf_coil=46.6270502920285, n_tf_turn=200.13346153846155, whtconcu=24895.07929687943, whtconsc=7945.1211509981658, @@ -6880,7 +6880,9 @@ def test_calc_tf_coil_costs(calctfcoilcostsparam, monkeypatch, costs2015): monkeypatch.setattr(tfcoil_variables, "n_tf_coils", calctfcoilcostsparam.n_tf_coils) - monkeypatch.setattr(tfcoil_variables, "tfleng", calctfcoilcostsparam.tfleng) + monkeypatch.setattr( + tfcoil_variables, "len_tf_coil", calctfcoilcostsparam.len_tf_coil + ) monkeypatch.setattr(tfcoil_variables, "n_tf_turn", calctfcoilcostsparam.n_tf_turn) diff --git a/tests/unit/test_sctfcoil.py b/tests/unit/test_sctfcoil.py index 1fd3b2ed37..85196d25ae 100644 --- a/tests/unit/test_sctfcoil.py +++ b/tests/unit/test_sctfcoil.py @@ -905,7 +905,7 @@ class TfResHeatingParam(NamedTuple): n_tf_turn: Any = None thkcas: Any = None tftort: Any = None - tfleng: Any = None + len_tf_coil: Any = None res_tf_leg: Any = None tcpav: Any = None arealeg: Any = None @@ -1123,7 +1123,7 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): n_tf_turn=1, thkcas=0, tftort=0.45367650933034859, - tfleng=15.582502857142856, + len_tf_coil=15.582502857142856, res_tf_leg=0, tcpav=347.13, arealeg=0.070242733939617885, @@ -1173,7 +1173,7 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): n_tf_turn=1, thkcas=0, tftort=0.44435902370665786, - tfleng=15.654502857142857, + len_tf_coil=15.654502857142857, res_tf_leg=5.647653956699231e-06, tcpav=347.13, arealeg=0.068800107640501845, @@ -1248,7 +1248,7 @@ def test_tf_res_heating(tfresheatingparam, monkeypatch, sctfcoil): monkeypatch.setattr(tfcoil_variables, "tftort", tfresheatingparam.tftort) - monkeypatch.setattr(tfcoil_variables, "tfleng", tfresheatingparam.tfleng) + monkeypatch.setattr(tfcoil_variables, "len_tf_coil", tfresheatingparam.len_tf_coil) monkeypatch.setattr(tfcoil_variables, "res_tf_leg", tfresheatingparam.res_tf_leg) @@ -1893,7 +1893,7 @@ class TfCoilAreaAndMassesParam(NamedTuple): dcondins: Any = None - tfleng: Any = None + len_tf_coil: Any = None dcase: Any = None @@ -2011,7 +2011,7 @@ class TfCoilAreaAndMassesParam(NamedTuple): order="F", ).transpose(), dcondins=1800, - tfleng=50.483843027201402, + len_tf_coil=50.483843027201402, dcase=8000, acndttf=0.0014685061538103825, n_tf_turn=200, @@ -2083,7 +2083,7 @@ class TfCoilAreaAndMassesParam(NamedTuple): order="F", ).transpose(), dcondins=1800, - tfleng=50.514015976170839, + len_tf_coil=50.514015976170839, dcase=8000, acndttf=0.0014685061538103825, n_tf_turn=200, @@ -2202,7 +2202,9 @@ def test_tf_coil_area_and_masses(tfcoilareaandmassesparam, monkeypatch, sctfcoil monkeypatch.setattr(tfcoil_variables, "dcondins", tfcoilareaandmassesparam.dcondins) - monkeypatch.setattr(tfcoil_variables, "tfleng", tfcoilareaandmassesparam.tfleng) + monkeypatch.setattr( + tfcoil_variables, "len_tf_coil", tfcoilareaandmassesparam.len_tf_coil + ) monkeypatch.setattr(tfcoil_variables, "dcase", tfcoilareaandmassesparam.dcase) @@ -14106,7 +14108,7 @@ def test_vv_stress_on_quench_integration(sctfcoil, monkeypatch): monkeypatch.setattr(build_variables, "dr_vv_inboard", 0.06) # Section 3 monkeypatch.setattr(build_variables, "d_vv_top", 0.06) # Section 3 - monkeypatch.setattr(tfcoil_variables, "tfleng", 51.1) # Table 2 + monkeypatch.setattr(tfcoil_variables, "len_tf_coil", 51.1) # Table 2 monkeypatch.setattr( tfcoil_variables, "tfa", [3.41, 7.77, 7.77, 3.41] ) # chosen to achieve Rm_coil in Table 2 From 13c943e88cf3d2b3de61a740830be9bdc118951c Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 13 Jan 2025 17:21:57 +0000 Subject: [PATCH 18/29] =?UTF-8?q?=F0=9F=94=84=20Rename=20'rhotfleg'=20to?= =?UTF-8?q?=20'rho=5Ftf=5Fleg'=20for=20consistency=20across=20the=20codeba?= =?UTF-8?q?se?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/sctfcoil.py | 10 +++++----- source/fortran/input.f90 | 2 +- source/fortran/tfcoil_variables.f90 | 4 ++-- tests/integration/ref_dicts.json | 6 +++--- tests/unit/test_sctfcoil.py | 18 +++++++++--------- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/process/sctfcoil.py b/process/sctfcoil.py index 21b4ad4d47..428284fc07 100644 --- a/process/sctfcoil.py +++ b/process/sctfcoil.py @@ -1823,13 +1823,13 @@ def tf_res_heating(self): # Leg resistivity (different leg temperature as separate cooling channels) if tfcoil_variables.i_tf_sup == 0: - tfcoil_variables.rhotfleg = ( + tfcoil_variables.rho_tf_leg = ( tfcoil_variables.frholeg * (1.72e0 + 0.0039e0 * (tfcoil_variables.tlegav - 273.15e0)) * 1.0e-8 ) elif tfcoil_variables.i_tf_sup == 2: - tfcoil_variables.rhotfleg = tfcoil_variables.frholeg * ( + tfcoil_variables.rho_tf_leg = tfcoil_variables.frholeg * ( 2.00016e-14 * tfcoil_variables.tlegav**3 - 6.75384e-13 * tfcoil_variables.tlegav**2 + 8.89159e-12 * tfcoil_variables.tlegav @@ -1894,7 +1894,7 @@ def tf_res_heating(self): # --- # TF outboard leg's resistance calculation (per leg) [ohm] tfcoil_variables.res_tf_leg = ( - tfcoil_variables.rhotfleg + tfcoil_variables.rho_tf_leg * tfcoil_variables.len_tf_coil / sctfcoil_module.a_leg_cond ) @@ -5368,8 +5368,8 @@ def outtf(self, peaktfflag): po.ovarre( self.outfile, "Leg resistivity (ohm.m)", - "(rhotfleg)", - tfcoil_variables.rhotfleg, + "(rho_tf_leg)", + tfcoil_variables.rho_tf_leg, ) po.ovarre( self.outfile, diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 6b824a343b..fbf27c89a4 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -326,7 +326,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) f_w, bmn, shear, m_res, f_rad, flpitch, istell, max_gyrotron_frequency, & te0_ecrh_achievable use tfcoil_variables, only: fcoolcp, tfinsgap, vftf, & - fhts, dr_tf_wp, rcool, rhotfleg, thkcas, & + fhts, dr_tf_wp, rcool, rho_tf_leg, thkcas, & casthi, n_pancake, bcritsc, i_tf_sup, str_pf_con_res, thwcndut, & thicndut, tftmp, oacdcp, tmax_croco, ptempalw, tmargmin_tf, tmpcry, & sig_tf_case_max, dztop, dcond, str_cs_con_res, etapump, drtop, vcool, dcondins, & diff --git a/source/fortran/tfcoil_variables.f90 b/source/fortran/tfcoil_variables.f90 index a0e31a4749..70227a6595 100644 --- a/source/fortran/tfcoil_variables.f90 +++ b/source/fortran/tfcoil_variables.f90 @@ -539,7 +539,7 @@ module tfcoil_variables !! TF coil inboard leg resistivity [Ohm-m]. If `itart=0`, this variable is the !! average resistivity over the whole magnet - real(dp) :: rhotfleg + real(dp) :: rho_tf_leg !! Resistivity of a TF coil leg (Ohm-m) real(dp) :: rho_tf_bus @@ -968,7 +968,7 @@ subroutine init_tfcoil_variables tfinsgap = 0.010D0 tflegmw = 0.0D0 rhocp = 0.0D0 - rhotfleg = 0.0D0 + rho_tf_leg = 0.0D0 rho_tf_bus = 1.86D-8 frhocp = 1.0D0 frholeg = 1.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 55f4cee561..10ef8ca7bd 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -4219,7 +4219,7 @@ "rhopedn": 1.0, "rhopedt": 1.0, "rho_tf_bus": -1.0, - "rhotfleg": 0.0, + "rho_tf_leg": 0.0, "ric": 0.0, "ricpf": 0.0, "rinboard": 0.651, @@ -10527,7 +10527,7 @@ "rhopedn": "r/a of density pedestal (`ipedestal>=1`)", "rhopedt": "r/a of temperature pedestal (`ipedestal>=1`)", "rho_tf_bus": "Resistivity of a TF coil bus (Ohm-m). Default value takes the same res as the leg one", - "rhotfleg": "Resistivity of a TF coil leg (Ohm-m)", + "rho_tf_leg": "Resistivity of a TF coil leg (Ohm-m)", "ric": "peak current in coil i (MA-turns)", "ricpf": "", "rinboard": "plasma inboard radius (m) (`consistency equation 29`)", @@ -19639,7 +19639,7 @@ "tfinsgap", "tflegmw", "rhocp", - "rhotfleg", + "rho_tf_leg", "rho_tf_bus", "frhocp", "frholeg", diff --git a/tests/unit/test_sctfcoil.py b/tests/unit/test_sctfcoil.py index 85196d25ae..8b50abf006 100644 --- a/tests/unit/test_sctfcoil.py +++ b/tests/unit/test_sctfcoil.py @@ -900,7 +900,7 @@ class TfResHeatingParam(NamedTuple): tlegav: Any = None thicndut: Any = None th_joint_contact: Any = None - rhotfleg: Any = None + rho_tf_leg: Any = None vol_cond_cp: Any = None n_tf_turn: Any = None thkcas: Any = None @@ -936,7 +936,7 @@ class TfResHeatingParam(NamedTuple): h_cp_top: Any = None is_leg_cp_temp_same: Any = None expected_rhocp: Any = None - expected_rhotfleg: Any = None + expected_rho_tf_leg: Any = None expected_vol_cond_cp: Any = None expected_res_tf_leg: Any = None expected_p_tf_leg_resistive: Any = None @@ -1118,7 +1118,7 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): tlegav=-1, thicndut=0.00080000000000000004, th_joint_contact=0.029999999999999999, - rhotfleg=0, + rho_tf_leg=0, vol_cond_cp=0, n_tf_turn=1, thkcas=0, @@ -1154,7 +1154,7 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): h_cp_top=2.6714285714285717, is_leg_cp_temp_same=0, expected_rhocp=2.008522e-08, - expected_rhotfleg=2.008522e-08, + expected_rho_tf_leg=2.008522e-08, expected_vol_cond_cp=12.020160732580297, expected_res_tf_leg=5.647653956699231e-06, expected_p_tf_leg_resistive=306032248.77863955, @@ -1168,7 +1168,7 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): tlegav=-1, thicndut=0.00080000000000000004, th_joint_contact=0.029999999999999999, - rhotfleg=2.008522e-08, + rho_tf_leg=2.008522e-08, vol_cond_cp=12.020160732580297, n_tf_turn=1, thkcas=0, @@ -1204,7 +1204,7 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): h_cp_top=2.6714285714285717, is_leg_cp_temp_same=1, expected_rhocp=2.008522e-08, - expected_rhotfleg=2.008522e-08, + expected_rho_tf_leg=2.008522e-08, expected_vol_cond_cp=11.545770024935592, expected_res_tf_leg=5.79314853092539e-06, expected_p_tf_leg_resistive=313916236.01951957, @@ -1238,7 +1238,7 @@ def test_tf_res_heating(tfresheatingparam, monkeypatch, sctfcoil): tfcoil_variables, "th_joint_contact", tfresheatingparam.th_joint_contact ) - monkeypatch.setattr(tfcoil_variables, "rhotfleg", tfresheatingparam.rhotfleg) + monkeypatch.setattr(tfcoil_variables, "rho_tf_leg", tfresheatingparam.rho_tf_leg) monkeypatch.setattr(tfcoil_variables, "vol_cond_cp", tfresheatingparam.vol_cond_cp) @@ -1330,8 +1330,8 @@ def test_tf_res_heating(tfresheatingparam, monkeypatch, sctfcoil): assert tfcoil_variables.rhocp == pytest.approx(tfresheatingparam.expected_rhocp) - assert tfcoil_variables.rhotfleg == pytest.approx( - tfresheatingparam.expected_rhotfleg + assert tfcoil_variables.rho_tf_leg == pytest.approx( + tfresheatingparam.expected_rho_tf_leg ) assert tfcoil_variables.vol_cond_cp == pytest.approx( From 75780e9a0745efa3a810f96bd9efcbda548adca0 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 13 Jan 2025 17:24:58 +0000 Subject: [PATCH 19/29] =?UTF-8?q?=F0=9F=94=84=20Rename=20'fcoolleg'=20to?= =?UTF-8?q?=20'f=5Fa=5Ftf=5Fcool=5Foutboard'=20for=20consistency=20across?= =?UTF-8?q?=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/sctfcoil.py | 2 +- source/fortran/input.f90 | 6 +++--- source/fortran/tfcoil_variables.f90 | 4 ++-- tests/integration/ref_dicts.json | 10 +++++----- tests/regression/input_files/st_regression.IN.DAT | 2 +- tests/unit/test_sctfcoil.py | 10 ++++++---- 6 files changed, 18 insertions(+), 16 deletions(-) diff --git a/process/sctfcoil.py b/process/sctfcoil.py index 428284fc07..45984d4636 100644 --- a/process/sctfcoil.py +++ b/process/sctfcoil.py @@ -1882,7 +1882,7 @@ def tf_res_heating(self): ) # toroidal direction + radial direction # Exact TF outboard leg conductor area per coil [m2] - sctfcoil_module.a_leg_cond = (1.0e0 - tfcoil_variables.fcoolleg) * ( + sctfcoil_module.a_leg_cond = (1.0e0 - tfcoil_variables.f_a_tf_cool_outboard) * ( tfcoil_variables.arealeg - sctfcoil_module.a_leg_gr_ins - sctfcoil_module.a_leg_ins diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index fbf27c89a4..47b5c288cc 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -336,7 +336,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) tcritsc, layer_ins, tinstf, n_layer, tcoolin, ripmax, frhocp, & cpttf, tmargmin, casths_fraction, eff_tf_cryo, eyoung_ins, & eyoung_steel, eyoung_res_tf_buck, eyoung_cond_axial, f_vforce_inboard, & - fcoolleg, frholeg, ftoroidalgap, i_tf_sc_mat, i_tf_shape, i_tf_bucking, & + f_a_tf_cool_outboard, frholeg, ftoroidalgap, i_tf_sc_mat, i_tf_shape, i_tf_bucking, & n_tf_graded_layers, n_tf_joints, n_tf_joints_contact, poisson_al, & poisson_copper, poisson_steel, rho_tf_joints, rho_tf_bus, th_joint_contact,& i_tf_stress_model, eyoung_al, i_tf_wp_geom, i_tf_case_geom, & @@ -1581,8 +1581,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('fcoolcp') call parse_real_variable('fcoolcp', fcoolcp, 0.0D0, 1.0D0, & 'Coolant fraction of TF centrepost (itart=1) or the whole magnet (itart=0)') - case ('fcoolleg') - call parse_real_variable('fcoolleg', fcoolleg, 0.0D0, 1.0D0, & + case ('f_a_tf_cool_outboard') + call parse_real_variable('f_a_tf_cool_outboard', f_a_tf_cool_outboard, 0.0D0, 1.0D0, & 'Coolant fraction of TF outboard leg (itart=1 only)') case ('fcutfsu') call parse_real_variable('fcutfsu', fcutfsu, 0.0D0, 1.0D0, & diff --git a/source/fortran/tfcoil_variables.f90 b/source/fortran/tfcoil_variables.f90 index 70227a6595..bd878a7e37 100644 --- a/source/fortran/tfcoil_variables.f90 +++ b/source/fortran/tfcoil_variables.f90 @@ -763,7 +763,7 @@ module tfcoil_variables real(dp) :: fcoolcp !! coolant fraction of TF coil inboard legs (`iteration variable 23`) - real(dp) :: fcoolleg + real(dp) :: f_a_tf_cool_outboard !! coolant fraction of TF coil outboard legs real(dp) :: a_cp_cool @@ -1032,7 +1032,7 @@ subroutine init_tfcoil_variables dztop = 0.0D0 etapump = 0.8D0 fcoolcp = 0.3D0 - fcoolleg = 0.2D0 + f_a_tf_cool_outboard = 0.2D0 a_cp_cool = 0.0D0 ncool = 0.0D0 ppump = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 10ef8ca7bd..cd712fc28e 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1898,7 +1898,7 @@ "fcohbop": 0.9, "fcontng": 0.195, "fcoolcp": 0.3, - "fcoolleg": 0.2, + "f_a_tf_cool_outboard": 0.2, "fcpttf": 1.0, "fcqt": 1.0, "fcr0": 0.0966, @@ -9515,7 +9515,7 @@ "fcohbop": "ratio of central solenoid overall current density at beginning of pulse / end of flat-top\n (`iteration variable 41`)", "fcontng": "project contingency factor", "fcoolcp": "coolant fraction of TF coil inboard legs (`iteration variable 23`)", - "fcoolleg": "coolant fraction of TF coil outboard legs", + "f_a_tf_cool_outboard": "coolant fraction of TF coil outboard legs", "fcpttf": "f-value for TF coil current per turn upper limit\n (`constraint equation 77`, `iteration variable 146`)", "fcqt": "TF coil quench temparature remains below tmax_croco\n (`constraint equation 74`, `iteration variable 141`)", "fcr0": "fixed charge rate during construction", @@ -12583,7 +12583,7 @@ "lb": 0.0, "ub": 1.0 }, - "fcoolleg": { + "f_a_tf_cool_outboard": { "lb": 0.0, "ub": 1.0 }, @@ -19704,7 +19704,7 @@ "dztop", "etapump", "fcoolcp", - "fcoolleg", + "f_a_tf_cool_outboard", "a_cp_cool", "ncool", "ppump", @@ -20261,7 +20261,7 @@ "fcohbop": "real_variable", "fcontng": "real_variable", "fcoolcp": "real_variable", - "fcoolleg": "real_variable", + "f_a_tf_cool_outboard": "real_variable", "fcqt": "real_variable", "fcr0": "real_variable", "fcspc": "real_variable", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index a2f364df63..42127e7508 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -1484,7 +1484,7 @@ tftmp = 20.0 * DESCRIPTION: Max Centrepost Coolant Flow Speed (m/s) * JUSTIFICATION: -*fcoolleg = +*f_a_tf_cool_outboard = * DESCRIPTION: Coolant fraction of TF outboard leg (itart=1 only) (default = 0.2) * JUSTIFICATION: Not set, using default diff --git a/tests/unit/test_sctfcoil.py b/tests/unit/test_sctfcoil.py index 8b50abf006..b71959e489 100644 --- a/tests/unit/test_sctfcoil.py +++ b/tests/unit/test_sctfcoil.py @@ -923,7 +923,7 @@ class TfResHeatingParam(NamedTuple): fcoolcp: Any = None casthi: Any = None a_cp_cool: Any = None - fcoolleg: Any = None + f_a_tf_cool_outboard: Any = None i_cp_joints: Any = None tinstf: Any = None dr_tf_outboard: Any = None @@ -1141,7 +1141,7 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): fcoolcp=0.12725, casthi=0.0077415000000000019, a_cp_cool=0, - fcoolleg=0.20000000000000001, + f_a_tf_cool_outboard=0.20000000000000001, i_cp_joints=1, tinstf=0, dr_tf_outboard=0.15483000000000002, @@ -1191,7 +1191,7 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): fcoolcp=0.12725, casthi=0.0077415000000000019, a_cp_cool=0.00068328705812121333, - fcoolleg=0.20000000000000001, + f_a_tf_cool_outboard=0.20000000000000001, i_cp_joints=1, tinstf=0, dr_tf_outboard=0.15483000000000002, @@ -1292,7 +1292,9 @@ def test_tf_res_heating(tfresheatingparam, monkeypatch, sctfcoil): monkeypatch.setattr(tfcoil_variables, "a_cp_cool", tfresheatingparam.a_cp_cool) - monkeypatch.setattr(tfcoil_variables, "fcoolleg", tfresheatingparam.fcoolleg) + monkeypatch.setattr( + tfcoil_variables, "f_a_tf_cool_outboard", tfresheatingparam.f_a_tf_cool_outboard + ) monkeypatch.setattr(tfcoil_variables, "i_cp_joints", tfresheatingparam.i_cp_joints) From 6fc008284a25d11f44e31c65c873e3a50438b39b Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 13 Jan 2025 17:28:16 +0000 Subject: [PATCH 20/29] =?UTF-8?q?=F0=9F=94=84=20Rename=20'tcpav'=20to=20't?= =?UTF-8?q?emp=5Fcp=5Faverage'=20for=20consistency=20across=20the=20codeba?= =?UTF-8?q?se?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/init.py | 6 ++--- process/sctfcoil.py | 18 ++++++------- process/utilities/errorlist.json | 4 +-- source/fortran/constraint_equations.f90 | 10 +++---- source/fortran/input.f90 | 6 ++--- source/fortran/iteration_variables.f90 | 12 ++++----- source/fortran/numerics.f90 | 2 +- source/fortran/tfcoil_variables.f90 | 6 ++--- tests/integration/ref_dicts.json | 26 +++++++++---------- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/test_sctfcoil.py | 10 ++++--- 11 files changed, 52 insertions(+), 50 deletions(-) diff --git a/process/init.py b/process/init.py index a809f3aa7d..a4186b48f9 100644 --- a/process/init.py +++ b/process/init.py @@ -716,7 +716,7 @@ def check_process(): fortran.numerics.ixc[: fortran.numerics.nvar] == 20 ).any() and fortran.numerics.boundu[19] < 273.15: raise ProcessValidationError( - "Too low CP conductor temperature (tcpav). Lower limit for copper > 273.15 K" + "Too low CP conductor temperature (temp_cp_average). Lower limit for copper > 273.15 K" ) # Call a lvl 3 error if superconductor magnets are used @@ -747,11 +747,11 @@ def check_process(): fortran.numerics.ixc[: fortran.numerics.nvar] == 20 ).any() and fortran.numerics.boundu[19] > 50.0: raise ProcessValidationError( - "Too large CP conductor temperature (tcpav). Upper limit for cryo-al < 50 K" + "Too large CP conductor temperature (temp_cp_average). Upper limit for cryo-al < 50 K" ) # Otherwise intitialise the average conductor temperature at - fortran.tfcoil_variables.tcpav = fortran.tfcoil_variables.tcoolin + fortran.tfcoil_variables.temp_cp_average = fortran.tfcoil_variables.tcoolin # Check if the boostrap current selection is addapted to ST if fortran.physics_variables.i_bootstrap_current == 1: diff --git a/process/sctfcoil.py b/process/sctfcoil.py index 45984d4636..f6b65fe65b 100644 --- a/process/sctfcoil.py +++ b/process/sctfcoil.py @@ -1799,16 +1799,16 @@ def tf_res_heating(self): if tfcoil_variables.i_tf_sup == 0: tfcoil_variables.rhocp = ( tfcoil_variables.frhocp - * (1.72e0 + 0.0039e0 * (tfcoil_variables.tcpav - 273.15e0)) + * (1.72e0 + 0.0039e0 * (tfcoil_variables.temp_cp_average - 273.15e0)) * 1.0e-8 ) # Aluminium if tfcoil_variables.i_tf_sup == 2: tfcoil_variables.rhocp = tfcoil_variables.frhocp * ( - 2.00016e-14 * tfcoil_variables.tcpav**3 - - 6.75384e-13 * tfcoil_variables.tcpav**2 - + 8.89159e-12 * tfcoil_variables.tcpav + 2.00016e-14 * tfcoil_variables.temp_cp_average**3 + - 6.75384e-13 * tfcoil_variables.temp_cp_average**2 + + 8.89159e-12 * tfcoil_variables.temp_cp_average ) # Calculations dedicated for configurations with CP @@ -1819,7 +1819,7 @@ def tf_res_heating(self): < np.finfo(float(tfcoil_variables.tlegav)).eps ): sctfcoil_module.is_leg_cp_temp_same = 1 - tfcoil_variables.tlegav = tfcoil_variables.tcpav + tfcoil_variables.tlegav = tfcoil_variables.temp_cp_average # Leg resistivity (different leg temperature as separate cooling channels) if tfcoil_variables.i_tf_sup == 0: @@ -5398,8 +5398,8 @@ def outtf(self, peaktfflag): po.ovarre( self.outfile, "Average CP temperature (K)", - "(tcpav)", - tfcoil_variables.tcpav, + "(temp_cp_average)", + tfcoil_variables.temp_cp_average, ) po.ovarre( self.outfile, @@ -5424,8 +5424,8 @@ def outtf(self, peaktfflag): po.ovarre( self.outfile, "Average coil temperature (K)", - "(tcpav)", - tfcoil_variables.tcpav, + "(temp_cp_average)", + tfcoil_variables.temp_cp_average, ) # Ripple calculations diff --git a/process/utilities/errorlist.json b/process/utilities/errorlist.json index a80428b097..6bfa1fa5a6 100644 --- a/process/utilities/errorlist.json +++ b/process/utilities/errorlist.json @@ -1208,12 +1208,12 @@ { "no": 240, "level": 3, - "message": "CHECK: Too large CP conductor temperature (tcpav). Upper limit for cryo-al < 50 K" + "message": "CHECK: Too large CP conductor temperature (temp_cp_average). Upper limit for cryo-al < 50 K" }, { "no": 241, "level": 3, - "message": "CHECK: Too low CP conductor temperature (tcpav). Lower limit for copper > 273.15 K" + "message": "CHECK: Too low CP conductor temperature (temp_cp_average). Lower limit for copper > 273.15 K" }, { "no": 242, diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index 8648972365..b9f43c0bae 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -1882,12 +1882,12 @@ subroutine constraint_eqn_043(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! #=#=# consistency !! and hence also optional here. !! Logic change during pre-factoring: err, symbol, units will be assigned only if present. - !! tcpav : input real : average temp of TF coil inboard leg conductor (C)e + !! temp_cp_average : input real : average temp of TF coil inboard leg conductor (C)e !! tcpav2 : input real : centrepost average temperature (C) (for consistency) !! itart : input integer : switch for spherical tokamak (ST) models:
    !!
  • = 0 use conventional aspect ratio models; !!
  • = 1 use spherical tokamak models
- use tfcoil_variables, only: tcpav, tcpav2 + use tfcoil_variables, only: temp_cp_average, tcpav2 use physics_variables, only: itart use tfcoil_variables, only: i_tf_sup @@ -1903,11 +1903,11 @@ subroutine constraint_eqn_043(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) ! For some reasons these lines are needed to make VMCON CONVERGE .... if ( i_tf_sup == 0 ) then ! Copper case - tcpav = tcpav - 273.15D0 + temp_cp_average = temp_cp_average - 273.15D0 tcpav2 = tcpav2 - 273.15D0 end if - tmp_cc = 1.0D0 - tcpav/tcpav2 + tmp_cc = 1.0D0 - temp_cp_average/tcpav2 tmp_con = tcpav2 * (1.0D0 - tmp_cc) tmp_err = tcpav2 * tmp_cc tmp_symbol = '=' @@ -1915,7 +1915,7 @@ subroutine constraint_eqn_043(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) ! For some reasons these lines are needed to make VMCON CONVERGE .... if ( i_tf_sup == 0 ) then ! Copper case - tcpav = tcpav + 273.15D0 + temp_cp_average = temp_cp_average + 273.15D0 tcpav2 = tcpav2 + 273.15D0 end if diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 47b5c288cc..4f4379ed84 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -330,7 +330,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) casthi, n_pancake, bcritsc, i_tf_sup, str_pf_con_res, thwcndut, & thicndut, tftmp, oacdcp, tmax_croco, ptempalw, tmargmin_tf, tmpcry, & sig_tf_case_max, dztop, dcond, str_cs_con_res, etapump, drtop, vcool, dcondins, & - i_tf_tresca, dhecoil, tmaxpro, n_tf_coils, tcpav, fcutfsu, j_tf_bus, & + i_tf_tresca, dhecoil, tmaxpro, n_tf_coils, temp_cp_average, fcutfsu, j_tf_bus, & casthi_fraction, tmargmin_cs, vdalw, dcase, t_turn_tf,& cpttf_max, tdmptf, casths, i_tf_turns_integer, quench_model, & tcritsc, layer_ins, tinstf, n_layer, tcoolin, ripmax, frhocp, & @@ -1720,8 +1720,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('tcoolin') call parse_real_variable('tcoolin', tcoolin, 4.0D0, 373.15D0, & 'Centrepost coolant inlet temperature (K)') - case ('tcpav') - call parse_real_variable('tcpav', tcpav, 4.0D0, 573.15D0, & + case ('temp_cp_average') + call parse_real_variable('temp_cp_average', temp_cp_average, 4.0D0, 573.15D0, & 'Average centrepost coolant temperature (K)') case ('tcritsc') call parse_real_variable('tcritsc', tcritsc, 1.0D0, 300.0D0, & diff --git a/source/fortran/iteration_variables.f90 b/source/fortran/iteration_variables.f90 index 8a6ef5058e..2f4a83c06b 100755 --- a/source/fortran/iteration_variables.f90 +++ b/source/fortran/iteration_variables.f90 @@ -485,25 +485,25 @@ subroutine set_itv_19(ratio) !--------------------------------- subroutine init_itv_20 - !!
  • (20) tcpav + !!
  • (20) temp_cp_average use numerics, only: lablxc, boundl, boundu implicit none - lablxc(20) = 'tcpav ' + lablxc(20) = 'temp_cp_average ' boundl(20) = 40.00D0 boundu(20) = 3.000D2 end subroutine init_itv_20 real(kind(1.d0)) function itv_20() - use tfcoil_variables, only: tcpav + use tfcoil_variables, only: temp_cp_average implicit none - itv_20 = tcpav + itv_20 = temp_cp_average end function itv_20 subroutine set_itv_20(ratio) - use tfcoil_variables, only: tcpav + use tfcoil_variables, only: temp_cp_average implicit none real(kind(1.d0)) :: ratio - tcpav = ratio + temp_cp_average = ratio end subroutine set_itv_20 !--------------------------------- diff --git a/source/fortran/numerics.f90 b/source/fortran/numerics.f90 index ed437e58f4..745a7dd8fd 100755 --- a/source/fortran/numerics.f90 +++ b/source/fortran/numerics.f90 @@ -221,7 +221,7 @@ module numerics !!
  • (17) t_between_pulse !!
  • (18) q !!
  • (19) beam_energy - !!
  • (20) tcpav + !!
  • (20) temp_cp_average !!
  • (21) ft_burn (f-value for equation 13) !!
  • (22) NOT USED !!
  • (23) fcoolcp diff --git a/source/fortran/tfcoil_variables.f90 b/source/fortran/tfcoil_variables.f90 index bd878a7e37..dc4bc977a5 100644 --- a/source/fortran/tfcoil_variables.f90 +++ b/source/fortran/tfcoil_variables.f90 @@ -794,7 +794,7 @@ module tfcoil_variables real(dp) :: dtiocool !! inlet / outlet TF coil coolant temperature rise (K) - real(dp) :: tcpav + real(dp) :: temp_cp_average !! Average temperature of centrepost called CP (K). Only used for resistive coils !! to compute the resisitive heating. Must be an iteration variable for !! ST (`itart=1`) (`iteration variable 20`) @@ -804,7 +804,7 @@ module tfcoil_variables real(dp) :: tlegav !! Average temperature of the TF outboard legs [K]. If `tlegav=-1.0`, the ouboard - !! legs and CP temperatures are the same. Fixed for now, should use a contraints eq like tcpav + !! legs and CP temperatures are the same. Fixed for now, should use a contraints eq like temp_cp_average real(dp) :: tcpmax !! peak centrepost temperature (K) @@ -1042,7 +1042,7 @@ subroutine init_tfcoil_variables rcool = 0.005D0 tcoolin = 313.15D0 ! 40 C dtiocool = 0.0D0 - tcpav = 373.15D0 ! 100 C + temp_cp_average = 373.15D0 ! 100 C tcpav2 = 0.0D0 tlegav = -1.0D0 tcpmax = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index cd712fc28e..65fd4c76d1 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -7493,7 +7493,7 @@ "tcomrepl": 0.5, "tconl": 0.0, "tcoolin": 313.15, - "tcpav": 373.15, + "temp_cp_average": 373.15, "tcpav2": 0.0, "tcpmax": 0.0, "tcritsc": 16.0, @@ -9958,8 +9958,8 @@ "ksic": "power fraction for outboard double-null scrape-off plasma", "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 (ipfres=0)\n (itv 38,37,41,12)\n
    • (27) Central solenoid BOP current density upper limit (ipfres=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 iblanket =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 fbmaxcs)\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) tcpav\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) coheof\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) fcohbop\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) li6enrich\n
    • (99) NOT USED\n
    • (100) NOT USED\n
    • (101) NOT USED\n
    • (102) fimpvar\n
    • (103) flhthresh (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) fw_channel_length: 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) oh_steel_frac : 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) fbmaxcs : F-value for max peak CS field (con. 79, itvar 149)\n
    • (152) fbmaxcs : 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) fvssu : 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) tcpav\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) coheof\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) fcohbop\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) li6enrich\n
      • (99) NOT USED\n
      • (100) NOT USED\n
      • (101) NOT USED\n
      • (102) fimpvar\n
      • (103) flhthresh (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) fw_channel_length: 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) oh_steel_frac : 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) fbmaxcs : F-value for max peak CS field (con. 79, itvar 149)\n
      • (152) fbmaxcs : 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) fvssu : 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) coheof\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) fcohbop\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) li6enrich\n
        • (99) NOT USED\n
        • (100) NOT USED\n
        • (101) NOT USED\n
        • (102) fimpvar\n
        • (103) flhthresh (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) fw_channel_length: 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) oh_steel_frac : 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) fbmaxcs : F-value for max peak CS field (con. 79, itvar 149)\n
        • (152) fbmaxcs : 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) fvssu : 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) coheof\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) fcohbop\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) li6enrich\n
          • (99) NOT USED\n
          • (100) NOT USED\n
          • (101) NOT USED\n
          • (102) fimpvar\n
          • (103) flhthresh (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) fw_channel_length: 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) oh_steel_frac : 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) fbmaxcs : F-value for max peak CS field (con. 79, itvar 149)\n
          • (152) fbmaxcs : 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) fvssu : 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", "lambda_EU": "Decay length in EUROFER [cm]", "lambda_He_VV": "Decay length [cm]", "lambda_n_BZ_IB": "Decay length in IB BZ [cm]", @@ -10749,7 +10749,7 @@ "tcomrepl": "time taken to replace both blanket and divertor (y) (`iavail=1`)", "tconl": "main plasma connection length (m)", "tcoolin": "centrepost coolant inlet temperature (K)", - "tcpav": "Average temperature of centrepost called CP (K). Only used for resistive coils\n to compute the resisitive heating. Must be an iteration variable for\n ST (`itart=1`) (`iteration variable 20`)", + "temp_cp_average": "Average temperature of centrepost called CP (K). Only used for resistive coils\n to compute the resisitive heating. Must be an iteration variable for\n ST (`itart=1`) (`iteration variable 20`)", "tcpav2": "Computed centrepost average temperature (K) (for consistency)", "tcpmax": "peak centrepost temperature (K)", "tcritsc": "critical temperature (K) for superconductor at zero field and strain (`i_tf_sc_mat=4, =tc0m`)", @@ -10836,7 +10836,7 @@ "timelabel": "array of time labels during plasma pulse (s)", "tin": "density weighted average ion temperature (keV)", "tinstf": "Thickness of the ground insulation layer surrounding (m)\n - Superconductor TF (`i_tf_sup == 1`) : The TF coil Winding packs\n - Resistive magnets (`i_tf_sup /= 1`) : The TF coil wedges\n Rem : Thickness calculated for stellarators.", - "tlegav": "Average temperature of the TF outboard legs [K]. If `tlegav=-1.0`, the ouboard\n legs and CP temperatures are the same. Fixed for now, should use a contraints eq like tcpav", + "tlegav": "Average temperature of the TF outboard legs [K]. If `tlegav=-1.0`, the ouboard\n legs and CP temperatures are the same. Fixed for now, should use a contraints eq like temp_cp_average", "tlife": "Full power year plant lifetime (years)", "tlvpmw": "estimate of total low voltage power (MW)", "tmargmin": "minimum allowable temperature margin : TFC AND CS (K)", @@ -14459,7 +14459,7 @@ "lb": 4.0, "ub": 373.15 }, - "tcpav": { + "temp_cp_average": { "lb": 4.0, "ub": 573.15 }, @@ -15656,7 +15656,7 @@ "lb": 0.001, "ub": 10.0 }, - "tcpav": { + "temp_cp_average": { "lb": 40.0, "ub": 300.0 }, @@ -15844,7 +15844,7 @@ "dr_fw_plasma_gap_outboard": 0.15, "dr_shld_inboard": 0.69, "dr_shld_outboard": 1.05, - "tcpav": 373.15, + "temp_cp_average": 373.15, "tdmptf": 10.0, "t_between_pulse": 1800.0, "te": 12.9, @@ -16278,7 +16278,7 @@ }, "20": { "lb": 40.0, - "name": "tcpav", + "name": "temp_cp_average", "ub": 300.0 }, "21": { @@ -16741,7 +16741,7 @@ "18": "q", "19": "beam_energy", "2": "bt", - "20": "tcpav", + "20": "temp_cp_average", "21": "ft_burn", "23": "fcoolcp", "25": "fpnetel", @@ -16957,7 +16957,7 @@ "dr_fw_plasma_gap_outboard": "74", "dr_shld_inboard": "93", "dr_shld_outboard": "94", - "tcpav": "20", + "temp_cp_average": "20", "tdmptf": "56", "t_between_pulse": "17", "te": "4", @@ -19714,7 +19714,7 @@ "rcool", "tcoolin", "dtiocool", - "tcpav", + "temp_cp_average", "tcpav2", "tlegav", "tcpmax", @@ -20752,7 +20752,7 @@ "t_burn": "real_variable", "tcomrepl": "real_variable", "tcoolin": "real_variable", - "tcpav": "real_variable", + "temp_cp_average": "real_variable", "tcritsc": "real_variable", "tcycmn": "real_variable", "tdiv": "real_variable", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 42127e7508..98256bc280 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -1584,7 +1584,7 @@ tftmp = 20.0 * VARIABLES: itart. tcpav2 calculated in-situ *ixc = 20 -*tcpav = 20.42 +*temp_cp_average = 20.42 *boundl(20) = 20.0 *boundu(20) = 25.0 * DESCRIPTION: Average temperature of centrepost diff --git a/tests/unit/test_sctfcoil.py b/tests/unit/test_sctfcoil.py index b71959e489..390f9156f0 100644 --- a/tests/unit/test_sctfcoil.py +++ b/tests/unit/test_sctfcoil.py @@ -907,7 +907,7 @@ class TfResHeatingParam(NamedTuple): tftort: Any = None len_tf_coil: Any = None res_tf_leg: Any = None - tcpav: Any = None + temp_cp_average: Any = None arealeg: Any = None c_tf_total: Any = None rho_tf_joints: Any = None @@ -1125,7 +1125,7 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): tftort=0.45367650933034859, len_tf_coil=15.582502857142856, res_tf_leg=0, - tcpav=347.13, + temp_cp_average=347.13, arealeg=0.070242733939617885, c_tf_total=25500000, rho_tf_joints=2.5000000000000002e-10, @@ -1175,7 +1175,7 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): tftort=0.44435902370665786, len_tf_coil=15.654502857142857, res_tf_leg=5.647653956699231e-06, - tcpav=347.13, + temp_cp_average=347.13, arealeg=0.068800107640501845, c_tf_total=25500000, rho_tf_joints=2.5000000000000002e-10, @@ -1252,7 +1252,9 @@ def test_tf_res_heating(tfresheatingparam, monkeypatch, sctfcoil): monkeypatch.setattr(tfcoil_variables, "res_tf_leg", tfresheatingparam.res_tf_leg) - monkeypatch.setattr(tfcoil_variables, "tcpav", tfresheatingparam.tcpav) + monkeypatch.setattr( + tfcoil_variables, "temp_cp_average", tfresheatingparam.temp_cp_average + ) monkeypatch.setattr(tfcoil_variables, "arealeg", tfresheatingparam.arealeg) From 90cc78adeac8416a45d5dc27cc56bcc537d029bd Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 13 Jan 2025 17:30:20 +0000 Subject: [PATCH 21/29] =?UTF-8?q?=F0=9F=94=84=20Rename=20'tlegav'=20to=20'?= =?UTF-8?q?temp=5Ftf=5Flegs=5Foutboard'=20for=20consistency=20across=20the?= =?UTF-8?q?=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/init.py | 10 +++++----- process/sctfcoil.py | 25 +++++++++++++++---------- process/utilities/errorlist.json | 4 ++-- source/fortran/tfcoil_variables.f90 | 6 +++--- tests/integration/ref_dicts.json | 6 +++--- tests/unit/test_sctfcoil.py | 12 ++++++++---- 6 files changed, 36 insertions(+), 27 deletions(-) diff --git a/process/init.py b/process/init.py index a4186b48f9..b14947e8c9 100644 --- a/process/init.py +++ b/process/init.py @@ -704,11 +704,11 @@ def check_process(): # Temperature of the TF legs cannot be cooled down if ( - fortran.tfcoil_variables.tlegav > 0 - and fortran.tfcoil_variables.tlegav < 273.15 + fortran.tfcoil_variables.temp_tf_legs_outboard > 0 + and fortran.tfcoil_variables.temp_tf_legs_outboard < 273.15 ): raise ProcessValidationError( - "TF legs conductor temperature (tlegav) cannot be < 0 C (273.15 K) for water cooled magents" + "TF legs conductor temperature (temp_tf_legs_outboard) cannot be < 0 C (273.15 K) for water cooled magents" ) # Check if conductor upper limit is properly set to 50 K or below @@ -737,9 +737,9 @@ def check_process(): ) # Check if the leg average temperature is low enough for the resisitivity fit - if fortran.tfcoil_variables.tlegav > 50.0: + if fortran.tfcoil_variables.temp_tf_legs_outboard > 50.0: raise ProcessValidationError( - "TF legs conductor temperature (tlegav) should be < 40 K for the cryo-al resistivity to be defined" + "TF legs conductor temperature (temp_tf_legs_outboard) should be < 40 K for the cryo-al resistivity to be defined" ) # Check if conductor upper limit is properly set to 50 K or below diff --git a/process/sctfcoil.py b/process/sctfcoil.py index f6b65fe65b..f3e647f5d3 100644 --- a/process/sctfcoil.py +++ b/process/sctfcoil.py @@ -1815,29 +1815,34 @@ def tf_res_heating(self): if physics_variables.itart == 1: # Tricky trick to make the leg / CP tempearture the same if ( - abs(tfcoil_variables.tlegav + 1.0e0) - < np.finfo(float(tfcoil_variables.tlegav)).eps + abs(tfcoil_variables.temp_tf_legs_outboard + 1.0e0) + < np.finfo(float(tfcoil_variables.temp_tf_legs_outboard)).eps ): sctfcoil_module.is_leg_cp_temp_same = 1 - tfcoil_variables.tlegav = tfcoil_variables.temp_cp_average + tfcoil_variables.temp_tf_legs_outboard = ( + tfcoil_variables.temp_cp_average + ) # Leg resistivity (different leg temperature as separate cooling channels) if tfcoil_variables.i_tf_sup == 0: tfcoil_variables.rho_tf_leg = ( tfcoil_variables.frholeg - * (1.72e0 + 0.0039e0 * (tfcoil_variables.tlegav - 273.15e0)) + * ( + 1.72e0 + + 0.0039e0 * (tfcoil_variables.temp_tf_legs_outboard - 273.15e0) + ) * 1.0e-8 ) elif tfcoil_variables.i_tf_sup == 2: tfcoil_variables.rho_tf_leg = tfcoil_variables.frholeg * ( - 2.00016e-14 * tfcoil_variables.tlegav**3 - - 6.75384e-13 * tfcoil_variables.tlegav**2 - + 8.89159e-12 * tfcoil_variables.tlegav + 2.00016e-14 * tfcoil_variables.temp_tf_legs_outboard**3 + - 6.75384e-13 * tfcoil_variables.temp_tf_legs_outboard**2 + + 8.89159e-12 * tfcoil_variables.temp_tf_legs_outboard ) # Tricky trick to make the leg / CP tempearture the same if sctfcoil_module.is_leg_cp_temp_same == 1: - tfcoil_variables.tlegav = -1.0e0 + tfcoil_variables.temp_tf_legs_outboard = -1.0e0 # Centrepost resisitivity and conductor/insulation volume @@ -5404,8 +5409,8 @@ def outtf(self, peaktfflag): po.ovarre( self.outfile, "Average leg temperature (K)", - "(tlegav)", - tfcoil_variables.tlegav, + "(temp_tf_legs_outboard)", + tfcoil_variables.temp_tf_legs_outboard, ) else: diff --git a/process/utilities/errorlist.json b/process/utilities/errorlist.json index 6bfa1fa5a6..dbd7759653 100644 --- a/process/utilities/errorlist.json +++ b/process/utilities/errorlist.json @@ -1198,12 +1198,12 @@ { "no": 238, "level": 3, - "message": "CHECK: TF legs conductor temperature (tlegav) should be < 40 K for the cryo-al resistivity to be defined." + "message": "CHECK: TF legs conductor temperature (temp_tf_legs_outboard) should be < 40 K for the cryo-al resistivity to be defined." }, { "no": 239, "level": 3, - "message": "CHECK: TF legs conductor temperature (tlegav) cannot be < 0 C (273.15 K) for water cooled magents." + "message": "CHECK: TF legs conductor temperature (temp_tf_legs_outboard) cannot be < 0 C (273.15 K) for water cooled magents." }, { "no": 240, diff --git a/source/fortran/tfcoil_variables.f90 b/source/fortran/tfcoil_variables.f90 index dc4bc977a5..1aa9499792 100644 --- a/source/fortran/tfcoil_variables.f90 +++ b/source/fortran/tfcoil_variables.f90 @@ -802,8 +802,8 @@ module tfcoil_variables real(dp) :: tcpav2 !! Computed centrepost average temperature (K) (for consistency) - real(dp) :: tlegav - !! Average temperature of the TF outboard legs [K]. If `tlegav=-1.0`, the ouboard + real(dp) :: temp_tf_legs_outboard + !! Average temperature of the TF outboard legs [K]. If `temp_tf_legs_outboard=-1.0`, the ouboard !! legs and CP temperatures are the same. Fixed for now, should use a contraints eq like temp_cp_average real(dp) :: tcpmax @@ -1044,7 +1044,7 @@ subroutine init_tfcoil_variables dtiocool = 0.0D0 temp_cp_average = 373.15D0 ! 100 C tcpav2 = 0.0D0 - tlegav = -1.0D0 + temp_tf_legs_outboard = -1.0D0 tcpmax = 0.0D0 vcool = 20.0D0 vol_cond_cp = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 65fd4c76d1..192b358e2b 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -7604,7 +7604,7 @@ ], "tin": 0.0, "tinstf": 0.018, - "tlegav": -1.0, + "temp_tf_legs_outboard": -1.0, "tlife": 30.0, "tlvpmw": 0.0, "tmargmin": 0.0, @@ -10836,7 +10836,7 @@ "timelabel": "array of time labels during plasma pulse (s)", "tin": "density weighted average ion temperature (keV)", "tinstf": "Thickness of the ground insulation layer surrounding (m)\n - Superconductor TF (`i_tf_sup == 1`) : The TF coil Winding packs\n - Resistive magnets (`i_tf_sup /= 1`) : The TF coil wedges\n Rem : Thickness calculated for stellarators.", - "tlegav": "Average temperature of the TF outboard legs [K]. If `tlegav=-1.0`, the ouboard\n legs and CP temperatures are the same. Fixed for now, should use a contraints eq like temp_cp_average", + "temp_tf_legs_outboard": "Average temperature of the TF outboard legs [K]. If `temp_tf_legs_outboard=-1.0`, the ouboard\n legs and CP temperatures are the same. Fixed for now, should use a contraints eq like temp_cp_average", "tlife": "Full power year plant lifetime (years)", "tlvpmw": "estimate of total low voltage power (MW)", "tmargmin": "minimum allowable temperature margin : TFC AND CS (K)", @@ -19716,7 +19716,7 @@ "dtiocool", "temp_cp_average", "tcpav2", - "tlegav", + "temp_tf_legs_outboard", "tcpmax", "vcool", "vol_cond_cp", diff --git a/tests/unit/test_sctfcoil.py b/tests/unit/test_sctfcoil.py index 390f9156f0..c3f67fb116 100644 --- a/tests/unit/test_sctfcoil.py +++ b/tests/unit/test_sctfcoil.py @@ -897,7 +897,7 @@ class ResTfInternalGeomParam(NamedTuple): class TfResHeatingParam(NamedTuple): rhocp: Any = None - tlegav: Any = None + temp_tf_legs_outboard: Any = None thicndut: Any = None th_joint_contact: Any = None rho_tf_leg: Any = None @@ -1115,7 +1115,7 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): ( TfResHeatingParam( rhocp=0, - tlegav=-1, + temp_tf_legs_outboard=-1, thicndut=0.00080000000000000004, th_joint_contact=0.029999999999999999, rho_tf_leg=0, @@ -1165,7 +1165,7 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): ), TfResHeatingParam( rhocp=2.008522e-08, - tlegav=-1, + temp_tf_legs_outboard=-1, thicndut=0.00080000000000000004, th_joint_contact=0.029999999999999999, rho_tf_leg=2.008522e-08, @@ -1230,7 +1230,11 @@ def test_tf_res_heating(tfresheatingparam, monkeypatch, sctfcoil): monkeypatch.setattr(tfcoil_variables, "rhocp", tfresheatingparam.rhocp) - monkeypatch.setattr(tfcoil_variables, "tlegav", tfresheatingparam.tlegav) + monkeypatch.setattr( + tfcoil_variables, + "temp_tf_legs_outboard", + tfresheatingparam.temp_tf_legs_outboard, + ) monkeypatch.setattr(tfcoil_variables, "thicndut", tfresheatingparam.thicndut) From e2f9cc8a058bb3395cc832aab246f3a0c41fe940 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 13 Jan 2025 17:34:10 +0000 Subject: [PATCH 22/29] =?UTF-8?q?=F0=9F=94=84=20Rename=20'rhocp'=20to=20'r?= =?UTF-8?q?ho=5Fcp'=20for=20consistency=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/sctfcoil.py | 14 +++++++------- process/tfcoil.py | 4 ++-- source/fortran/tfcoil_variables.f90 | 4 ++-- tests/integration/ref_dicts.json | 6 +++--- tests/unit/test_sctfcoil.py | 16 ++++++++-------- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/process/sctfcoil.py b/process/sctfcoil.py index f3e647f5d3..8c75c21045 100644 --- a/process/sctfcoil.py +++ b/process/sctfcoil.py @@ -1797,7 +1797,7 @@ def tf_res_heating(self): Rem SK : Sliding joints might have a region of high resistivity """ if tfcoil_variables.i_tf_sup == 0: - tfcoil_variables.rhocp = ( + tfcoil_variables.rho_cp = ( tfcoil_variables.frhocp * (1.72e0 + 0.0039e0 * (tfcoil_variables.temp_cp_average - 273.15e0)) * 1.0e-8 @@ -1805,7 +1805,7 @@ def tf_res_heating(self): # Aluminium if tfcoil_variables.i_tf_sup == 2: - tfcoil_variables.rhocp = tfcoil_variables.frhocp * ( + tfcoil_variables.rho_cp = tfcoil_variables.frhocp * ( 2.00016e-14 * tfcoil_variables.temp_cp_average**3 - 6.75384e-13 * tfcoil_variables.temp_cp_average**2 + 8.89159e-12 * tfcoil_variables.temp_cp_average @@ -1865,7 +1865,7 @@ def tf_res_heating(self): tfcoil_variables.thicndut, tfcoil_variables.n_tf_turn, tfcoil_variables.c_tf_total, - tfcoil_variables.rhocp, + tfcoil_variables.rho_cp, tfcoil_variables.fcoolcp, tfcoil_variables.n_tf_coils, ) @@ -1946,7 +1946,7 @@ def tf_res_heating(self): else: # TF resistive powers tfcoil_variables.p_cp_resistive = ( - tfcoil_variables.rhocp + tfcoil_variables.rho_cp * tfcoil_variables.c_tf_total**2 * tfcoil_variables.len_tf_coil / (sctfcoil_module.a_leg_cond * tfcoil_variables.n_tf_coils) @@ -5367,8 +5367,8 @@ def outtf(self, peaktfflag): po.ovarre( self.outfile, "CP resistivity (ohm.m)", - "(rhocp)", - tfcoil_variables.rhocp, + "(rho_cp)", + tfcoil_variables.rho_cp, ) po.ovarre( self.outfile, @@ -5418,7 +5418,7 @@ def outtf(self, peaktfflag): self.outfile, "TF resistivity (ohm.m)", "(p_cp_resistive)", - tfcoil_variables.rhocp, + tfcoil_variables.rho_cp, ) po.ovarre( self.outfile, diff --git a/process/tfcoil.py b/process/tfcoil.py index 5417b7174d..2c9636d235 100644 --- a/process/tfcoil.py +++ b/process/tfcoil.py @@ -298,8 +298,8 @@ def cntrpst(self): po.ovarre( self.outfile, "Average conductor resistivity (ohm.m)", - "(rhocp)", - tfv.rhocp, + "(rho_cp)", + tfv.rho_cp, ) po.ovarre( self.outfile, diff --git a/source/fortran/tfcoil_variables.f90 b/source/fortran/tfcoil_variables.f90 index 1aa9499792..88d3394fed 100644 --- a/source/fortran/tfcoil_variables.f90 +++ b/source/fortran/tfcoil_variables.f90 @@ -535,7 +535,7 @@ module tfcoil_variables real(dp) :: tflegmw !! TF coil outboard leg resistive power (MW) - real(dp) :: rhocp + real(dp) :: rho_cp !! TF coil inboard leg resistivity [Ohm-m]. If `itart=0`, this variable is the !! average resistivity over the whole magnet @@ -967,7 +967,7 @@ subroutine init_tfcoil_variables tfind = 0.0D0 tfinsgap = 0.010D0 tflegmw = 0.0D0 - rhocp = 0.0D0 + rho_cp = 0.0D0 rho_tf_leg = 0.0D0 rho_tf_bus = 1.86D-8 frhocp = 1.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 192b358e2b..dc7142e304 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -4215,7 +4215,7 @@ "rho_max_dt": null, "rho_star": 0.0, "rho_tf_joints": 2.5e-10, - "rhocp": 0.0, + "rho_cp": 0.0, "rhopedn": 1.0, "rhopedt": 1.0, "rho_tf_bus": -1.0, @@ -10523,7 +10523,7 @@ "rho_max_dt": "r/a where the temperature gradient is largest (`ipedestal==0`)", "rho_star": "", "rho_tf_joints": "TF joints surfacic resistivity [ohm.m]. Feldmetal joints assumed.", - "rhocp": "TF coil inboard leg resistivity [Ohm-m]. If `itart=0`, this variable is the\n average resistivity over the whole magnet", + "rho_cp": "TF coil inboard leg resistivity [Ohm-m]. If `itart=0`, this variable is the\n average resistivity over the whole magnet", "rhopedn": "r/a of density pedestal (`ipedestal>=1`)", "rhopedt": "r/a of temperature pedestal (`ipedestal>=1`)", "rho_tf_bus": "Resistivity of a TF coil bus (Ohm-m). Default value takes the same res as the leg one", @@ -19638,7 +19638,7 @@ "tfind", "tfinsgap", "tflegmw", - "rhocp", + "rho_cp", "rho_tf_leg", "rho_tf_bus", "frhocp", diff --git a/tests/unit/test_sctfcoil.py b/tests/unit/test_sctfcoil.py index c3f67fb116..ab9661005b 100644 --- a/tests/unit/test_sctfcoil.py +++ b/tests/unit/test_sctfcoil.py @@ -896,7 +896,7 @@ class ResTfInternalGeomParam(NamedTuple): class TfResHeatingParam(NamedTuple): - rhocp: Any = None + rho_cp: Any = None temp_tf_legs_outboard: Any = None thicndut: Any = None th_joint_contact: Any = None @@ -935,7 +935,7 @@ class TfResHeatingParam(NamedTuple): itart: Any = None h_cp_top: Any = None is_leg_cp_temp_same: Any = None - expected_rhocp: Any = None + expected_rho_cp: Any = None expected_rho_tf_leg: Any = None expected_vol_cond_cp: Any = None expected_res_tf_leg: Any = None @@ -1114,7 +1114,7 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): "tfresheatingparam", ( TfResHeatingParam( - rhocp=0, + rho_cp=0, temp_tf_legs_outboard=-1, thicndut=0.00080000000000000004, th_joint_contact=0.029999999999999999, @@ -1153,7 +1153,7 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): itart=1, h_cp_top=2.6714285714285717, is_leg_cp_temp_same=0, - expected_rhocp=2.008522e-08, + expected_rho_cp=2.008522e-08, expected_rho_tf_leg=2.008522e-08, expected_vol_cond_cp=12.020160732580297, expected_res_tf_leg=5.647653956699231e-06, @@ -1164,7 +1164,7 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): expected_is_leg_cp_temp_same=1, ), TfResHeatingParam( - rhocp=2.008522e-08, + rho_cp=2.008522e-08, temp_tf_legs_outboard=-1, thicndut=0.00080000000000000004, th_joint_contact=0.029999999999999999, @@ -1203,7 +1203,7 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): itart=1, h_cp_top=2.6714285714285717, is_leg_cp_temp_same=1, - expected_rhocp=2.008522e-08, + expected_rho_cp=2.008522e-08, expected_rho_tf_leg=2.008522e-08, expected_vol_cond_cp=11.545770024935592, expected_res_tf_leg=5.79314853092539e-06, @@ -1228,7 +1228,7 @@ def test_tf_res_heating(tfresheatingparam, monkeypatch, sctfcoil): :type monkeypatch: _pytest.monkeypatch.monkeypatch """ - monkeypatch.setattr(tfcoil_variables, "rhocp", tfresheatingparam.rhocp) + monkeypatch.setattr(tfcoil_variables, "rho_cp", tfresheatingparam.rho_cp) monkeypatch.setattr( tfcoil_variables, @@ -1336,7 +1336,7 @@ def test_tf_res_heating(tfresheatingparam, monkeypatch, sctfcoil): sctfcoil.tf_res_heating() - assert tfcoil_variables.rhocp == pytest.approx(tfresheatingparam.expected_rhocp) + assert tfcoil_variables.rho_cp == pytest.approx(tfresheatingparam.expected_rho_cp) assert tfcoil_variables.rho_tf_leg == pytest.approx( tfresheatingparam.expected_rho_tf_leg From b5bf734954b2206ce3781e53e127eb03281ceee0 Mon Sep 17 00:00:00 2001 From: chris-ashe Date: Mon, 13 Jan 2025 19:29:53 +0000 Subject: [PATCH 23/29] =?UTF-8?q?=F0=9F=94=84=20Rename=20'arealeg'=20to=20?= =?UTF-8?q?'a=5Ftf=5Fleg=5Foutboard'=20for=20consistency=20across=20the=20?= =?UTF-8?q?codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/sctfcoil.py | 14 +++++--- process/stellarator.py | 6 ++-- source/fortran/tfcoil_variables.f90 | 4 +-- tests/integration/ref_dicts.json | 6 ++-- tests/unit/test_sctfcoil.py | 52 +++++++++++++++++------------ 5 files changed, 48 insertions(+), 34 deletions(-) diff --git a/process/sctfcoil.py b/process/sctfcoil.py index 8c75c21045..3dff1c2f2c 100644 --- a/process/sctfcoil.py +++ b/process/sctfcoil.py @@ -1550,9 +1550,11 @@ def tf_global_geometry(self): ) # Area of rectangular cross-section TF outboard leg [m2] - tfcoil_variables.arealeg = ( + tfcoil_variables.a_tf_leg_outboard = ( + ( tfcoil_variables.tftort * build_variables.dr_tf_outboard ) + ) # --- def tf_current(self): @@ -1874,7 +1876,7 @@ def tf_res_heating(self): # Rem : For physics_variables.itart = 1, these quantitire corresponds to the outer leg only # --- # Leg ground insulation area per coil [m2] - sctfcoil_module.a_leg_gr_ins = tfcoil_variables.arealeg - ( + sctfcoil_module.a_leg_gr_ins = tfcoil_variables.a_tf_leg_outboard - ( tfcoil_variables.tftort - 2.0e0 * tfcoil_variables.tinstf ) * (build_variables.dr_tf_outboard - 2.0e0 * tfcoil_variables.tinstf) @@ -1888,7 +1890,7 @@ def tf_res_heating(self): # Exact TF outboard leg conductor area per coil [m2] sctfcoil_module.a_leg_cond = (1.0e0 - tfcoil_variables.f_a_tf_cool_outboard) * ( - tfcoil_variables.arealeg + tfcoil_variables.a_tf_leg_outboard - sctfcoil_module.a_leg_gr_ins - sctfcoil_module.a_leg_ins ) @@ -2722,7 +2724,7 @@ def tf_coil_area_and_masses(self): if physics_variables.itart == 1: # Total volume of one outerleg [m3] tfcoil_variables.voltfleg = ( - tfcoil_variables.len_tf_coil * tfcoil_variables.arealeg + tfcoil_variables.len_tf_coil * tfcoil_variables.a_tf_leg_outboard ) # Outboard leg TF conductor volume [m3] @@ -3382,7 +3384,9 @@ def tf_case_geom(self, i_tf_wp_geom, i_tf_case_geom): ) - sctfcoil_module.awpc # Outboard leg cross-sectional area of surrounding case [m2] - tfcoil_variables.acasetfo = tfcoil_variables.arealeg - sctfcoil_module.awpc + tfcoil_variables.acasetfo = ( + tfcoil_variables.a_tf_leg_outboard - sctfcoil_module.awpc + ) # Front casing area [m2] if i_tf_case_geom == 0: diff --git a/process/stellarator.py b/process/stellarator.py index b21e48366b..dfa21956f0 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -1048,7 +1048,7 @@ def blanket_neutronics(self): 0.25 * tfcoil_variables.len_tf_coil * tfcoil_variables.tfareain + 0.75 * tfcoil_variables.len_tf_coil - * tfcoil_variables.arealeg + * tfcoil_variables.a_tf_leg_outboard * tfcoil_variables.n_tf_coils ) @@ -2708,7 +2708,7 @@ def stcoil(self, output: bool): + tfcoil_variables.casthi + 2.0e0 * tfcoil_variables.tinstf ) # [m] Thickness of outboard leg in radial direction (same as inboard) - tfcoil_variables.arealeg = ( + tfcoil_variables.a_tf_leg_outboard = ( build_variables.dr_tf_inboard * tfcoil_variables.tftort ) # [m^2] overall coil cross-sectional area (assuming inboard and # outboard leg are the same) @@ -2750,7 +2750,7 @@ def stcoil(self, output: bool): # Variables for ALL coils. tfcoil_variables.tfareain = ( - tfcoil_variables.n_tf_coils * tfcoil_variables.arealeg + 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 diff --git a/source/fortran/tfcoil_variables.f90 b/source/fortran/tfcoil_variables.f90 index 88d3394fed..7a081cb487 100644 --- a/source/fortran/tfcoil_variables.f90 +++ b/source/fortran/tfcoil_variables.f90 @@ -48,7 +48,7 @@ module tfcoil_variables ! real(dp) :: alstrtf !! Allowable Tresca stress in TF coil structural material (Pa) - real(dp) :: arealeg + real(dp) :: a_tf_leg_outboard !! outboard TF leg area (m2) real(dp) :: aswp @@ -848,7 +848,7 @@ subroutine init_tfcoil_variables aiwp = 0.0D0 sig_tf_case_max = 6.0D8 sig_tf_wp_max = 6.0D8 - arealeg = 0.0D0 + a_tf_leg_outboard = 0.0D0 aswp = 0.0D0 avwp = 0.0D0 awphec = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index dc7142e304..e5fde64e48 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -257,7 +257,7 @@ "area_fw_ob": 0.0, "area_omp": 0.0, "area_target": 0.0, - "arealeg": 0.0, + "a_tf_leg_outboard": 0.0, "areaoh": 0.0, "armour_density": 0.0, "armour_fw_bl_mass": 0.0, @@ -8828,7 +8828,7 @@ "area_fw_ob": "", "area_omp": "", "area_target": "", - "arealeg": "outboard TF leg area (m2)", + "a_tf_leg_outboard": "outboard TF leg area (m2)", "areaoh": "Central solenoid vertical cross-sectional area (m2)", "armour_density": "FW armour density [kg/m3]", "armour_fw_bl_mass": "Total mass of armour, first wall and blanket (kg)", @@ -19523,7 +19523,7 @@ "aiwp", "sig_tf_case_max", "sig_tf_wp_max", - "arealeg", + "a_tf_leg_outboard", "aswp", "avwp", "awphec", diff --git a/tests/unit/test_sctfcoil.py b/tests/unit/test_sctfcoil.py index ab9661005b..4cda723b45 100644 --- a/tests/unit/test_sctfcoil.py +++ b/tests/unit/test_sctfcoil.py @@ -600,7 +600,7 @@ class TfGlobalGeometryParam(NamedTuple): n_tf_coils: Any = None - arealeg: Any = None + a_tf_leg_outboard: Any = None i_tf_sup: Any = None @@ -628,7 +628,7 @@ class TfGlobalGeometryParam(NamedTuple): expected_tftort: Any = None - expected_arealeg: Any = None + expected_a_tf_leg_outboard: Any = None expected_r_tf_outboard_in: Any = None @@ -652,7 +652,7 @@ class TfGlobalGeometryParam(NamedTuple): c_tf_total=0, tftort=1, n_tf_coils=16, - arealeg=0, + a_tf_leg_outboard=0, i_tf_sup=1, dztop=0, i_tf_case_geom=0, @@ -666,7 +666,7 @@ class TfGlobalGeometryParam(NamedTuple): tan_theta_coil=0, expected_tfareain=27.308689677971632, expected_tftort=1.6395161177915356, - expected_arealeg=1.9805354702921749, + expected_a_tf_leg_outboard=1.9805354702921749, expected_r_tf_outboard_in=15.915405859443332, expected_r_tf_outboard_out=17.123405859443331, expected_theta_coil=0.19634954084936207, @@ -682,7 +682,7 @@ class TfGlobalGeometryParam(NamedTuple): c_tf_total=241812532.66279837, tftort=1.7488698442633552, n_tf_coils=16, - arealeg=2.6728635794409041, + a_tf_leg_outboard=2.6728635794409041, i_tf_sup=1, dztop=0, i_tf_case_geom=0, @@ -696,7 +696,7 @@ class TfGlobalGeometryParam(NamedTuple): tan_theta_coil=0.19891236737965801, expected_tfareain=35.703669036223495, expected_tftort=1.7488698442633552, - expected_arealeg=2.6728635794409041, + expected_a_tf_leg_outboard=2.6728635794409041, expected_r_tf_outboard_in=16.299182480677967, expected_r_tf_outboard_out=17.827520102947819, expected_theta_coil=0.19634954084936207, @@ -750,7 +750,9 @@ def test_tf_global_geometry(tfglobalgeometryparam, monkeypatch, sctfcoil): tfcoil_variables, "n_tf_coils", tfglobalgeometryparam.n_tf_coils ) - monkeypatch.setattr(tfcoil_variables, "arealeg", tfglobalgeometryparam.arealeg) + monkeypatch.setattr( + tfcoil_variables, "a_tf_leg_outboard", tfglobalgeometryparam.a_tf_leg_outboard + ) monkeypatch.setattr(tfcoil_variables, "i_tf_sup", tfglobalgeometryparam.i_tf_sup) @@ -792,8 +794,8 @@ def test_tf_global_geometry(tfglobalgeometryparam, monkeypatch, sctfcoil): tfglobalgeometryparam.expected_tftort ) - assert tfcoil_variables.arealeg == pytest.approx( - tfglobalgeometryparam.expected_arealeg + assert tfcoil_variables.a_tf_leg_outboard == pytest.approx( + tfglobalgeometryparam.expected_a_tf_leg_outboard ) assert sctfcoil_module.r_tf_outboard_in == pytest.approx( @@ -908,7 +910,7 @@ class TfResHeatingParam(NamedTuple): len_tf_coil: Any = None res_tf_leg: Any = None temp_cp_average: Any = None - arealeg: Any = None + a_tf_leg_outboard: Any = None c_tf_total: Any = None rho_tf_joints: Any = None p_tf_leg_resistive: Any = None @@ -1126,7 +1128,7 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): len_tf_coil=15.582502857142856, res_tf_leg=0, temp_cp_average=347.13, - arealeg=0.070242733939617885, + a_tf_leg_outboard=0.070242733939617885, c_tf_total=25500000, rho_tf_joints=2.5000000000000002e-10, p_tf_leg_resistive=0, @@ -1176,7 +1178,7 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): len_tf_coil=15.654502857142857, res_tf_leg=5.647653956699231e-06, temp_cp_average=347.13, - arealeg=0.068800107640501845, + a_tf_leg_outboard=0.068800107640501845, c_tf_total=25500000, rho_tf_joints=2.5000000000000002e-10, p_tf_leg_resistive=332643748.67243439, @@ -1260,7 +1262,9 @@ def test_tf_res_heating(tfresheatingparam, monkeypatch, sctfcoil): tfcoil_variables, "temp_cp_average", tfresheatingparam.temp_cp_average ) - monkeypatch.setattr(tfcoil_variables, "arealeg", tfresheatingparam.arealeg) + monkeypatch.setattr( + tfcoil_variables, "a_tf_leg_outboard", tfresheatingparam.a_tf_leg_outboard + ) monkeypatch.setattr(tfcoil_variables, "c_tf_total", tfresheatingparam.c_tf_total) @@ -1935,7 +1939,7 @@ class TfCoilAreaAndMassesParam(NamedTuple): i_tf_sc_mat: Any = None - arealeg: Any = None + a_tf_leg_outboard: Any = None thkcas: Any = None @@ -2036,7 +2040,7 @@ class TfCoilAreaAndMassesParam(NamedTuple): vol_cond_cp=0, i_tf_sup=1, i_tf_sc_mat=5, - arealeg=1.9805354702921749, + a_tf_leg_outboard=1.9805354702921749, thkcas=0.52465000000000006, voltfleg=0, cplen=0, @@ -2108,7 +2112,7 @@ class TfCoilAreaAndMassesParam(NamedTuple): vol_cond_cp=0, i_tf_sup=1, i_tf_sc_mat=5, - arealeg=1.9805354702921749, + a_tf_leg_outboard=1.9805354702921749, thkcas=0.52465000000000006, voltfleg=0, cplen=20.562180043124066, @@ -2254,7 +2258,11 @@ def test_tf_coil_area_and_masses(tfcoilareaandmassesparam, monkeypatch, sctfcoil tfcoil_variables, "i_tf_sc_mat", tfcoilareaandmassesparam.i_tf_sc_mat ) - monkeypatch.setattr(tfcoil_variables, "arealeg", tfcoilareaandmassesparam.arealeg) + monkeypatch.setattr( + tfcoil_variables, + "a_tf_leg_outboard", + tfcoilareaandmassesparam.a_tf_leg_outboard, + ) monkeypatch.setattr(tfcoil_variables, "thkcas", tfcoilareaandmassesparam.thkcas) @@ -2688,7 +2696,7 @@ class TfCaseGeomParam(NamedTuple): acasetfo: Any = None - arealeg: Any = None + a_tf_leg_outboard: Any = None tfareain: Any = None @@ -2741,7 +2749,7 @@ class TfCaseGeomParam(NamedTuple): TfCaseGeomParam( acasetf=0, acasetfo=0, - arealeg=1.9805354702921749, + a_tf_leg_outboard=1.9805354702921749, tfareain=27.308689677971632, n_tf_coils=16, casths=0.05000000000000001, @@ -2768,7 +2776,7 @@ class TfCaseGeomParam(NamedTuple): TfCaseGeomParam( acasetf=1.0015169239205168, acasetfo=1.2752592893394648, - arealeg=1.9805354702921749, + a_tf_leg_outboard=1.9805354702921749, tfareain=27.308689677971632, n_tf_coils=16, casths=0.05000000000000001, @@ -2811,7 +2819,9 @@ def test_tf_case_geom(tfcasegeomparam, monkeypatch, sctfcoil): monkeypatch.setattr(tfcoil_variables, "acasetfo", tfcasegeomparam.acasetfo) - monkeypatch.setattr(tfcoil_variables, "arealeg", tfcasegeomparam.arealeg) + monkeypatch.setattr( + tfcoil_variables, "a_tf_leg_outboard", tfcasegeomparam.a_tf_leg_outboard + ) monkeypatch.setattr(tfcoil_variables, "tfareain", tfcasegeomparam.tfareain) From e1c3d51e309e576a06e5e2059590555907f3630f Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 15 Jan 2025 09:03:02 +0000 Subject: [PATCH 24/29] =?UTF-8?q?=F0=9F=94=84=20Update=20resistive=20heati?= =?UTF-8?q?ng=20calculations=20and=20improve=20method=20documentation=20fo?= =?UTF-8?q?r=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/sctfcoil.py | 31 +++++++++++++++++++++++-------- tests/unit/test_sctfcoil.py | 24 ++++++++++++------------ 2 files changed, 35 insertions(+), 20 deletions(-) diff --git a/process/sctfcoil.py b/process/sctfcoil.py index 3dff1c2f2c..5eb54eab25 100644 --- a/process/sctfcoil.py +++ b/process/sctfcoil.py @@ -1792,20 +1792,34 @@ def circumference(aaa, bbb): * (1.0e0 + (3.0e0 * hh) / (10.0e0 + np.sqrt(4.0e0 - 3.0e0 * hh))) ) - def tf_res_heating(self): + def tf_res_heating(self) -> None: """ - Resitive magnet resitive heating calculations - Rem SK : Clamped joined superconductors might have resistive power losses on the joints - Rem SK : Sliding joints might have a region of high resistivity + Calculate resistive heating for resistive magnets. + + This method calculates the resistive heating for resistive magnets. + It considers the following scenarios: + - Clamped joints in superconductors might have resistive power losses on the joints. + - Sliding joints might have a region of high resistivity. + + Notes: + - The resisitivty is set to be thet for GLIDCOP AL-15 at 20°C for copper (i_tf_sup = 0). + - The coeffcieicnt of resistivity is set to be that of pure copper + + References: + - https://www.spotweldingconsultants.com/GlidCop_AL_15.pdf + + - https://cirris.com/temperature-coefficient-of-copper/ """ + + # Resistivity of the Glidcop copper centerpost if tfcoil_variables.i_tf_sup == 0: tfcoil_variables.rho_cp = ( tfcoil_variables.frhocp - * (1.72e0 + 0.0039e0 * (tfcoil_variables.temp_cp_average - 273.15e0)) + * (1.86e0 + 0.00393e0 * (tfcoil_variables.temp_cp_average - 293.15e0)) * 1.0e-8 ) - # Aluminium + # Resistivity of the aluminium centerpost if tfcoil_variables.i_tf_sup == 2: tfcoil_variables.rho_cp = tfcoil_variables.frhocp * ( 2.00016e-14 * tfcoil_variables.temp_cp_average**3 @@ -1830,8 +1844,9 @@ def tf_res_heating(self): tfcoil_variables.rho_tf_leg = ( tfcoil_variables.frholeg * ( - 1.72e0 - + 0.0039e0 * (tfcoil_variables.temp_tf_legs_outboard - 273.15e0) + 1.86e0 + + 0.00393e0 + * (tfcoil_variables.temp_tf_legs_outboard - 293.15e0) ) * 1.0e-8 ) diff --git a/tests/unit/test_sctfcoil.py b/tests/unit/test_sctfcoil.py index 4cda723b45..22f9806195 100644 --- a/tests/unit/test_sctfcoil.py +++ b/tests/unit/test_sctfcoil.py @@ -1155,22 +1155,22 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): itart=1, h_cp_top=2.6714285714285717, is_leg_cp_temp_same=0, - expected_rho_cp=2.008522e-08, - expected_rho_tf_leg=2.008522e-08, + expected_rho_cp=2.0721414e-08, + expected_rho_tf_leg=2.0721414e-08, expected_vol_cond_cp=12.020160732580297, - expected_res_tf_leg=5.647653956699231e-06, - expected_p_tf_leg_resistive=306032248.77863955, - expected_p_cp_resistive=432477095.0716282, + expected_res_tf_leg=5.826541893267926e-06, + expected_p_tf_leg_resistive=315725738.84145576, + expected_p_cp_resistive=446175692.00121117, expected_pres_joints=1944336.7995005273, expected_a_cp_cool=0.00068328705812121333, expected_is_leg_cp_temp_same=1, ), TfResHeatingParam( - rho_cp=2.008522e-08, + rho_cp=2.0721414e-08, temp_tf_legs_outboard=-1, thicndut=0.00080000000000000004, th_joint_contact=0.029999999999999999, - rho_tf_leg=2.008522e-08, + rho_tf_leg=2.0721414e-08, vol_cond_cp=12.020160732580297, n_tf_turn=1, thkcas=0, @@ -1205,12 +1205,12 @@ def test_res_tf_internal_geom(restfinternalgeomparam, monkeypatch, sctfcoil): itart=1, h_cp_top=2.6714285714285717, is_leg_cp_temp_same=1, - expected_rho_cp=2.008522e-08, - expected_rho_tf_leg=2.008522e-08, + expected_rho_cp=2.0721414e-08, + expected_rho_tf_leg=2.0721414e-08, expected_vol_cond_cp=11.545770024935592, - expected_res_tf_leg=5.79314853092539e-06, - expected_p_tf_leg_resistive=313916236.01951957, - expected_p_cp_resistive=437653650.39632624, + expected_res_tf_leg=5.9766449694251195e-06, + expected_p_tf_leg_resistive=323859449.2807237, + expected_p_cp_resistive=451516213.33864105, expected_pres_joints=1944336.7995005273, expected_a_cp_cool=0.00068328705812121333, expected_is_leg_cp_temp_same=1, From c0ecf64c73a22e431e33535dc79b4118654fd1a4 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 31 Jan 2025 13:26:08 +0000 Subject: [PATCH 25/29] :art: Pre commit check --- process/power.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/process/power.py b/process/power.py index e8619b5c80..37f3fdb8ee 100644 --- a/process/power.py +++ b/process/power.py @@ -2268,7 +2268,7 @@ def cryo( ensxpfm, t_pulse_repetition, cpttf, - n_tf,_coils + n_tf_coils, ): """ Calculates cryogenic loads From 7132b6b2c5f7e20fc1761a534354aa1c2a966a71 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 4 Feb 2025 10:11:59 +0000 Subject: [PATCH 26/29] =?UTF-8?q?=F0=9F=94=84=20Improve=20documentation=20?= =?UTF-8?q?for=20resistivity=20parameters=20and=20add=20comments=20for=20c?= =?UTF-8?q?larity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/sctfcoil.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/process/sctfcoil.py b/process/sctfcoil.py index 5eb54eab25..89e0cfc1cd 100644 --- a/process/sctfcoil.py +++ b/process/sctfcoil.py @@ -1802,8 +1802,8 @@ def tf_res_heating(self) -> None: - Sliding joints might have a region of high resistivity. Notes: - - The resisitivty is set to be thet for GLIDCOP AL-15 at 20°C for copper (i_tf_sup = 0). - - The coeffcieicnt of resistivity is set to be that of pure copper + - The copper resisitivty is set to be that for GLIDCOP AL-15 at 20°C for copper (i_tf_sup = 0). + - The coefficient of resistivity is set to be that of pure copper References: - https://www.spotweldingconsultants.com/GlidCop_AL_15.pdf @@ -1814,6 +1814,8 @@ def tf_res_heating(self) -> None: # Resistivity of the Glidcop copper centerpost if tfcoil_variables.i_tf_sup == 0: tfcoil_variables.rho_cp = ( + # 1.86 is the resitivity at `20°C` for GLIDCOP AL-15 + # 0.00393 is the coefficient of resistivity for copper tfcoil_variables.frhocp * (1.86e0 + 0.00393e0 * (tfcoil_variables.temp_cp_average - 293.15e0)) * 1.0e-8 @@ -5406,6 +5408,7 @@ def outtf(self, peaktfflag): "Total legs resitive power loss, (W)", "(p_tf_leg_resistive)", tfcoil_variables.p_tf_leg_resistive, + tf_res, ) po.ovarre( self.outfile, From f3d2288045b2071ffe291224e0081216cc51b95f Mon Sep 17 00:00:00 2001 From: Jack Date: Thu, 6 Feb 2025 11:36:26 +0000 Subject: [PATCH 27/29] Removed undefined variable --- process/sctfcoil.py | 1 - 1 file changed, 1 deletion(-) diff --git a/process/sctfcoil.py b/process/sctfcoil.py index 89e0cfc1cd..df743ff8f0 100644 --- a/process/sctfcoil.py +++ b/process/sctfcoil.py @@ -5408,7 +5408,6 @@ def outtf(self, peaktfflag): "Total legs resitive power loss, (W)", "(p_tf_leg_resistive)", tfcoil_variables.p_tf_leg_resistive, - tf_res, ) po.ovarre( self.outfile, From e39ec3a82719df69dbd315007d3a7e4a93964160 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 12 Feb 2025 13:43:54 +0000 Subject: [PATCH 28/29] lint fix --- process/sctfcoil.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/process/sctfcoil.py b/process/sctfcoil.py index df743ff8f0..5416053715 100644 --- a/process/sctfcoil.py +++ b/process/sctfcoil.py @@ -1551,10 +1551,8 @@ 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 ) - ) # --- def tf_current(self): From 8ce78d936e3ca53d5eccedd9f275e02a62cd012b Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 13 Feb 2025 15:42:35 +0000 Subject: [PATCH 29/29] =?UTF-8?q?=F0=9F=94=84=20Add=20new=20obsolete=20var?= =?UTF-8?q?iable=20mappings=20for=20TF=20parameters?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/io/obsolete_vars.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index 10c2e91722..57de0ef139 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -190,6 +190,12 @@ "iradloss": "i_rad_loss", "ipnlaws": "n_confinement_scalings", "iinvqd": None, + "rhotfleg": "rho_tf_leg", + "n_tf": "n_tf_coils", + "tcpav": "temp_cp_average", + "jbus": "j_tf_bus", + "fcoolleg": "f_a_tf_cooil_outboard", + "rhotfbus": "rho_tf_bus", } OBS_VARS_HELP = {