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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ Switch `itart` provides overall control of the ST switches within the code, and
| Switch | Conventional aspect ratio (`itart = 0`) | Low aspect ratio (`itart = 1`) |
| --- | --- | --- |
| `ishape` | 0, 2, 3, 4 | 1, 5, 6, 7, 8 |
| `ibss` | 1, 2, 3 | 2, 3 |
| `icurr` | 1, 3, 4, 5, 6, 7 | 2, 9 |
| `i_bootstrap_current` | 1, 2, 3 | 2, 3 |
| `i_plasma_current` | 1, 3, 4, 5, 6, 7 | 2, 9 |
| `itfsup` | 0, 1 | 0 |

<center>Table 1: <i> Summary of the switch values in 'PROCESS' that relate to conventional aspect ratio and low aspect ratio machines.</i></center>
Expand Down
40 changes: 20 additions & 20 deletions documentation/proc-pages/physics-models/error.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1042,15 +1042,15 @@ Scalings}\label{bootstrap-diamagnetic-and-pfirsch-schluxfcter-current-scalings}
The fraction of the plasma current provided by the so-called bootstrap
effect can be either input into the code directly, or calculated using
one of four methods, as summarised here. Note that methods
\texttt{ibss\ =\ 1-3} use fits to parabolic density and temperature
\texttt{i_bootstrap_current\ =\ 1-3} use fits to parabolic density and temperature
Comment thread
chris-ashe marked this conversation as resolved.
profiles, and do not take into account the existence of pedestals
(\texttt{ipedestal\ =\ 1}), whereas the Sauter et al. scaling
(\texttt{ibss\ =\ 4}) allows general profiles to be used.
(\texttt{i_bootstrap_current\ =\ 4}) allows general profiles to be used.

\begin{longtable}[]{@{}cl@{}}
\toprule
\begin{minipage}[b]{0.05\columnwidth}\centering\strut
\texttt{ibss}\strut
\texttt{i_bootstrap_current}\strut
\end{minipage} & \begin{minipage}[b]{0.03\columnwidth}\raggedright\strut
Description\strut
\end{minipage}\tabularnewline
Expand All @@ -1060,15 +1060,15 @@ Description\strut
1\strut
\end{minipage} & \begin{minipage}[t]{0.03\columnwidth}\raggedright\strut
ITER scaling -- To use the ITER scaling method for the bootstrap current
fraction. Set \texttt{bscfmax} to the maximum required bootstrap current
fraction. Set \texttt{bootstrap_current_fraction_max} to the maximum required bootstrap current
fraction (\(\leq 1\)). This method is valid at high aspect ratio
only.\strut
\end{minipage}\tabularnewline
\begin{minipage}[t]{0.05\columnwidth}\centering\strut
2\strut
\end{minipage} & \begin{minipage}[t]{0.03\columnwidth}\raggedright\strut
General scaling\footnotemark{} -- To use a more general scaling method,
set \texttt{bscfmax} to the maximum required bootstrap current fraction
set \texttt{bootstrap_current_fraction_max} to the maximum required bootstrap current fraction
(\(\leq 1\)).\strut
\end{minipage}
\footnotetext{W.M. Nevins, `Summary Report: ITER Specialists' Meeting on
Expand All @@ -1078,15 +1078,15 @@ set \texttt{bscfmax} to the maximum required bootstrap current fraction
3\strut
\end{minipage} & \begin{minipage}[t]{0.03\columnwidth}\raggedright\strut
Numerically fitted scaling\footnotemark{} -- To use a numerically fitted
scaling method, valid for all aspect ratios, set \texttt{bscfmax} to the
scaling method, valid for all aspect ratios, set \texttt{bootstrap_current_fraction_max} to the
maximum required bootstrap current fraction (\(\leq 1\)).\strut
\end{minipage}
\footnotetext{H.R. Wilson, Nuclear Fusion \textbf{32} (1992) 257}\tabularnewline
\begin{minipage}[t]{0.05\columnwidth}\centering\strut
4\strut
\end{minipage} & \begin{minipage}[t]{0.03\columnwidth}\raggedright\strut
Sauter, Angioni and Lin-Liu scaling\footnotemark{} \footnotemark{} --
Set \texttt{bscfmax} to the maximum required bootstrap current fraction
Set \texttt{bootstrap_current_fraction_max} to the maximum required bootstrap current fraction
(\(\leq 1\)).\strut
\end{minipage}
\addtocounter{footnote}{-1}
Expand All @@ -1099,7 +1099,7 @@ Set \texttt{bscfmax} to the maximum required bootstrap current fraction
\end{longtable}

!!! Note ``Fixed Bootstrap Current'' Direct input -- To input the
bootstrap current fraction directly, set \texttt{bscfmax} to \((-1)\)
bootstrap current fraction directly, set \texttt{bootstrap_current_fraction_max} to \((-1)\)
times the required value (e.g. -0.73 sets the bootstrap faction to
0.73).

Expand Down Expand Up @@ -2547,7 +2547,7 @@ Overfull \hbox (3.56793pt too wide) in paragraph at lines 1038--1043
\T1/lmr/m/n/10 (-20) tion.

Overfull \hbox (22.65782pt too wide) in paragraph at lines 1038--1043
\T1/lmtt/m/n/10 bscfmax
\T1/lmtt/m/n/10 bootstrap_current_fraction_max

Overfull \hbox (5.74335pt too wide) in paragraph at lines 1038--1043
\T1/lmr/m/n/10 (-20) max-
Expand Down Expand Up @@ -2619,7 +2619,7 @@ Overfull \hbox (19.63986pt too wide) in paragraph at lines 1046--1050
\T1/lmr/m/n/10 (-20) method,

Overfull \hbox (22.65782pt too wide) in paragraph at lines 1046--1050
\T1/lmtt/m/n/10 bscfmax
\T1/lmtt/m/n/10 bootstrap_current_fraction_max

Overfull \hbox (5.74335pt too wide) in paragraph at lines 1046--1050
\T1/lmr/m/n/10 (-20) max-
Expand Down Expand Up @@ -2679,7 +2679,7 @@ Overfull \hbox (2.53915pt too wide) in paragraph at lines 1056--1060
\T1/lmr/m/n/10 (-20) tios,

Overfull \hbox (22.65782pt too wide) in paragraph at lines 1056--1060
\T1/lmtt/m/n/10 bscfmax
\T1/lmtt/m/n/10 bootstrap_current_fraction_max

Overfull \hbox (5.74335pt too wide) in paragraph at lines 1056--1060
\T1/lmr/m/n/10 (-20) max-
Expand Down Expand Up @@ -2727,7 +2727,7 @@ Overfull \hbox (7.44649pt too wide) in paragraph at lines 1064--1068
\T1/lmr/m/n/10 (-20) ing[][][]

Overfull \hbox (22.65782pt too wide) in paragraph at lines 1064--1068
\T1/lmtt/m/n/10 bscfmax
\T1/lmtt/m/n/10 bootstrap_current_fraction_max

Overfull \hbox (5.74335pt too wide) in paragraph at lines 1064--1068
\T1/lmr/m/n/10 (-20) max-
Expand Down Expand Up @@ -4677,7 +4677,7 @@ Overfull \hbox (3.56793pt too wide) in paragraph at lines 1038--1043
\T1/lmr/m/n/10 (-20) tion.

Overfull \hbox (22.65782pt too wide) in paragraph at lines 1038--1043
\T1/lmtt/m/n/10 bscfmax
\T1/lmtt/m/n/10 bootstrap_current_fraction_max

Overfull \hbox (5.74335pt too wide) in paragraph at lines 1038--1043
\T1/lmr/m/n/10 (-20) max-
Expand Down Expand Up @@ -4749,7 +4749,7 @@ Overfull \hbox (19.63986pt too wide) in paragraph at lines 1046--1050
\T1/lmr/m/n/10 (-20) method,

Overfull \hbox (22.65782pt too wide) in paragraph at lines 1046--1050
\T1/lmtt/m/n/10 bscfmax
\T1/lmtt/m/n/10 bootstrap_current_fraction_max

Overfull \hbox (5.74335pt too wide) in paragraph at lines 1046--1050
\T1/lmr/m/n/10 (-20) max-
Expand Down Expand Up @@ -4809,7 +4809,7 @@ Overfull \hbox (2.53915pt too wide) in paragraph at lines 1056--1060
\T1/lmr/m/n/10 (-20) tios,

Overfull \hbox (22.65782pt too wide) in paragraph at lines 1056--1060
\T1/lmtt/m/n/10 bscfmax
\T1/lmtt/m/n/10 bootstrap_current_fraction_max

Overfull \hbox (5.74335pt too wide) in paragraph at lines 1056--1060
\T1/lmr/m/n/10 (-20) max-
Expand Down Expand Up @@ -4857,7 +4857,7 @@ Overfull \hbox (7.44649pt too wide) in paragraph at lines 1064--1068
\T1/lmr/m/n/10 (-20) ing[][][]

Overfull \hbox (22.65782pt too wide) in paragraph at lines 1064--1068
\T1/lmtt/m/n/10 bscfmax
\T1/lmtt/m/n/10 bootstrap_current_fraction_max

Overfull \hbox (5.74335pt too wide) in paragraph at lines 1064--1068
\T1/lmr/m/n/10 (-20) max-
Expand Down Expand Up @@ -6789,7 +6789,7 @@ Overfull \hbox (3.56793pt too wide) in paragraph at lines 1038--1043
\T1/lmr/m/n/10 (-20) tion.

Overfull \hbox (22.65782pt too wide) in paragraph at lines 1038--1043
\T1/lmtt/m/n/10 bscfmax
\T1/lmtt/m/n/10 bootstrap_current_fraction_max

Overfull \hbox (5.74335pt too wide) in paragraph at lines 1038--1043
\T1/lmr/m/n/10 (-20) max-
Expand Down Expand Up @@ -6861,7 +6861,7 @@ Overfull \hbox (19.63986pt too wide) in paragraph at lines 1046--1050
\T1/lmr/m/n/10 (-20) method,

Overfull \hbox (22.65782pt too wide) in paragraph at lines 1046--1050
\T1/lmtt/m/n/10 bscfmax
\T1/lmtt/m/n/10 bootstrap_current_fraction_max

Overfull \hbox (5.74335pt too wide) in paragraph at lines 1046--1050
\T1/lmr/m/n/10 (-20) max-
Expand Down Expand Up @@ -6921,7 +6921,7 @@ Overfull \hbox (2.53915pt too wide) in paragraph at lines 1056--1060
\T1/lmr/m/n/10 (-20) tios,

Overfull \hbox (22.65782pt too wide) in paragraph at lines 1056--1060
\T1/lmtt/m/n/10 bscfmax
\T1/lmtt/m/n/10 bootstrap_current_fraction_max

Overfull \hbox (5.74335pt too wide) in paragraph at lines 1056--1060
\T1/lmr/m/n/10 (-20) max-
Expand Down Expand Up @@ -6969,7 +6969,7 @@ Overfull \hbox (7.44649pt too wide) in paragraph at lines 1064--1068
\T1/lmr/m/n/10 (-20) ing[][][]

Overfull \hbox (22.65782pt too wide) in paragraph at lines 1064--1068
\T1/lmtt/m/n/10 bscfmax
\T1/lmtt/m/n/10 bootstrap_current_fraction_max

Overfull \hbox (5.74335pt too wide) in paragraph at lines 1064--1068
\T1/lmr/m/n/10 (-20) max-
Expand Down
Loading