🔄 Rename mffwpo to mflow_fw_outboard_coolant_channel for clarity and …

…consistency across the codebase
ukaea · Feb 21, 2025 · e63d2c2 · e63d2c2
1 parent bfb6d22
commit e63d2c2
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 19 deletions.
diff --git a/process/blanket_library.py b/process/blanket_library.py
@@ -785,7 +785,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool):
             blanket_library.mflow_fw_inboard_coolant_total
             / blanket_library.n_fw_inboard_channels
         )
-        blanket_library.mffwpo = (
+        blanket_library.mflow_fw_outboard_coolant_channel = (
             blanket_library.mflow_fw_outboard_coolant_total
             / blanket_library.n_fw_outboard_channels
         )
@@ -798,7 +798,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool):
         )
         velfwo = self.flow_velocity(
             i_channel_shape=1,
-            mass_flow_rate=blanket_library.mffwpo,
+            mass_flow_rate=blanket_library.mflow_fw_outboard_coolant_channel,
             flow_density=fwbs_variables.den_fw_coolant,
         )
 
@@ -1749,18 +1749,21 @@ def thermo_hydraulic_model(self, output: bool):
         #     blanket_library.p_fw_inboard_nuclear_heat_mw,
         #     "Inboard first wall",
         # )
-        (fwbs_variables.temp_fw_outboard_peak, cf, rhof, fwbs_variables.mffwpo) = (
-            self.fw.fw_temp(
-                output,
-                fwbs_variables.radius_fw_channel,
-                build_variables.dr_fw_outboard,
-                build_variables.a_fw_outboard,
-                fwbs_variables.psurffwo,
-                blanket_library.p_fw_outboard_nuclear_heat_mw,
-                "Outboard first wall",
-            )
+        (
+            fwbs_variables.temp_fw_outboard_peak,
+            cf,
+            rhof,
+            fwbs_variables.mflow_fw_outboard_coolant_channel,
+        ) = self.fw.fw_temp(
+            output,
+            fwbs_variables.radius_fw_channel,
+            build_variables.dr_fw_outboard,
+            build_variables.a_fw_outboard,
+            fwbs_variables.psurffwo,
+            blanket_library.p_fw_outboard_nuclear_heat_mw,
+            "Outboard first wall",
         )
-        # (fwbs_variables.temp_fw_outboard_peak, cf, rhof, fwbs_variables.mffwpo) = fw_module.fw_temp(
+        # (fwbs_variables.temp_fw_outboard_peak, cf, rhof, fwbs_variables.mflow_fw_outboard_coolant_channel) = fw_module.fw_temp(
         #     int(output),
         #     self.outfile,
         #     fwbs_variables.radius_fw_channel,

diff --git a/source/fortran/blanket_library.f90 b/source/fortran/blanket_library.f90
@@ -75,7 +75,7 @@ module blanket_library
     real(dp) :: n_fw_inboard_channels, n_fw_outboard_channels
     !! Inboard / outboard total number of first wall coolant channels
 
-    real(dp) :: mflow_fw_inboard_coolant_channel, mffwpo
+    real(dp) :: mflow_fw_inboard_coolant_channel, mflow_fw_outboard_coolant_channel
     !! Inboard/outboard mass flow rate per coolant pipe (kg/s)
 
     real(dp) :: p_blkt_nuclear_heat_inboard_mw, p_blkt_nuclear_heat_outboard_mw
@@ -155,7 +155,7 @@ subroutine init_blanket_library
         n_fw_inboard_channels = 0.0D0
         n_fw_outboard_channels = 0.0D0
         mflow_fw_inboard_coolant_channel = 0.0D0
-        mffwpo = 0.0D0
+        mflow_fw_outboard_coolant_channel = 0.0D0
         p_blkt_nuclear_heat_inboard_mw = 0.0D0
         p_blkt_nuclear_heat_outboard_mw = 0.0D0
         mflow_blkt_inboard_coolant = 0.0D0

diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json
@@ -3302,7 +3302,7 @@
         "mflow_fw_inboard_coolant_total": 0.0,
         "mflow_fw_outboard_coolant_total": 0.0,
         "mflow_fw_inboard_coolant_channel": 0.0,
-        "mffwpo": 0.0,
+        "mflow_fw_outboard_coolant_channel": 0.0,
         "mfile": 13.0,
         "mflibe": 0.0,
         "mftotal": 0.0,
@@ -10076,7 +10076,7 @@
         "mflow_fw_inboard_coolant_total": "Inboard/outboard total mass flow rate to remove inboard FW power (kg/s)",
         "mflow_fw_outboard_coolant_total": "Inboard/outboard total mass flow rate to remove inboard FW power (kg/s)",
         "mflow_fw_inboard_coolant_channel": "Inboard/outboard mass flow rate per coolant pipe (kg/s)",
-        "mffwpo": "Inboard/outboard mass flow rate per coolant pipe (kg/s)",
+        "mflow_fw_outboard_coolant_channel": "Inboard/outboard mass flow rate per coolant pipe (kg/s)",
         "mfile": "Machine-optimised output file unit",
         "mflibe": "total mass of FLiBe (kg)",
         "mftotal": "Total mass flow rate for coolant (kg/s)",
@@ -17274,7 +17274,7 @@
             "n_fw_inboard_channels",
             "n_fw_outboard_channels",
             "mflow_fw_inboard_coolant_channel",
-            "mffwpo",
+            "mflow_fw_outboard_coolant_channel",
             "p_blkt_nuclear_heat_inboard_mw",
             "p_blkt_nuclear_heat_outboard_mw",
             "mflow_blkt_inboard_coolant",
@@ -18658,7 +18658,7 @@
             "n_blkt_outboard_channels",
             "mftotal",
             "mflow_fw_inboard_coolant_channel",
-            "mffwpo",
+            "mflow_fw_outboard_coolant_channel",
             "mflow_fw_inboard_coolant_total",
             "mflow_fw_outboard_coolant_total",
             "mflow_fw_coolant_total",