Add new plasma shaping option by ajpearcey · Pull Request #4134 · ukaea/PROCESS

ajpearcey · 2026-03-20T08:28:52Z

add new relationship for elongation v aspect ratio. Validated for low aspect ratio ST devices.

chris-ashe

Few comments, you also need to update the docs and give a reference. Please put the reference in IEEE style with a hyperlink DOI

chris-ashe · 2026-03-20T11:01:52Z

            # 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":


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

Okay this change will become redundant after a rebase.

chris-ashe · 2026-03-20T11:02:37Z

    ),
    "fiooic": InputVariable(
-        data_structure.constraint_variables, float, range=(0.001, 1.0)
+        data_structure.constraint_variables, float, range=(0.001, 10.0)


Why has this been changed?

This was changed to allow a fudge factor during some future concepts scans

chris-ashe · 2026-03-20T11:03:48Z


+        if physics_variables.i_plasma_geometry == 12:
+
+            physics_variables.kappa = 2.93e0 * ( 1.8e0 / physics_variables.aspect ) ** 0.4e0


A comment with the model origin needs to be added

I'm slightly unclear on the definitive source of the this scaling.

I will see if I can hunt it down

chris-ashe · 2026-03-20T11:04:01Z

+            elif physics_variables.i_plasma_geometry == 12:
+                po.ovarrf(
+                    self.outfile,
+                    "Elongation, X-point (calculated from aspect ratio via scaling)",


The string needs to state the model

timothy-nunn

Thanks @chris-ashe for the review. @ajpearcey please fix the merge conflicts so that the CI can run and I can review any failures there

chris-ashe

@ajpearcey Can you please update the docs and add a reference in IEE format with a clickable DOI link

codecov-commenter · 2026-04-16T14:34:13Z

Codecov Report

❌ Patch coverage is 33.33333% with 4 lines in your changes missing coverage. Please review.
✅ Project coverage is 49.68%. Comparing base (dbfa312) to head (5f8ff4d).
⚠️ Report is 2 commits behind head on main.

Files with missing lines	Patch %	Lines
process/models/physics/plasma_geometry.py	33.33%	4 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #4134      +/-   ##
==========================================
- Coverage   49.68%   49.68%   -0.01%     
==========================================
  Files         148      148              
  Lines       29773    29779       +6     
==========================================
+ Hits        14794    14796       +2     
- Misses      14979    14983       +4

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

timothy-nunn

Please talk to @chris-ashe about the enums. Happy otherwise once Chris approves!

timothy-nunn · 2026-04-16T14:50:02Z

        79: "eta_ecrh_injector_wall_plug",
        80: "fcoolcp",
        81: "n_tf_coil_turns",
+        82: "f_p_plasma_separatrix_rad", # really fradpwr


Suggested change

82: "f_p_plasma_separatrix_rad", # really fradpwr

82: "f_p_plasma_separatrix_rad",

timothy-nunn · 2026-04-16T14:51:57Z


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

+        if physics_variables.i_plasma_geometry == 12:


Then use the new enum here

timothy-nunn · 2026-04-16T14:52:04Z

                    physics_variables.kappa,
                    "OP ",
                )
+            elif physics_variables.i_plasma_geometry == 12:


…ion and data source

timothy-nunn · 2026-04-16T15:24:10Z

        79: "eta_ecrh_injector_wall_plug",
        80: "fcoolcp",
        81: "n_tf_coil_turns",
+        82: "f_p_plasma_separatrix_rad",  # really fradpwr


Suggested change

82: "f_p_plasma_separatrix_rad", # really fradpwr

82: "f_p_plasma_separatrix_rad",

timothy-nunn · 2026-04-16T15:24:26Z

        50: "f_nd_impurity_electrons(13)",
        51: "f_p_div_lower",
        52: "rad_fraction_sol",
+        53: "obsolete",  # Removed


Suggested change

53: "obsolete", # Removed

53: "Obsolete", # OBSOLETE

ajpearcey requested a review from a team as a code owner March 20, 2026 08:28

chris-ashe requested changes Mar 20, 2026

View reviewed changes

timothy-nunn self-assigned this Mar 24, 2026

timothy-nunn reviewed Mar 24, 2026

View reviewed changes

ajpearcey force-pushed the i_plasma_geo_12 branch from 6dc2bd9 to 330e980 Compare April 14, 2026 14:33

chris-ashe requested changes Apr 16, 2026

View reviewed changes

ajpearcey force-pushed the i_plasma_geo_12 branch from f202321 to 9e5c020 Compare April 16, 2026 14:22

apearce added 7 commits April 16, 2026 15:51

✨ add new plasma shaping option

4a4ff7c

🔥 remove updated variables

2cd823f

🔥 remove unneeded variables

512d591

📝 update comments with reference

9a5a537

📝 update docs

30fdbbb

📝 update doc string

480ac5a

🐛 fix rebase

e1bac33

chris-ashe force-pushed the i_plasma_geo_12 branch from 7de4d9e to e1bac33 Compare April 16, 2026 14:52

timothy-nunn reviewed Apr 16, 2026

View reviewed changes

chris-ashe added 2 commits April 16, 2026 16:04

📝 update plasma geometry documentation and add Menard 1997 scaling model

67226bf

📝 update plasma geometry documentation to clarify elongation calculat…

5f8ff4d

…ion and data source

timothy-nunn reviewed Apr 16, 2026

View reviewed changes


		if physics_variables.i_plasma_geometry == 12:

		physics_variables.kappa = 2.93e0 * ( 1.8e0 / physics_variables.aspect ) ** 0.4e0

	82: "f_p_plasma_separatrix_rad", # really fradpwr
	82: "f_p_plasma_separatrix_rad",


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

		if physics_variables.i_plasma_geometry == 12:

Conversation

ajpearcey commented Mar 20, 2026

Uh oh!

chris-ashe left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ajpearcey Apr 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ajpearcey Apr 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

timothy-nunn left a comment

Choose a reason for hiding this comment

Uh oh!

chris-ashe left a comment

Choose a reason for hiding this comment

Uh oh!

codecov-commenter commented Apr 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

timothy-nunn left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

ajpearcey Apr 14, 2026 •

edited

Loading

ajpearcey Apr 14, 2026 •

edited

Loading

codecov-commenter commented Apr 16, 2026 •

edited

Loading