🔌 Update current drive variables to new style#3615
Conversation
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #3615 +/- ##
=======================================
Coverage 36.28% 36.28%
=======================================
Files 88 88
Lines 22067 22069 +2
=======================================
+ Hits 8006 8008 +2
Misses 14061 14061 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
There was a problem hiding this comment.
Copilot reviewed 86 out of 90 changed files in this pull request and generated 1 comment.
Files not reviewed (4)
- documentation/proc-pages/physics-models/error.txt: Language not supported
- examples/data/csv_output_large_tokamak_MFILE.DAT: Language not supported
- examples/data/large_tokamak_1_MFILE.DAT: Language not supported
- examples/data/large_tokamak_2_MFILE.DAT: Language not supported
Comments suppressed due to low confidence (1)
documentation/proc-pages/eng-models/heating_and_current_drive/NBI/culham_nb.md:59
- The word 'clauclated' appears to be a typo; please correct it to 'calculated'.
Power split to the ions and electrons is clauclated with the `cfnbi()` method found [here](../NBI/nbi_overview.md/#ion-coupled-power-cfnbi) and outputs `f_p_beam_injected_ions`
1b0dc35 to
cd6b5de
Compare
There was a problem hiding this comment.
Copilot reviewed 89 out of 92 changed files in this pull request and generated no comments.
Files not reviewed (3)
- documentation/proc-pages/physics-models/error.txt: Language not supported
- examples/data/csv_output_large_tokamak_MFILE.DAT: Language not supported
- examples/data/large_tokamak_1_MFILE.DAT: Language not supported
Comments suppressed due to low confidence (2)
documentation/proc-pages/fusion-devices/stellarator.md:176
- The new variable name suggests the power is expressed in megawatts, while the description still states it is in Watts. Please update the units in the description or the variable name to maintain consistency.
The value of variable `p_hcd_primary_extra_heat_mw` determines the actual amount of auxiliary heating power (in Watts) to be applied to the plasma. Switch `ignite` may be used if necessary.
documentation/proc-pages/eng-models/heating_and_current_drive/NBI/culham_nb.md:59
- The word 'clauclated' is misspelled. Please change it to 'calculated'.
Power split to the ions and electrons is clauclated with the \(\mathtt{cfnbi()}\) method found [here](../NBI/nbi_overview.md/#ion-coupled-power-cfnbi) and outputs \(\mathtt{f_p_beam_injected_ions}\)
There was a problem hiding this comment.
Copilot reviewed 89 out of 92 changed files in this pull request and generated no comments.
Files not reviewed (3)
- documentation/proc-pages/physics-models/error.txt: Language not supported
- examples/data/csv_output_large_tokamak_MFILE.DAT: Language not supported
- examples/data/large_tokamak_1_MFILE.DAT: Language not supported
Comments suppressed due to low confidence (1)
documentation/proc-pages/fusion-devices/stellarator.md:176
- The description mentions power in Watts while the variable name indicates megawatts. Please verify and update the unit description to ensure consistency.
The value of variable `p_hcd_primary_extra_heat_mw` determines the actual amount of auxiliary heating power (in Watts) to be applied to the plasma. Switch `ignite` may be used if necessary.
3ac1faa to
04c2b55
Compare
There was a problem hiding this comment.
Level 3 errors no longer exist (except for a couple remaining in constraints_equations). These should be raised in the code as ProcessValueErrors
…urrent drive efficiency variables
… in secondary current drive efficiency calculations
…rent drive variables
…sistency in current drive variables
…clarity and consistency in current drive calculations
…tency in current drive power calculations
…nsistency in current drive calculations
…urrent drive calculations
…current drive calculations
… and consistency in current drive calculations
…and consistency in current drive calculations
…stency in current drive calculations
…y in current drive calculations
…ency in current drive calculations
…nsistency in current drive calculations
…y and consistency in current drive calculations
…y in current drive calculations
5664ebd to
464291e
Compare
…tion and obsolete_vars.py
b473f32 to
ee8af04
Compare
…_tokamak_once_through_IN.DAT
b4f56fd to
5441437
Compare
📝 Doc updates
New unit types for absolute (
eta_cd) and normalised current drive efficiencies (eta_cd_norm) have been added to the style guide.Variable changes
New variables
eta_cd_norm_hcd_secondaryGeneric
iefrf->i_hcd_primaryiefrffix->i_hcd_secondarywave_mode->i_ecrh_wave_modeharnum->n_ecrh_harmonicirfcd->i_hcd_calculationsechpwr->p_ecrh_injected_mwetacd->eta_hcd_primary_injector_wall_plugetacdfix->eta_hcd_secondary_injector_wall_plugpinjalw->p_hcd_injected_maxpinjmw->p_hcd_injected_total_mwpinjfixmw->p_hcd_secondary_injected_mwpinjemw->p_hcd_injected_electrons_mwpinjimw->p_hcd_injected_ions_mwpheat->p_hcd_primary_extra_heat_mwpheatfix->p_hcd_secondary_extra_heat_mwNeutral beam
nbshinemw->p_beam_shine_through_mwpnbitot->p_beam_injected_mwforbitloss->f_p_beam_orbit_lossnbshinef->f_p_beam_shine_throughnbshinefmax->f_p_beam_shine_through_maxporbitlossmw->p_beam_orbit_loss_mwnbshield->dx_beam_shieldfpion->f_p_beam_injected_ionstaubeam->n_beam_decay_lengths_corebeam_current->c_beam_totalbeam_energy->e_beam_kevf_tritium_beam->f_beam_tritiumpnbeamseems to be the same aspnbitotEfficiencies
etanbi->eta_beam_injector_wall_plugetalh->eta_lowhyb_injector_wall_plugetaech->eta_ecrh_injector_wall_pluggamma_ecrh->eta_cd_norm_ecrhgamcd->eta_cd_norm_hcd_primaryeffcd->eta_cd_hcd_primaryeffcdfix->eta_cd_hcd_secondaryCurrents
ps_current_fraction->f_c_plasma_pfirsch_schluterbscf_iter89->f_c_plasma_bootstrap_iter89bscf_nevins->f_c_plasma_bootstrap_nevinsbscf_sauter->f_c_plasma_bootstrap_sauterbscf_aries->f_c_plasma_bootstrap_wilsonbscf_sakai->f_c_plasma_bootstrap_sakaibscf_aries->f_c_plasma_bootstrap_ariesbscf_andrade->f_c_plasma_bootstrap_andradebscf_hoang->f_c_plasma_bootstrap_hoangbscf_wong->f_c_plasma_bootstrap_wongbootstrap_current_fraction_max->f_c_plasma_bootstrap_maxbootstrap_current_fraction->f_c_plasma_bootstrapdiacf_hender->f_c_plasma_diamagnetic_henderdiacf_scene->f_c_plasma_diamagnetic_scenediamagnetic_current_fraction->f_c_plasma_diamagneticplasma_current_internal_fraction->f_c_plasma_internalpscf_scene->f_c_plasma_pfirsch_schluter_scene🐛 : Bugs
gamcdwhich represents the normalised current drive efficiency was used between the secondary and primary heating systems so if compared one of the current drive values would be wrong, a new variableeta_cd_norm_hcd_secondaryhas been made to fix this`Checklist
I confirm that I have completed the following checks: