diff --git a/documentation/source/fusion-devices/stellarator.md b/documentation/source/fusion-devices/stellarator.md index 30a4e4a6bf..0ba7b487e2 100644 --- a/documentation/source/fusion-devices/stellarator.md +++ b/documentation/source/fusion-devices/stellarator.md @@ -223,7 +223,7 @@ A reasonable set of input parameters for the stellarator coil module is the foll i_tf_sc_mat = 8 * Switch for superconductor material in tf coils; sig_tf_wp_max = 4.e8 * Maximal allowable Stress level on Ground insulation for a simple stellarator coil stress module (Pa) f_a_tf_turn_cable_copper = 0.7 *Copper fraction of cable conductor (TF coils), Schauer: 900 SCU strands, 522 Copper strands. Value for 0.4 Helium -tftmp = 4.75 *Peak helium coolant temperature in TF coils and PF coils (K) +temp_tf_operating = 4.75 *Peak helium coolant temperature in TF coils and PF coils (K) temp_tf_cryo = 4.75 * Temperature in TF coils, required for plant efficiency (K) f_a_tf_turn_cable_space_extra_void = 0.3 *Coolant fraction of TF coil leg (itfsup=0) this is the same for conductor and strand! f_j_tf_wp_critical_max = 0.78 * Fraction TF coil critical current to operation current (constraint margin) diff --git a/examples/data/large_tokamak_IN.DAT b/examples/data/large_tokamak_IN.DAT index cc19dd2588..900cd37977 100644 --- a/examples/data/large_tokamak_IN.DAT +++ b/examples/data/large_tokamak_IN.DAT @@ -557,7 +557,7 @@ dx_tf_wp_insulation = 0.008 dia_tf_turn_coolant_channel = 0.01 * Helium coolant temperature [K] -tftmp = 4.75 +temp_tf_operating = 4.75 * Coolant fraction of TF cable [-] f_a_tf_turn_cable_space_extra_void = 0.3 diff --git a/examples/data/large_tokamak_eval_IN.DAT b/examples/data/large_tokamak_eval_IN.DAT index 4d1db75a9f..2b3fd57df1 100644 --- a/examples/data/large_tokamak_eval_IN.DAT +++ b/examples/data/large_tokamak_eval_IN.DAT @@ -377,7 +377,7 @@ i_tf_sc_mat = 1 * Switch for superconductor material in TF coils; ripple_b_tf_plasma_edge_max = 0.6 * maximum allowable toroidal field ripple amplitude at plasma edge (%) t_tf_superconductor_quench = 17.97282589344206 * fast discharge time for TF coil in event of quench (s) (`iteration variable 56`) n_tf_coils = 16 * Number of TF coils (default = 50 for stellarators); Number of TF coils outer legs for ST -tftmp = 4.75 * peak helium coolant temperature in TF coils and PF coils (K) +temp_tf_operating = 4.75 * peak helium coolant temperature in TF coils and PF coils (K) dr_tf_nose_case = 0.2816873221155309 * inboard TF coil case outer (non-plasma side) thickness (m) (`iteration variable 57`) dr_tf_wp_with_insulation = 0.5153787768966674 * radial thickness of winding pack (m) (issue #514) dx_tf_turn_steel = 0.008012110032981922 * TF coil conduit case thickness (m) (`iteration variable 58`) diff --git a/examples/data/large_tokamak_varied_min_net_electric_IN.DAT b/examples/data/large_tokamak_varied_min_net_electric_IN.DAT index 432d68ae6e..e4ae9af9ba 100644 --- a/examples/data/large_tokamak_varied_min_net_electric_IN.DAT +++ b/examples/data/large_tokamak_varied_min_net_electric_IN.DAT @@ -561,7 +561,7 @@ dx_tf_wp_insulation = 0.008 dia_tf_turn_coolant_channel = 0.01 * Helium coolant temperature [K] -tftmp = 4.75 +temp_tf_operating = 4.75 * Coolant fraction of TF cable [-] f_a_tf_turn_cable_space_extra_void = 0.3 diff --git a/examples/data/large_tokamak_varyrun_IN.DAT b/examples/data/large_tokamak_varyrun_IN.DAT index 75e2a2759f..97c578c255 100644 --- a/examples/data/large_tokamak_varyrun_IN.DAT +++ b/examples/data/large_tokamak_varyrun_IN.DAT @@ -562,7 +562,7 @@ dx_tf_wp_insulation = 0.008 dia_tf_turn_coolant_channel = 0.01 * Helium coolant temperature [K] -tftmp = 4.75 +temp_tf_operating = 4.75 * Coolant fraction of TF cable [-] f_a_tf_turn_cable_space_extra_void = 0.3 diff --git a/examples/data/scan_example_file_IN.DAT b/examples/data/scan_example_file_IN.DAT index 323c0321ca..732a770227 100644 --- a/examples/data/scan_example_file_IN.DAT +++ b/examples/data/scan_example_file_IN.DAT @@ -567,7 +567,7 @@ dx_tf_wp_insulation = 0.008 dia_tf_turn_coolant_channel = 0.01 * Helium coolant temperature [K] -tftmp = 4.75 +temp_tf_operating = 4.75 * Coolant fraction of TF cable [-] f_a_tf_turn_cable_space_extra_void = 0.3 diff --git a/process/core/data_structure/obsolete_vars.py b/process/core/data_structure/obsolete_vars.py index 78b331d72f..271100841d 100644 --- a/process/core/data_structure/obsolete_vars.py +++ b/process/core/data_structure/obsolete_vars.py @@ -482,6 +482,7 @@ "temp_plasma_pedestal_kev": "temp_plasma_pedestal_electron_kev", "temp_plasma_separatrix_kev": "temp_plasma_separatrix_electron_kev", "iohcl": "i_cs_use", + "tftmp": "temp_tf_operating", } OBS_VARS_HELP = { diff --git a/process/core/init.py b/process/core/init.py index 922a360825..cd2ceb5533 100644 --- a/process/core/init.py +++ b/process/core/init.py @@ -1179,10 +1179,10 @@ def check_process(inputs, data): # noqa: ARG001 if ( SuperconductorModel(data.tfcoil.i_tf_sc_mat).sc_type == SuperconductorType.LOW_TEMPERATURE - and data.tfcoil.tftmp > 10.0 + and data.tfcoil.temp_tf_operating > 10.0 ): raise ProcessValidationError( - "The LTS conductor temperature (tftmp) has to be lower than 10" + "The LTS conductor temperature (temp_tf_operating) has to be lower than 10" ) # PF coil resistivity is zero if superconducting @@ -1310,8 +1310,10 @@ def check_process(inputs, data): # noqa: ARG001 ) # Cold end of the cryocooler should be colder than the TF - if data.tfcoil.temp_tf_cryo > data.tfcoil.tftmp: - raise ProcessValidationError("temp_tf_cryo should be lower than tftmp") + if data.tfcoil.temp_tf_cryo > data.tfcoil.temp_tf_operating: + raise ProcessValidationError( + "temp_tf_cryo should be lower than temp_tf_operating" + ) # Cannot use TF coil strain limit if i_str_wp is off: if ( diff --git a/process/core/input.py b/process/core/input.py index c288a0fc58..b00bf16b65 100644 --- a/process/core/input.py +++ b/process/core/input.py @@ -833,7 +833,7 @@ def bounds(self) -> tuple[NumberType | None, NumberType | None]: "tfcbv": InputVariable("buildings", float, range=(10000.0, 1000000.0)), "dx_tf_wp_insertion_gap": InputVariable("tfcoil", float, range=(1e-10, 0.1)), "f_dr_tf_outboard_inboard": InputVariable("build", float, range=(0.2, 5.0)), - "tftmp": InputVariable("tfcoil", float, range=(0.01, 293.0)), + "temp_tf_operating": InputVariable("tfcoil", float, range=(0.01, 293.0)), "temp_cs_superconductor_operating": InputVariable( "pf_coil", float, range=(0.01, 293.0) ), diff --git a/process/core/io/mfile/comparison.py b/process/core/io/mfile/comparison.py index c5577cda73..a444b30f5e 100644 --- a/process/core/io/mfile/comparison.py +++ b/process/core/io/mfile/comparison.py @@ -181,7 +181,7 @@ "b_tf_inboard_peak_symmetric", "iooic", "tmarg", - "tftmp", + "temp_tf_operating", "qtarget", "qtargetcomplete", "totalpowerlost", diff --git a/process/core/io/plot/summary/api.py b/process/core/io/plot/summary/api.py index b5e807ec71..3b85019ce3 100644 --- a/process/core/io/plot/summary/api.py +++ b/process/core/io/plot/summary/api.py @@ -647,7 +647,7 @@ def _add_page(name: str | None = None): f_a_cable_space_helium=m_file.get( "f_a_tf_turn_cable_space_cooling", scan=scan ), - temp_he_peak=m_file.get("tftmp", scan=scan), + temp_he_peak=m_file.get("temp_tf_operating", scan=scan), temp_quench_max=m_file.get("temp_tf_conductor_quench_max", scan=scan), cu_rrr=m_file.get("rrr_tf_cu", scan=scan), t_quench_detection=m_file.get("t_tf_quench_detection", scan=scan), diff --git a/process/core/io/plot/summary/magnets/tf.py b/process/core/io/plot/summary/magnets/tf.py index e500550f05..78f0ce000b 100644 --- a/process/core/io/plot/summary/magnets/tf.py +++ b/process/core/io/plot/summary/magnets/tf.py @@ -1958,7 +1958,7 @@ def _pack_strands_rectangular_with_obstacles( f" {mfile.get('b_tf_superconductor_critical_zero_temp_strain', scan=scan):.4f}" " T\nCritical temperature at\nzero field and strain:" f" {mfile.get('temp_tf_superconductor_critical_zero_field_strain', scan=scan):.4f}" # noqa: E501 - f" K\nTemperature at conductor: {mfile.get('tftmp', scan=scan):.4f}" + f" K\nTemperature at conductor: {mfile.get('temp_tf_operating', scan=scan):.4f}" " K\nField at conductor:" f" {mfile.get('b_tf_inboard_peak_with_ripple', scan=scan):.4f}" " T\nSuperconductor critical current density at\noperating" @@ -2196,7 +2196,7 @@ def plot_tf_croco_turn(axis: plt.Axes, fig, mfile: MFile, scan: int): f" {mfile.get('b_tf_superconductor_critical_zero_temp_strain', scan=scan):.4f}" " T\nCritical temperature at\nzero field and strain:" f" {mfile.get('temp_tf_superconductor_critical_zero_field_strain', scan=scan):.4f}" # noqa: E501 - f" K\nTemperature at conductor: {mfile.get('tftmp', scan=scan):.4f}" + f" K\nTemperature at conductor: {mfile.get('temp_tf_operating', scan=scan):.4f}" " K\nField at conductor:" f" {mfile.get('b_tf_inboard_peak_with_ripple', scan=scan):.4f}" " T\nSuperconductor critical current density at\noperating" diff --git a/process/data_structure/tfcoil_variables.py b/process/data_structure/tfcoil_variables.py index 1e9bdb5a55..86566f757b 100644 --- a/process/data_structure/tfcoil_variables.py +++ b/process/data_structure/tfcoil_variables.py @@ -628,8 +628,8 @@ class TFData: tfsao: float = 0.0 """area of the outboard TF coil legs (m2)""" - tftmp: float = 4.5 - """peak helium coolant temperature in TF coils and PF coils (K)""" + temp_tf_operating: float = 4.5 + """Operating temperature of the TF coil [K]""" dx_tf_inboard_out_toroidal: float = 1.0 """Inboard leg toroidal thickness at outer edge (m)""" diff --git a/process/models/pfcoil.py b/process/models/pfcoil.py index 3f0be2c320..2b3e4da4d4 100644 --- a/process/models/pfcoil.py +++ b/process/models/pfcoil.py @@ -897,7 +897,7 @@ def pfcoil(self): isumat=self.data.pf_coil.i_pf_superconductor, fhts=self.data.tfcoil.fhts, strain=self.data.tfcoil.str_pf_con_res, - temp_pf_peak_field=self.data.tfcoil.tftmp, + temp_pf_peak_field=self.data.tfcoil.temp_tf_operating, bcritsc=self.data.tfcoil.bcritsc, tcritsc=self.data.tfcoil.tcritsc, dr_hts_tape=self.data.superconducting_tfcoil.dr_tf_hts_tape, diff --git a/process/models/stellarator/coils/calculate.py b/process/models/stellarator/coils/calculate.py index 151e34abc5..0104529d3c 100644 --- a/process/models/stellarator/coils/calculate.py +++ b/process/models/stellarator/coils/calculate.py @@ -417,7 +417,7 @@ def winding_pack_total_size( # jcrit for this bmax: jcrit_vector[k] = jcrit_from_material( b_max_k[k], - data.tfcoil.tftmp + data.tfcoil.tmargmin, + data.tfcoil.temp_tf_operating + data.tfcoil.tmargmin, data.tfcoil.i_tf_sc_mat, data.tfcoil.bcritsc, data.tfcoil.f_a_tf_turn_cable_copper, diff --git a/process/models/stellarator/coils/quench.py b/process/models/stellarator/coils/quench.py index 1b0c1b1667..b8894bc749 100644 --- a/process/models/stellarator/coils/quench.py +++ b/process/models/stellarator/coils/quench.py @@ -61,7 +61,7 @@ def calculate_quench_protection(coilcurrent, data: DataStructure): t_detect=data.tfcoil.t_tf_quench_detection, f_cu=data.tfcoil.f_a_tf_turn_cable_copper, f_cond=1 - data.tfcoil.f_a_tf_turn_cable_space_extra_void, - temp=data.tfcoil.tftmp, + temp=data.tfcoil.temp_tf_operating, a_cable=data.tfcoil.a_tf_turn_cable_space_no_void, a_turn=data.tfcoil.dx_tf_turn_general**2, ) diff --git a/process/models/tfcoil/superconducting.py b/process/models/tfcoil/superconducting.py index 34fcfa3d97..009ba7f86f 100644 --- a/process/models/tfcoil/superconducting.py +++ b/process/models/tfcoil/superconducting.py @@ -974,8 +974,8 @@ def output_tf_superconductor_info(self): po.ovarre( self.outfile, "TF coil temperature at peak field (K)", - "(tftmp)", - self.data.tfcoil.tftmp, + "(temp_tf_operating)", + self.data.tfcoil.temp_tf_operating, ) po.ovarre( self.outfile, @@ -2720,7 +2720,7 @@ def run(self, output: bool = False): j_tf_wp=self.data.tfcoil.j_tf_wp, i_tf_superconductor=self.data.tfcoil.i_tf_sc_mat, f_strain_scale=self.data.tfcoil.fhts, - temp_tf_coolant_peak_field=self.data.tfcoil.tftmp, + temp_tf_coolant_peak_field=self.data.tfcoil.temp_tf_operating, bcritsc=self.data.tfcoil.bcritsc, tcritsc=self.data.tfcoil.tcritsc, data=self.data, @@ -2760,7 +2760,7 @@ def run(self, output: bool = False): bc20m=d_sc_tf.b_tf_superconductor_critical_zero_temp_strain, tc0m=d_sc_tf.temp_tf_superconductor_critical_zero_field_strain, c0=1.0e10, - temp_tf_coolant_peak_field=self.data.tfcoil.tftmp, + temp_tf_coolant_peak_field=self.data.tfcoil.temp_tf_operating, data=self.data, ) ) @@ -2786,7 +2786,7 @@ def run(self, output: bool = False): t_tf_quench_dump=self.data.tfcoil.t_tf_superconductor_quench, f_a_tf_turn_cable_copper=self.data.tfcoil.f_a_tf_turn_cable_copper, f_a_tf_turn_cable_space_cooling=d_sc_tf.f_a_tf_turn_cable_space_cooling, - temp_tf_coolant_peak_field=self.data.tfcoil.tftmp, + temp_tf_coolant_peak_field=self.data.tfcoil.temp_tf_operating, temp_tf_conductor_quench_max=self.data.tfcoil.temp_tf_conductor_quench_max, b_tf_inboard_peak=self.data.tfcoil.b_tf_inboard_peak_with_ripple, cu_rrr=self.data.tfcoil.rrr_tf_cu, @@ -3991,7 +3991,7 @@ def run(self, output: bool = False): a_tf_turn=self.data.tfcoil.a_tf_turn, b_tf_inboard_peak=self.data.tfcoil.b_tf_inboard_peak_with_ripple, cur_tf_turn=self.data.tfcoil.c_tf_turn, - temp_tf_peak=self.data.tfcoil.tftmp, + temp_tf_peak=self.data.tfcoil.temp_tf_operating, i_tf_superconductor=self.data.tfcoil.i_tf_sc_mat, dr_tf_hts_tape=d_sc_tf.dr_tf_hts_tape, dx_tf_hts_tape_rebco=d_sc_tf.dx_tf_hts_tape_rebco, @@ -4035,7 +4035,7 @@ def run(self, output: bool = False): bc20m=d_sc_tf.b_tf_superconductor_critical_zero_temp_strain, tc0m=d_sc_tf.temp_tf_superconductor_critical_zero_field_strain, c0=1.0e10, - temp_tf_coolant_peak_field=self.data.tfcoil.tftmp, + temp_tf_coolant_peak_field=self.data.tfcoil.temp_tf_operating, data=self.data, ) ) @@ -4249,7 +4249,7 @@ def run(self, output: bool = False): t_tf_quench_dump=self.data.tfcoil.t_tf_superconductor_quench, f_a_tf_turn_cable_space_cooling=d_sc_tf.f_a_tf_turn_cable_space_cooling, f_a_tf_turn_cable_copper=self.data.tfcoil.f_a_tf_turn_cable_copper, - temp_tf_coolant_peak_field=self.data.tfcoil.tftmp, + temp_tf_coolant_peak_field=self.data.tfcoil.temp_tf_operating, temp_tf_conductor_quench_max=self.data.tfcoil.temp_tf_conductor_quench_max, b_tf_inboard_peak=self.data.tfcoil.b_tf_inboard_peak_with_ripple, cu_rrr=self.data.tfcoil.rrr_tf_cu, diff --git a/tests/integration/data/large_tokamak_IN.DAT b/tests/integration/data/large_tokamak_IN.DAT index 16230592e5..7eb764a9bd 100644 --- a/tests/integration/data/large_tokamak_IN.DAT +++ b/tests/integration/data/large_tokamak_IN.DAT @@ -561,7 +561,7 @@ dx_tf_wp_insulation = 0.008 dia_tf_turn_coolant_channel = 0.01 * Helium coolant temperature [K] -tftmp = 4.75 +temp_tf_operating = 4.75 * Coolant fraction of TF cable [-] f_a_tf_turn_cable_space_extra_void = 0.3 diff --git a/tests/integration/data/large_tokamak_eval.IN.DAT b/tests/integration/data/large_tokamak_eval.IN.DAT index 29ccd473a4..da81aaf4a1 100644 --- a/tests/integration/data/large_tokamak_eval.IN.DAT +++ b/tests/integration/data/large_tokamak_eval.IN.DAT @@ -373,7 +373,7 @@ i_tf_sc_mat = 1 * Switch for superconductor material in TF coils; ripple_b_tf_plasma_edge_max = 0.6 * maximum allowable toroidal field ripple amplitude at plasma edge (%) t_tf_superconductor_quench = 17.97282589344206 * fast discharge time for TF coil in event of quench (s) (`iteration variable 56`) n_tf_coils = 16 * Number of TF coils (default = 50 for stellarators); Number of TF coils outer legs for ST -tftmp = 4.75 * peak helium coolant temperature in TF coils and PF coils (K) +temp_tf_operating = 4.75 * peak helium coolant temperature in TF coils and PF coils (K) dr_tf_nose_case = 0.2816873221155309 * inboard TF coil case outer (non-plasma side) thickness (m) (`iteration variable 57`) dr_tf_wp_with_insulation = 0.5153787768966674 * radial thickness of winding pack (m) (issue #514) dx_tf_turn_steel = 0.008012110032981922 * TF coil conduit case thickness (m) (`iteration variable 58`) diff --git a/tests/regression/input_files/helias_5b.IN.DAT b/tests/regression/input_files/helias_5b.IN.DAT index c364f1b694..ee71578696 100644 --- a/tests/regression/input_files/helias_5b.IN.DAT +++ b/tests/regression/input_files/helias_5b.IN.DAT @@ -163,7 +163,7 @@ runtitle = HELIAS-5B f_a_tf_turn_cable_copper = 0.69 *Copper fraction of cable conductor (TF coils) i_tf_sc_mat = 1 *Switch for superconductor material in tf coils (1: ITER Nb3Sn) -tftmp = 4.2 *Peak helium coolant temperature in TF coils and PF coils (k) +temp_tf_operating = 4.2 *Peak helium coolant temperature in TF coils and PF coils (k) temp_tf_cryo = 4.2 *Coil temperature for cryogenic plant power calculation (K) dx_tf_turn_general = 0.056 *Dimension conductor area including steel and insulation. dx_tf_turn_insulation = 0.002 *Conduit insulation thickness (m) diff --git a/tests/regression/input_files/large_tokamak_eval.IN.DAT b/tests/regression/input_files/large_tokamak_eval.IN.DAT index d9128b7218..2980495ab4 100644 --- a/tests/regression/input_files/large_tokamak_eval.IN.DAT +++ b/tests/regression/input_files/large_tokamak_eval.IN.DAT @@ -376,7 +376,7 @@ i_tf_sc_mat = 1 * Switch for superconductor material in TF coils; ripple_b_tf_plasma_edge_max = 0.6 * maximum allowable toroidal field ripple amplitude at plasma edge (%) t_tf_superconductor_quench = 17.97282589344206 * fast discharge time for TF coil in event of quench (s) (`iteration variable 56`) n_tf_coils = 16 * Number of TF coils (default = 50 for stellarators); Number of TF coils outer legs for ST -tftmp = 4.75 * peak helium coolant temperature in TF coils and PF coils (K) +temp_tf_operating = 4.75 * peak helium coolant temperature in TF coils and PF coils (K) dr_tf_nose_case = 0.2816873221155309 * inboard TF coil case outer (non-plasma side) thickness (m) (`iteration variable 57`) dr_tf_wp_with_insulation = 0.5153787768966674 * radial thickness of winding pack (m) (issue #514) dx_tf_turn_steel = 0.008012110032981922 * TF coil conduit case thickness (m) (`iteration variable 58`) diff --git a/tests/regression/input_files/large_tokamak_nof.IN.DAT b/tests/regression/input_files/large_tokamak_nof.IN.DAT index 203363dad0..f16a487f5f 100644 --- a/tests/regression/input_files/large_tokamak_nof.IN.DAT +++ b/tests/regression/input_files/large_tokamak_nof.IN.DAT @@ -570,7 +570,7 @@ dx_tf_wp_insulation = 0.008 dia_tf_turn_coolant_channel = 0.01 * Helium coolant temperature [K] -tftmp = 4.75 +temp_tf_operating = 4.75 * Coolant fraction of TF cable [-] f_a_tf_turn_cable_space_extra_void = 0.3 diff --git a/tests/regression/input_files/low_aspect_ratio_DEMO.IN.DAT b/tests/regression/input_files/low_aspect_ratio_DEMO.IN.DAT index af4872e2a9..b5ec0dcc86 100644 --- a/tests/regression/input_files/low_aspect_ratio_DEMO.IN.DAT +++ b/tests/regression/input_files/low_aspect_ratio_DEMO.IN.DAT @@ -928,7 +928,7 @@ dia_tf_turn_coolant_channel = 0.010 * DESCRIPTION: diameter of He coil in TF winding (m) * JUSTIFICATION: -tftmp = 4.750 +temp_tf_operating = 4.750 * DESCRIPTION: Peak helium coolant temperature in tf coils and pf coils (k) * JUSTIFICATION: diff --git a/tests/regression/input_files/spherical_tokamak_eval.IN.DAT b/tests/regression/input_files/spherical_tokamak_eval.IN.DAT index 55d139b8c0..9e917d4502 100644 --- a/tests/regression/input_files/spherical_tokamak_eval.IN.DAT +++ b/tests/regression/input_files/spherical_tokamak_eval.IN.DAT @@ -358,7 +358,7 @@ eyoung_res_tf_buck = 205.0e9 * Resistive TF magnets bucking cylinder young modul ripple_b_tf_plasma_edge_max = 1.0 * maximum allowable toroidal field ripple amplitude at plasma edge (%) i_cp_joints = 0 * Switch for CP demoutable joints type n_tf_coils = 12 * Number of TF coils (default = 50 for stellarators); Number of TF coils outer legs for ST -tftmp = 20.0 * peak helium coolant temperature in TF coils and PF coils (K) +temp_tf_operating = 20.0 * peak helium coolant temperature in TF coils and PF coils (K) dr_tf_nose_case = 0.1293140904093427 * inboard TF coil case outer (non-plasma side) thickness (m) (`iteration variable 57`) dr_tf_wp_with_insulation = 0.6044340543574178 * radial thickness of winding pack (m) (`iteration variable 140`) (issue #514) temp_tf_cryo = 20.0 * coil temperature for cryogenic plant power calculation (K) diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index b3da2cd28e..c1a763f344 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -1330,7 +1330,7 @@ temp_tf_cryo = 20.0 * DESCRIPTION: Coil temperature for cryogenic plant power calculation (K) * JUSTIFICATION: -tftmp = 20.0 +temp_tf_operating = 20.0 * DESCRIPTION: Peak helium coolant temperature in TF coils and PF coils [K] * JUSTIFICATION: TF coil joints much easier at 20 K. * We set the temperature at 19.9K for run convergence issues diff --git a/tests/regression/input_files/stellarator_helias.IN.DAT b/tests/regression/input_files/stellarator_helias.IN.DAT index 73480c5d80..5081668a78 100644 --- a/tests/regression/input_files/stellarator_helias.IN.DAT +++ b/tests/regression/input_files/stellarator_helias.IN.DAT @@ -233,7 +233,7 @@ runtitle = SQuID *-----------------Tfcoil Variables-----------------* i_tf_sc_mat = 1 * Switch for superconductor material in tf coils (1: ITER Nb3Sn) -tftmp = 4.5 * Peak helium coolant temperature in TF coils and PF coils (K) +temp_tf_operating = 4.5 * Peak helium coolant temperature in TF coils and PF coils (K) tmargmin = 1.5 * Temperature margin for superconductor current density calculation (K) temp_tf_cryo = 4.5 * Coil temperature for cryogenic plant power calculation (K) dx_tf_turn_general = 0.056 * Dimension conductor area including steel and insulation. diff --git a/tests/unit/data/large_tokamak_IN.DAT b/tests/unit/data/large_tokamak_IN.DAT index 16230592e5..7eb764a9bd 100644 --- a/tests/unit/data/large_tokamak_IN.DAT +++ b/tests/unit/data/large_tokamak_IN.DAT @@ -561,7 +561,7 @@ dx_tf_wp_insulation = 0.008 dia_tf_turn_coolant_channel = 0.01 * Helium coolant temperature [K] -tftmp = 4.75 +temp_tf_operating = 4.75 * Coolant fraction of TF cable [-] f_a_tf_turn_cable_space_extra_void = 0.3 diff --git a/tests/unit/models/test_costs_1990.py b/tests/unit/models/test_costs_1990.py index 6516137dc9..6bf28717d9 100644 --- a/tests/unit/models/test_costs_1990.py +++ b/tests/unit/models/test_costs_1990.py @@ -124,7 +124,7 @@ def test_acc2263(monkeypatch, costs): monkeypatch.setattr(costs.data.costs, "fkind", 1) monkeypatch.setattr(costs.data.costs, "lsa", 4) monkeypatch.setattr(costs.data.costs, "uccry", 9.3e4) - monkeypatch.setattr(costs.data.tfcoil, "tftmp", 4.5) + monkeypatch.setattr(costs.data.tfcoil, "temp_tf_operating", 4.5) monkeypatch.setattr(costs.data.heat_transport, "helpow", 80.980e3) costs.acc2263() diff --git a/tests/unit/models/test_pfcoil.py b/tests/unit/models/test_pfcoil.py index 63b7638a9b..0a7a9ecb84 100644 --- a/tests/unit/models/test_pfcoil.py +++ b/tests/unit/models/test_pfcoil.py @@ -2465,7 +2465,7 @@ class PFCoilParam(NamedTuple): aspect: Any = None itart: Any = None beta_poloidal_vol_avg: Any = None - tftmp: Any = None + temp_tf_operating: Any = None dcond: Any = None fhts: Any = None tcritsc: Any = None @@ -2538,7 +2538,7 @@ class PFCoilParam(NamedTuple): aspect=3.1, itart=0, beta_poloidal_vol_avg=6.313e-1, - tftmp=4.750, + temp_tf_operating=4.750, dcond=np.full(9, 9.0e3), fhts=0.5, tcritsc=1.6e1, @@ -2644,7 +2644,7 @@ def test_pfcoil(monkeypatch, pfcoil, pfcoilparam): monkeypatch.setattr(pfcoil.data.physics, field, getattr(pfcoilparam, field)) for field in [ - "tftmp", + "temp_tf_operating", "dcond", "fhts", "tcritsc", @@ -2709,7 +2709,7 @@ class OhCalcParam(NamedTuple): n_pf_coil_turns: Any = None m_pf_coil_structure: Any = None dcond: Any = None - tftmp: Any = None + temp_tf_operating: Any = None tcritsc: Any = None str_cs_con_res: Any = None fhts: Any = None @@ -2762,7 +2762,7 @@ class OhCalcParam(NamedTuple): n_pf_coil_turns=np.full(22, 0.0), m_pf_coil_structure=np.full(22, 0.0), dcond=np.full(9, 9.0e3), - tftmp=4.750, + temp_tf_operating=4.750, tcritsc=1.6e1, str_cs_con_res=-5.000e-3, fhts=0.5, @@ -2838,7 +2838,7 @@ def test_ohcalc(monkeypatch, reinitialise_error_module, cs_coil, ohcalcparam): for field in [ "dcond", - "tftmp", + "temp_tf_operating", "tcritsc", "str_cs_con_res", "fhts", diff --git a/tracking/tracking_data.py b/tracking/tracking_data.py index 17572bce5b..48198435b9 100644 --- a/tracking/tracking_data.py +++ b/tracking/tracking_data.py @@ -138,7 +138,7 @@ "HeatTransport.p_plant_electric_net_mw", "HeatTransport.eta_turbine", "HeatTransport.p_plant_electric_gross_mw", - "TFCoil.tftmp", + "TFCoil.temp_tf_operating", "TFCoil.n_tf_coils", "TFCoil.b_tf_inboard_peak_symmetric", "PFCoil.vs_cs_pf_total_pulse",