Skip to content

Add new plasma shaping option #4134

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

Open
ajpearcey wants to merge 2 commits into
base: main
Choose a base branch
from
+24 −1
Open

Add new plasma shaping option #4134

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
b087207
✨ add new plasma shaping option
Mar 19, 2026
866a5ab
🔥 remove updated variables
Mar 20, 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
3 changes: 2 additions & 1 deletion process/input.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1295,6 +1295,7 @@ def __post_init__(self):
data_structure.pfcoil_variables, float, range=(0.0, 1e-05)
),
"rinboard": InputVariable(data_structure.build_variables, float, range=(0.1, 10.0)),
"routboard": InputVariable(data_structure.build_variables, float, range=(0.1, 20.0)),
Copy link
Copy Markdown
Collaborator

@chris-ashe chris-ashe Mar 20, 2026

Choose a reason for hiding this comment

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

Why has this been added? Is it a new variable

"ripple_b_tf_plasma_edge_max": InputVariable(
data_structure.tfcoil_variables, float, range=(0.1, 100.0)
),
Expand Down Expand Up @@ -1865,7 +1866,7 @@ def __post_init__(self):
data_structure.physics_variables, int, range=(1, 9)
),
"i_plasma_geometry": InputVariable(
data_structure.physics_variables, int, range=(0, 11)
data_structure.physics_variables, int, range=(0, 12)
),
"i_plasma_shape": InputVariable(
data_structure.physics_variables, int, choices=[0, 1]
Expand Down
5 changes: 5 additions & 0 deletions process/io/plot_scans.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,7 @@ def main(args=None):
5: "oacdcp",
6: "pflux_fw_neutron_max_mw",
7: "beamfus0",
8: "Obsolete",# OBSOLETE
9: "temp_plasma_electron_vol_avg_kev",
10: "boundu(15)",
11: "beta_norm_max",
Expand Down Expand Up @@ -347,6 +348,7 @@ def main(args=None):
50: "f_nd_impurity_electrons(13)",
51: "f_p_div_lower",
52: "rad_fraction_sol",
53: "obsolete", # Removed
54: "b_crit_upper_nbti",
55: "dr_shld_inboard",
56: "p_cryo_plant_electric_max_mw",
Expand Down Expand Up @@ -375,6 +377,7 @@ def main(args=None):
79: "eta_ecrh_injector_wall_plug",
80: "fcoolcp",
81: "n_tf_coil_turns",
82: "f_p_plasma_separatrix_rad", # really fradpwr
}
# -------------------

Expand Down Expand Up @@ -951,6 +954,8 @@ def main(args=None):
# Output file naming
if output_name == "plasma_current_MA":
extra_str = f"plasma_current{f'_vs_{output_name2}' if output_names2 != [] else ''}"
if output_name == "p_div_separatrix_max_mw/physics_variables.rmajor":
Copy link
Copy Markdown
Collaborator

@chris-ashe chris-ashe Mar 20, 2026

Choose a reason for hiding this comment

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

This shouldnt be needed in this from now as there is now physics_variables.p_plasma_separatrix_rmajor_mw

extra_str = f"p_div_separatrix_max_mwrmajor{f'_vs_{output_name2}' if output_names2 != [] else ''}"
elif stack_plots and output_names[-1] == output_name:
extra_str = f"{output_name}{f'_vs_{output_name2}' if output_names2 != [] else '_vs_'.join(output_names)}"
else:
Expand Down
8 changes: 8 additions & 0 deletions process/models/physics/physics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3931,6 +3931,14 @@ def outplas(self):
physics_variables.kappa,
"OP ",
)
elif physics_variables.i_plasma_geometry == 12:
po.ovarrf(
self.outfile,
"Elongation, X-point (calculated from aspect ratio via scaling)",
Copy link
Copy Markdown
Collaborator

@chris-ashe chris-ashe Mar 20, 2026

Choose a reason for hiding this comment

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

The string needs to state the model

"(kappa)",
physics_variables.kappa,
"OP ",
)
else:
raise ProcessValueError(
"Illegal value of i_plasma_geometry",
Expand Down
9 changes: 9 additions & 0 deletions process/models/physics/plasma_geometry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,15 @@ def plasma_geometry(self):

# ======================================================================

if physics_variables.i_plasma_geometry == 12:

physics_variables.kappa = 2.93e0 * ( 1.8e0 / physics_variables.aspect ) ** 0.4e0
Copy link
Copy Markdown
Collaborator

@chris-ashe chris-ashe Mar 20, 2026

Choose a reason for hiding this comment

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

A comment with the model origin needs to be added


physics_variables.kappa95 = physics_variables.kappa / 1.12e0
physics_variables.triang95 = physics_variables.triang / 1.50e0

# ======================================================================

# Scrape-off layer thicknesses
if physics_variables.i_plasma_wall_gap == 0:
build_variables.dr_fw_plasma_gap_outboard = 0.1e0 * physics_variables.rminor
Expand Down