-
Notifications
You must be signed in to change notification settings - Fork 18
:3263 update the plasma current section of the docs to show and explain all models #3320
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
chris-ashe
merged 115 commits into
main
from
3263-update-the-plasma-current-section-of-the-docs-to-show-and-explain-all-models
Oct 9, 2024
Merged
Changes from all commits
Commits
Show all changes
115 commits
Select commit
Hold shift + click to select a range
a8156c3
Rename the plasma current calculation function and tests for readability
chris-ashe f40cc89
Merge branch 'main' into 3263-update-the-plasma-current-section-of-th…
chris-ashe 520f508
Tidy up and re-format calculate_plasma_current: Type hints added, har…
chris-ashe c1908e5
Added a new structure for the plasma current docs dividing the types …
chris-ashe 974e20b
Re-name icurr to i_plasma_current and add icurr to the obsolete varia…
chris-ashe f599865
Black format
chris-ashe 2e20df7
Documentation added for Peng (i_plasma_current = 1)
chris-ashe ca53017
Rename plasc to calculate_plasma_current_peng
chris-ashe 90d8241
Fix calling of i_plasma_current == 6 for the 2nd Todd scaling
chris-ashe 6331862
Rename idia to i_diamagnetic_fraction and place idia into the obsolet…
chris-ashe bb97f2f
Add type hints and expanded docstrings to the Hender and SCENE diamag…
chris-ashe 720fdb3
Merge in main
chris-ashe 11e2aed
:memo: chore: Update diamagnetic current documentation
chris-ashe edc4afe
:memo: chore: Update Pfirsch-Schlüter current documentation
chris-ashe 44f9a97
:art: refactor: Update ps_fraction_scene function documentation
chris-ashe c9a7420
:bug: refactor: Update i_diamagnetic_current variable name in initia…
chris-ashe adfca06
:art: refactor: Update "ibss" to "i_bootstrap_current" variable name …
chris-ashe 187a295
refactor: Add type hints and revised docstrings for calculate_plasma_…
chris-ashe 3df026b
refactor: Update _plascar_bpol function with type hints and revised d…
chris-ashe 89af8ad
:memo: refactor: Added first instance of all models for calculating t…
chris-ashe 7837a54
refactor: Update bpol function with type hints and revised docstring
chris-ashe 64ab328
refactor: Rename bpol function to calculate_poloidal_field and update…
chris-ashe ee23717
:memo: Complete the initial documentation section for the calculate_p…
chris-ashe fa39999
:memo: Tidy up comments in calculate_poloidal_field()
chris-ashe 46843bf
Update bootstrap_current.md to be up to date with main
chris-ashe 81f8012
:rectlye: refactor: Re-arrange the three current section sin physics.…
chris-ashe 764baff
refactor: Remove cboot internally from bootstrap_fraction_iter89 and …
chris-ashe 73403e3
Update bootstrap_current.md with overview of bootstrap current in tok…
chris-ashe b4c2d84
Merge branch 'main' into 3263-update-the-plasma-current-section-of-th…
chris-ashe 39f87ca
refactor: Remove cboot parameter from bootstrap_fraction_iter89 tests
chris-ashe 18272a5
Add type hints and revised docstrings to ITER and Wilson bootstrap fu…
chris-ashe 3836cdc
:white_check_mark: Update test suite and files to use i_plasma_curren…
chris-ashe 45a7748
refactor: Update variable names for diamagnetic current calculation i…
chris-ashe cff1a29
:label: refactor: Update variable names of ips to i_pfirsch_scluter_c…
chris-ashe b808deb
Merge branch 'main' into 3263-update-the-plasma-current-section-of-th…
chris-ashe 18d7bba
Merge branch 'main' into 3263-update-the-plasma-current-section-of-th…
chris-ashe 28b8a18
Fix type in Sakai scaling and lack of inverse aspect ratio term in in…
chris-ashe 96a9b22
Add type hints and improved docstring to bootstrap_fraction_nevins()
chris-ashe 04c35a4
Refactor bsinteg() function in physics.py
chris-ashe 2835856
Refactor bsinteg() function to nevins_integral() in physics.py
chris-ashe 7ec77bd
Fix the nevins_integral() and bootstrap_fraction_nevins() to align to…
chris-ashe 1d59c7a
Merge branch 'main' into 3263-update-the-plasma-current-section-of-th…
chris-ashe c763d89
Add type hints and updated docstring along with a few comments to boo…
chris-ashe 16e35f1
Refactor tpf() into trapped_particle_fraction() function and update i…
chris-ashe eee6267
Refactor dcsa() into calculate_l31_coefficient() function and update …
chris-ashe 6defc39
Refactor hcsa() into calculate_l31_32_coefficient() and add type hint…
chris-ashe 22ed67d
Refactor xcsa() into calculate_l34_alpha_31_coefficient() and add typ…
chris-ashe 6c5ab72
Re-arrange physics.py to group functions based on use and add block c…
chris-ashe 7f1acc4
Refactor coulg() into coulomb_logarithm_sauter() function and update …
chris-ashe c08d0aa
Refactor nuee() into electron_collisions_sauter() function and update…
chris-ashe d6ce90a
Refactor nuess() into electron_collisionality_sauter() and add expand…
chris-ashe 11f7454
Refactor nui() into ion_collisions_sauter() function and update its d…
chris-ashe fec2f50
Refactor nuis() into ion_collisionality_sauter() function and update …
chris-ashe 38a0b30
Refactor beta_poloidal_local to beta_poloidal_sauter for Sauter boots…
chris-ashe 65612bb
Refactor beta_poloidal_local_total() to beta_poloidal_total_sauter() …
chris-ashe 265997e
Format black
chris-ashe 6aa83f5
Refactor magnetic_moment to inverse_q for safety factor profile and u…
chris-ashe 8dc555f
Update bootstrap_fraction_sauter() in-line comments
chris-ashe ab757e6
Rename bootipf into bootstrap_current_fraction and add to obsolete va…
chris-ashe 3abdc8e
Rename plasipf to plasma_current_internal_fraction
chris-ashe 4c1d78e
Add inductive plasma current to navigation menu
chris-ashe 3531f41
Refactor bscfmax to bootstrap_current_fraction_max and add bscfmax to…
chris-ashe ea979e0
Initial commit of bootstrap models. Have added the main key details o…
chris-ashe d00f786
Turn i_plasma_current = 1 into a callable function named calculate_cu…
chris-ashe c4e6b3b
Refactor ITER IPDG89 scaling to use a callable function
chris-ashe a573a7c
Refactor Connor-Hastie model to use a callable function named calcula…
chris-ashe 8d30057
Refactor Todd empirical scaling to use a callable function named calc…
chris-ashe 6a63fff
Refactor Sauter model to use a callable function named calculate_curr…
chris-ashe e96d600
Refactor the FIESTA plasma current scaling to use a callable function
chris-ashe 86ac02e
Re-arrange physics.py again to group function and add section for the…
chris-ashe dca1504
Add documentation about the electron and ion local poloidal beta corr…
chris-ashe f133bad
Add descriptions and links about how the different Sauter bootstrap f…
chris-ashe 18204ae
Add documentation for setting maximum desirable bootstrap current fra…
chris-ashe 3b244cd
Rename diaipf to diamagnetic_current_fraction
chris-ashe 8d69fe0
Add documentation for plasma current ramp-up time lower limit and pla…
chris-ashe 861e7b7
Add bokeh plot to show difference between current profiles for the Co…
chris-ashe 5551b66
Remove the calculation of qbar from the top of physics() and place it…
chris-ashe eee2ad4
Add graph and description about the qbar definition for the STAR Peng…
chris-ashe c5ca0e8
Update docs to describe more of q_cyl and add references for differen…
chris-ashe 571fcd8
Change the 95% values of kappa and traing to the separatrix values, i…
chris-ashe 2486f02
Update documentation for wilson bootstrap model and add AEA FUS 172 r…
chris-ashe 3162aa5
Refactor Todd plasma current scaling calculation in physics.py to inc…
chris-ashe 58ffae4
Ad @nb.jit decorators to physics.py functions
chris-ashe e6190dd
Add about rod and plasma current constraint equation in docs
chris-ashe fe9dd13
Update expected values for the Sakai, bootstrap current fraction mode…
chris-ashe a483dda
Refactor physics.py to remove @nb.jit decorator from nevins_integral …
chris-ashe 16fefd3
Refactor physics.py to remove @nb.jit decorator peng plasma current c…
chris-ashe 85dfc05
Update the tests relating to i_plasma_current = 2 which had the defin…
chris-ashe aa082aa
black format
chris-ashe 4dd5071
Refactor variable name bscfmax to bootstrap_current_fraction_max in l…
chris-ashe 771ef4e
:memo: Add derivation of plasma current formula
chris-ashe 1018d87
Refactor variable name psipf to ps_current_fraction in current_drive.…
chris-ashe 0ef1a61
Refactor variable name facoh to inductive_current_fraction in multipl…
chris-ashe b06a8cd
Refactor variable name faccd to aux_current_fraction in multiple files
chris-ashe 4829df3
Refactor variable name faccdfix to aux_current_fraction_fix in curren…
chris-ashe 95cd925
Refactor variable name plascur to plasma_current in multiple files
chris-ashe bac2836
Refactor variable name plasma_current/1D6 to plasma_current_MA in mul…
chris-ashe adeb494
Merge branch 'main' into 3263-update-the-plasma-current-section-of-th…
chris-ashe 10037ed
Refactor variable name qpsi to q95 for Wilson bootstrap model in phys…
chris-ashe 1142ce1
Refactor navigation menu in mkdocs.yml to include Composition, Impuri…
chris-ashe af89f10
Format YAML files
chris-ashe 3d6f10b
Refactor the ipdg89 bootstrap function to be concurrent with the form…
chris-ashe 1cfe274
Refactor test_calculate_plasma_current function to use more descripti…
chris-ashe 38cc7af
Fix html script id to make Bokeh plot show for Connor-Hastie current …
chris-ashe e61914e
Spelling fixes and reviewer corrections to wording
chris-ashe dda6d0f
Remove old heating and current drive index file that was lost in dele…
chris-ashe 3fa46f1
Add introduction about the summation of the different current compone…
chris-ashe 47b5f5e
Remove redundant heating and current drive section from plasma curren…
chris-ashe 2918a95
Refactor CSS to add horizontal rule styling
chris-ashe 3c799fe
Add details about inductive current models
chris-ashe dba1114
Changed Sauter functions to have `_` at the start to declare that the…
chris-ashe 9f07991
Add how PROCESS handles the Sauter bootstrap calculation into the doc…
chris-ashe bec9713
Add section to Sauter bootstrap scaling about the trapped particle fr…
chris-ashe 7d5b369
Add content about determining the new profile indexes in the Wilson b…
chris-ashe e1cb988
Fixes for tests
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
69 changes: 0 additions & 69 deletions
69
documentation/proc-pages/eng-models/heating-and-current-drive.md
This file was deleted.
Oops, something went wrong.
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.
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.