Skip to content

Ensure i_fw_coolant_type is output as a string #4441

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
clmould merged 5 commits into from
Jul 17, 2026
Merged

Ensure i_fw_coolant_type is output as a string #4441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9b8fbd7
Ensure i_fw_coolant_type is output as a string
timothy-nunn Jul 15, 2026
93bde1b
Remove quotes from helium in plot summary
timothy-nunn Jul 16, 2026
20e359a
Remove unnecessary strip
timothy-nunn Jul 16, 2026
ba2f95b
Capitalise helium
timothy-nunn Jul 16, 2026
a59ecad
Capitlaise
timothy-nunn Jul 16, 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
2 changes: 1 addition & 1 deletion process/core/io/plot/summary.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5386,7 +5386,7 @@ def plot_first_wall_poloidal_cross_section(axis: plt.Axes, mfile: MFile, scan: i
len_fw_channel = mfile.get("len_fw_channel", scan=scan)
temp_fw_coolant_in = mfile.get("temp_fw_coolant_in", scan=scan)
temp_fw_coolant_out = mfile.get("temp_fw_coolant_out", scan=scan)
i_fw_coolant_type = mfile.get("i_fw_coolant_type", scan=scan)
i_fw_coolant_type = mfile.get("i_fw_coolant_type", scan=scan).strip("'\"")
temp_fw_peak = mfile.get("temp_fw_peak", scan=scan)
pres_fw_coolant = mfile.get("pres_fw_coolant", scan=scan)
n_fw_outboard_channels = mfile.get("n_fw_outboard_channels", scan=scan)
Expand Down
2 changes: 1 addition & 1 deletion process/models/blankets/blanket_library.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -796,7 +796,7 @@ def primary_coolant_properties(self, output: bool):
self.outfile,
"Coolant type",
"(i_fw_coolant_type)",
CoolantType(self.data.fwbs.i_fw_coolant_type).full_name,
f"'{CoolantType(self.data.fwbs.i_fw_coolant_type).full_name}'",
)
po.ovarre(
self.outfile,
Expand Down
2 changes: 1 addition & 1 deletion process/models/fw.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,7 +757,7 @@ def output_fw_pumping(self):
self.outfile,
"First wall coolant type",
"(i_fw_coolant_type)",
CoolantType(self.data.fwbs.i_fw_coolant_type).full_name,
f"'{CoolantType(self.data.fwbs.i_fw_coolant_type).full_name}'",
)
po.ovarre(
self.outfile,
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/data/large_tokamak_MFILE.DAT
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35555,7 +35555,7 @@ Peak_radiation_wall_load_(MW/m^2)________________________________________ (pflux
Fast_alpha_particle_power_incident_on_the_first-wall_(MW)________________ (p_fw_alpha_mw)________________ 1.63384428835724727e+01 OP
Nominal_mean_neutron_load_on_vessel_first-wall_(MW/m^2)__________________ (pflux_fw_neutron_mw)__________ 1.01656659994562149e+00 OP
# First wall pumping #
First_wall_coolant_type__________________________________________________ (i_fw_coolant_type)____________ Helium
First_wall_coolant_type__________________________________________________ (i_fw_coolant_type)____________ 'Helium'
Outlet_temperature_of_first_wall_coolant_[K]_____________________________ (temp_fw_coolant_out)__________ 8.23000000000000000e+02 OP
Inlet_temperature_of_first_wall_coolant_[K]______________________________ (temp_fw_coolant_in)___________ 5.73000000000000000e+02 OP
Pressure_of_first_wall_coolant_[Pa]______________________________________ (pres_fw_coolant)______________ 1.55000000000000000e+07 OP
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/data/large_tokamak_MFILE.DAT
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7356,7 +7356,7 @@ Radial_thickness_off_outboard_first_wall_(m)_____________________________ (dr_fw
Number_of_inboard_first_wall_cooling_channels____________________________ (n_fw_inboard_channels)________ 7550 OP
Number_of_outboard_first_wall_cooling_channels___________________________ (n_fw_outboard_channels)_______ 12505 OP
# First wall pumping #
First_wall_coolant_type__________________________________________________ (i_fw_coolant_type)____________ 'helium'
First_wall_coolant_type__________________________________________________ (i_fw_coolant_type)____________ 'Helium'
Outlet_temperature_of_first_wall_coolant_[K]_____________________________ (temp_fw_coolant_out)__________ 8.23000000000000000e+02 OP
Inlet_temperature_of_first_wall_coolant_[K]______________________________ (temp_fw_coolant_in)___________ 5.73000000000000000e+02 OP
Pressure_of_first_wall_coolant_[Pa]______________________________________ (pres_fw_coolant)______________ 1.55000000000000000e+07 OP
Expand Down
Loading