Tidy TF resistive #3465
Merged
timothy-nunn merged 29 commits intomainfrom Feb 13, 2025
Merged
Conversation
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #3465 +/- ##
==========================================
- Coverage 31.21% 29.88% -1.33%
==========================================
Files 81 81
Lines 19432 22455 +3023
==========================================
+ Hits 6065 6710 +645
- Misses 13367 15745 +2378 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
chris-ashe
force-pushed
the
tidy_tf_power_supplies
branch
from
c496b13 to
a213299
Compare
j-a-foster
reviewed
Jan 24, 2025
Collaborator
j-a-foster
left a comment
j-a-foster
left a comment
There was a problem hiding this comment.
Happy with the changes made and happy for this to be merged.
Do any docs need to be updated?
chris-ashe
force-pushed
the
tidy_tf_power_supplies
branch
from
5d172f1 to
bf95989
Compare
timothy-nunn
reviewed
Feb 4, 2025
| ! For some reasons these lines are needed to make VMCON CONVERGE .... | ||
| if ( i_tf_sup == 0 ) then ! Copper case | ||
| tcpav = tcpav - 273.15D0 | ||
| temp_cp_average = temp_cp_average - 273.15D0 |
Collaborator
There was a problem hiding this comment.
I've seen you changing 273 to 293 elsewhere. Just to confirm this should be left as it.
| ! For some reasons these lines are needed to make VMCON CONVERGE .... | ||
| if ( i_tf_sup == 0 ) then ! Copper case | ||
| tcpav = tcpav + 273.15D0 | ||
| temp_cp_average = temp_cp_average + 273.15D0 |
chris-ashe
force-pushed
the
tidy_tf_power_supplies
branch
2 times, most recently
from
406f724 to
a7fd6c8
Compare
timothy-nunn
requested changes
Feb 12, 2025
Collaborator
timothy-nunn
left a comment
timothy-nunn
left a comment
There was a problem hiding this comment.
Quality job on CI failing
https://github.com/ukaea/PROCESS/actions/runs/13263761673/job/37026044400?pr=3465#step:5:34
Need to rebase onto main to get fixes to Stellarator confinement time and new regression tests
…tial value to that of GLIDCOP copper as the current value was that of Aluminium though the mass of copper was used for the bus bar
…of that for an individual coil
chris-ashe
force-pushed
the
tidy_tf_power_supplies
branch
from
a7fd6c8 to
f3d2288
Compare
timothy-nunn
approved these changes
Feb 13, 2025
Collaborator
timothy-nunn
left a comment
timothy-nunn
left a comment
There was a problem hiding this comment.
Happy with code changes
j-a-foster
approved these changes
Feb 13, 2025
timothy-nunn
requested changes
Feb 13, 2025
| "iradloss": "i_rad_loss", | ||
| "ipnlaws": "n_confinement_scalings", | ||
| "iinvqd": None, | ||
| "n_tf": "n_tf_coils", |
Collaborator
There was a problem hiding this comment.
Need to add rhotfbus, jbus, fcoolleg
chris-ashe
force-pushed
the
tidy_tf_power_supplies
branch
from
e410b27 to
8ce78d9
Compare
timothy-nunn
approved these changes
Feb 13, 2025
ajpearcey
pushed a commit
that referenced
this pull request
Feb 26, 2025
* 🔄 Rename tfbusl to len_tf_bus for clarity and consistency across the codebase * ➕ Add len_tf_bus as a input variable * 🔄 Rename tfbusl to rho_tf_bus for clarity and consistency; Change initial value to that of GLIDCOP copper as the current value was that of Aluminium though the mass of copper was used for the bus bar * 🔄 Refactor tfbusmas to m_tf_bus for clarity and consistency * 🔄 Rename n_tf to n_tf_coils for clarity and consistency across the codebase * 🔄 Rename jbus to j_tf_bus for clarity and consistency; * 🔄 Refactor tflegres to res_tf_leg for clarity and consistency across the codebase * 🔄 Rename presleg to p_tf_leg_resistive for clarity and consistency; * 🐛 Fix TF resistive power calc that used the total TF current instead of that for an individual coil * 🔄 Rename ztot to res_tf_system_total * 🔄 Rename prescp to p_cp_resistive for clarity and consistency across the codebase * 🐛 Remove 0.92 fudge value to frholeg * 🐛 Remove 0.92 fudge value from frhocp * 🔄 Rename 'ritfc' to 'c_tf_total' for consistency across the codebase * 🔄 Update comment for rho_tf_bus to specify GLIDCOP AL-15 as the default material * 🐛 Refactor TF leg resistive power calculations to account for all legs * 🔄 Rename 'tfleng' to 'len_tf_coil' for consistency across the codebase * 🔄 Rename 'rhotfleg' to 'rho_tf_leg' for consistency across the codebase * 🔄 Rename 'fcoolleg' to 'f_a_tf_cool_outboard' for consistency across the codebase * 🔄 Rename 'tcpav' to 'temp_cp_average' for consistency across the codebase * 🔄 Rename 'tlegav' to 'temp_tf_legs_outboard' for consistency across the codebase * 🔄 Rename 'rhocp' to 'rho_cp' for consistency across the codebase * 🔄 Rename 'arealeg' to 'a_tf_leg_outboard' for consistency across the codebase * 🔄 Update resistive heating calculations and improve method documentation for clarity * 🎨 Pre commit check * 🔄 Improve documentation for resistivity parameters and add comments for clarity * Removed undefined variable * lint fix * 🔄 Add new obsolete variable mappings for TF parameters --------- Co-authored-by: Jack <jack.foster@ukaea.uk>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Namespace changes
Functions
Variables
tfbusl->len_tf_busrhotfbus->rho_tf_bustfbusmas->m_tf_busn_tf->n_tf_coilsjbus->j_tf_bustflegres->res_tf_legpresleg->p_tf_leg_resisitiveztot->res_tf_system_totalprescp->p_cp_resisitiveritfc->c_tf_totaltfleng->len_tf_coilrhotfleg->rho_tf_legfcoolleg->f_a_tf_cool_outboardtlegav->temp_tf_legs_outboardrhocp->rho_cparealeg->a_tf_leg_outboard✨ New additions
len_tf_bus: Can now be put as an input variableThe copper resisitivty and temperature relation has been updated to use a new initial value of 1.86μΩ.cm taken for Glidcop AL-15 (https://www.spotweldingconsultants.com/GlidCop_AL_15.pdf) with a new resistivity coefficient of 0.00393 for pure copper (https://cirris.com/temperature-coefficient-of-copper/)
🐛 Bugs
rho_tf_buswas2.62E-8which is that of Aluminium even though the busbar assumes a copper density. It has been updated to the value of1.86E-8which is that of GLIDCOP AL-15 (C15715).frholegandfrhocpwere being divded by 0.92 before multiplying the resistivity value outputp_tf_leg_resistancewas taking the square of the total TF currents then dividing by the number of TF coils instead of dividing the total current by the number of coils then squaring the current value. This is then multiplied by the total number of TF coils to get the total TF leg resistanceChecklist
I confirm that I have completed the following checks: