3153 var missing in plot proc.py#3158
Merged
chris-ashe merged 19 commits intomainfrom Apr 26, 2024
Merged
Conversation
j-a-foster
approved these changes
Apr 25, 2024
Collaborator
j-a-foster
left a comment
There was a problem hiding this comment.
Tested the new plot_proc functionality and checked that issues described in PR description have been addressed. Ready for merge.
j-a-foster
approved these changes
Apr 26, 2024
Collaborator
j-a-foster
left a comment
There was a problem hiding this comment.
Happy with the changes to the docs. Ready for merge.
j-a-foster
reviewed
Apr 26, 2024
j-a-foster
approved these changes
Apr 26, 2024
Collaborator
j-a-foster
left a comment
There was a problem hiding this comment.
Happy with changes to docs. Ready for merge.
chris-ashe
added a commit
that referenced
this pull request
May 1, 2024
* remove obsolete variables * fix integer output as float * variable not found errors corrected * remove wp plotting in toroidal cross-section * NB duct plotting switch * change to BLUEMIRA colours * fix plasma colour fill * colour scheme switch added * blnktth import changes * test variable import fix * fix plotting colours with argparse * TF WP data added to doc description * utilites doc splot_scans update * gamcd value doc update * Final docs commnets updates
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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 Add tauelaw back to mfile #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: