Skip to content

Commit

Permalink
🔄 Rename beta_norm_limit_upper to beta_norm_max for consistency acros…
Browse files Browse the repository at this point in the history
…s data files and scripts
  • Loading branch information
chris-ashe committed Dec 19, 2024
1 parent aee23af commit 2e12caf
Show file tree
Hide file tree
Showing 37 changed files with 139 additions and 139 deletions.
6 changes: 3 additions & 3 deletions documentation/proc-pages/physics-models/error.txt
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ where \(B_0\) is the axial vacuum toroidal field, and \(\beta\) is
defined with respect to the total equilibrium \(\mathbf{B}\)-field
\footnote{T. C. Hender et al., `Physics Assessment for the European
Reactor Study', AEA Fusion Report AEA FUS 172 (1992)}. The beta
coefficient \(g\) is set using input parameter \texttt{beta_norm_limit_upper}. To apply
coefficient \(g\) is set using input parameter \texttt{beta_norm_max}. To apply
the beta limit, constraint equation no. 24 should be turned on with
iteration variable no. 36 (\texttt{fbeta_max}). The limit can be applied
to either the total plasma beta, in which case switch \texttt{iculbl}
Expand All @@ -401,7 +401,7 @@ neutral beam components, in which case \texttt{iculbl} should be set to
coefficient}{Aspect ratio scaling of beta g coefficient}}\label{aspect-ratio-scaling-of-beta-g-coefficient}

Switch \texttt{gtscale} determines whether the beta \(g\) coefficient
\texttt{beta_norm_limit_upper} should scale with aspect ratio
\texttt{beta_norm_max} should scale with aspect ratio
(\(\mathtt{gtscale \not= 0}\)), or be fixed at the input value
(\texttt{gtscale\ =\ 0\}}). Note that \texttt{gtscale} is over-ridden if
\texttt{iprofile} = 1.
Expand Down Expand Up @@ -568,7 +568,7 @@ profile peaking factor \texttt{alphaj} is consistent with the input
values for the safety factor on axis and at the plasma edge (\texttt{q0}
and \texttt{q}, respectively), the plasma internal inductance \(l_i\) is
consistent with this \texttt{alphaj}, and the beta \(g\) coefficient
\texttt{beta_norm_limit_upper} scales with \(l_i\).
\texttt{beta_norm_max} scales with \(l_i\).

It is recommended that current scaling law \texttt{icurr\ =\ 4} is used
if \texttt{iprofile\ =\ 1}. Switch \texttt{gtscale} is over-ridden if
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ $$\begin{aligned}
\end{aligned}$$

where $B_0$ is the axial vacuum toroidal field. The beta
coefficient $g$ is set using input parameter `beta_norm_limit_upper`. To apply the beta limit,
coefficient $g$ is set using input parameter `beta_norm_max`. To apply the beta limit,
constraint equation 24 should be turned on with iteration variable 36
(`fbeta_max`).

Expand All @@ -114,18 +114,18 @@ By default, $\beta$ is defined with respect to the total equilibrium B-field [^2

### Setting the Beta $g$ Coefficient

Switch `iprofile` determines how the beta $g$ coefficient `beta_norm_limit_upper` should
Switch `iprofile` determines how the beta $g$ coefficient `beta_norm_max` should
be calculated.

| `iprofile` | Description |
| :-: | - |
| 0 | `alphaj`, `rli` and `beta_norm_limit_upper` are inputs. |
| 1 (default) | `alphaj`, `rli` and `beta_norm_limit_upper` are calulcated consistently. `beta_norm_limit_upper` calculated using $g=4l_i$ [^3]. This is only recommended for high aspect ratio tokamaks.|
| 2 | `alphaj` and `rli` are inputs. `beta_norm_limit_upper` calculated using $g=2.7(1+5\epsilon^{3.5})$ (which gives g = 3.0 for aspect ratio = 3) |
| 3 | `alphaj` and `rli` are inputs. `beta_norm_limit_upper` calculated using $g=3.12+3.5\epsilon^{1.7}$ [^4]|
| 4 | `alphaj` and `beta_norm_limit_upper` are inputs. `rli` calculated from elongation [^4]. This is only recommended for spherical tokamaks.|
| 5 | `alphaj` is an input. `rli` calculated from elongation and `beta_norm_limit_upper` calculated using $g=3.12+3.5\epsilon^{1.7}$ [^4]. This is only recommended for spherical tokamaks.|
| 6 | `alphaj` and `c_beta` are inputs. `rli` calculated from elongation and `beta_norm_limit_upper` calculated using $C_{\beta}=(g-3.7)F_p / 12.5-3.5F_p$, where $F_p$ is the pressure peaking and $C_{\beta}$ is the destabilisation papermeter (default 0.5)[^5]. See Section 2.4 of Tholerus et al. (2024) for a more detailed description. <u> This is only recommended for spherical tokamaks <u>.|
| 0 | `alphaj`, `rli` and `beta_norm_max` are inputs. |
| 1 (default) | `alphaj`, `rli` and `beta_norm_max` are calulcated consistently. `beta_norm_max` calculated using $g=4l_i$ [^3]. This is only recommended for high aspect ratio tokamaks.|
| 2 | `alphaj` and `rli` are inputs. `beta_norm_max` calculated using $g=2.7(1+5\epsilon^{3.5})$ (which gives g = 3.0 for aspect ratio = 3) |
| 3 | `alphaj` and `rli` are inputs. `beta_norm_max` calculated using $g=3.12+3.5\epsilon^{1.7}$ [^4]|
| 4 | `alphaj` and `beta_norm_max` are inputs. `rli` calculated from elongation [^4]. This is only recommended for spherical tokamaks.|
| 5 | `alphaj` is an input. `rli` calculated from elongation and `beta_norm_max` calculated using $g=3.12+3.5\epsilon^{1.7}$ [^4]. This is only recommended for spherical tokamaks.|
| 6 | `alphaj` and `c_beta` are inputs. `rli` calculated from elongation and `beta_norm_max` calculated using $C_{\beta}=(g-3.7)F_p / 12.5-3.5F_p$, where $F_p$ is the pressure peaking and $C_{\beta}$ is the destabilisation papermeter (default 0.5)[^5]. See Section 2.4 of Tholerus et al. (2024) for a more detailed description. <u> This is only recommended for spherical tokamaks <u>.|

Further details on the calculation of `alphaj` and `rli` is given in [Plasma Current](./plasma_current.md).

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@ $$

A limited degree of self-consistency between the plasma current profile and other parameters can be
enforced by setting switch `iprofile = 1`. This sets the current
profile peaking factor $\alpha_J$ (`alphaj`), the normalised internal inductance $l_i$ (`rli`) and beta limit $g$-factor (`beta_norm_limit_upper`) using the
profile peaking factor $\alpha_J$ (`alphaj`), the normalised internal inductance $l_i$ (`rli`) and beta limit $g$-factor (`beta_norm_max`) using the
safety factor on axis `q0` and the cylindrical safety factor $q_*$ (`qstar`):

$$\begin{aligned}
Expand Down
4 changes: 2 additions & 2 deletions examples/data/csv_output_large_tokamak_MFILE.DAT
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@
Thermal_toroidal_beta_(=_beta-exp)______________________________________ ______________________________ 3.2509E-02 OP
2nd_stability_beta_:_beta_p_/_(R/a)_____________________________________ (eps*beta_poloidal)___________________ 4.1770E-01
2nd_stability_beta_upper_limit__________________________________________ (beta_poloidal_eps_max)____________________ 1.3800E+00
Beta_g_coefficient______________________________________________________ (beta_norm_limit_upper)______________________ 4.7593E+00
Beta_g_coefficient______________________________________________________ (beta_norm_max)______________________ 4.7593E+00
Normalised_thermal_beta_________________________________________________ ______________________________ 2.5527E+00
Normalised_total_beta___________________________________________________ ______________________________ 2.9150E+00
Normalised_toroidal_beta________________________________________________ (normalised_toroidal_beta)____ 3.0013E+00
Expand Down Expand Up @@ -1559,7 +1559,7 @@ alphan = 1.00
alphat = 1.45

* (troyon-like) coefficient for beta scaling
beta_norm_limit_upper = 3.0
beta_norm_max = 3.0

* Zohm elongation scaling adjustment factor (ishape=2; 3)
fkzohm = 1.02
Expand Down
4 changes: 2 additions & 2 deletions examples/data/large_tokamak_1_MFILE.DAT
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@
Thermal_toroidal_physics_variables.beta_(=_beta-exp)____________________ ______________________________ 3.0215E-02 OP
2nd_stability_physics_variables.beta_:_beta_p_/_(R/a)___________________ (eps*beta_poloidal)___________________ 4.2857E-01
2nd_stability_physics_variables.beta_upper_limit________________________ (beta_poloidal_eps_max)____________________ 1.3800E+00
Beta_g_coefficient______________________________________________________ (beta_norm_limit_upper)______________________ 4.9099E+00
Beta_g_coefficient______________________________________________________ (beta_norm_max)______________________ 4.9099E+00
Normalised_thermal_beta_________________________________________________ ______________________________ 2.4977E+00
Normalised_total_beta___________________________________________________ ______________________________ 2.8562E+00
Normalised_toroidal_beta________________________________________________ (normalised_toroidal_beta)____ 2.9330E+00
Expand Down Expand Up @@ -1553,7 +1553,7 @@ alphan = 1.00
alphat = 1.45

* (troyon-like) coefficient for beta scaling
beta_norm_limit_upper = 3.0
beta_norm_max = 3.0

* Zohm elongation scaling adjustment factor (ishape=2; 3)
fkzohm = 1.02
Expand Down
4 changes: 2 additions & 2 deletions examples/data/large_tokamak_2_MFILE.DAT
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@
Thermal_toroidal_physics_variables.beta_(=_beta-exp)____________________ ______________________________ 3.0215E-02 OP
2nd_stability_physics_variables.beta_:_beta_p_/_(R/a)___________________ (eps*beta_poloidal)___________________ 4.2857E-01
2nd_stability_physics_variables.beta_upper_limit________________________ (beta_poloidal_eps_max)____________________ 1.3800E+00
Beta_g_coefficient______________________________________________________ (beta_norm_limit_upper)______________________ 4.9099E+00
Beta_g_coefficient______________________________________________________ (beta_norm_max)______________________ 4.9099E+00
Normalised_thermal_beta_________________________________________________ ______________________________ 2.4977E+00
Normalised_total_beta___________________________________________________ ______________________________ 2.8562E+00
Normalised_toroidal_beta________________________________________________ (normalised_toroidal_beta)____ 2.9330E+00
Expand Down Expand Up @@ -1553,7 +1553,7 @@ alphan = 1.00
alphat = 1.45

* (troyon-like) coefficient for beta scaling
beta_norm_limit_upper = 3.0
beta_norm_max = 3.0

* Zohm elongation scaling adjustment factor (ishape=2; 3)
fkzohm = 1.02
Expand Down
4 changes: 2 additions & 2 deletions examples/data/large_tokamak_3_MFILE.DAT
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@
Thermal_toroidal_physics_variables.beta_(=_beta-exp)____________________ ______________________________ 3.0215E-02 OP
2nd_stability_physics_variables.beta_:_beta_p_/_(R/a)___________________ (eps*beta_poloidal)___________________ 4.2857E-01
2nd_stability_physics_variables.beta_upper_limit________________________ (beta_poloidal_eps_max)____________________ 1.3800E+00
Beta_g_coefficient______________________________________________________ (beta_norm_limit_upper)______________________ 4.9099E+00
Beta_g_coefficient______________________________________________________ (beta_norm_max)______________________ 4.9099E+00
Normalised_thermal_beta_________________________________________________ ______________________________ 2.4977E+00
Normalised_total_beta___________________________________________________ ______________________________ 2.8562E+00
Normalised_toroidal_beta________________________________________________ (normalised_toroidal_beta)____ 2.9330E+00
Expand Down Expand Up @@ -1553,7 +1553,7 @@ alphan = 1.00
alphat = 1.45

* (troyon-like) coefficient for beta scaling
beta_norm_limit_upper = 3.0
beta_norm_max = 3.0

* Zohm elongation scaling adjustment factor (ishape=2; 3)
fkzohm = 1.02
Expand Down
4 changes: 2 additions & 2 deletions examples/data/large_tokamak_4_MFILE.DAT
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@
Thermal_toroidal_physics_variables.beta_(=_beta-exp)____________________ ______________________________ 3.0215E-02 OP
2nd_stability_physics_variables.beta_:_beta_p_/_(R/a)___________________ (eps*beta_poloidal)___________________ 4.2857E-01
2nd_stability_physics_variables.beta_upper_limit________________________ (beta_poloidal_eps_max)____________________ 1.3800E+00
Beta_g_coefficient______________________________________________________ (beta_norm_limit_upper)______________________ 4.9099E+00
Beta_g_coefficient______________________________________________________ (beta_norm_max)______________________ 4.9099E+00
Normalised_thermal_beta_________________________________________________ ______________________________ 2.4977E+00
Normalised_total_beta___________________________________________________ ______________________________ 2.8562E+00
Normalised_toroidal_beta________________________________________________ (normalised_toroidal_beta)____ 2.9330E+00
Expand Down Expand Up @@ -1553,7 +1553,7 @@ alphan = 1.00
alphat = 1.45

* (troyon-like) coefficient for beta scaling
beta_norm_limit_upper = 3.0
beta_norm_max = 3.0

* Zohm elongation scaling adjustment factor (ishape=2; 3)
fkzohm = 1.02
Expand Down
2 changes: 1 addition & 1 deletion examples/data/large_tokamak_IN.DAT
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ alphan = 1.00
alphat = 1.45

* (troyon-like) coefficient for beta scaling
beta_norm_limit_upper = 3.0
beta_norm_max = 3.0

* Zohm elongation scaling adjustment factor (ishape=2; 3)
fkzohm = 1.02
Expand Down
Loading

0 comments on commit 2e12caf

Please sign in to comment.