From 18257cfc6d11b9014d2c771e193b52cf6a3bba9c Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 3 Dec 2025 15:07:40 +0000 Subject: [PATCH 1/7] Add Outboard and Inboard Blanket classes with basic geometry calculations --- process/blanket_library.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/process/blanket_library.py b/process/blanket_library.py index fc16881d13..07df75bbba 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -3177,3 +3177,27 @@ def dshellvol(rmajor, rminor, zminor, drin, drout, dz): vout = v2 - v1 return vin, vout, vin + vout + + +class OutboardBlanket(BlanketLibrary): + def calculate_basic_geometry(self): + self.component_volumes() + + dia_blkt_channel = self.pipe_hydraulic_diameter(i_channel_shape=1) + fwbs_variables.radius_blkt_channel = dia_blkt_channel / 2 + ( + fwbs_variables.radius_blkt_channel_90_bend, + fwbs_variables.radius_blkt_channel_180_bend, + ) = self.calculate_pipe_bend_radius(i_ps=1) + + +class InboardBlanket(BlanketLibrary): + def calculate_basic_geometry(self): + self.component_volumes() + + dia_blkt_channel = self.pipe_hydraulic_diameter(i_channel_shape=1) + fwbs_variables.radius_blkt_channel = dia_blkt_channel / 2 + ( + fwbs_variables.radius_blkt_channel_90_bend, + fwbs_variables.radius_blkt_channel_180_bend, + ) = self.calculate_pipe_bend_radius(i_ps=1) From 3cd5afe0fc233a819178943ee4c2fff731aecf86 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 3 Dec 2025 15:23:08 +0000 Subject: [PATCH 2/7] Refactor set_pumping_powers_as_fractions to accept parameters and return calculated values for coolant pumping powers --- process/blanket_library.py | 88 +++++++++++++++++++++++++++----------- process/dcll.py | 21 ++++++++- process/hcpb.py | 21 ++++++++- 3 files changed, 102 insertions(+), 28 deletions(-) diff --git a/process/blanket_library.py b/process/blanket_library.py index 07df75bbba..bb1d72b66f 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -2978,35 +2978,71 @@ def coolant_pumping_power( return pumppower -def set_pumping_powers_as_fractions(): - # User sets mechanical pumping power as a fraction of thermal power in component - - heat_transport_variables.p_fw_coolant_pump_mw = ( - heat_transport_variables.f_p_fw_coolant_pump_total_heat - * ( - fwbs_variables.p_fw_nuclear_heat_total_mw - + fwbs_variables.psurffwi - + fwbs_variables.psurffwo - ) +def set_pumping_powers_as_fractions( + f_p_fw_coolant_pump_total_heat: float, + f_p_blkt_coolant_pump_total_heat: float, + f_p_shld_coolant_pump_total_heat: float, + f_p_div_coolant_pump_total_heat: float, + p_fw_nuclear_heat_total_mw: float, + psurffwi: float, + psurffwo: float, + p_blkt_nuclear_heat_total_mw: float, + p_shld_nuclear_heat_mw: float, + p_cp_shield_nuclear_heat_mw: float, + p_plasma_separatrix_mw: float, + p_div_nuclear_heat_total_mw: float, + p_div_rad_total_mw: float, +) -> tuple[float, float, float, float]: + """ + Calculate mechanical pumping powers as fractions of thermal power in each component. + + :param f_p_fw_coolant_pump_total_heat: Fraction for FW coolant pump. + :type f_p_fw_coolant_pump_total_heat: float + :param f_p_blkt_coolant_pump_total_heat: Fraction for blanket coolant pump. + :type f_p_blkt_coolant_pump_total_heat: float + :param f_p_shld_coolant_pump_total_heat: Fraction for shield coolant pump. + :type f_p_shld_coolant_pump_total_heat: float + :param f_p_div_coolant_pump_total_heat: Fraction for divertor coolant pump. + :type f_p_div_coolant_pump_total_heat: float + :param p_fw_nuclear_heat_total_mw: Total FW nuclear heating (MW). + :type p_fw_nuclear_heat_total_mw: float + :param psurffwi: Inboard FW surface heating (MW). + :type psurffwi: float + :param psurffwo: Outboard FW surface heating (MW). + :type psurffwo: float + :param p_blkt_nuclear_heat_total_mw: Total blanket nuclear heating (MW). + :type p_blkt_nuclear_heat_total_mw: float + :param p_shld_nuclear_heat_mw: Shield nuclear heating (MW). + :type p_shld_nuclear_heat_mw: float + :param p_cp_shield_nuclear_heat_mw: CP shield nuclear heating (MW). + :type p_cp_shield_nuclear_heat_mw: float + :param p_plasma_separatrix_mw: Plasma separatrix power (MW). + :type p_plasma_separatrix_mw: float + :param p_div_nuclear_heat_total_mw: Divertor nuclear heating (MW). + :type p_div_nuclear_heat_total_mw: float + :param p_div_rad_total_mw: Divertor radiative power (MW). + :type p_div_rad_total_mw: float + + :return: Tuple of pumping powers (MW) for FW, blanket, shield, and divertor. + :rtype: tuple[float, float, float, float] + """ + p_fw_coolant_pump_mw = f_p_fw_coolant_pump_total_heat * ( + p_fw_nuclear_heat_total_mw + psurffwi + psurffwo ) - heat_transport_variables.p_blkt_coolant_pump_mw = ( - heat_transport_variables.f_p_blkt_coolant_pump_total_heat - * fwbs_variables.p_blkt_nuclear_heat_total_mw + p_blkt_coolant_pump_mw = ( + f_p_blkt_coolant_pump_total_heat * p_blkt_nuclear_heat_total_mw ) - heat_transport_variables.p_shld_coolant_pump_mw = ( - heat_transport_variables.f_p_shld_coolant_pump_total_heat - * ( - fwbs_variables.p_shld_nuclear_heat_mw - + fwbs_variables.p_cp_shield_nuclear_heat_mw - ) + p_shld_coolant_pump_mw = f_p_shld_coolant_pump_total_heat * ( + p_shld_nuclear_heat_mw + p_cp_shield_nuclear_heat_mw ) - heat_transport_variables.p_div_coolant_pump_mw = ( - heat_transport_variables.f_p_div_coolant_pump_total_heat - * ( - physics_variables.p_plasma_separatrix_mw - + fwbs_variables.p_div_nuclear_heat_total_mw - + fwbs_variables.p_div_rad_total_mw - ) + p_div_coolant_pump_mw = f_p_div_coolant_pump_total_heat * ( + p_plasma_separatrix_mw + p_div_nuclear_heat_total_mw + p_div_rad_total_mw + ) + return ( + p_fw_coolant_pump_mw, + p_blkt_coolant_pump_mw, + p_shld_coolant_pump_mw, + p_div_coolant_pump_mw, ) diff --git a/process/dcll.py b/process/dcll.py index 8f1198c5af..a114d2a8ef 100644 --- a/process/dcll.py +++ b/process/dcll.py @@ -309,7 +309,26 @@ def dcll_power_and_heating(self, output: bool): if fwbs_variables.i_p_coolant_pumping == 1: # User sets mechanical pumping power directly - blanket_library.set_pumping_powers_as_fractions() + ( + heat_transport_variables.p_fw_coolant_pump_mw, + heat_transport_variables.p_blkt_coolant_pump_mw, + heat_transport_variables.p_shld_coolant_pump_mw, + heat_transport_variables.p_div_coolant_pump_mw, + ) = blanket_library.set_pumping_powers_as_fractions( + f_p_fw_coolant_pump_total_heat=heat_transport_variables.f_p_fw_coolant_pump_total_heat, + f_p_blkt_coolant_pump_total_heat=heat_transport_variables.f_p_blkt_coolant_pump_total_heat, + f_p_shld_coolant_pump_total_heat=heat_transport_variables.f_p_shld_coolant_pump_total_heat, + f_p_div_coolant_pump_total_heat=heat_transport_variables.f_p_div_coolant_pump_total_heat, + p_fw_nuclear_heat_total_mw=fwbs_variables.p_fw_nuclear_heat_total_mw, + psurffwi=fwbs_variables.psurffwi, + psurffwo=fwbs_variables.psurffwo, + p_blkt_nuclear_heat_total_mw=fwbs_variables.p_blkt_nuclear_heat_total_mw, + p_shld_nuclear_heat_mw=heat_transport_variables.p_shld_nuclear_heat_mw, + p_cp_shield_nuclear_heat_mw=fwbs_variables.p_cp_shield_nuclear_heat_mw, + p_plasma_separatrix_mw=physics_variables.p_plasma_separatrix_mw, + p_div_nuclear_heat_total_mw=fwbs_variables.p_div_nuclear_heat_total_mw, + p_div_rad_total_mw=fwbs_variables.p_div_rad_total_mw, + ) elif fwbs_variables.i_p_coolant_pumping in [2, 3]: # Mechanical pumping power is calculated for first wall and blanket diff --git a/process/hcpb.py b/process/hcpb.py index 0bbbb515c3..87ad7bbecb 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -813,7 +813,26 @@ def powerflow_calc(self, output: bool): if fwbs_variables.i_p_coolant_pumping == 1: # User sets mechanical pumping power directly - blanket_library.set_pumping_powers_as_fractions() + ( + heat_transport_variables.p_fw_coolant_pump_mw, + heat_transport_variables.p_blkt_coolant_pump_mw, + heat_transport_variables.p_shld_coolant_pump_mw, + heat_transport_variables.p_div_coolant_pump_mw, + ) = blanket_library.set_pumping_powers_as_fractions( + f_p_fw_coolant_pump_total_heat=heat_transport_variables.f_p_fw_coolant_pump_total_heat, + f_p_blkt_coolant_pump_total_heat=heat_transport_variables.f_p_blkt_coolant_pump_total_heat, + f_p_shld_coolant_pump_total_heat=heat_transport_variables.f_p_shld_coolant_pump_total_heat, + f_p_div_coolant_pump_total_heat=heat_transport_variables.f_p_div_coolant_pump_total_heat, + p_fw_nuclear_heat_total_mw=fwbs_variables.p_fw_nuclear_heat_total_mw, + psurffwi=fwbs_variables.psurffwi, + psurffwo=fwbs_variables.psurffwo, + p_blkt_nuclear_heat_total_mw=fwbs_variables.p_blkt_nuclear_heat_total_mw, + p_shld_nuclear_heat_mw=heat_transport_variables.p_shld_nuclear_heat_mw, + p_cp_shield_nuclear_heat_mw=fwbs_variables.p_cp_shield_nuclear_heat_mw, + p_plasma_separatrix_mw=physics_variables.p_plasma_separatrix_mw, + p_div_nuclear_heat_total_mw=fwbs_variables.p_div_nuclear_heat_total_mw, + p_div_rad_total_mw=fwbs_variables.p_div_rad_total_mw, + ) elif fwbs_variables.i_p_coolant_pumping == 2: # Calculate the required material properties of the FW and BB coolant. From ddf2762c8681c3a235ba0d6d8fd967785776d743 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 3 Dec 2025 15:31:17 +0000 Subject: [PATCH 3/7] Add set_blanket_module_geometry calls in Outboard and Inboard Blanket classes --- process/blanket_library.py | 5 ++++- process/dcll.py | 2 ++ process/hcpb.py | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/process/blanket_library.py b/process/blanket_library.py index bb1d72b66f..5f7cfe6552 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -1921,7 +1921,6 @@ def thermo_hydraulic_model(self, output: bool): # load in pressures if primary pumping == 2 if fwbs_variables.i_p_coolant_pumping == 2: - self.set_blanket_module_geometry() deltap = self.thermo_hydraulic_model_pressure_drop_calculations( output=output ) @@ -3226,6 +3225,8 @@ def calculate_basic_geometry(self): fwbs_variables.radius_blkt_channel_180_bend, ) = self.calculate_pipe_bend_radius(i_ps=1) + self.set_blanket_module_geometry() + class InboardBlanket(BlanketLibrary): def calculate_basic_geometry(self): @@ -3237,3 +3238,5 @@ def calculate_basic_geometry(self): fwbs_variables.radius_blkt_channel_90_bend, fwbs_variables.radius_blkt_channel_180_bend, ) = self.calculate_pipe_bend_radius(i_ps=1) + + self.set_blanket_module_geometry() diff --git a/process/dcll.py b/process/dcll.py index a114d2a8ef..036cf50b95 100644 --- a/process/dcll.py +++ b/process/dcll.py @@ -96,6 +96,8 @@ def run(self, output: bool): fwbs_variables.radius_blkt_channel_180_bend, ) = self.calculate_pipe_bend_radius(i_ps=1) + self.set_blanket_module_geometry() + self.primary_coolant_properties(output=output) self.liquid_breeder_properties(output=output) self.dcll_neutronics_and_power(output=output) diff --git a/process/hcpb.py b/process/hcpb.py index 87ad7bbecb..c2c2656800 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -53,6 +53,8 @@ def run(self, output: bool): fwbs_variables.radius_blkt_channel_180_bend, ) = self.calculate_pipe_bend_radius(i_ps=1) + self.set_blanket_module_geometry() + # Centrepost neutronics if physics_variables.itart == 1: # CP radius at the point of maximum sield radius [m] From 388e96b227fe406e40229be2f48c19d91f7d9aa8 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 3 Dec 2025 15:37:29 +0000 Subject: [PATCH 4/7] Refactor DCLL and CCFE_HCPB classes to inherit from InboardBlanket and OutboardBlanket --- process/dcll.py | 4 ++-- process/hcpb.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/process/dcll.py b/process/dcll.py index 036cf50b95..5dd7f3949d 100644 --- a/process/dcll.py +++ b/process/dcll.py @@ -3,7 +3,7 @@ from process import ( process_output as po, ) -from process.blanket_library import BlanketLibrary +from process.blanket_library import InboardBlanket, OutboardBlanket from process.data_structure import ( build_variables, current_drive_variables, @@ -15,7 +15,7 @@ ) -class DCLL(BlanketLibrary): +class DCLL(InboardBlanket, OutboardBlanket): """This module contains the Dual Coolant Lead Lithium (DCLL) specific submods of PROCESSS. author: G. Graham, CCFE diff --git a/process/hcpb.py b/process/hcpb.py index c2c2656800..517b6da6f5 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -8,7 +8,7 @@ from process import ( process_output as po, ) -from process.blanket_library import BlanketLibrary +from process.blanket_library import InboardBlanket, OutboardBlanket from process.coolprop_interface import FluidProperties from process.data_structure import ( build_variables, @@ -27,7 +27,7 @@ logger = logging.getLogger(__name__) -class CCFE_HCPB(BlanketLibrary): +class CCFE_HCPB(OutboardBlanket, InboardBlanket): """This module contains the PROCESS CCFE HCPB blanket model based on CCFE HCPB model from the PROCESS engineering paper PROCESS Engineering paper (M. Kovari et al.) From d785fa875578525e54181793eff410f56c88a1a5 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 3 Dec 2025 16:02:07 +0000 Subject: [PATCH 5/7] Add geometry calculation methods for inboard and outboard blanket segments --- process/blanket_library.py | 74 +++++++++++++++++++++++++------------- process/dcll.py | 13 +++++++ process/hcpb.py | 13 +++++++ 3 files changed, 75 insertions(+), 25 deletions(-) diff --git a/process/blanket_library.py b/process/blanket_library.py index 5f7cfe6552..c7a9f60c9f 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -630,30 +630,6 @@ def set_blanket_module_geometry(self): fwbs_variables.n_blkt_inboard_modules_poloidal = 1 fwbs_variables.n_blkt_outboard_modules_poloidal = 1 - # Calculate mid-plane toroidal circumference and segment - # of inboard blanket - blanket_library.len_blkt_inboard_segment_toroidal = ( - 2.0e0 - * np.pi - * ( - physics_variables.rmajor - - physics_variables.rminor - - build_variables.dr_fw_plasma_gap_inboard - ) - ) / fwbs_variables.n_blkt_inboard_modules_toroidal - - # Calculate mid-plane toroidal circumference and segment - # of outboard blanke - blanket_library.len_blkt_outboard_segment_toroidal = ( - 2.0e0 - * np.pi - * ( - physics_variables.rmajor - + physics_variables.rminor - + build_variables.dr_fw_plasma_gap_outboard - ) - ) / fwbs_variables.n_blkt_outboard_modules_toroidal - # Calculate poloidal height of blanket modules self.blanket_module_poloidal_height() @@ -3225,7 +3201,30 @@ def calculate_basic_geometry(self): fwbs_variables.radius_blkt_channel_180_bend, ) = self.calculate_pipe_bend_radius(i_ps=1) - self.set_blanket_module_geometry() + def set_blanket_outboard_module_geometry( + self, + n_blkt_outboard_modules_toroidal: int, + rmajor: float, + rminor: float, + dr_fw_plasma_gap_outboard: float, + ) -> float: + """ + Calculate the mid-plane toroidal circumference and segment length of the outboard blanket. + + :param n_blkt_outboard_modules_toroidal: Number of outboard blanket modules in the toroidal direction. + :type n_blkt_outboard_modules_toroidal: int + :param rmajor: Major radius (m). + :type rmajor: float + :param rminor: Minor radius (m). + :type rminor: float + :param dr_fw_plasma_gap_outboard: Outboard first wall to plasma gap (m). + :type dr_fw_plasma_gap_outboard: float + :return: Length of outboard blanket segment in the toroidal direction (m). + :rtype: float + """ + return ( + 2.0 * np.pi * (rmajor + rminor + dr_fw_plasma_gap_outboard) + ) / n_blkt_outboard_modules_toroidal class InboardBlanket(BlanketLibrary): @@ -3240,3 +3239,28 @@ def calculate_basic_geometry(self): ) = self.calculate_pipe_bend_radius(i_ps=1) self.set_blanket_module_geometry() + + def set_blanket_inboard_module_geometry( + self, + n_blkt_inboard_modules_toroidal: int, + rmajor: float, + rminor: float, + dr_fw_plasma_gap_inboard: float, + ) -> float: + """ + Calculate the mid-plane toroidal circumference and segment length of the inboard blanket. + + :param n_blkt_inboard_modules_toroidal: Number of inboard blanket modules in the toroidal direction. + :type n_blkt_inboard_modules_toroidal: int + :param rmajor: Major radius (m). + :type rmajor: float + :param rminor: Minor radius (m). + :type rminor: float + :param dr_fw_plasma_gap_inboard: Inboard first wall to plasma gap (m). + :type dr_fw_plasma_gap_inboard: float + :return: Length of inboard blanket segment in the toroidal direction (m). + :rtype: float + """ + return ( + 2.0 * np.pi * (rmajor + rminor + dr_fw_plasma_gap_inboard) + ) / n_blkt_inboard_modules_toroidal diff --git a/process/dcll.py b/process/dcll.py index 5dd7f3949d..91ef85a3e2 100644 --- a/process/dcll.py +++ b/process/dcll.py @@ -98,6 +98,19 @@ def run(self, output: bool): self.set_blanket_module_geometry() + blanket_library.len_blkt_inboard_segment_toroidal = self.set_blanket_inboard_module_geometry( + n_blkt_inboard_modules_toroidal=fwbs_variables.n_blkt_inboard_modules_toroidal, + rmajor=physics_variables.rmajor, + rminor=physics_variables.rminor, + dr_fw_plasma_gap_inboard=build_variables.dr_fw_plasma_gap_inboard, + ) + blanket_library.len_blkt_outboard_segment_toroidal = self.set_blanket_outboard_module_geometry( + n_blkt_outboard_modules_toroidal=fwbs_variables.n_blkt_outboard_modules_toroidal, + rmajor=physics_variables.rmajor, + rminor=physics_variables.rminor, + dr_fw_plasma_gap_outboard=build_variables.dr_fw_plasma_gap_outboard, + ) + self.primary_coolant_properties(output=output) self.liquid_breeder_properties(output=output) self.dcll_neutronics_and_power(output=output) diff --git a/process/hcpb.py b/process/hcpb.py index 517b6da6f5..899e973ba8 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -55,6 +55,19 @@ def run(self, output: bool): self.set_blanket_module_geometry() + blanket_library.len_blkt_inboard_segment_toroidal = self.set_blanket_inboard_module_geometry( + n_blkt_inboard_modules_toroidal=fwbs_variables.n_blkt_inboard_modules_toroidal, + rmajor=physics_variables.rmajor, + rminor=physics_variables.rminor, + dr_fw_plasma_gap_inboard=build_variables.dr_fw_plasma_gap_inboard, + ) + blanket_library.len_blkt_outboard_segment_toroidal = self.set_blanket_outboard_module_geometry( + n_blkt_outboard_modules_toroidal=fwbs_variables.n_blkt_outboard_modules_toroidal, + rmajor=physics_variables.rmajor, + rminor=physics_variables.rminor, + dr_fw_plasma_gap_outboard=build_variables.dr_fw_plasma_gap_outboard, + ) + # Centrepost neutronics if physics_variables.itart == 1: # CP radius at the point of maximum sield radius [m] From 4f0caf009d648944a34d833a4d85e1acb2a059b5 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 5 Dec 2025 12:54:20 +0000 Subject: [PATCH 6/7] Reviewer changes --- process/dcll.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/process/dcll.py b/process/dcll.py index 91ef85a3e2..430a66d965 100644 --- a/process/dcll.py +++ b/process/dcll.py @@ -338,7 +338,7 @@ def dcll_power_and_heating(self, output: bool): psurffwi=fwbs_variables.psurffwi, psurffwo=fwbs_variables.psurffwo, p_blkt_nuclear_heat_total_mw=fwbs_variables.p_blkt_nuclear_heat_total_mw, - p_shld_nuclear_heat_mw=heat_transport_variables.p_shld_nuclear_heat_mw, + p_shld_nuclear_heat_mw=fwbs_variables.p_shld_nuclear_heat_mw, p_cp_shield_nuclear_heat_mw=fwbs_variables.p_cp_shield_nuclear_heat_mw, p_plasma_separatrix_mw=physics_variables.p_plasma_separatrix_mw, p_div_nuclear_heat_total_mw=fwbs_variables.p_div_nuclear_heat_total_mw, From 95da307833babb8d337c72a1f69142fc448759b9 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 5 Dec 2025 17:08:40 +0000 Subject: [PATCH 7/7] Rename geometry methods in blanket classes for consistency --- process/blanket_library.py | 4 ++-- process/dcll.py | 4 ++-- process/hcpb.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/process/blanket_library.py b/process/blanket_library.py index c7a9f60c9f..694c9211db 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -3201,7 +3201,7 @@ def calculate_basic_geometry(self): fwbs_variables.radius_blkt_channel_180_bend, ) = self.calculate_pipe_bend_radius(i_ps=1) - def set_blanket_outboard_module_geometry( + def calculate_blanket_outboard_module_geometry( self, n_blkt_outboard_modules_toroidal: int, rmajor: float, @@ -3240,7 +3240,7 @@ def calculate_basic_geometry(self): self.set_blanket_module_geometry() - def set_blanket_inboard_module_geometry( + def calculate_blanket_inboard_module_geometry( self, n_blkt_inboard_modules_toroidal: int, rmajor: float, diff --git a/process/dcll.py b/process/dcll.py index 430a66d965..0d14496888 100644 --- a/process/dcll.py +++ b/process/dcll.py @@ -98,13 +98,13 @@ def run(self, output: bool): self.set_blanket_module_geometry() - blanket_library.len_blkt_inboard_segment_toroidal = self.set_blanket_inboard_module_geometry( + blanket_library.len_blkt_inboard_segment_toroidal = self.calculate_blanket_inboard_module_geometry( n_blkt_inboard_modules_toroidal=fwbs_variables.n_blkt_inboard_modules_toroidal, rmajor=physics_variables.rmajor, rminor=physics_variables.rminor, dr_fw_plasma_gap_inboard=build_variables.dr_fw_plasma_gap_inboard, ) - blanket_library.len_blkt_outboard_segment_toroidal = self.set_blanket_outboard_module_geometry( + blanket_library.len_blkt_outboard_segment_toroidal = self.calculate_blanket_outboard_module_geometry( n_blkt_outboard_modules_toroidal=fwbs_variables.n_blkt_outboard_modules_toroidal, rmajor=physics_variables.rmajor, rminor=physics_variables.rminor, diff --git a/process/hcpb.py b/process/hcpb.py index 899e973ba8..94d5424853 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -55,13 +55,13 @@ def run(self, output: bool): self.set_blanket_module_geometry() - blanket_library.len_blkt_inboard_segment_toroidal = self.set_blanket_inboard_module_geometry( + blanket_library.len_blkt_inboard_segment_toroidal = self.calculate_blanket_inboard_module_geometry( n_blkt_inboard_modules_toroidal=fwbs_variables.n_blkt_inboard_modules_toroidal, rmajor=physics_variables.rmajor, rminor=physics_variables.rminor, dr_fw_plasma_gap_inboard=build_variables.dr_fw_plasma_gap_inboard, ) - blanket_library.len_blkt_outboard_segment_toroidal = self.set_blanket_outboard_module_geometry( + blanket_library.len_blkt_outboard_segment_toroidal = self.calculate_blanket_outboard_module_geometry( n_blkt_outboard_modules_toroidal=fwbs_variables.n_blkt_outboard_modules_toroidal, rmajor=physics_variables.rmajor, rminor=physics_variables.rminor,