972 pf power supplies accounting 2 by grmtrkngtn · Pull Request #4089 · ukaea/PROCESS

grmtrkngtn · 2026-02-09T16:07:48Z

Description

Updates pfpwr equation to account for additional components in pf power management: busbar, power supply and storage system.

We have added separate functions to calculate the power loss for each component.
pfpwr has been adapted to use these new functions to account for the pf power supply - previously they were lumped into one value.
A mild refactor of pfpwr function (modularising it a bit, renaming some variables)

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.

…ly and storage losses. Added their implementation

codecov-commenter · 2026-02-10T09:52:56Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 49.61%. Comparing base (09c52f5) to head (095bc14).
⚠️ Report is 10 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #4089      +/-   ##
==========================================
+ Coverage   48.04%   49.61%   +1.57%     
==========================================
  Files         144      148       +4     
  Lines       30211    29772     -439     
==========================================
+ Hits        14515    14772     +257     
+ Misses      15696    15000     -696

☔ 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.

grmtrkngtn · 2026-02-10T10:01:37Z

@j-a-foster I've pushed my changes here for your review

chris-ashe

Noticing quite a few large regression changes. Have made some initial minor comments

Unsurprisingly it has changed the PF power profile, though has it changed the PF current profile diagram in plot_proc?

process/power.py

documentation/eng-models/power-requirements.md

documentation/source/eng-models/power-requirements.md

documentation/eng-models/power-requirements.md

timothy-nunn · 2026-02-10T14:14:36Z

I'll add @mkovari to review since he made the original issue

j-a-foster · 2026-02-10T17:21:51Z

Should've fixed all subscripts in docs now.

timothy-nunn

Mainly comments on index names

process/power.py

timothy-nunn

Thanks Graeme. Happy with the code, will approve and merge when the others reviewers are happy.

* CI cleanup * move tf data to json file * add biome for json formatting and format * general formatting cleanup * add plotting option to tests * add marker to list * fix python selection * add parallelism * move python version to env workflow level * fix CI

* Rename Fw class to FirstWall and update references throughout the codebase * Add methods to calculate first wall geometry and areas in FirstWall class * Add method to calculate elliptical first wall areas in FirstWall class * Add dz_fw_half variable for first wall half-height in fwbs_variables.py * Add method to apply first wall coverage factors in FirstWall class * Refactor first wall geometry calculations into FirstWall class methods * Requested changes * Refactor first wall area calculations to use first_wall_variables and add first_wall_variables.py

* Add average neutron flux variable for plasma surface * Add average neutron flux calculation for plasma surface * Add average neutron flux display in plasma information plot

* Add PlasmaBeta class and integrate into Physics initialization * Refactor beta normalization calculations to use PlasmaBeta class methods * Add static method to PlasmaBeta for calculating normalized beta * Refactor beta information output to PlasmaBeta class for improved organization * Move total normalised beta calc to outside of calculate_plasma_current * Add static method to PlasmaBeta for calculating plasma energy from beta * Refactor plasma energy calculations to use PlasmaBeta methods for improved clarity and maintainability * Refactor fast alpha beta calculation into PlasmaBeta class and remove redundant function from physics_functions.py * Refactor beta limit calculation into PlasmaBeta class and remove redundant function from physics.py * Refactor poloidal beta calculation to use PlasmaBeta class methods and remove redundant function * Refactor thermal beta normalization calculation to use PlasmaBeta class method * Refactor beta norm max calculation to use PlasmaBeta class property for improved maintainability * Refactor beta norm max calculation to use BetaNormMaxModel Enum method and improve error handling * Update plasma beta documentation to include function references for Wesson, Original Scaling, Menard, Tholerus, and Stambaugh relations * Refactor plasma current documentation for clarity and consistency in variable formatting * Refactor plasma beta calculations into a dedicated run method for improved organization and maintainability * Refactor normalized beta calculations into PlasmaBeta class for improved organization and maintainability

* Fixed negativity in sqrt in costs.py by np.clip. * Introduced a local variable sqrt_p_plant_electric_net_mw in the scope of the method coelc to warn in case p_plant_electric_net_mw is negative. Also caught a third place where sqrt_p_plant_electric_net_mw is needed .(missed earlier as it was commented out) * Update process/costs.py Clarified what's the purpose of the calculation inside the warning. Co-authored-by: Timothy <75321887+timothy-nunn@users.noreply.github.com> * Bug fixes so regression test passes - Undid the comment line change (previously over-corrected) --------- Co-authored-by: Timothy <75321887+timothy-nunn@users.noreply.github.com>

* Add PlasmaInductance class and integrate into physics and stellarator models * Refactor internal inductance calculations to use PlasmaInductance class methods and remove redundant static methods * Refactor internal inductance calculation to use IndInternalNormModel and PlasmaInductance class for improved clarity and maintainability * Refactor output of volt-second information into PlasmaInductance class for improved organization and maintainability * Update documentation for PlasmaInductance: add method references to Wesson and Menard relations * Refactor internal inductance calculations: move logic to PlasmaInductance class and streamline execution with run method

* Add method to calculate reduced mass of two particles * Refactor classical distance of closest approach calculation to use reduced mass and relative velocity * Add method to calculate average relative velocity and update usage in detailed physics calculations * ❇️ Add deuteron thermal velocity profile to physics variables * Add deuteron thermal velocity profile calculations to detailed physics * Add electron-deuteron Coulomb logarithm profile to physics variables * Add electron-deuteron Coulomb logarithm calculations and plotting * Add deuteron Larmor frequency profile to physics variables * Add deuteron toroidal Larmor frequency profile calculations and plotting * Add triton thermal velocity profile to physics variables * Add electron-triton Coulomb logarithm profile to physics variables * Add triton Larmor frequency profile to physics variables * Add triton thermal velocity, Larmor frequency, and Coulomb logarithm profiles to physics variables * Add triton velocity, Larmor frequency, and Coulomb logarithm profiles to plotting functions * Update vel_relative parameter to be required in distance calculation method

…-accounting-2

grmtrkngtn · 2026-02-17T17:37:52Z

Hi Graeme @ym1906 . Could you summarise the changes in the regression tests and in the profile of stored energy and power required? Thanks

Hi Michael - the main change in terms of the pf coil power accounting are as follows

p_pf_electric_supplies_mw: 1.02 → 3.18 MW (+212%)

The PF power profile variables (p_pf_electric_supplies_profile_mw1–4) scale consistently with this change.

Do you think this seems reasonable?

grmtrkngtn · 2026-02-26T16:31:36Z

Hi Graeme @ym1906 . Could you summarise the changes in the regression tests and in the profile of stored energy and power required? Thanks

Hi Michael @mkovari could you respond to this comment for review? #4089 (comment)

mkovari · 2026-02-27T15:28:42Z

I am puzzled why there isn't any energy requirement in the charge and discharge phases.
The central solenoid current is changing all the time. (It doesn't change between time points 2 and 3 as there are the same time.)

All three loss terms should be non-zero:

@ym1906 @timothy-nunn

grmtrkngtn · 2026-03-05T14:51:24Z

@mkovari the character of these profiles is the same on main and the changes made in this branch. If this behaviour is unusual, it's a separate problem. @chris-ashe or @ajpearcey do you have any comment on this?

documentation/eng-models/power-requirements.md

process/models/power.py

process/power.py

j-a-foster

Happy with changes.

chris-ashe

Just a rename to do. Doc changes look good

grmtrkngtn · 2026-04-10T14:38:03Z

Thanks Chris, should have pushed the last rename now.

grmtrkngtn added 4 commits February 4, 2026 11:36

Added new variables for efficiency of pf-coil power components

ede81d1

Updated the indices in loops to align with PROCESS style guide

ef8d2e3

updates the dosctring of new pf power variables

c1b3831

Refactored pfpwr. Added new functions to calculate busbar, power supp…

e9aaa12

…ly and storage losses. Added their implementation

grmtrkngtn requested a review from a team as a code owner February 9, 2026 16:07

grmtrkngtn linked an issue Feb 9, 2026 that may be closed by this pull request

PF power supplies accounting 2 #972

Open

Added documentation for the changes to pf power accounting

b26b4cd

chris-ashe added the PF Coils label Feb 10, 2026

chris-ashe self-requested a review February 10, 2026 10:31

chris-ashe requested changes Feb 10, 2026

View reviewed changes

timothy-nunn self-assigned this Feb 10, 2026

timothy-nunn requested a review from mkovari February 10, 2026 14:14

j-a-foster added 2 commits February 10, 2026 15:34

Corrected unparsed variables

91b22d0

Fixed subscripts in docs

8f51ff7

timothy-nunn requested changes Feb 11, 2026

View reviewed changes

grmtrkngtn added 10 commits February 11, 2026 10:09

Removed unnecessary comments

5332df6

change ngrpt to n_pf_coil groups for clarity

42db87e

Updated index name for number of pf coils in each group

0671d75

Updated ii index to idx_circuit

caeecef

Updated jj index to idx_group

8feead1

Updated jpf to idx_pf_coil, removed id_coil_in_group

6c61b06

Updated kk to idx_time

6d5448c

Updated ii to idx_time_interval

5d532b3

Updated ii to idx_circuit

2032b8f

Updated functions and calls to use the updated indexing

1b908dd

timothy-nunn reviewed Feb 11, 2026

View reviewed changes

je-cook and others added 8 commits February 17, 2026 16:14

Add plasma neutron surface power to output (#4087)

230e386

* Add average neutron flux variable for plasma surface * Add average neutron flux calculation for plasma surface * Add average neutron flux display in plasma information plot

Merge remote-tracking branch 'origin/main' into 972-pf-power-supplies…

b511fe9

…-accounting-2

timothy-nunn requested a review from chris-ashe February 19, 2026 16:37

grmtrkngtn requested a review from j-a-foster April 7, 2026 15:39

chris-ashe requested changes Apr 8, 2026

View reviewed changes

j-a-foster approved these changes Apr 8, 2026

View reviewed changes

grmtrkngtn added 9 commits April 9, 2026 10:43

reformatted total energy loss equation

4364a98

updated _pf_loss_storage_j to numpy docstring

07f212d

updated _pf_loss_powersupply_j to numpy docstring

55c3398

updated _pf_loss_busbar_j to numpy docstring

8209454

updated _pf_loss_interval_total_j to numpy docstring

0120116

updated pfpwr docstring

22e50bf

updated pfpwr variables in line with style guide

5248478

updated pfbusr with res_pf_bus#

1878e6d

Merge branch 'main' into 972-pf-power-supplies-accounting-2

31a718f

timothy-nunn requested a review from chris-ashe April 9, 2026 10:35

Tightened comments

88d8619

chris-ashe reviewed Apr 10, 2026

View reviewed changes

renamed index to a_pf_bus_cm

095bc14

Conversation

grmtrkngtn commented Feb 9, 2026

Description

Checklist

Uh oh!

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

Uh oh!

Codecov Report

Uh oh!

grmtrkngtn commented Feb 10, 2026

Uh oh!

chris-ashe left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

timothy-nunn commented Feb 10, 2026

Uh oh!

j-a-foster commented Feb 10, 2026

Uh oh!

timothy-nunn left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

timothy-nunn left a comment

Choose a reason for hiding this comment

Uh oh!

grmtrkngtn commented Feb 17, 2026

Uh oh!

grmtrkngtn commented Feb 26, 2026

Uh oh!

mkovari commented Feb 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

grmtrkngtn commented Mar 5, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

j-a-foster 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!

grmtrkngtn commented Apr 10, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

codecov-commenter commented Feb 10, 2026 •

edited

Loading

mkovari commented Feb 27, 2026 •

edited

Loading