3013 add class methods for each current drive efficiency calc along with suitable tests#3621

Merged

timothy-nunn merged 41 commits intomainfrom

3013-add-class-methods-for-each-current-drive-efficiency-calc-along-with-suitable-tests

Apr 24, 2025

Commits on Apr 23, 2025

♻️ Refactor CurrentDrive initialization to include new classes for each current drive type
chris-ashe
committed
:sparkle: Add lower_hybrid_fenstermacher function to calculate lower hybrid frequency and update references in CurrentDrive class
chris-ashe
committed
✨ Add ion_cyclotron_ipdg89 function for calculating ion cyclotron heating efficiency and update documentation
chris-ashe
committed
✨ Add electron_cyclotron_fenstermacher function for calculating electron cyclotron heating efficiency and update related documentation
chris-ashe
committed
✨ Add lower_hybrid_ehst function for calculating Lower Hybrid current drive efficiency and update documentation
chris-ashe
committed
✨ Add electron_berstein_freethy function for calculating Electron Bernstein Wave current drive efficiency and refactor CurrentDrive class to utilize this new method
chris-ashe
committed
✨ Add electron_cyclotron_freethy function for calculating Electron Cyclotron current drive efficiency and refactor CurrentDrive class to utilize this new method
chris-ashe
committed
✨ Refactor CurrentDrive class to streamline current drive efficiency calculations using a dictionary of models and remove redundant code
chris-ashe
committed
🔄 Make eta_cd_hcd_secondary a proper current_drive variable
chris-ashe
committed
➕ Add calculation for the normalised secondary efficiency
chris-ashe
committed
✨ Create new current driven variables for the hcd systems
chris-ashe
committed
✨ Add calculations for secondary heating current drive efficiency and introduce new variables for driven current fractions
chris-ashe
committed
🔄 Rename pinjwpfix to p_hcd_secondary_electric_mw for clarity and consistency in current drive calculations
chris-ashe
committed
🔄 Rename variable plhybd to p_hcd_lowhyb_injected_total_mw for clarity and consistency in current drive calculations
chris-ashe
committed
🔄 Rename variable pnbeam to p_hcd_beam_injected_total_mw for clarity and consistency in current drive calculations
chris-ashe
committed
✨ Introduce p_hcd_primary_injected_mw variable and update calculations for primary heating power in current drive module
chris-ashe
committed
✨ Add variables for ion cyclotron and electron Bernstein wave injection power in current drive module
chris-ashe
committed
✨ Add injector wall plug efficiency variables for ion cyclotron and electron Bernstein wave in current drive module
chris-ashe
committed
♻️ Refactor current drive calculations to introduce p_hcd_secondary_ions_mw and update injected power handling for ion cyclotron cases
chris-ashe
committed
🔄 Rename pinjwp to p_hcd_electric_total_mw for clarity and update related calculations in current drive and heat transport modules
chris-ashe
committed
✨ Introduce p_hcd_primary_electric_mw variable and update calculations for primary heating power in heat transport module
chris-ashe
committed
♻️ Update current drive calculations to handle electron Bernstein wave cases and improve wall plug power efficiency
chris-ashe
committed
♻️ Refactor primary heating power calculations in current drive module for improved clarity and maintainability
chris-ashe
committed
✨ Add p_beam_plasma_coupled_mw variable to track neutral beam power coupled to plasma after losses
chris-ashe
committed
🔄 Rename echwpow to p_hcd_ecrh_electric_mw for clarity and update related data files
chris-ashe
committed
♻️ Update current drive calculations to include electron Bernstein wave power and improve wall plug efficiency
chris-ashe
committed
♻️ Rename pwplh to p_hcd_lowhyb_electric_mw for clarity and update related calculations and tests
chris-ashe
committed
✨ Add p_ebw_injected_mw variable to track electron Bernstein wave power and update related tests
chris-ashe
committed
:memo: Enhance current drive reporting by adding extra power metrics and improving efficiency calculations
chris-ashe
committed
🔄 Rename fvsbrnni to f_c_plasma_non_inductive for clarity and update related data files and calculations
chris-ashe
committed
🔄 Rename inductive_current_fraction to f_c_plasma_inductive for clarity and update related calculations and documentation
chris-ashe
committed
🔄 Rename aux_current_fraction to f_c_plasma_auxiliary for clarity and update related calculations and data files
chris-ashe
committed
:memo: Fix nbi in output
chris-ashe
committed
Post rebase updates
chris-ashe
committed
🔄 Move legend function from CurrentDrive to ElectronCyclotron for better organization and clarity
chris-ashe
committed
🔄 Add initial data files and documentation for heating and current drive systems
chris-ashe
committed
🔄 Add p_hcd_injected_current_total_mw as a variable
chris-ashe
committed
🔄 Refactor current drive method calls for clarity and consistency
chris-ashe
committed
🔄 Refactor current drive method calls for clarity and consistency
chris-ashe
committed
Re make current drive unit tests to new style, create case for lower hybrid
chris-ashe
committed
🔄 Refactor CurrentDrive initialization to instantiate cyclotron and beam classes directly
chris-ashe
committed