Skip to content

4165 new energy confinement scaling for ncst spherical tokamak - #4480

Open
grmtrkngtn wants to merge 7 commits into
mainfrom
4165-new-energy-confinement-scaling-for-ncst-spherical-tokamak
Open

4165 new energy confinement scaling for ncst spherical tokamak#4480
grmtrkngtn wants to merge 7 commits into
mainfrom
4165-new-energy-confinement-scaling-for-ncst-spherical-tokamak

Conversation

@grmtrkngtn

Copy link
Copy Markdown
Collaborator

Description

Adds new NCST confinement time scaling law.

Checklist

I confirm that I have completed the following checks:

  • My changes follow the PROCESS style guide
  • I have justified any large differences in the regression tests caused by this pull request in the comments.
  • I have added new tests where appropriate for the changes I have made.
  • If I have had to change any existing unit or integration tests, I have justified this change in the pull request comments.
  • If I have made documentation changes, I have checked they render correctly.
  • I have added documentation for my change, if appropriate.

@grmtrkngtn
grmtrkngtn requested a review from a team as a code owner July 27, 2026 14:24
@grmtrkngtn grmtrkngtn linked an issue Jul 27, 2026 that may be closed by this pull request
@grmtrkngtn
grmtrkngtn requested review from a team and chris-ashe July 27, 2026 14:24
@grmtrkngtn grmtrkngtn self-assigned this Jul 27, 2026
@grmtrkngtn grmtrkngtn added the Confinement time Plasma energy or particle confinement times label Jul 27, 2026
@codecov-commenter

codecov-commenter commented Jul 27, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 66.66667% with 2 lines in your changes missing coverage. Please review.
✅ Project coverage is 48.66%. Comparing base (cdccae0) to head (4587820).
⚠️ Report is 3 commits behind head on main.

Files with missing lines Patch % Lines
process/models/physics/confinement_time.py 60.00% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #4480      +/-   ##
==========================================
+ Coverage   48.65%   48.66%   +0.01%     
==========================================
  Files         151      151              
  Lines       29714    29731      +17     
==========================================
+ Hits        14457    14469      +12     
- Misses      15257    15262       +5     

☔ View full report in Codecov by Harness.
📢 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.

@chris-ashe chris-ashe left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

@grmtrkngtn A documentation addition still needs to be done also

Comment thread process/models/physics/confinement_time.py Outdated

@staticmethod
def ncst_confinement_time(
pcur: float,

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Suggested change
pcur: float,
cur_plasma_ma: float,

I know lots of the scaling still say pcur but cur_plasma_ma is the current correct style guide way

@grmtrkngtn grmtrkngtn Jul 27, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Per Alex's comment, maybe it's best to leave these for now and resolve the file in totality.

Comment thread process/models/physics/confinement_time.py
Comment thread process/models/physics/confinement_time.py Outdated
Comment thread process/models/physics/confinement_time.py Outdated
Comment thread process/models/physics/confinement_time.py Outdated
Notes
-----
- The electron density used to derive the scaling was measured locally
at a normalised minor radius of approximately 0.9. The central

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Should we not then be using the pedestal or the separatrix density then?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

I'm not sure pedestal is a good choice given this is for L-mode plasmas. Besides, its numerical effect is very small because the fitted exponent is only -0.01

@ajpearcey

Copy link
Copy Markdown
Collaborator

I would note, that this will cause a lot of conflicts with #4386 which is also trying to add in a scaling number 51. with several of the same name changes made.

I would also note that all the code has currents and current fraction with variables names like f_c_plasma_bootstrap, f_c_plasma_auxiliary, f_c_plasma_inductive. I personally think changing some subsections of the current variable names and leaving other is confusing. I'd spin this part out into it's own PR.

@grmtrkngtn
grmtrkngtn force-pushed the 4165-new-energy-confinement-scaling-for-ncst-spherical-tokamak branch from c199876 to 3578edc Compare July 27, 2026 15:24
grmtrkngtn and others added 5 commits July 27, 2026 16:26
Format docstring

Co-authored-by: Christopher Ashe <91618944+chris-ashe@users.noreply.github.com>
format units

Co-authored-by: Christopher Ashe <91618944+chris-ashe@users.noreply.github.com>
Format reference

Co-authored-by: Christopher Ashe <91618944+chris-ashe@users.noreply.github.com>
@grmtrkngtn
grmtrkngtn requested a review from chris-ashe July 28, 2026 08:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Confinement time Plasma energy or particle confinement times

Projects

None yet

Development

Successfully merging this pull request may close these issues.

New energy confinement scaling for NCST spherical tokamak

4 participants