Skip to content

Remove circular FW and blanket, and create ivc_tools.py for common fns #4235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
timothy-nunn merged 2 commits into from
May 8, 2026
Merged

Remove circular FW and blanket, and create ivc_tools.py for common fns #4235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67917d6
remove circular fw and blanket , and move common ivc fns into a separ…
clmould Apr 20, 2026
a7debef
pr comment changes
clmould May 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
329 changes: 15 additions & 314 deletions process/models/blankets/blanket_library.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@
primary_pumping_variables,
)
from process.models.build import FwBlktVVShape
from process.models.engineering.ivc_functions import (
calculate_pipe_bend_radius,
dshellarea,
dshellvol,
eshellarea,
eshellvol,
)
from process.models.engineering.pumping import (
calculate_reynolds_number,
darcy_friction_haaland,
Expand Down Expand Up @@ -1350,7 +1357,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool):
(
self.data.fwbs.radius_blkt_channel_90_bend,
self.data.fwbs.radius_blkt_channel_180_bend,
) = self.calculate_pipe_bend_radius(
) = calculate_pipe_bend_radius(
i_ps=1,
radius_fw_channel=self.data.fwbs.radius_fw_channel,
b_bz_liq=self.data.fwbs.b_bz_liq,
Expand Down Expand Up @@ -1390,7 +1397,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool):
(
self.data.fwbs.radius_blkt_channel_90_bend,
self.data.fwbs.radius_blkt_channel_180_bend,
) = self.calculate_pipe_bend_radius(
) = calculate_pipe_bend_radius(
i_ps=1,
radius_fw_channel=self.data.fwbs.radius_fw_channel,
b_bz_liq=self.data.fwbs.b_bz_liq,
Expand Down Expand Up @@ -2795,12 +2802,10 @@ def total_pressure_drop(
float
Total pressure drop (Pa).
"""
radius_pipe_90_deg_bend, radius_pipe_180_deg_bend = (
self.calculate_pipe_bend_radius(
i_ps=icoolpump,
radius_fw_channel=self.data.fwbs.radius_fw_channel,
b_bz_liq=self.data.fwbs.b_bz_liq,
)
radius_pipe_90_deg_bend, radius_pipe_180_deg_bend = calculate_pipe_bend_radius(
i_ps=icoolpump,
radius_fw_channel=self.data.fwbs.radius_fw_channel,
b_bz_liq=self.data.fwbs.b_bz_liq,
)

# Friction - for all coolants
Expand Down Expand Up @@ -3005,27 +3010,6 @@ def liquid_breeder_mhd_pressure_drop(

return liquid_breeder_pressure_drop_mhd

@staticmethod
def calculate_pipe_bend_radius(i_ps: int, radius_fw_channel: float, b_bz_liq: float):
"""Set the pipe bend radius based on the coolant type.

Parameters
----------
i_ps : int
switch for primary or secondary coolant
radius_fw_channel: float
radius of first wall cooling channels [m]
b_bz_liq: float
radial width of the rectangular cooling channel [m]
for long poloidal sections of blanket breeding zone

"""
# If primary coolant or secondary coolant (See DCLL)
radius_pipe_90_deg_bend = (3 * radius_fw_channel) if (i_ps == 1) else b_bz_liq
radius_pipe_180_deg_bend = radius_pipe_90_deg_bend / 2

return radius_pipe_90_deg_bend, radius_pipe_180_deg_bend

def coolant_friction_pressure_drop(
self,
i_ps: int,
Expand Down Expand Up @@ -3467,289 +3451,6 @@ def coolant_pumping_power(
return pumppower


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.

Parameters
----------
f_p_fw_coolant_pump_total_heat : float
Fraction for FW coolant pump.
f_p_blkt_coolant_pump_total_heat : float
Fraction for blanket coolant pump.
f_p_shld_coolant_pump_total_heat : float
Fraction for shield coolant pump.
f_p_div_coolant_pump_total_heat : float
Fraction for divertor coolant pump.
p_fw_nuclear_heat_total_mw : float
Total FW nuclear heating (MW).
psurffwi : float
Inboard FW surface heating (MW).
psurffwo : float
Outboard FW surface heating (MW).
p_blkt_nuclear_heat_total_mw : float
Total blanket nuclear heating (MW).
p_shld_nuclear_heat_mw : float
Shield nuclear heating (MW).
p_cp_shield_nuclear_heat_mw : float
CP shield nuclear heating (MW).
p_plasma_separatrix_mw : float
Plasma separatrix power (MW).
p_div_nuclear_heat_total_mw : float
Divertor nuclear heating (MW).
p_div_rad_total_mw : float
Divertor radiative power (MW).

Returns
-------
tuple[float, float, float, float]
Tuple of pumping powers (MW) for FW, blanket, shield, and divertor.
"""
p_fw_coolant_pump_mw = f_p_fw_coolant_pump_total_heat * (
p_fw_nuclear_heat_total_mw + psurffwi + psurffwo
)
p_blkt_coolant_pump_mw = (
f_p_blkt_coolant_pump_total_heat * p_blkt_nuclear_heat_total_mw
)
p_shld_coolant_pump_mw = f_p_shld_coolant_pump_total_heat * (
p_shld_nuclear_heat_mw + p_cp_shield_nuclear_heat_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,
)


def eshellarea(rshell, rmini, rmino, zminor):
"""Routine to calculate the inboard, outboard and total surface areas
of a toroidal shell comprising two elliptical sections

rshell : input real : major radius of centre of both ellipses (m)
rmini : input real : horizontal distance from rshell to
inboard elliptical shell (m)
rmino : input real : horizontal distance from rshell to
outboard elliptical shell (m)
zminor : input real : vertical internal half-height of shell (m)
ain : output real : surface area of inboard section (m3)
aout : output real : surface area of outboard section (m3)
atot : output real : total surface area of shell (m3)
This routine calculates the surface area of the inboard and outboard
sections of a toroidal shell defined by two co-centred semi-ellipses.

Parameters
----------
rshell :

rmini :

rmino :

zminor :

"""
# Inboard section
elong = zminor / rmini
ain = 2.0 * np.pi * elong * (np.pi * rshell * rmini - 2.0 * rmini * rmini)

# Outboard section
elong = zminor / rmino
aout = 2.0 * np.pi * elong * (np.pi * rshell * rmino + 2.0 * rmino * rmino)

return ain, aout, ain + aout


def dshellarea(
rmajor: float, rminor: float, zminor: float
) -> tuple[float, float, float]:
"""Calculate the inboard, outboard, and total surface areas of a D-shaped toroidal shell.

The inboard section is assumed to be a cylinder.
The outboard section is defined by a semi-ellipse, centred on the major radius of the inboard section.

Parameters
----------
rmajor : float
Major radius of inboard straight section (m)
rminor : float
Horizontal width of shell (m)
zminor : float
Vertical half-height of shell (m)

Returns
-------
tuple[float, float, float]
Tuple containing:
- ain: Surface area of inboard straight section (m²)
- aout: Surface area of outboard curved section (m²)
- atot: Total surface area of shell (m²)
"""
# Area of inboard cylindrical shell
ain = 4.0 * zminor * np.pi * rmajor

# Area of elliptical outboard section
elong = zminor / rminor
aout = 2.0 * np.pi * elong * (np.pi * rmajor * rminor + 2.0 * rminor * rminor)

return ain, aout, ain + aout


def eshellvol(rshell, rmini, rmino, zminor, drin, drout, dz):
"""Routine to calculate the inboard, outboard and total volumes
of a toroidal shell comprising two elliptical sections

This routine calculates the volume of the inboard and outboard sections
of a toroidal shell defined by two co-centred semi-ellipses.
Each section's internal and external surfaces are in turn defined
by two semi-ellipses. The volumes of each section are calculated as
the difference in those of the volumes of revolution enclosed by their
inner and outer surfaces.

Parameters
----------
rshell :
major radius of centre of both ellipses (m)
rmini :
horizontal distance from rshell to outer edge of inboard elliptical shell (m)
rmino :
horizontal distance from rshell to inner edge of outboard elliptical shell (m)
zminor :
vertical internal half-height of shell (m)
drin :
horiz. thickness of inboard shell at midplane (m)
drout :
horiz. thickness of outboard shell at midplane (m)
dz :
vertical thickness of shell at top/bottom (m)

Returns
-------
vin :
volume of inboard section (m3)
vout:
volume of outboard section (m3)
vtot:
total volume of shell (m3)
-------
"""
# Inboard section

# Volume enclosed by outer (higher R) surface of elliptical section
# and the vertical straight line joining its ends
a = rmini
b = zminor
elong = b / a
v1 = 2.0 * np.pi * elong * (0.5 * np.pi * rshell * a**2 - (2.0 / 3.0) * a**3)

# Volume enclosed by inner (lower R) surface of elliptical section
# and the vertical straight line joining its ends
a = rmini + drin
b = zminor + dz
elong = b / a
v2 = 2.0 * np.pi * elong * (0.5 * np.pi * rshell * a**2 - (2.0 / 3.0) * a**3)

# Volume of inboard section of shell
vin = v2 - v1

# Outboard section

# Volume enclosed by inner (lower R) surface of elliptical section
# and the vertical straight line joining its ends
a = rmino
b = zminor
elong = b / a
v1 = 2.0 * np.pi * elong * (0.5 * np.pi * rshell * a**2 + (2.0 / 3.0) * a**3)

# Volume enclosed by outer (higher R) surface of elliptical section
# and the vertical straight line joining its ends
a = rmino + drout
b = zminor + dz
elong = b / a
v2 = 2.0 * np.pi * elong * (0.5 * np.pi * rshell * a**2 + (2.0 / 3.0) * a**3)

# Volume of outboard section of shell
vout = v2 - v1

return vin, vout, vin + vout


def dshellvol(rmajor, rminor, zminor, drin, drout, dz):
"""Routine to calculate the inboard, outboard and total volumes
of a D-shaped toroidal shell

This routine calculates the volume of the inboard and outboard sections
of a D-shaped toroidal shell defined by the above input parameters.
The inboard section is assumed to be a cylinder of uniform thickness.
The outboard section's internal and external surfaces are defined
by two semi-ellipses, centred on the outer edge of the inboard section;
its volume is calculated as the difference in those of the volumes of
revolution enclosed by the two surfaces.

Parameters
----------
rmajor :
major radius to outer point of inboardstraight section of shell (m)
rminor :
horizontal internal width of shell (m)
zminor :
vertical internal half-height of shell (m)
drin :
horiz. thickness of inboard shell at midplane (m)
drout :
horiz. thickness of outboard shell at midplane (m)
dz :
vertical thickness of shell at top/bottom (m)

Returns
-------
vin :
volume of inboard straight section (m3)
vout:
volume of outboard curved section (m3)
vtot:
total volume of shell (m3)

"""
# Volume of inboard cylindrical shell
vin = 2.0 * (zminor + dz) * np.pi * (rmajor**2 - (rmajor - drin) ** 2)

# Volume enclosed by inner surface of elliptical outboard section
# and the vertical straight line joining its ends
a = rminor
b = zminor
elong = b / a
v1 = 2.0 * np.pi * elong * (0.5 * np.pi * rmajor * a**2 + (2.0 / 3.0) * a**3)

# Volume enclosed by outer surface of elliptical outboard section
# and the vertical straight line joining its ends
a = rminor + drout
b = zminor + dz
elong = b / a
v2 = 2.0 * np.pi * elong * (0.5 * np.pi * rmajor * a**2 + (2.0 / 3.0) * a**3)

# Volume of elliptical outboard shell
vout = v2 - v1

return vin, vout, vin + vout


class OutboardBlanket(BlanketLibrary):
def calculate_basic_geometry(self):
self.component_volumes()
Expand All @@ -3759,7 +3460,7 @@ def calculate_basic_geometry(self):
(
self.data.fwbs.radius_blkt_channel_90_bend,
self.data.fwbs.radius_blkt_channel_180_bend,
) = self.calculate_pipe_bend_radius(
) = calculate_pipe_bend_radius(
i_ps=1,
radius_fw_channel=self.data.fwbs.radius_fw_channel,
b_bz_liq=self.data.fwbs.b_bz_liq,
Expand Down Expand Up @@ -3804,7 +3505,7 @@ def calculate_basic_geometry(self):
(
self.data.fwbs.radius_blkt_channel_90_bend,
self.data.fwbs.radius_blkt_channel_180_bend,
) = self.calculate_pipe_bend_radius(
) = calculate_pipe_bend_radius(
i_ps=1,
radius_fw_channel=self.data.fwbs.radius_fw_channel,
b_bz_liq=self.data.fwbs.b_bz_liq,
Expand Down
Loading
Loading