PROCESS is a systems code at UKAEA that calculates in a self-consistent manner the parameters of a fusion power plant with a specified performance, ensuring that its operating limits are not violated, and with the option to optimise to a given function of these parameters.
There has been several problems in plot_proc.py that prevent it from showing all of the variables correctly and formatted neatly
Changes include:
The dark blue WP is now no longer plotted in the toroidal cross-section plot as this would normally overlap with the TF coil case lines. The TF plotter on page 3 now does this better.
The "plasma" and "cryostat" labels have been removed from the toroidal cross-section plot to prevent cluttering.
The vertical thermal shield (thsield_vb) was not importable as it was not outputted to the MFILE, this is now resolved.
The width of the neutral beam duct (beamwd) was being outputted to the MFILE with its default value when a design did not use NBI, this has now been removed from the output.
The spacing between the label names and colours for the cross section plots have been spaced out to prevent overlap of text.
Variable descriptions all now have correct capitalisation.
Change of list indexing now sees plot_proc.py know the correct number of PF coils. Preventing rpf[n] not found errors.
The colour legend is now moved to the top right of the first page to prevent clashing with the plasma composition output
The inclusion of fixed secondary heating and current drive is now properly implemented preventing NaN errors and saying there is secondary heating when it is not present.
wwp2 is now only imported when the WP design that uses it (i_tf_wp_geom == 1) is used. It was previously wrongly imported when i_tf_turns_integer == 0.
nbshield, rtanbeam, rtanmax and beamwd are now only imported when NBI is used, as they are not in the MFILE otherwise.
Scaling law name output is now back thanks to #3156
i_tf_wp_geom and i_tf_case_geom output has now been fixed to show integers as they are switch variables.
kallenbach_switch has been removed as the Kallenbach models are no longer used.
Outputs using alstrtf have been removed as the variable is obsolete.
Spacing between all output labels and values has been increased to prevent overlap.
The numbering of the PF coils has been better adjusted to fit properly within the boxes without colliding with the box edges
"Th shield" is now "Thermal shield" in the plotting key.
NB duct is now only shown in the colour key when NBI is present
A new colour scheme has been added for the cross sections to match that used in BLUEMIRA, it can be set in the CLI with --colour
The plasma colour fill now completely fills the plasma boundary with no over spill
Checklist
I confirm that I have completed the following checks:
[x] I have justified any large differences in the regression tests caused by this pull request in the comments.
[x] I have added new tests where appropriate for the changes I have made.
[x] If I have had to change any existing unit or integration tests, I have justified this change in the pull request comments.
[x] If I have made documentation changes, I have checked they render correctly.
[x] I have added documentation for my change, if appropriate.
Description
There has been several problems in
plot_proc.pythat prevent it from showing all of the variables correctly and formatted neatlyChanges include:
The dark blue WP is now no longer plotted in the toroidal cross-section plot as this would normally overlap with the TF coil case lines. The TF plotter on page 3 now does this better.
The "plasma" and "cryostat" labels have been removed from the toroidal cross-section plot to prevent cluttering.
The vertical thermal shield (
thsield_vb) was not importable as it was not outputted to the MFILE, this is now resolved.The width of the neutral beam duct (
beamwd) was being outputted to the MFILE with its default value when a design did not use NBI, this has now been removed from the output.The spacing between the label names and colours for the cross section plots have been spaced out to prevent overlap of text.
Variable descriptions all now have correct capitalisation.
Change of list indexing now sees
plot_proc.pyknow the correct number of PF coils. Preventingrpf[n]not found errors.The colour legend is now moved to the top right of the first page to prevent clashing with the plasma composition output
The inclusion of fixed secondary heating and current drive is now properly implemented preventing NaN errors and saying there is secondary heating when it is not present.
wwp2is now only imported when the WP design that uses it (i_tf_wp_geom == 1) is used. It was previously wrongly imported wheni_tf_turns_integer == 0.nbshield, rtanbeam, rtanmaxandbeamwdare now only imported when NBI is used, as they are not in the MFILE otherwise.Scaling law name output is now back thanks to #3156
i_tf_wp_geomandi_tf_case_geomoutput has now been fixed to show integers as they are switch variables.kallenbach_switchhas been removed as the Kallenbach models are no longer used.Outputs using
alstrtfhave been removed as the variable is obsolete.Spacing between all output labels and values has been increased to prevent overlap.
The numbering of the PF coils has been better adjusted to fit properly within the boxes without colliding with the box edges
"Th shield" is now "Thermal shield" in the plotting key.
NB duct is now only shown in the colour key when NBI is present
A new colour scheme has been added for the cross sections to match that used in BLUEMIRA, it can be set in the CLI with
--colourThe plasma colour fill now completely fills the plasma boundary with no over spill
Checklist
I confirm that I have completed the following checks: