-
Notifications
You must be signed in to change notification settings - Fork 18
3013 add class methods for each current drive efficiency calc along with suitable tests
#3621
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
timothy-nunn
merged 41 commits into
main
from
3013-add-class-methods-for-each-current-drive-efficiency-calc-along-with-suitable-tests
Apr 24, 2025
Merged
Changes from all commits
Commits
Show all changes
41 commits
Select commit
Hold shift + click to select a range
7b8ea3a
♻️ Refactor CurrentDrive initialization to include new classes for ea…
chris-ashe 1ec13ce
:sparkle: Add lower_hybrid_fenstermacher function to calculate lower …
chris-ashe fc38b75
✨ Add ion_cyclotron_ipdg89 function for calculating ion cyclotron hea…
chris-ashe 0a4bf7c
✨ Add electron_cyclotron_fenstermacher function for calculating elect…
chris-ashe 6fcccc6
✨ Add lower_hybrid_ehst function for calculating Lower Hybrid current…
chris-ashe 9ed7bc3
✨ Add electron_berstein_freethy function for calculating Electron Ber…
chris-ashe 7d6f1f8
✨ Add electron_cyclotron_freethy function for calculating Electron Cy…
chris-ashe 47d050d
✨ Refactor CurrentDrive class to streamline current drive efficiency …
chris-ashe 7ad3df5
🔄 Make eta_cd_hcd_secondary a proper current_drive variable
chris-ashe c4602f5
➕ Add calculation for the normalised secondary efficiency
chris-ashe 4af1403
✨ Create new current driven variables for the hcd systems
chris-ashe 490479c
✨ Add calculations for secondary heating current drive efficiency and…
chris-ashe c03f9e3
🔄 Rename pinjwpfix to p_hcd_secondary_electric_mw for clarity and con…
chris-ashe 20f52a6
🔄 Rename variable plhybd to p_hcd_lowhyb_injected_total_mw for clarit…
chris-ashe 0da8a51
🔄 Rename variable pnbeam to p_hcd_beam_injected_total_mw for clarity …
chris-ashe 32fa0fe
✨ Introduce p_hcd_primary_injected_mw variable and update calculation…
chris-ashe edd5b9c
✨ Add variables for ion cyclotron and electron Bernstein wave injecti…
chris-ashe 1ebbc02
✨ Add injector wall plug efficiency variables for ion cyclotron and e…
chris-ashe c2a87b2
♻️ Refactor current drive calculations to introduce p_hcd_secondary_i…
chris-ashe f8af8d2
🔄 Rename pinjwp to p_hcd_electric_total_mw for clarity and update rel…
chris-ashe 6b1eba7
✨ Introduce p_hcd_primary_electric_mw variable and update calculation…
chris-ashe 22aca7e
♻️ Update current drive calculations to handle electron Bernstein wav…
chris-ashe 85f4d21
♻️ Refactor primary heating power calculations in current drive modul…
chris-ashe 17184ed
✨ Add p_beam_plasma_coupled_mw variable to track neutral beam power c…
chris-ashe 636c91e
🔄 Rename echwpow to p_hcd_ecrh_electric_mw for clarity and update rel…
chris-ashe 8eeb453
♻️ Update current drive calculations to include electron Bernstein wa…
chris-ashe 6683b77
♻️ Rename pwplh to p_hcd_lowhyb_electric_mw for clarity and update re…
chris-ashe 072742d
✨ Add p_ebw_injected_mw variable to track electron Bernstein wave pow…
chris-ashe 426f7fd
:memo: Enhance current drive reporting by adding extra power metrics …
chris-ashe aa6d166
🔄 Rename fvsbrnni to f_c_plasma_non_inductive for clarity and update …
chris-ashe bef486e
🔄 Rename inductive_current_fraction to f_c_plasma_inductive for clari…
chris-ashe 01d9240
🔄 Rename aux_current_fraction to f_c_plasma_auxiliary for clarity and…
chris-ashe 7b35f0e
:memo: Fix nbi in output
chris-ashe 287d0f3
Post rebase updates
chris-ashe b694092
🔄 Move legend function from CurrentDrive to ElectronCyclotron for bet…
chris-ashe 5f0304e
🔄 Add initial data files and documentation for heating and current dr…
chris-ashe f80c0f6
🔄 Add p_hcd_injected_current_total_mw as a variable
chris-ashe f30b2cb
🔄 Refactor current drive method calls for clarity and consistency
chris-ashe cb34a38
🔄 Refactor current drive method calls for clarity and consistency
chris-ashe 32811fd
Re make current drive unit tests to new style, create case for lower …
chris-ashe 255258c
🔄 Refactor CurrentDrive initialization to instantiate cyclotron and b…
chris-ashe File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
2 changes: 1 addition & 1 deletion
2
documentation/proc-pages/eng-models/heating_and_current_drive/NBI/nbi_overview.md
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
2 changes: 1 addition & 1 deletion
2
documentation/proc-pages/eng-models/heating_and_current_drive/RF/ebw_overview.md
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
2 changes: 1 addition & 1 deletion
2
documentation/proc-pages/eng-models/heating_and_current_drive/RF/ec_overview.md
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
5 changes: 4 additions & 1 deletion
5
...ntation/proc-pages/eng-models/heating_and_current_drive/RF/ehst_lower_hybrid.md
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
7 changes: 5 additions & 2 deletions
7
...dels/heating_and_current_drive/RF/fenstermacher_electron_cyclotron_resonance.md
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,9 @@ | ||
| # Fenstermacher Electron Cyclotron Resonance | ||
| # Fenstermacher Electron Cyclotron Resonance | `electron_cyclotron_fenstermacher()` | ||
|
|
||
| - `i_hcd_primary/i_hcd_secondary` = 3 [^1] | ||
|
|
||
| - `i_hcd_primary/i_hcd_secondary` = 3 | ||
| $$ | ||
| \text{Current drive efficiency [A/W]} = \frac{0.21 T_{\langle e,n_{\text{e}} \rangle}}{R_0n_{\text{e,20}}(31.0-(\log{n_{\text{e}}}/2)+(\log{(T_\text{e}}\times1000))} | ||
| $$ | ||
|
|
||
| [^1]: T.C. Hender et al., 'Physics Assessment of the European Reactor Study', AEA FUS 172, 1992. |
10 changes: 8 additions & 2 deletions
10
...roc-pages/eng-models/heating_and_current_drive/RF/fenstermacher_lower_hybrid.md
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,13 @@ | ||
| # Fenstermacher Lower Hybrid | ||
| # Fenstermacher Lower Hybrid | `lower_hybrid_fenstermacher()` | ||
|
|
||
| - `i_hcd_primary/i_hcd_secondary` = 1: | ||
|
|
||
| This forumla was originally in the Oak RidgeSystems Code[^1], attributed to Fenstermacher and is used in the AEA FUS 172 report[^2]. | ||
|
|
||
| $$ | ||
| \text{Current drive efficiency [A/W]} = 0.36 \frac{(1+(T_{\text{e}}/25)^{1.16})}{R_{0} n_{\text{e},20}} | ||
| $$ | ||
| $$ | ||
|
|
||
| [^1]: R.L.Reid et al, Oak Ridge Report ORNL/FEDC-87-7, 1988 | ||
|
|
||
| [^2]: T.C. Hender et al., 'Physics Assessment of the European Reactor Study', AEA FUS 172, 1992. | ||
8 changes: 6 additions & 2 deletions
8
documentation/proc-pages/eng-models/heating_and_current_drive/RF/ic_model.md
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,11 @@ | ||
| # Ion cyclotron model | ||
| # IPDG89 ion cyclotron model | `ion_cyclotron_ipdg89()` | ||
|
|
||
| - `i_hcd_primary/i_hcd_secondary` = 2 | ||
| - `i_hcd_primary/i_hcd_secondary` = 2 [^1] [^2] | ||
|
|
||
| $$ | ||
| \text{Current drive efficiency [A/W]} = \frac{\frac{0.063 T_{\langle \text{e}, n_{\text{e}}\rangle}}{2+Z_{\text{eff}}}}{R_0n_{\text{e,20}}} | ||
| $$ | ||
|
|
||
| [^1]: N.A. Uckan and ITER Physics Group, 'ITER Physics Design Guidelines: 1989', https://inis.iaea.org/collection/NCLCollectionStore/_Public/21/068/21068960.pdf | ||
|
|
||
| [^2] T.C. Hender et al., 'Physics Assessment of the European Reactor Study', AEA FUS 172, 1992. |
2 changes: 1 addition & 1 deletion
2
documentation/proc-pages/eng-models/heating_and_current_drive/RF/ic_overview.md
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
3 changes: 2 additions & 1 deletion
3
documentation/proc-pages/eng-models/heating_and_current_drive/RF/lhcd_overview.md
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| # Lower Hybrid Current Drive | ||
| # Lower Hybrid Current Drive | `LowerHybrid` | ||
|
|
||
| Lower hybrid heating is generated through the propagation of a lower hybrid wave within a plasma, characterized by a frequency lying between the ion and electron cyclotron frequencies. This wave possesses an electric field component parallel to the magnetic field, enabling the acceleration of electrons traveling along the field lines. | ||
|
|
||
| Lower hybrid resonance heating employs electromagnetic power within the 1-8 GHz frequency range. At 3 GHz, the vacuum wavelength measures 0.1 meters, facilitating the transmission and launching of energy via waveguides operating in their fundamental mode. This feature stands out as a primary advantage of this method. |
4 changes: 2 additions & 2 deletions
4
...on/proc-pages/eng-models/heating_and_current_drive/heating-and-current-drive.md
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
4 changes: 2 additions & 2 deletions
4
documentation/proc-pages/physics-models/plasma_current/inductive_plasma_current.md
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
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.