Skip to content
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

Jump to bottom

Change Variable Names with "/" : Papercut #1722 #3404

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Change Variable Names with "/" : Papercut #1722 #3404

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4d495c2
Change Variable Name: pdivtbt/qar
Nov 15, 2024
15f7e06
Change Variable Name: pdivmax/rmajor
Nov 15, 2024
50b3df4
Âremove unnecessary plot naming
Nov 18, 2024
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/io/mfile_comparison.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@
"pinnerzoneradmw",
"pradmw",
"bootstrap_current_fraction",
"pdivmax/rmajor",
"pdivmax_over_rmajor",
"fimp(14",
"etath",
"capcost",
Expand Down
2 changes: 1 addition & 1 deletion process/io/plot_scans.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,7 @@ def main(args=None):
else f"{args.outputdir}/scan_{scan_var_name}_vs_plasma_current"
+ f".{save_format}"
)
elif output_name == "pdivtbt/qar":
elif output_name == "pdivtbt_over_qar":
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This else if statement is now unnecessary. It was just to stop an invalid file name being used. This now shouldn't happen.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed.

plt.savefig(
f"{args.outputdir}/scan_{scan_var_name}_vs_pdivtbtqar"
+ f"_vs_{output_name2}"
Expand Down
4 changes: 2 additions & 2 deletions process/io/variable_metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ class VariableMetadata:
"pradmw": VariableMetadata(
latex=r"$P_{\mathrm{rad}}$ [$MW$]", description="Radiation power", units="MW"
),
"pdivtbt/qar": VariableMetadata(
"pdivtbt_over_qar": VariableMetadata(
latex=r"$\frac{P_{\mathrm{sep}}B_T}{q_{95}AR_{\mathrm{maj}}}$ [$MWTm^{-1}$]",
description="",
units="MWTm^{-1}",
Expand Down Expand Up @@ -361,7 +361,7 @@ class VariableMetadata:
"fimp(13)": VariableMetadata(
latex=r"$Xe_{\mathrm{f}}$", description="Impurity fraction (Xenon)", units=""
),
"pdivmax/rmajor": VariableMetadata(
"pdivmax_over_rmajor": VariableMetadata(
latex=r"$P_{\mathrm{div}}/R_\mathrm{maj}$ [MW/m]",
description="Divertor power per major radius",
units="MW/m",
Expand Down
2 changes: 1 addition & 1 deletion process/physics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4602,7 +4602,7 @@ def outplas(self):
po.ovarre(
self.outfile,
"Psep Bt / qAR ratio (MWT/m)",
"(pdivtbt/qar)",
"(pdivtbt_over_qar)",
(
(physics_variables.pdivt * physics_variables.bt)
/ (
Expand Down
Loading