Update pfcoil_variables.f90 variables for clarity#3538
Merged
timothy-nunn merged 70 commits intomainfrom Mar 7, 2025
Merged
Conversation
pfcoil_variables.f90 variables for clarity
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #3538 +/- ##
=======================================
Coverage 31.21% 31.21%
=======================================
Files 83 83
Lines 19935 19935
=======================================
Hits 6223 6223
Misses 13712 13712 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
4ba1e0c to
472d191
Compare
eeeea5e to
5f5c472
Compare
pfcoil_variables.f90 variables for claritypfcoil_variables.f90 variables for clarity
fa820c8 to
ff4cffd
Compare
timothy-nunn
requested changes
Feb 27, 2025
Collaborator
timothy-nunn
left a comment
There was a problem hiding this comment.
Integration tests failing and one regression input file still contains obsolete variables.
Also a random file has been added, I have commented a '?'
| "ipfres": "i_pf_conductor", | ||
| "fvssu": "fvs_cs_pf_total_ramp", | ||
| "fbmaxcs": "fb_cs_limit_max", | ||
| "fcohbop": "f_j_cs_start_pulse_end_flat_top", |
Collaborator
There was a problem hiding this comment.
Can't this just be None too?
…istency and clarity
…r consistency and clarity
…r consistency and clarity
…tency and clarity
…stency and clarity
…tency and clarity
…tency and clarity
…istency across multiple files
…istency across multiple files
…ncy across multiple files
…ss multiple files
… and consistency across multiple files
…y and consistency across multiple files
…nd consistency across multiple files
…ency across multiple files
…across multiple files
…ency across multiple files
…across multiple files
…ency across multiple files
…ross multiple files
…y across multiple files
…sistency across multiple files
…nd consistency across multiple files
…y across multiple files
ff4cffd to
a746230
Compare
timothy-nunn
approved these changes
Mar 7, 2025
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
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.
This PR changes the vast majority of the variables found in
pfcoil_variables.f90in attempt to make them more verbose, descriptive and easier to understand. This is due to many of the PF variables still being in the old Fortran style.These changes are not exhaustive and the new variable name may not represent the variable exactly as its new name is inferred from its previous. Therefore some variables may change again in the future if their naming is found to not be accurate.
Namespace changes
Variables
Numbers
ncirt->n_pf_cs_plasma_circuitsturns->n_pf_coil_turnsnohc->n_cs_pf_coilsncls->n_pf_coils_in_groupngrpmx->n_pf_groups_maxngrp->n_pf_coil_groupsnclsmx->n_pf_coils_in_group_maxngc->n_pf_coils_maxGeometry
For the six vertical and radial variables there was a lot of name mangling when doing find and replace as the variables aren't verbose enough to what exactly they are for
ra->r_pf_coil_innerrb->r_pf_coil_outerrpf->r_pf_coil_middlerohc->r_cs_middleipfloc->i_pf_locationzh->z_pf_coil_upperzl->z_pf_coil_lowerzpf->z_pf_coil_middlepfrmax->r_pf_coil_outer_maxa_oh_turn->a_cs_turnareaoh->a_cs_poloidalvf->f_a_pf_coil_voidvfohc->f_a_cs_voidStructures
wtc->m_pf_coil_conductorwhtpf->m_pf_coil_conductor_totalwts->m_pf_coil_structurewhtpfs->m_pf_coil_structure_totaloh_steel_frac->f_a_cs_steelpfmmax->m_pf_coil_maxCurrents
cohbop->j_cs_pulse_startrjpfalw->j_pf_wp_criticalcoheof->j_cs_flat_top_endric->c_pf_cs_coils_peak_macurpfb->c_pf_cs_coil_pulse_start_macurpff->c_pf_cs_coil_flat_top_macurpfs->c_pf_cs_coil_pulse_end_marjpfalw->j_pf_wp_criticalcpt->c_pf_coil_turncptdin->c_pf_coil_turn_peak_inputrjconpf->j_pf_coil_wp_peakrjohc->j_cs_critical_flat_top_endrjohc0->j_cs_critical_pulse_startjscoh_bop->j_cs_conductor_critical_pulse_startjsocoh_eof->j_cs_conductor_critical_flat_top_endfcohbof->f_j_cs_start_end_flat_topfcohbop->f_j_cs_start_pulse_end_flat_topfvssu->fvs_cs_pf_total_rampMagnetic fields
bmaxcs_lim->b_cs_limit_maxfbmaxcs->fb_cs_limit_maxbpf->b_pf_coil_peakbmaxoh0->b_cs_peak_pulse_startbmaxoh->b_cs_peak_flat_top_endVolt-seconds / Fluxes
vsohsu->vs_cs_rampvsohbn->vs_cs_burnvsefsu->vs_pf_coils_total_rampvssu->vs_cs_pf_total_rampvsefbn->vs_pf_coils_total_burnvsbn->vs_cs_pf_total_burnvseft->vs_pf_coils_total_pulsevsoh->vs_cs_total_pulsevstot->vs_cs_pf_total_pulsetmargoh->temp_cs_marginpfclres->rho_pf_coilisumatoh->i_cs_superconductorisumatpf->i_pf_superconductorohhghf->f_z_cs_tf_internalsxlg->ind_pf_cs_plasma_mutualipfres->i_pf_superconductorpowohres->p_cs_resisitive_flat_toppowpfres->p_pf_coil_resisitve_total_flat_topChecklist
I confirm that I have completed the following checks: