🔄 - rename dtiocool to dtemp_cp_coolant for clarity and consistency

Author: chris-ashe

process/data_structure/tfcoil_variables.py

@@ -1021,7 +1021,7 @@
 """centrepost coolant inlet temperature (K)"""
 
 
-dtiocool: float = None
+dtemp_cp_coolant: float = None
 """inlet / outlet TF coil coolant temperature rise (K)"""
 
 
@@ -1288,7 +1288,7 @@ def init_tfcoil_variables():
     global temp_cp_max
     global radius_cp_coolant_channel
     global temp_cp_coolant_inlet
-    global dtiocool
+    global dtemp_cp_coolant
     global temp_cp_average
     global tcpav2
     global temp_tf_legs_outboard
@@ -1523,7 +1523,7 @@ def init_tfcoil_variables():
     temp_cp_max = 473.15  # 200 C
     radius_cp_coolant_channel = 0.005
     temp_cp_coolant_inlet = 313.15  # 40 C
-    dtiocool = 0.0
+    dtemp_cp_coolant = 0.0
     temp_cp_average = 373.15  # 100 C
     tcpav2 = 0.0
     temp_tf_legs_outboard = -1.0

process/io/plot_proc.py

@@ -6625,7 +6625,7 @@ def plot_resistive_tf_wp(axis, mfile_data, scan: int, fig) -> None:
     textstr_cooling = (
         f"$\\mathbf{{Cooling \\ info:}}$\n \n"
         f"Coolant inlet temperature: {mfile_data.data['temp_cp_coolant_inlet'].get_scan(scan):.2f} K\n"
-        f"Coolant temperature rise: {mfile_data.data['dtiocool'].get_scan(scan):.2f} K\n"
+        f"Coolant temperature rise: {mfile_data.data['dtemp_cp_coolant'].get_scan(scan):.2f} K\n"
         f"Coolant velocity: {mfile_data.data['vel_cp_coolant_midplane'].get_scan(scan):.2f} $\\mathrm{{ms^{{-1}}}}$\n\n"
         f"Average CP temperature: {mfile_data.data['temp_cp_average'].get_scan(scan):.2f} K\n"
         f"CP resistivity: {mfile_data.data['rho_cp'].get_scan(scan):.2e} $\\Omega \\mathrm{{m}}$\n"

process/tf_coil.py

@@ -2244,7 +2244,7 @@ def cntrpst(self):
             )
 
             # Water temperature rise
-            tfcoil_variables.dtiocool = ptot / (cool_mass_flow * coolant_cp)
+            tfcoil_variables.dtemp_cp_coolant = ptot / (cool_mass_flow * coolant_cp)
 
             # Constant coolant velocity
             vcool_max = tfcoil_variables.vel_cp_coolant_midplane
@@ -2279,14 +2279,14 @@ def cntrpst(self):
             vcool_max = cool_mass_flow / (acool * coolant_density)
 
             # Getting the global in-outlet temperature increase
-            tfcoil_variables.dtiocool = (
+            tfcoil_variables.dtemp_cp_coolant = (
                 tcool_calc - tfcoil_variables.temp_cp_coolant_inlet
             )
         # --------------
 
         # Average coolant temperature
         tcool_av = (
-            tfcoil_variables.temp_cp_coolant_inlet + 0.5e0 * tfcoil_variables.dtiocool
+            tfcoil_variables.temp_cp_coolant_inlet + 0.5e0 * tfcoil_variables.dtemp_cp_coolant
         )
         # **********************************************
 
@@ -2386,19 +2386,19 @@ def cntrpst(self):
             tfcoil_variables.temp_cp_coolant_inlet
             + dtcncpav
             + dtfilmav
-            + 0.5e0 * tfcoil_variables.dtiocool
+            + 0.5e0 * tfcoil_variables.dtemp_cp_coolant
         )
 
         # Peak wall temperature
         tfcoil_variables.temp_cp_peak = (
             tfcoil_variables.temp_cp_coolant_inlet
-            + tfcoil_variables.dtiocool
+            + tfcoil_variables.dtemp_cp_coolant
             + dtfilmav
             + dtconcpmx
         )
         tcoolmx = (
             tfcoil_variables.temp_cp_coolant_inlet
-            + tfcoil_variables.dtiocool
+            + tfcoil_variables.dtemp_cp_coolant
             + dtfilmav
         )
         # -------------------------
@@ -2534,8 +2534,8 @@ def cntrpst(self):
             po.ovarre(
                 self.outfile,
                 "Input-output coolant temperature rise (K)",
-                "(dtiocool)",
-                tfcoil_variables.dtiocool,
+                "(dtemp_cp_coolant)",
+                tfcoil_variables.dtemp_cp_coolant,
             )
             po.ovarre(self.outfile, "Film temperature rise (K)", "(dtfilmav)", dtfilmav)
             po.ovarre(

tests/unit/test_tfcoil.py

@@ -162,7 +162,7 @@ class CntrpstTestAsset(NamedTuple):
     :temp_cp_coolant_inlet: value for tfcoil_variables.temp_cp_coolant_inlet to be mocked with (centrepost coolant inlet temperature)
     :type temp_cp_coolant_inlet: float
 
-    :expected_dtiocool: expected value of tfcoil_variables.dtiocool after tfcoil.cntrpst routine has run
+    :expected_dtiocool: expected value of tfcoil_variables.dtemp_cp_coolant after tfcoil.cntrpst routine has run
     :type expected_dtiocool: float
     :expected_tcpav2: expected value of tfcoil_variables.tcpav2 after tfcoil.cntrpst routine has run
     :type expected_tcpav2: float
@@ -196,7 +196,7 @@ def test_cntrpst(cntrpst_asset, monkeypatch, reinitialise_error_module, tfcoil):
     """Integration test for cntrpst
 
     Testing tfcoil module variables being set:
-        - dtiocool
+        - dtemp_cp_coolant
         - tcpav2
         - temp_cp_peak
         - p_cp_coolant_pump_elec
@@ -233,7 +233,7 @@ def test_cntrpst(cntrpst_asset, monkeypatch, reinitialise_error_module, tfcoil):
     assert pytest.approx(tfcoil_variables.n_cp_coolant_channels_total) == 203718.3271576
 
     assert (
-        pytest.approx(tfcoil_variables.dtiocool, abs=1e-8)
+        pytest.approx(tfcoil_variables.dtemp_cp_coolant, abs=1e-8)
         == cntrpst_asset.expected_dtiocool
     )
     assert pytest.approx(tfcoil_variables.tcpav2) == cntrpst_asset.expected_tcpav2