diff --git a/documentation/proc-pages/fusion-devices/stellarator.md b/documentation/proc-pages/fusion-devices/stellarator.md
index 2365cced61..b2bc51e616 100644
--- a/documentation/proc-pages/fusion-devices/stellarator.md
+++ b/documentation/proc-pages/fusion-devices/stellarator.md
@@ -74,7 +74,7 @@ ixc = 10 * "ISS04 Renormalization Factor" (can also be fixed)
 ixc = 50 * Coil current density, aka winding pack thickness (required!) 
 ixc = 59 * Winding Pack copper fraction
 ixc = 56 * Exponential Quench Dumping Time
-ixc = 109 * Thermal alpha particle pressure (iterated to consistency, use together with `taulimit`)
+ixc = 109 * Thermal alpha particle pressure (iterated to consistency, use together with `f_alpha_energy_confinement_min`)
 ixc = 169 * Achievable Temperature of the ECRH at the ignition point
 ```
 
@@ -142,13 +142,13 @@ The constraint equation `icc=91` together with `ixc = 169` enforces that the fou
 
 ### $\tau_E$ scaling laws
 
-Five confinement time scaling laws relevant to stellarators are present within `PROCESS`. The value of switch isc` determines which of these in the plasma energy balance calculation.
+Five confinement time scaling laws relevant to stellarators are present within `PROCESS`. The value of switch i_confinement_time` determines which of these in the plasma energy balance calculation.
 
-$\tau_E$ (Large Helical Device[^8]: `isc=21`) = $0.17 \, R^{0.75}_0 \, a^2_p \, \bar{n}^{0.69}_{20} \, B^{0.84}_0 \, P^{-0.58}$  
-$\tau_E$ (Gyro-reduced Bohm[^9]: `isc=22`) = $0.25 \, R^{0.6}_0 \, a^{2.4}_p \, \bar{n}^{0.6}_{20} \, B^{0.8}_0 \, P^{-0.6}$  
-$\tau_E$ (Lackner-Gottardi[^10]: `isc=23`) = $0.17 \, R_0 \, a^2_p \, \bar{n}^{0.6}_{20} \, B^{0.8}_0 \, P^{-0.6} \, \iota^{0.4}$  
-$\tau_E$ (ISS95[^11]: `isc=37`) = $0.079 \, R^{0.65}_0 \, a^{2.21}_p \, \bar{n}^{0.51}_{20} \, B^{0.83}_0 \, P^{-0.59} \, \bar{\iota}^{0.4}$  
-$\tau_E$ (ISS04[^12]: `isc=38`) = $0.134 \, R^{0.64}_0 \, a^{2.28}_p \, \bar{n}^{0.54}_{20} \, B^{0.84}_0 \, P^{-0.61} \, \bar{\iota}^{0.41}$
+$\tau_E$ (Large Helical Device[^8]: `i_confinement_time=21`) = $0.17 \, R^{0.75}_0 \, a^2_p \, \bar{n}^{0.69}_{20} \, B^{0.84}_0 \, P^{-0.58}$  
+$\tau_E$ (Gyro-reduced Bohm[^9]: `i_confinement_time=22`) = $0.25 \, R^{0.6}_0 \, a^{2.4}_p \, \bar{n}^{0.6}_{20} \, B^{0.8}_0 \, P^{-0.6}$  
+$\tau_E$ (Lackner-Gottardi[^10]: `i_confinement_time=23`) = $0.17 \, R_0 \, a^2_p \, \bar{n}^{0.6}_{20} \, B^{0.8}_0 \, P^{-0.6} \, \iota^{0.4}$  
+$\tau_E$ (ISS95[^11]: `i_confinement_time=37`) = $0.079 \, R^{0.65}_0 \, a^{2.21}_p \, \bar{n}^{0.51}_{20} \, B^{0.83}_0 \, P^{-0.59} \, \bar{\iota}^{0.4}$  
+$\tau_E$ (ISS04[^12]: `i_confinement_time=38`) = $0.134 \, R^{0.64}_0 \, a^{2.28}_p \, \bar{n}^{0.54}_{20} \, B^{0.84}_0 \, P^{-0.61} \, \bar{\iota}^{0.41}$
 
 Here $\bar{\iota}$ is the rotational transform, which is equivalent to the reciprocal of the tokamak safety factor $q$.
 
diff --git a/documentation/proc-pages/physics-models/error.txt b/documentation/proc-pages/physics-models/error.txt
index f78e58a533..dd2b71e11b 100644
--- a/documentation/proc-pages/physics-models/error.txt
+++ b/documentation/proc-pages/physics-models/error.txt
@@ -596,7 +596,7 @@ energy confinement times \(\tau_E\) are equal.
 
 Many energy confinement time scaling laws are present within PROCESS,
 for tokamaks, RFPs or stellarators. These are calculated in routine
-\texttt{pcond}. The value of \texttt{isc} determines which of the
+\texttt{pcond}. The value of \texttt{i_confinement_time} determines which of the
 scalings is used in the plasma energy balance calculation. The table
 below summarises the available scaling laws. The most commonly used is
 the so-called IPB98(y,2) scaling.
@@ -604,7 +604,7 @@ the so-called IPB98(y,2) scaling.
 \begin{longtable}[]{@{}cll@{}}
 \toprule
 \begin{minipage}[b]{0.05\columnwidth}\centering\strut
-\texttt{isc}\strut
+\texttt{i_confinement_time}\strut
 \end{minipage} & \begin{minipage}[b]{0.03\columnwidth}\raggedright\strut
 scaling law\strut
 \end{minipage} & \begin{minipage}[b]{0.03\columnwidth}\raggedright\strut
@@ -967,7 +967,7 @@ J. Menard 2019, Phil. Trans. R. Soc. A 377:201704401\strut
 \begin{minipage}[t]{0.05\columnwidth}\centering\strut
 48\strut
 \end{minipage} & \begin{minipage}[t]{0.03\columnwidth}\raggedright\strut
-Use input \texttt{tauee\_in}\strut
+Use input \texttt{t_electron_energy_confinement\_in}\strut
 \end{minipage} & \begin{minipage}[t]{0.03\columnwidth}\raggedright\strut
 \strut
 \end{minipage}\tabularnewline
@@ -987,21 +987,21 @@ additional radiation causes an almost equal drop in power transported by
 ions and electrons, leaving the confinement nearly unchanged.
 
 To allow for these uncertainties, three options are available, using the
-switch \texttt{iradloss}. In each case, the particle transport loss
+switch \texttt{i_rad_loss}. In each case, the particle transport loss
 power \(P_{\mbox{loss}}\), referred to in the code as \texttt{pscaling},
 is derived directly from the energy confinement scaling law.
 
-\texttt{iradloss\ =\ 0} -- Total power lost is scaling power plus
+\texttt{i_rad_loss\ =\ 0} -- Total power lost is scaling power plus
 radiation
 
 \texttt{pscaling\ +\ pden_plasma_rad_mw\ =\ f_alpha_plasma*alpha_power_density\ +\ charged_power_density\ +\ pden_plasma_ohmic_mw\ +\ pinjmw/vol_plasma}
 
-\texttt{iradloss\ =\ 1} -- Total power lost is scaling power plus core
+\texttt{i_rad_loss\ =\ 1} -- Total power lost is scaling power plus core
 radiation only
 
 \texttt{pscaling\ +\ pcoreradpv\ =\ f_alpha_plasma*alpha_power_density\ +\ charged_power_density\ +\ pden_plasma_ohmic_mw\ +\ pinjmw/vol_plasma}
 
-\texttt{iradloss\ =\ 2} -- Total power lost is scaling power only, with
+\texttt{i_rad_loss\ =\ 2} -- Total power lost is scaling power only, with
 no additional allowance for radiation. This is not recommended for power
 plant models.
 
@@ -1376,9 +1376,9 @@ too high.
 Laws}{Inverse Quadrature in \textbackslash{}tau\_E Scaling Laws}}\label{inverse-quadrature-in-tau_e-scaling-laws}
 
 Switch \texttt{iinvqd} determines whether the energy confinement time
-scaling laws due to Kaye-Goldston (\texttt{isc\ =\ 5}) and Goldston
-(\texttt{isc\ =\ 9}) should include an inverse quadrature scaling with
-the Neo-Alcator result (\texttt{isc\ =\ 1}). A value
+scaling laws due to Kaye-Goldston (\texttt{i_confinement_time\ =\ 5}) and Goldston
+(\texttt{i_confinement_time\ =\ 9}) should include an inverse quadrature scaling with
+the Neo-Alcator result (\texttt{i_confinement_time\ =\ 1}). A value
 \texttt{iinvqd\ =\ 1}includes this scaling.
 
 \subsubsection{Plasma / First Wall Gap}\label{plasma-first-wall-gap}
diff --git a/documentation/proc-pages/physics-models/plasma_confinement.md b/documentation/proc-pages/physics-models/plasma_confinement.md
index e618aae029..0c57713d64 100644
--- a/documentation/proc-pages/physics-models/plasma_confinement.md
+++ b/documentation/proc-pages/physics-models/plasma_confinement.md
@@ -1,155 +1,738 @@
-# Confinement Time Scaling Laws
+# Plasma confinement time
+
+## Overview
+
+Confinement time scalings are empirical relationships derived from experimental data across various fusion machines. These scalings help predict how changes in tokamak parameters (like size, magnetic field strength, and plasma density) will affect the confinement time and overall performance.
 
 The energy confinement time $\tau_E$ is calculated using one of a choice of empirical scalings. ($\tau_E$ is defined below.)
 
-Many energy confinement time scaling laws are available within PROCESS, for
-tokamaks, RFPs and stellarators. These are calculated in routine `pcond`. The 
-value of `isc` determines which of the scalings is used in the plasma energy 
-balance calculation. The table below summarises the available scaling laws. The 
-most commonly used is the so-called IPB98(y,2) scaling.       
-
-| `isc` | scaling law | reference |
-| :-: | - | - |
-| 1 | Neo-Alcator (ohmic) | [^1] | 
-| 2 | Mirnov (H-mode) | [^1] |
-| 3 | Merezhkin-Muhkovatov (L-mode) | [^1] |
-| 4 | Shimomura (H-mode) | JAERI-M 87-080 (1987) |
-| 5 | Kaye-Goldston (L-mode) | Nuclear Fusion **25** (1985) p.65 |
-| 6 | ITER 89-P (L-mode) | Nuclear Fusion **30** (1990) p.1999 |
-| 7 | ITER 89-O (L-mode) | [^2] |
-| 8 | Rebut-Lallia (L-mode) | Plasma Physics and Controlled Nuclear Fusion Research **2** (1987) p. 187 |
-| 9  | Goldston (L-mode)| Plas.\ Phys.\ Controlled Fusion **26** (1984) p.87 |
-| 10 | T10 (L-mode) | [^2] |
-| 11 | JAERI-88 (L-mode) | JAERI-M 88-068 (1988) |
-| 12 | Kaye-Big Complex (L-mode) | Phys.\ Fluids B **2** (1990) p.2926 |
-| 13 | ITER H90-P (H-mode) |  |
-| 14 | ITER Mix (minimum of 6 and 7) |  |
-| 15 | Riedel (L-mode) |  |
-| 16 | Christiansen et al. (L-mode) | JET Report JET-P (1991) 03 |
-| 17 | Lackner-Gottardi (L-mode) | Nuclear Fusion **30** (1990) p.767  |
-| 18 | Neo-Kaye (L-mode) | [^2] |
-| 19 | Riedel (H-mode) |  |
-| 20 | ITER H90-P (amended) | Nuclear Fusion **32** (1992) p.318 |
-| 21 | Large Helical Device (stellarator) | Nuclear Fusion **30** (1990) |
-| 22 | Gyro-reduced Bohm (stellarator) | Bull. Am. Phys. Society, **34** (1989) p.1964 |
-| 23 | Lackner-Gottardi (stellarator) | Nuclear Fusion **30** (1990) p.767 |
-| 24 | ITER-93H (H-mode) | PPCF, Proc. 15th Int. Conf.Seville, 1994 IAEA-CN-60/E-P-3 |
-| 25 | TITAN (RFP) | TITAN RFP Fusion Reactor Study, Scoping Phase Report, UCLA-PPG-1100, page 5--9, Jan 1987 |
-| 26 | ITER H-97P ELM-free (H-mode) | J. G. Cordey et al., EPS Berchtesgaden, 1997 |
-| 27 | ITER H-97P ELMy (H-mode) | J. G. Cordey et al., EPS Berchtesgaden, 1997 |
-| 28 | ITER-96P (= ITER97-L) (L-mode) | Nuclear Fusion **37** (1997) p.1303 |
-| 29 | Valovic modified ELMy (H-mode) | |
-| 30 | Kaye PPPL April 98 (L-mode) |  |
-| 31 | ITERH-PB98P(y) (H-mode) | |
-| 32 | IPB98(y) (H-mode)   | Nuclear Fusion **39** (1999) p.2175, Table 5,  |
-| 33 | IPB98(y,1) (H-mode) | Nuclear Fusion **39** (1999) p.2175, Table 5, full data |
-| 34 | IPB98(y,2) (H-mode) | Nuclear Fusion **39** (1999) p.2175, Table 5, NBI only |
-| 35 | IPB98(y,3) (H-mode) | Nuclear Fusion **39** (1999) p.2175, Table 5, NBI only, no C-Mod |
-| 36 | IPB98(y,4) (H-mode) | Nuclear Fusion **39** (1999) p.2175, Table 5, NBI only ITER like |
-| 37 | ISS95 (stellarator) | Nuclear Fusion **36** (1996) p.1063  |
-| 38 | ISS04 (stellarator) | Nuclear Fusion **45** (2005) p.1684  |
-| 39 | DS03 (H-mode) | Plasma Phys. Control. Fusion **50** (2008) 043001, equation 4.13  |
-| 40 | Non-power law (H-mode) | A. Murari et al 2015 Nucl. Fusion 55 073009, Table 4.  |
-| 41 | Petty 2008 (H-mode) |  C.C. Petty 2008 Phys. Plasmas **15** 080501, equation 36 |
-| 42 | Lang 2012 (H-mode) | P.T. Lang et al. 2012 IAEA conference proceeding EX/P4-01 |
-| 43 | Hubbard 2017 -- nominal (I-mode) | A.E. Hubbard et al. 2017, Nuclear Fusion **57** 126039 |
-| 44 | Hubbard 2017 -- lower (I-mode) | A.E. Hubbard et al. 2017, Nuclear Fusion **57** 126039 |
-| 45 | Hubbard 2017 -- upper (I-mode) | A.E. Hubbard et al. 2017, Nuclear Fusion **57** 126039 |
-| 46 | NSTX (H-mode; spherical tokamak) | J. Menard 2019, Phil. Trans. R. Soc. A 377:201704401 |
-| 47 | NSTX-Petty08 Hybrid (H-mode) | J. Menard 2019, Phil. Trans. R. Soc. A 377:201704401 |
-| 48 | NSTX gyro-Bohm (Buxton) (H-mode; spherical tokamak) | P. Buxton et al. 2019 Plasma Phys. Control. Fusion 61 035006 |
-| 49 | Use input `tauee_in` |  |
-| 50 | ITPA20 (H-mode) | G. Verdoolaege et al 2021 Nucl. Fusion 61 076006 |
+Normally most confinement scalings will be of the form:
+
+$$
+\tau_{\text{E}} =  C I_{\text{p}}^{\alpha_{I}} B_{\text{T}}^{\alpha_{B}} \overline{n}_e^{\alpha_{n}} P_{\text{L}}^{\alpha_{P}} R^{\alpha_{R}} \kappa^{\alpha_{\kappa}} \epsilon^{\alpha_{\epsilon}} M^{\alpha_{M}}
+$$
+
+Where $\tau_{\text{E}}$ is the confinement time in seconds, $C$ is a coefficient , $I_{\text{p}}$ [MA] is the plasma current, $B_{\text{T}}$ [T] is the toroidal magnetic field, $\overline{n}_e$ [$10^{19} \text{m}^{-3}$] is the electron central line averaged density, $P_{\text{L}}$ [MW] is the loss power, $R$ [m] is the major radius, $\kappa$ is the plasma elongation,
+$\epsilon$ is the inverse aspect ratio and $M$ is the average atomic mass of the plasma.
+
+Classically the loss power, $P_{\text{L}}$ is defined as:
+
+$$
+P_{\text{L}} = \frac{W}{\tau_{\text{E}}}
+$$
+
+where $W$ is the total thermal energy of the plasma. We can look at it mainly as the difference in heating and loss powers in the plasma, as such we interpret it as power transported out from the
+“core” by charged particles. This leads to the classic definition of loss power for the scaling:
+
+$$
+P_{\text{L}} = \underbrace{f_{\alpha}P_{\alpha} + P_{\text{c}} + P_{\text{OH}} + P_{\text{HCD}}}_{\text{Plasma heating}}
+$$
+
+where $f_{\alpha}$ is the [fraction of alpha power that is coupled to the plasma](../physics-models/fusion_reactions/plasma_reactions.md#coupled-alpha-particle-power), $P_{\alpha}$ is the alpha power, $P_{\text{c}}$ is the charged particle power, $P_{\text{OH}}$ is the ohmic heating power, $P_{\text{HCD}}$ is the plasma heating done by the external heating & current drive systems.
+
+----------
+
+## Calculating plasma confinement time | `calculate_confinement_time()`
+
+The correspoding plasma confinement time is calculated by the `calculate_confinement_time()` function in `physics.py` with scalings taken from `confinement_time.py`.
+
+A key definition of elongation is defined here and is used mainly in the ITER physics basis scalings [^12]:
+
+$$
+\kappa_{\text{IPB}} = \frac{V_{\text{p}}}{2\pi R}\frac{1}{\pi a^2}
+$$
+
+where $V_{\text{p}}$ is the plasma volume, $R$ is the plasma major radius and $a$ is the plasma minor radius.
+
+The loss power $P_{\text{L}}$ [$\mathtt{p\_plasma\_loss\_mw}$] is calculated from above but may have a separate radiation term depending on the condition of `i_rad_loss` switch below.
+
+
+-------------
 
 ### Effect of radiation on energy confinement
 
 Published confinement scalings are all based on low radiation pulses. A power
-plant will certainly be a high radiation machine --- both in the core, due to
+plant will certainly be a high radiation machine, both in the core, due to
 bremsstrahlung and synchrotron radiation, and in the edge due to impurity
-seeding. The scaling data do not predict this radiation --- that needs to be
+seeding. The scaling data does not predict this radiation [^24] [^25], that needs to be
 done by the radiation model. However, if the transport is very "stiff", as
 predicted by some models, then the additional radiation causes an almost equal
 drop in power transported by ions and electrons, leaving the confinement
 nearly unchanged.
 
 To allow for these uncertainties, three options are available, using the switch
-`iradloss`. In each case, the particle transport loss power `pscaling` is
-derived directly from the energy confinement scaling law.
-
-`iradloss = 0` -- Total power lost is scaling power plus radiation:
-
-`pscaling + pden_plasma_rad_mw = f_alpha_plasma*alpha_power_density_total + charged_power_density + pden_plasma_ohmic_mw + pinjmw/vol_plasma`
-
-
-`iradloss = 1` -- Total power lost is scaling power plus radiation from a region defined as the "core":
-  
-`pscaling + pcoreradpv = f_alpha_plasma*alpha_power_density_total + charged_power_density + pden_plasma_ohmic_mw + pinjmw/vol_plasma`
-
-`iradloss = 2` -- Total power lost is scaling power only, with no additional 
-allowance for radiation. This is not recommended for power plant models.
-
-`pscaling = f_alpha_plasma*alpha_power_density_total + charged_power_density + pden_plasma_ohmic_mw + pinjmw/vol_plasma`
-
-## L-H Power Threshold Scalings
-
-Transitions from a standard confinement mode (L-mode) to an improved
-confinement regime (H-mode), called L-H transitions, are observed in most
-tokamaks. A range of scaling laws are available that provide estimates of the
-heating power required to initiate these transitions, via extrapolations
-from present-day devices. PROCESS calculates these power threshold values
-for the scaling laws listed in the table below, in routine `pthresh`.
-
-For an H-mode plasma, use input parameter `ilhthresh` to
-select the scaling to use, and turn on constraint equation no. 15 with
-iteration variable no. 103 (`flhthresh`). By default, this will ensure
-that the power reaching the divertor is at least equal to the threshold power
-calculated for the chosen scaling, which is a necessary condition for
-H-mode. 
-
-For an L-mode plasma, use input parameter `ilhthresh` to
-select the scaling to use, and turn on constraint equation no. 15 with 
-iteration variable no. 103 (`flhthresh`). Set lower and upper bounds for 
-the f-value `boundl(103) = 0.001` and `boundu(103) = 1.0` 
-to ensure that the power does not exceed the calculated threshold, 
-and therefore the machine remains in L-mode.
-
-
-| `ilhthresh` | Name | Reference |
-| :-: | - | - |
-| 1 | ITER 1996 nominal | ITER Physics Design Description Document |
-| 2 | ITER 1996 upper bound | D. Boucher, p.2-2 |
-| 3 | ITER 1996 lower bound | 
-| 4 | ITER 1997 excluding elongation | J. A. Snipes, ITER H-mode Threshold Database |
-| 5 | ITER 1997 including elongation |  Working Group, Controlled Fusion and Plasma Physics, 24th EPS conference, Berchtesgaden, June 1997, vol.21A, part III, p.961 |
-| 6 | Martin 2008 nominal | Martin et al, 11th IAEA Tech. Meeting |
-| 7 | Martin 2008 95% upper bound |  H-mode Physics and Transport Barriers, Journal |
-| 8 | Martin 2008 95% lower bound |  of Physics: Conference Series **123**, 2008 |
-| 9 | Snipes 2000 nominal | J. A. Snipes and the International H-mode |
-| 10| Snipes 2000 upper bound | Threshold Database Working Group |
-| 11| Snipes 2000 lower bound |  2000, Plasma Phys. Control. Fusion, 42, A299 |
-| 12| Snipes 2000 (closed divertor): nominal | 
-| 13| Snipes 2000 (closed divertor): upper bound | 
-| 14| Snipes 2000 (closed divertor): lower bound | 
-| 15| Hubbard 2012 L-I threshold scaling: nominal | [Hubbard et al. (2012; Nucl. Fusion 52 114009)](https://iopscience.iop.org/article/10.1088/0029-5515/52/11/114009) |
-| 16| Hubbard 2012 L-I threshold scaling: lower bound | [Hubbard et al. (2012; Nucl. Fusion 52 114009)](https://iopscience.iop.org/article/10.1088/0029-5515/52/11/114009 |
-| 17| Hubbard 2012 L-I threshold scaling: upper bound | [Hubbard et al. (2012; Nucl. Fusion 52 114009)](https://iopscience.iop.org/article/10.1088/0029-5515/52/11/114009 |
-| 18| Hubbard 2017 L-I threshold scaling | [Hubbard et al. (2017; Nucl. Fusion 57 126039)](https://iopscience.iop.org/article/10.1088/1741-4326/aa8570) |
-| 19 | Martin 2008 aspect ratio corrected nominal | Martin et al (2008; J Phys Conf, 123, 012033) |
-| 20 | Martin 2008 aspect ratio corrected 95% upper bound | [Takizuka et al. (2004; Plasma Phys. Contol. Fusion, 46, A227)](https://iopscience.iop.org/article/10.1088/0741-3335/46/5A/024)  |
-| 21 | Martin 2008 aspect ratio corrected 95% lower bound |  
-
-## Ignition
+`i_rad_loss`.
+
+- For `i_rad_loss = 0` the total plasma radiation is taken from the loss power.
+
+$$
+P_{\text{L}} = \underbrace{f_{\alpha}P_{\alpha} + P_{\text{c}} + P_{\text{OH}} + P_{\text{HCD}}}_{\text{Plasma heating}} - P_{\text{rad}}
+$$
+
+- For `i_rad_loss = 1` the plasma radiation only from the "core" region is taken from the loss power.
+
+$$
+P_{\text{L}} = \underbrace{f_{\alpha}P_{\alpha} + P_{\text{c}} + P_{\text{OH}} + P_{\text{HCD}}}_{\text{Plasma heating}} - P_{\text{rad,core}}
+$$
+
+- For `i_rad_loss = 2` the plasma radiation is not taken from the loss power
+
+$$
+P_{\text{L}} = \underbrace{f_{\alpha}P_{\alpha} + P_{\text{c}} + P_{\text{OH}} + P_{\text{HCD}}}_{\text{Plasma heating}}
+$$
+
+----------
+
+### Ignition
 
 Switch `ignite` can be used to denote whether the plasma is ignited, i.e. fully self-sustaining 
-without the need for any injected auxiliary power during the burn. If `ignite` = 1, the calculated 
-injected power does not contribute to the plasma power balance, although the cost of the auxiliary 
-power system is taken into account (the system is then assumed to be required to provide heating 
-and/or current drive during the plasma start-up phase only). If `ignite` = 0, the plasma is not 
-ignited, and the auxiliary power is taken into account in the plasma power balance during the burn 
-phase. An ignited plasma will be difficult to control and is unlikely to be practical. This 
+without the need for any injected auxiliary power during the burn. If `ignite = 1`, the heating and current drive power $P_{\text{HCD}}$, does not contribute to the loss power term. 
+
+If `ignite = 0`, the plasma is not ignited, and the heating and current drive power $P_{\text{HCD}}$, does contribute to the loss power term.
+phase. An ignited plasma will be difficult to control and is unlikely to be practical. This
 option is not recommended.
 
-[^1]: T. C. Hender et al., 'Physics Assessment for the European Reactor Study',
-AEA Fusion Report AEA FUS 172 (1992)
-[^2]: N.A. Uckan and ITER Physics Group, 'ITER Physics Design Guidelines: 1989',
-ITER Documentation Series, No. 10, IAEA/ITER/DS/10 (1990)
\ No newline at end of file
+----------
+
+### Available confinement time scalings
+
+Many energy confinement time scaling laws are available within PROCESS, for conventional aspect ratio tokamaks, spherical tokamaks, and stellarators.
+The value of `i_confinement_time` determines which of the scalings is used in the plasma energy balance calculation.
+
+The scaling chosen with `i_confinement_time` is then calculated and multiplied with the $H$-factor [$\mathtt{hfact}$]. $\mathtt{hfact}$ can be set as an interation variable by setting `ixc = 10` in the `IN.DAT` input file.
+
+---------------
+
+#### 0: User input confinement time
+
+Is selected with `i_confinement_time = 0`
+
+$$
+\tau_{\text{E}} = \mathtt{t\_electron\_confinement\_in}
+$$
+
+------------
+
+#### 1: Nec-Alcator scaling (Ohmic)
+
+Is selected with `i_confinement_time = 1`[^1]
+
+$$
+\tau_{\text{E}} = 0.07 n_{20}aRq_{\text{cyl}}
+$$
+
+------------
+
+#### 2: Mirnov scaling (H-mode)
+
+Is selected with `i_confinement_time = 2`[^1]
+
+$$
+\tau_{\text{E}} = 0.2 a \sqrt{\kappa_{95}}I_{\text{p}}
+$$
+
+------------
+
+#### 3: Merezhkin-Mukhovatov scaling (Ohmic / L-mode)
+
+Is selected with `i_confinement_time = 3`[^1]
+
+$$
+\tau_{\text{E}} = 0.0035 \overline{n}_{20}a^{0.25}R^{2.75}q_{\text{cyl}}\kappa_{95}^{0.125}M_i^{0.5}T_{10}^{0.5}
+$$
+
+
+---------------
+
+#### 4: Shimomura scaling (H-mode)
+
+Is selected with `i_confinement_time = 4`[^1]
+
+$$
+\tau_{\text{E}} = 0.045 Ra B_{\text{T}}\sqrt{\kappa_{95}}\sqrt{M_{\text{i}}}
+$$
+
+----------------
+
+#### 5: Kaye-Goldston scaling (L-mode)
+
+Is selected with `i_confinement_time = 5`[^1]
+
+$$
+\tau_{\text{E}} = 0.055 I_{\text{p}}^{1.24}P_{\text{L}}^{-0.58}R^{1.65}a^{-0.49}\kappa_{95}^{0.28}n_{20}^{0.26}B_{\text{T}}^{-0.09}\left(\frac{M_{\text{i}}}{1.5}\right)^{0.5}
+$$
+
+----------------
+
+#### 6: ITER 89-P scaling (L-mode)
+
+Is selected with `i_confinement_time = 6`[^1] [^2]
+
+$$
+\tau_{\text{E}} = 0.048 I_{\text{p}}^{0.85}R^{1.2}a^{0.3}\kappa^{0.5}\overline{n}_{20}^{0.1}B_{\text{T}}^{0.2}M_{\text{i}}^{0.5} P_{\text{L}}^{-0.5}
+$$
+
+----------------
+
+#### 7: ITER 89-0 scaling (L-mode)
+
+Is selected with `i_confinement_time = 7` [^2]
+
+$$
+\begin{aligned}
+\tau_E= & 0.04 I_{\text{p}}^{0.5} R^{0.3} a^{0.8} \kappa^{0.6} M_i^{0.5} \\
+& +0.064 I_{\text{p}}^{0.8} R^{1.6} a^{0.6} \kappa^{0.2} \bar{n}_{20}^{0.6} B_0^{0.35} M_i^{0.2} / P_{\text{L}}
+\end{aligned}
+$$
+
+----------------
+
+#### 8: Rebut-Lallia scaling (L-mode)
+
+Is selected with `i_confinement_time = 8` [^2]
+
+$$
+\begin{aligned}
+\tau_E= & 1.65\left[1.2 \times 10^{-5} I_{\text{p}} \ell^{1.5} Z_{e f f}^{-0.5}\right. \\
+& \left.+0.146 \bar{n}_{20}^{0.75} I_{\text{p}}^{0.5} B_0^{0.5} \ell^{2.75} Z_{e f f}^{0.25} / P_{\text{L}}\right]\left(A_i / 2\right)^{0.5}
+\end{aligned}
+$$
+
+where $\ell = \left(a^2R\kappa\right)^{\frac{1}{3}}$
+
+----------------
+
+#### 9: Goldston scaling (L-mode)
+
+Is selected with `i_confinement_time = 9` [^1]
+
+$$
+\tau_{\text{E}} = 0.037 I_{\text{p}} P_{\text{L}}^{-0.5} R^{1.75}a^{-0.37}\kappa_{95}^{0.5} \left(\frac{M_i}{1.5}\right)^{0.5}
+$$
+
+----------------
+
+#### 10: T-10 scaling (L-mode)
+
+Is selected with `i_confinement_time = 10` [^1]
+
+
+$$
+\tau_{\text{E}} =  0.095 a R B_{\text{T}} \kappa_{95}^{0.5} \frac{\overline{n}_{20}}{\overline{n}_{20*}}P_{\text{L}}^{-0.4} \left[\frac{Z_{\text{eff}}^2 I_{\text{p}}^4}{aRq_{\text{cyl}}^3\kappa_{95}^{1.5}}  \right]^{0.08}
+$$
+
+where $\overline{n}_{20*} = 1.3\left(\frac{B_{\text{T}}}{Rq_{\text{cyl}}}\right)$ and $\frac{\overline{n}_{20}}{\overline{n}_{20*}} \le 1$
+
+----------------
+
+#### 11: JAERI / Odajima-Shimomura scaling (L-mode)
+
+Is selected with `i_confinement_time = 11` [^1]
+
+
+$$
+\tau_{\text{E}} =  \left[\frac{0.085\kappa_{95}a^2+0.069In_{20}^{0.6}B_{\text{T}}^{0.2}R^{1.6} a^{0.4} \kappa_{95}^{0.2} G\left(q_{\text{cyl}},Z_{\text{eff}}\right)}{P_{\text{L}}}\right]M_{\text{i}}^{0.5}
+$$
+
+where $G\left(q_{\text{cyl}},Z_{\text{eff}}\right) = Z_{\text{eff}}^{0.4}\left[\frac{\left(15 - Z_{\text{eff}}\right)}{20}\right]^{0.6}\left[3q_{\text{cyl}}\frac{q_{\text{cyl}}+5}{(q_{\text{cyl}}+2)(q_{\text{cyl}}+7)}\right]^{0.6}$
+
+
+----------------
+
+#### 12: Kaye "big" scaling (L-mode)
+
+Is selected with `i_confinement_time = 12` [^1]
+
+$$
+\tau_{\text{E}} =  0.1051 I_{\text{p}}^{0.85} P_{\text{L}}^{-0.5} R^{0.5} a^{0.3} \kappa^{0.25} n_{20}^{0.1}B_{\text{T}}^{0.3}M_{\text{i}}^{0.5}
+$$
+
+-------------------------
+
+#### 13: ITER H90-P scaling (H-mode)
+
+Is selected with `i_confinement_time = 13` [^2]
+
+$$
+\tau_{\text{E}} =  0.064 I_{\text{p}}^{0.87} R^{1.82} a^{-0.12} \kappa_{95}^{0.35} \overline{n}_{20}^{0.09} B_{\text{T}}^{0.15} M_{\text{i}}^{0.5} P_{\text{L}}^{-0.5}
+$$
+
+-------------------------
+
+#### 14: Minimum of ITER 89-P and ITER 89-O
+
+Is selected with `i_confinement_time = 14` [^1] [^2]
+
+Will return the value of [ITER 89-P](#6-iter-89-p-l-mode-scaling) or [ITER 89-O](#7-iter-89-0-l-mode-scaling), whichever is smaller.
+
+-------------------------
+
+#### 15: Riedel scaling (L-mode)
+
+Is selected with `i_confinement_time = 15` [^2]
+
+$$
+\tau_{\text{E}} =  0.044 I_{\text{p}}^{0.93} R^{1.37} a^{-0.049} \kappa_{95}^{0.588} \overline{n}_{20}^{0.078} B_{\text{T}}^{0.152} P_{\text{L}}^{-0.537}
+$$
+
+-------------------------
+
+#### 16: Christiansen scaling (L-mode)
+
+Is selected with `i_confinement_time = 16` [^2]
+
+$$
+\tau_{\text{E}} =  0.24 I_{\text{p}}^{0.79} R^{0.56} a^{1.46} \kappa_{95}^{0.73} \overline{n}_{20}^{0.41} B_{\text{T}}^{0.29} P_{\text{L}}^{-0.79} M_{\text{i}}^{-0.02}
+$$
+
+-------------------------
+
+#### 17: Lackner-Gottardi scaling (L-mode)
+
+Is selected with `i_confinement_time = 17` [^2]
+
+$$
+\tau_{\text{E}} =  0.12 I_{\text{p}}^{0.8} R^{1.8} a^{0.4} \left(\frac{\kappa_{95}}{\left(1+\kappa_{95}\right)^{0.8}}\right) \overline{n}_{20}^{0.6} \hat{q}^{0.4} P_{\text{L}}^{-0.6}
+$$
+
+where $\hat{q} = \frac{(1+\kappa_{95}a^2B_{\text{T}})}{0.4 I_{\text{p}} R}$
+
+-------------------------
+
+#### 18: Neo-Kaye scaling (L-mode)
+
+Is selected with `i_confinement_time = 18` [^2]
+
+$$
+\tau_{\text{E}} =  0.063 I_{\text{p}}^{1.12} R^{1.3} a^{-0.04} \kappa_{95}^{0.28} \overline{n}_{20}^{0.14} B_{\text{T}}^{0.04} P_{\text{L}}^{-0.59}
+$$
+
+-------------------------
+
+#### 19: Riedel scaling (H-mode)
+
+Is selected with `i_confinement_time = 19` [^2]
+
+$$
+\tau_{\text{E}} =  0.1 M_{\text{i}}^{0.5} I_{\text{p}}^{0.884} R^{1.24} a^{-0.23} \kappa_{95}^{0.317} \overline{n}_{20}^{0.105} B_{\text{T}}^{0.207} P_{\text{L}}^{-0.486}
+$$
+
+-------------------------
+
+#### 20: Amended ITER H90-P scaling (H-mode)
+
+Is selected with `i_confinement_time = 20` [^3]
+
+$$
+\tau_{\text{E}} =  0.082 M_{\text{i}}^{0.5} I_{\text{p}}^{1.02} R^{1.6}  \kappa_{95}^{-0.19}  B_{\text{T}}^{0.15} P_{\text{L}}^{-0.47}
+$$
+
+-------------------------
+
+#### 21: Sudo et al. scaling (Stellarator)
+
+Is selected with `i_confinement_time = 21` [^4]
+
+$$
+\tau_{\text{E}} =  0.17 P_{\text{L}}^{-0.58} \overline{n}_{20}^{0.69} B^{0.84} a^{2.0} R^{0.75}
+$$
+
+-------------------------
+
+#### 22: Gyro reduced Bohm scaling (Stellarator)
+
+Is selected with `i_confinement_time = 22` [^5]
+
+$$
+\tau_{\text{E}} =  0.25 P_{\text{L}}^{-0.6} \overline{n}_{20}^{0.6} B_{\text{T}}^{0.8} a^{2.4} R^{0.6}
+$$
+
+-------------------------
+
+#### 23: Lackner-Gottardi scaling (Stellarator)
+
+Is selected with `i_confinement_time = 23` [^6]
+
+$$
+\tau_{\text{E}} =  0.17 P_{\text{L}}^{-0.6} \overline{n}_{20}^{0.6} B_{\text{T}}^{0.8} a^{2.0} R q_{95}^{0.4}
+$$
+
+-------------------------
+
+#### 24: ITER H93 ELM-free scaling (H-mode)
+
+Is selected with `i_confinement_time = 24` [^7]
+
+$$
+\tau_{\text{E}} =  0.036  I_{\text{p}}^{1.06} B_{\text{T}}^{0.32} P_{\text{L}}^{-0.67} R^{1.79} \epsilon^{-0.11} \kappa^{0.66} \overline{n}_{20}^{0.17} M_{\text{i}}^{0.41}
+$$
+
+-------------------------
+
+#### 25: TITAN Reversed-Field_Pinch scaling
+
+Is selected with `i_confinement_time = 25`
+
+!!! warning 
+    This scaling has been removed
+
+-------------------------
+
+#### 26: ITER H-97P ELM-free scaling (H-mode)
+
+Is selected with `i_confinement_time = 26` [^8]
+
+$$
+\tau_{\text{E}} =  0.031 M_{\text{i}}^{0.42} I_{\text{p}}^{0.95} R^{1.92} \epsilon^{0.08} \kappa_{95}^{0.63} \overline{n}_{19}^{0.35} B_{\text{T}}^{0.25} P_{\text{L}}^{-0.67}
+$$
+
+-------------------------
+
+#### 27: ITER H-97P ELMy scaling (H-mode)
+
+Is selected with `i_confinement_time = 27` [^8] [^9]
+
+$$
+\tau_{\text{E}} =  0.029 M_{\text{i}}^{0.2} I_{\text{p}}^{0.9} R^{2.03} \epsilon^{-0.19} \kappa_{95}^{0.92} \overline{n}_{19}^{0.4} B_{\text{T}}^{0.20} P_{\text{L}}^{-0.66}
+$$
+
+-------------------------
+
+#### 28: ITER-96P (ITER-97L) scaling (L-mode)
+
+Is selected with `i_confinement_time = 28` [^10]
+
+$$
+\tau_{\text{E}} =  0.023 M_{\text{i}}^{0.2} I_{\text{p}}^{0.96} R^{1.83} \epsilon^{-0.06} \kappa_{95}^{0.64} \overline{n}_{19}^{0.4} B_{\text{T}}^{0.03} P_{\text{L}}^{-0.73}
+$$
+
+-------------------------
+
+#### 29: Valovic modified ELMy scaling (H-mode)
+
+Is selected with `i_confinement_time = 29`
+
+$$
+\tau_{\text{E}} =  0.067 M_{\text{i}}^{0.05} I_{\text{p}}^{0.9} R^{1.31} \kappa^{0.56} \overline{n}_{19}^{0.45} B_{\text{T}}^{0.17} P_{\text{L}}^{-0.68} a^{0.79}
+$$
+
+!!! warning
+    The origin, name and values of this scaling cannot be confirmed.
+
+-------------------------
+
+#### 30: Kaye 98 modified scaling (L-mode)
+
+Is selected with `i_confinement_time = 30`
+
+$$
+\tau_{\text{E}} =  0.021 M_{\text{i}}^{0.25} I_{\text{p}}^{0.81} R^{2.01} \kappa^{0.7} \overline{n}_{19}^{0.47} B_{\text{T}}^{0.14} P_{\text{L}}^{-0.73} \epsilon^{0.18}
+$$
+
+!!! warning
+    The origin, name and values of this scaling cannot be confirmed.
+
+-------------------------
+
+#### 31: ITERH-PB98P(y) scaling (H-mode)
+
+Is selected with `i_confinement_time = 31` 
+
+$$
+\tau_{\text{E}} =  0.0615 M^{0.2} I_{\text{p}}^{0.9} R^{2.0} \kappa_{\text{IPB}}^{0.75} \overline{n}_{19}^{0.4} B_{\text{T}}^{0.1} P_{\text{L}}^{-0.66} \epsilon^{0.66}
+$$
+
+!!! warning
+    The origin, name and values of this scaling cannot be confirmed.
+
+-------------------------
+
+#### 32: IPB98(y) ELMy scaling (H-mode)
+
+Is selected with `i_confinement_time = 32` [^11] [^12]
+
+$$
+\tau_{\text{E}} =  0.0365 I_{\text{p}}^{0.97} B_{\text{T}}^{0.08} \overline{n}_{19}^{0.41} P_{\text{L}}^{-0.63} R^{1.93} \kappa^{0.67} \epsilon^{0.23} M^{0.2}
+$$
+
+-------------------------
+
+#### 33: IPB98(y,1) ELMy scaling (H-mode)
+
+Is selected with `i_confinement_time = 33` [^11] [^12]
+
+$$
+\tau_{\text{E}} =  0.0503 I_{\text{p}}^{0.91} B_{\text{T}}^{0.15} \overline{n}_{19}^{0.44} P_{\text{L}}^{-0.65} R^{2.05} \kappa_{\text{IPB}}^{0.72} \epsilon^{0.57} M^{0.13}
+$$
+
+-------------------------
+
+#### 34: IPB98(y,2) ELMy scaling (H-mode)
+
+Is selected with `i_confinement_time = 34` [^11] [^12]
+
+$$
+\tau_{\text{E}} =  0.0562 I_{\text{p}}^{0.93} B_{\text{T}}^{0.15} \overline{n}_{19}^{0.41} P_{\text{L}}^{-0.69} R^{1.97} \kappa_{\text{IPB}}^{0.78} \epsilon^{0.58} M^{0.19}
+$$
+
+-------------------------
+
+#### 35: IPB98(y,3) ELMy scaling (H-mode)
+
+Is selected with `i_confinement_time = 35` [^11] [^12]
+
+$$
+\tau_{\text{E}} =  0.0564 I_{\text{p}}^{0.88} B_{\text{T}}^{0.07} \overline{n}_{19}^{0.4} P_{\text{L}}^{-0.69} R^{2.15} \kappa_{\text{IPB}}^{0.78} \epsilon^{0.64} M^{0.2}
+$$
+
+-------------------------
+
+#### 36: IPB98(y,4) ELMy scaling (H-mode)
+
+Is selected with `i_confinement_time = 36` [^11] [^12]
+
+$$
+\tau_{\text{E}} =  0.0587 I_{\text{p}}^{0.85} B_{\text{T}}^{0.29} \overline{n}_{19}^{0.39} P_{\text{L}}^{-0.7} R^{2.08} \kappa_{\text{IPB}}^{0.76} \epsilon^{0.69} M^{0.17}
+$$
+
+-------------------------
+
+
+#### 37: ISS95 scaling (Stellarator)
+
+Is selected with `i_confinement_time = 37` [^13]
+
+$$
+\tau_{\text{E}} =  0.079 a^{2.21} R^{0.65} P_{\text{L}}^{-0.59} \overline{n}_{19}^{0.51} B_{\text{T}}^{0.83} \iota_{2/3}^{0.4}
+$$
+
+-------------------------
+
+
+#### 38: ISS04 scaling (Stellarator)
+
+Is selected with `i_confinement_time = 38` [^14]
+
+$$
+\tau_{\text{E}} =  0.134 a^{2.28} R^{0.64} P_{\text{L}}^{-0.61} \overline{n}_{19}^{0.54} B_{\text{T}}^{0.84} \iota_{2/3}^{0.41}
+$$
+
+-------------------------
+
+#### 39: DS03 beta-independent scaling (H-mode)
+
+Is selected with `i_confinement_time = 39` [^15]
+
+$$
+\tau_{\text{E}} =  0.028 I_{\text{p}}^{0.83} B_{\text{T}}^{0.07} \overline{n}_{19}^{0.49} P_{\text{L}}^{-0.55} R^{2.11} \kappa_{95}^{0.75} \epsilon^{0.3} M^{0.14}
+$$
+
+-------------------------
+
+#### 40: Murari "Non-power law" scaling (H-mode)
+
+Is selected with `i_confinement_time = 40` [^16]
+
+$$
+\tau_{\text{E}} =  0.0367 I_{\text{p}}^{1.006} R^{1.731} \kappa_{\text{IPB}}^{1.45} P_{\text{L}}^{-0.735} \\
+\times \frac{\overline{n}_{19}^{0.49}}{1+e^\left({-9.403\left(\frac{\overline{n}_{19}^{0.49}}{B_{\text{T}}}\right)^{-1.365}}\right)}
+$$
+
+-------------------------
+
+#### 41: Petty08 scaling (H-mode)
+
+Is selected with `i_confinement_time = 41` [^17]
+
+$$
+\tau_{\text{E}} =  0.052 I_{\text{p}}^{0.75} B_{\text{T}}^{0.3} \overline{n}_{19}^{0.32} P_{\text{L}}^{-0.47} R^{2.09} \kappa_{\text{IPB}}^{0.88} \epsilon^{0.84}
+$$
+
+-------------------------
+
+#### 42: Lang high density scaling (H-mode)
+
+Is selected with `i_confinement_time = 42` [^18]
+
+$$
+\tau_{\text{E}} =  6.94\times 10^{-7} M^{0.2} \kappa_{\text{IPB}}^{0.37} \left(\frac{q_{95}}{q_{\text{cyl}}}\right)^{0.77} \\
+\times A^{2.48205} \frac{I_{\text{p}}^{1.3678} B_{\text{T}}^{0.12} R^{1.2345} \overline{n}^{0.032236}}{A^{0.9\ln{A}}P_{\text{L}}^{0.74}} \left(\frac{\overline{n}_{e}}{n_{\text{GW}}}\right)^{-0.22 \ln{\left(\frac{\overline{n}_e}{n_{\text{GW}}}\right)}}
+$$
+
+-------------------------
+
+#### 43: Hubbard nominal scaling (I-mode)
+
+Is selected with `i_confinement_time = 43` [^19]
+
+$$
+\tau_{\text{E}} =  0.014 I_{\text{p}}^{0.68} B_{\text{T}}^{0.77} \overline{n}_{20}^{0.02} P_{\text{L}}^{-0.29}
+$$
+
+-------------------------
+
+#### 44: Hubbard lower scaling (I-mode)
+
+Is selected with `i_confinement_time = 44` [^19]
+
+$$
+\tau_{\text{E}} =  0.014 I_{\text{p}}^{0.6} B_{\text{T}}^{0.7} \overline{n}_{20}^{-0.03} P_{\text{L}}^{-0.33}
+$$
+
+-------------------------
+
+#### 45: Hubbard upper scaling (I-mode)
+
+Is selected with `i_confinement_time = 45` [^19]
+
+$$
+\tau_{\text{E}} =  0.014 I_{\text{p}}^{0.76} B_{\text{T}}^{0.84} \overline{n}_{20}^{-0.07} P_{\text{L}}^{-0.25}
+$$
+
+-------------------------
+
+
+#### 46: Menard NSTX scaling (H-mode)
+
+Is selected with `i_confinement_time = 46` [^20]
+
+$$
+\tau_{\text{E}} =  0.095 I_{\text{p}}^{0.75} B_{\text{T}}^{1.08} \overline{n}_{19}^{0.44} P_{\text{L}}^{-0.73} R^{1.97} \kappa_{\text{IPB}}^{0.78} \epsilon^{0.58} M^{0.19}
+$$
+
+-------------------------
+
+#### 47: Menard NSTX-Petty08 hybrid scaling
+
+Is selected with `i_confinement_time = 47` [^20]
+
+- If $\epsilon \le 0.4 \  (A \ge 2.5)$ apply the [Petty08 scaling](#41-petty-h-mode-scaling)
+- If $\epsilon \ge 0.6 \ (A \le 1.7)$ apply the [Menard NSTX scaling](#46-menard-nstx-h-mode-scaling)
+
+Otherwise:
+
+$$
+\tau_{\text{E}} =  \frac{\epsilon - 0.4}{0.2}\tau_{\text{E,NSTX}}+ \frac{0.6-\epsilon}{0.2}\tau_{\text{E,Petty08}}
+$$
+
+-------------------------
+
+#### 48: Buxton NSTX Gyro-Bohm scaling (H-mode)
+
+Is selected with `i_confinement_time = 48` [^21]
+
+$$
+\tau_{\text{E}} =  0.21 I_{\text{p}}^{0.54} B_{\text{T}}^{0.91} \overline{n}_{20}^{-0.05} P_{\text{L}}^{-0.38} R^{2.14}
+$$
+
+-------------------------
+
+#### 49: ITPA20 scaling (H-mode)
+
+Is selected with `i_confinement_time = 49` [^22]
+
+$$
+\tau_{\text{E}} =  0.053 I_{\text{p}}^{0.98} B_{\text{T}}^{0.22} \overline{n}_{19}^{0.24} P_{\text{L}}^{-0.669} R^{1.71} \left(1+\delta \right)^{0.36}  \kappa_{\text{IPB}}^{0.8} \epsilon^{0.35} M^{0.2}
+$$
+
+-------------------------
+
+#### 50: ITPA20-IL scaling (H-mode)
+
+Is selected with `i_confinement_time = 50` [^23]
+
+$$
+\tau_{\text{E}} =  0.067 I_{\text{p}}^{1.29} B_{\text{T}}^{-0.13} P_{\text{L}}^{-0.644} \overline{n}_{19}^{0.15} M^{0.3} R^{1.19} \left(1+\delta \right)^{0.56} \kappa_{\text{IPB}}^{0.67} 
+$$
+
+-------------------------
+
+### Transport Powers
+
+After the confinement time scaling with $H$-factor correction has been calculated, the ion and electron transport power densities are found. `PROCESS` assumes the scaling confinement time to be equal to the ion and electron energy confinement time.
+
+This is simply the volume averaged thermal energy of the electron and ions divided by the $H$-factor corrected confinement time from the chosen scaling.
+
+$$
+\mathtt{pden\_ion\_transport\_loss\_mw} = \frac{3}{2}\frac{n_{\text{i}} \langle T_{\text{i}} \rangle_{\text{n}}}{\tau_{\text{E}}}
+$$
+
+$$
+\mathtt{pden\_electron\_transport\_loss\_mw} = \frac{3}{2}\frac{n_{\text{e}} \langle T_{\text{e}} \rangle_{\text{n}}}{\tau_{\text{E}}}
+$$
+
+Here $\langle T_{\text{i}} \rangle$ and $\langle T_{\text{e}} \rangle$ are the ion and electron density weighted temperatures respectively.
+
+Calculate the density and density weighted ratio:
+
+$$
+\frac{n_{\text{i}}}{n_{\text{e}}}\frac{\langle T_{\text{i}} \rangle_{\text{n}}}{\langle T_{\text{e}} \rangle_{\text{n}}}
+$$
+
+The density weighted global energy confinement time is then found in terms of this ratio:
+
+$$
+\tau_{\text{E}} = \frac{\frac{n_{\text{i}}}{n_{\text{e}}}\frac{\langle T_{\text{i}} \rangle_{\text{n}}}{\langle T_{\text{e}} \rangle_{\text{n}}} + 1}{\left(\frac{\frac{n_{\text{i}}}{n_{\text{e}}}\frac{\langle T_{\text{i}} \rangle_{\text{n}}}{\langle T_{\text{e}} \rangle_{\text{n}}}}{\tau_{\text{i}}}+\frac{1}{\tau_{\text{e}}}\right)}
+$$
+
+----------
+
+## Key Constraints
+
+### Global plasma power balance
+
+This constraint can be activated by stating `icc = 2` in the input file.
+
+This constraint ensures self consistency between the the transport loss power used for the confinement scalings and the calculated confinement time in relation to the plasmas total thermal energy:
+
+$$
+P_{\text{L}} = \frac{W}{\tau_{\text{E}}}
+$$
+
+$$
+\underbrace{\frac{3}{2}\frac{n_{\text{i}} \langle T_{\text{i}} \rangle_{\text{n}}}{\tau_{\text{E}}} + \frac{3}{2}\frac{n_{\text{e}} \langle T_{\text{e}} \rangle_{\text{n}}}{\tau_{\text{E}}}}_{\frac{W}{\tau_{\text{E}}}}  = \underbrace{\frac{f_{\alpha}P_{\alpha} + P_{\text{c}} + P_{\text{OH}} + P_{\text{HCD}}}{V_{\text{P}}} - \frac{P_{\text{rad}}}{V_{\text{p}}}}_{P_{\text{L}}}
+$$
+
+The $\frac{3}{2}n_{\text{i}} \langle T_{\text{i}} \rangle_{\text{n}}$ value is simply the volume averaged ion thermal energy density where $\langle T_{\text{i}} \rangle_{\text{n}}$ is the density weighted temperature. The same goes for the $\frac{3}{2}n_{\text{e}} \langle T_{\text{e}} \rangle_{\text{e}}$ electron thermal energy density term. $\tau_{\text{E}}$ is the confinement time calculated from the chosen confinement scaling via `i_confinement_time`. 
+
+The constraint uses the loss power and thermal densities hence the inclusion of the $V_{\text{p}}$ plasma volume term. The constraint is adapted depending on the condition of `i_rad_loss` which governs the radiation contribution to the loss power definition, see the [radiation and energy confinement section](#effect-of-radiation-on-energy-confinement) for more info. The injected heating and current drive contribution $P_{\text{HCD}}$ is also included or excluded depending if the plasma is deemed to be ignited with the `ignite` switch.
+
+**It is highly recommended to always have this constraint on as it is a global consistency checker**
+
+----------
+
+### Lower limit on alpha particle confinement time ratio
+
+This constraint can be activated by stating `icc = 62` in the input file.
+
+The value of `f_alpha_energy_confinement_min` can be set to the desired minimum total ratio between the alpha confinement and energy confinement times.
+
+ The scaling value `falpha_energy_confinement` can be varied also.
+
+
+[^1]: N. A. Uckan, International Atomic Energy Agency, Vienna (Austria) and ITER Physics Group, "ITER physics design guidelines: 1989", no. No. 10. Feb. 1990.
+[^2]: T.C. Hender et al., 'Physics Assessment of the European Reactor Study', AEA FUS 172, 1992.
+[^3]: J. P. Christiansen et al., “Global energy confinement H-mode database for ITER,” Nuclear Fusion, vol. 32, no. 2, pp. 291-338, Feb. 1992, doi: https://doi.org/10.1088/0029-5515/32/2/i11.
+[^4]: S. Sudo et al., “Scalings of energy confinement and density limit in stellarator/heliotron devices,” Nuclear Fusion, vol. 30, no. 1, pp. 11-21, Jan. 1990, doi: https://doi.org/10.1088/0029-5515/30/1/002.
+[^5]: Goldston, R. J., H. Biglari, and G. W. Hammett. "E x B/B² vs. µ B/B as the Cause of Transport in Tokamaks." Bull. Am. Phys. Soc 34 (1989): 1964.
+[^6]: K. Lackner and N. A. O. Gottardi, “Tokamak confinement in relation to plateau scaling,” Nuclear Fusion, vol. 30, no. 4, pp. 767-770, Apr. 1990, doi: https://doi.org/10.1088/0029-5515/30/4/018.
+[^7]: K. Thomsen et al., “ITER H mode confinement database update,” vol. 34, no. 1, pp. 131-167, Jan. 1994, doi: https://doi.org/10.1088/0029-5515/34/1/i10.
+[^8]: I. C. Database and M. W. G. (presented Cordey), “Energy confinement scaling and the extrapolation to ITER,” Plasma Physics and Controlled Fusion, vol. 39, no. 12B, pp. B115-B127, Dec. 1997, doi: https://doi.org/10.1088/0741-3335/39/12b/009.
+[^9]: International Atomic Energy Agency, Vienna (Austria), "Technical basis for the ITER final design report, cost review and safety analysis (FDR)", no. 16. Dec. 1998.
+[^10]: S. B. Kaye et al., “ITER L mode confinement database,” Nuclear Fusion, vol. 37, no. 9, pp. 1303-1328, Sep. 1997, doi: https://doi.org/10.1088/0029-5515/37/9/i10.
+[^11]: I. P. E. G. on C. Transport, I. P. E. G. on C. Database, and I. P. B. Editors, “Chapter 2: Plasma confinement and transport,” Nuclear Fusion, vol. 39, no. 12, pp. 2175-2249, Dec. 1999, doi: https://doi.org/10.1088/0029-5515/39/12/302.
+[^12]: O. Kardaun, N. K. Thomsen, and A. Chudnovskiy, “Corrections to a sequence of papers in Nuclear Fusion,” Nuclear Fusion, vol. 48, no. 9, pp. 099801-099801, Aug. 2008, doi: https://doi.org/10.1088/0029-5515/48/9/099801.
+[^13]: U. Stroth et al., “Energy confinement scaling from the international stellarator database,” vol. 36, no. 8, pp. 1063-1077, Aug. 1996, doi: https://doi.org/10.1088/0029-5515/36/8/i11.
+[^14]: H. Yamada et al., “Characterization of energy confinement in net-current free plasmas using the extended International Stellarator Database,” vol. 45, no. 12, pp. 1684-1693, Nov. 2005, doi: https://doi.org/10.1088/0029-5515/45/12/024.
+[^15]: T. C. Luce, C. C. Petty, and J. G. Cordey, “Application of dimensionless parameter scaling techniques to the design and interpretation of magnetic fusion experiments,” Plasma Physics and Controlled Fusion, vol. 50, no. 4, p. 043001, Mar. 2008, doi: https://doi.org/10.1088/0741-3335/50/4/043001.
+[^16]: A. Murari, E. Peluso, M. Gelfusa, I. Lupelli, and P. Gaudio, “A new approach to the formulation and validation of scaling expressions for plasma confinement in tokamaks,” Nuclear Fusion, vol. 55, no. 7, pp. 073009-073009, Jun. 2015, doi: https://doi.org/10.1088/0029-5515/55/7/073009.
+[^17]: C. C. Petty, “Sizing up plasmas using dimensionless parameters,” Physics of Plasmas, vol. 15, no. 8, Aug. 2008, doi: https://doi.org/10.1063/1.2961043.
+[^18]: P. T. Lang, C. Angioni, R. M. M. Dermott, R. Fischer, and H. Zohm, “Pellet Induced High Density Phases during ELM Suppression in ASDEX Upgrade,” 24th IAEA Conference Fusion Energy, 2012, Oct. 2012, Available: https://www.researchgate.net/publication/274456104_Pellet_Induced_High_Density_Phases_during_ELM_Suppression_in_ASDEX_Upgrade.
+[^19]: A. E. Hubbard et al., “Physics and performance of the I-mode regime over an expanded operating space on Alcator C-Mod,” Nuclear Fusion, vol. 57, no. 12, p. 126039, Oct. 2017, doi: https://doi.org/10.1088/1741-4326/aa8570.
+[^20]: J. E. Menard, “Compact steady-state tokamak performance dependence on magnet and core physics limits,” Philosophical Transactions of the Royal Society A, vol. 377, no. 2141, pp. 20170440-20170440, Feb. 2019, doi: https://doi.org/10.1098/rsta.2017.0440.
+[^21]: P. F. Buxton, L. Connor, A. E. Costley, M. Gryaznevich, and S. McNamara, “On the energy confinement time in spherical tokamaks: implications for the design of pilot plants and fusion reactors,” vol. 61, no. 3, pp. 035006-035006, Jan. 2019, doi: https://doi.org/10.1088/1361-6587/aaf7e5.
+[^22]: G. Verdoolaege et al., “The updated ITPA global H-mode confinement database: description and analysis,” Nuclear Fusion, vol. 61, no. 7, pp. 076006-076006, Jan. 2021, doi: https://doi.org/10.1088/1741-4326/abdb91.
+[^23]: T. Luda et al., “Validation of a full-plasma integrated modeling approach on ASDEX Upgrade,” Nuclear Fusion, vol. 61, no. 12, pp. 126048-126048, Nov. 2021, doi: https://doi.org/10.1088/1741-4326/ac3293.
+[^24]: H. Lux, R. Kemp, E. Fable, and R. Wenninger, “Radiation and confinement in 0D fusion systems codes,” Plasma Physics and Controlled Fusion, vol. 58, no. 7, pp. 075001–075001, May 2016, doi: https://doi.org/10.1088/0741-3335/58/7/075001.
+[^25]: H. Lux, R. Kemp, D. J. Ward, and M. Sertoli, “Impurity radiation in DEMO systems modelling,” Fusion Engineering and Design, vol. 101, pp. 42–51, Dec. 2015, doi: https://doi.org/10.1016/j.fusengdes.2015.10.002.
+‌
\ No newline at end of file
diff --git a/documentation/proc-pages/physics-models/plasma_h_mode.md b/documentation/proc-pages/physics-models/plasma_h_mode.md
new file mode 100644
index 0000000000..6d4e3257d5
--- /dev/null
+++ b/documentation/proc-pages/physics-models/plasma_h_mode.md
@@ -0,0 +1,47 @@
+## L-H Power Threshold Scalings
+
+Transitions from a standard confinement mode (L-mode) to an improved
+confinement regime (H-mode), called L-H transitions, are observed in most
+tokamaks. A range of scaling laws are available that provide estimates of the
+heating power required to initiate these transitions, via extrapolations
+from present-day devices. PROCESS calculates these power threshold values
+for the scaling laws listed in the table below, in routine `pthresh`.
+
+For an H-mode plasma, use input parameter `ilhthresh` to
+select the scaling to use, and turn on constraint equation no. 15 with
+iteration variable no. 103 (`flhthresh`). By default, this will ensure
+that the power reaching the divertor is at least equal to the threshold power
+calculated for the chosen scaling, which is a necessary condition for
+H-mode. 
+
+For an L-mode plasma, use input parameter `ilhthresh` to
+select the scaling to use, and turn on constraint equation no. 15 with 
+iteration variable no. 103 (`flhthresh`). Set lower and upper bounds for 
+the f-value `boundl(103) = 0.001` and `boundu(103) = 1.0` 
+to ensure that the power does not exceed the calculated threshold, 
+and therefore the machine remains in L-mode.
+
+
+| `ilhthresh` | Name | Reference |
+| :-: | - | - |
+| 1 | ITER 1996 nominal | ITER Physics Design Description Document |
+| 2 | ITER 1996 upper bound | D. Boucher, p.2-2 |
+| 3 | ITER 1996 lower bound | 
+| 4 | ITER 1997 excluding elongation | J. A. Snipes, ITER H-mode Threshold Database |
+| 5 | ITER 1997 including elongation |  Working Group, Controlled Fusion and Plasma Physics, 24th EPS conference, Berchtesgaden, June 1997, vol.21A, part III, p.961 |
+| 6 | Martin 2008 nominal | Martin et al, 11th IAEA Tech. Meeting |
+| 7 | Martin 2008 95% upper bound |  H-mode Physics and Transport Barriers, Journal |
+| 8 | Martin 2008 95% lower bound |  of Physics: Conference Series **123**, 2008 |
+| 9 | Snipes 2000 nominal | J. A. Snipes and the International H-mode |
+| 10| Snipes 2000 upper bound | Threshold Database Working Group |
+| 11| Snipes 2000 lower bound |  2000, Plasma Phys. Control. Fusion, 42, A299 |
+| 12| Snipes 2000 (closed divertor): nominal | 
+| 13| Snipes 2000 (closed divertor): upper bound | 
+| 14| Snipes 2000 (closed divertor): lower bound | 
+| 15| Hubbard 2012 L-I threshold scaling: nominal | [Hubbard et al. (2012; Nucl. Fusion 52 114009)](https://iopscience.iop.org/article/10.1088/0029-5515/52/11/114009) |
+| 16| Hubbard 2012 L-I threshold scaling: lower bound | [Hubbard et al. (2012; Nucl. Fusion 52 114009)](https://iopscience.iop.org/article/10.1088/0029-5515/52/11/114009 |
+| 17| Hubbard 2012 L-I threshold scaling: upper bound | [Hubbard et al. (2012; Nucl. Fusion 52 114009)](https://iopscience.iop.org/article/10.1088/0029-5515/52/11/114009 |
+| 18| Hubbard 2017 L-I threshold scaling | [Hubbard et al. (2017; Nucl. Fusion 57 126039)](https://iopscience.iop.org/article/10.1088/1741-4326/aa8570) |
+| 19 | Martin 2008 aspect ratio corrected nominal | Martin et al (2008; J Phys Conf, 123, 012033) |
+| 20 | Martin 2008 aspect ratio corrected 95% upper bound | [Takizuka et al. (2004; Plasma Phys. Contol. Fusion, 46, A227)](https://iopscience.iop.org/article/10.1088/0741-3335/46/5A/024)  |
+| 21 | Martin 2008 aspect ratio corrected 95% lower bound |  
\ No newline at end of file
diff --git a/documentation/proc-pages/physics-models/plasma_overview.md b/documentation/proc-pages/physics-models/plasma_overview.md
index af1c6a9c1e..44f11bc531 100644
--- a/documentation/proc-pages/physics-models/plasma_overview.md
+++ b/documentation/proc-pages/physics-models/plasma_overview.md
@@ -16,23 +16,5 @@ domain.
 More detail is given in [^1], but this webpage is more up to date.
 
 
-## Other Plasma Physics Options
-
-### Neo-Classical Correction Effects
-
-Neo-classical trapped particle effects are 
-included in the calculation of the plasma resistance and ohmic heating power in 
-subroutine `plasma_ohmic_heating()`, which is called by routine `physics`.  The scaling used is only valid for aspect 
-ratios between 2.5 and 4, and it is possible for the plasma resistance to be 
-incorrect or even negative if the aspect ratio is outside this range.  An error is reported if the 
-calculated plasma resistance is negative.
-
-### Inverse Quadrature in $\tau_E$ Scaling Laws
-
-Switch `iinvqd` determines whether the energy confinement time scaling
-laws due to Kaye-Goldston (`isc = 5`) and Goldston (`isc = 9`) should include 
-an inverse quadrature scaling with the Neo-Alcator result (`isc = 1`). A value 
-`iinvqd = 1`includes this scaling.
-
 [^1]: M. Kovari, R. Kemp, H. Lux, P. Knight, J. Morris, D.J. Ward, '“PROCESS”: A systems code for fusion power plants—Part 1: Physics' Fusion Engineering and Design 89 (2014) 3054–3069
 
diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT
index cf88a76fb9..9f75e96088 100644
--- a/examples/data/csv_output_large_tokamak_MFILE.DAT
+++ b/examples/data/csv_output_large_tokamak_MFILE.DAT
@@ -82,9 +82,9 @@
  ftmargoh________________________________________________________________ (itvar020)____________________      1.0000E+00    
  ftmargoh_(final_value/initial_value)____________________________________ (xcm020)______________________      1.0000E+00    
  ftmargoh_(range_normalised)_____________________________________________ (nitvar020)___________________      1.0000E+00    
- ftaulimit_______________________________________________________________ (itvar021)____________________      7.2549E-01    
- ftaulimit_(final_value/initial_value)___________________________________ (xcm021)______________________      7.2549E-01    
- ftaulimit_(range_normalised)____________________________________________ (nitvar021)___________________      7.2521E-01    
+ falpha_energy_confinement_______________________________________________________________ (itvar021)____________________      7.2549E-01    
+ falpha_energy_confinement_(final_value/initial_value)___________________________________ (xcm021)______________________      7.2549E-01    
+ falpha_energy_confinement_(range_normalised)____________________________________________ (nitvar021)___________________      7.2521E-01    
  ftaucq__________________________________________________________________ (itvar022)____________________      9.1920E-01    
  ftaucq_(final_value/initial_value)______________________________________ (xcm022)______________________      1.0213E+00    
  ftaucq_(range_normalised)_______________________________________________ (nitvar022)___________________      9.1912E-01    
@@ -176,7 +176,7 @@
  J_winding_pack/J_protection_limit_normalised_residue____________________ (normres017)__________________      2.0761E-13    
  TF_coil_temp._margin_lower_limit__normalised_residue____________________ (normres018)__________________     -1.2975E-12    
  CS_temperature_margin_lower_limit_normalised_residue____________________ (normres019)__________________     -0.0000E+00    
- taup/taueff_______________________normalised_residue____________________ (normres020)__________________     -4.7055E-09    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (normres020)__________________     -4.7055E-09    
  Dump_time_set_by_VV_stress________normalised_residue____________________ (normres021)__________________      3.0487E-13    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (normres022)__________________     -4.9472E-13    
  ne0_>_neped_______________________normalised_residue____________________ (normres023)__________________      1.2901E-13    
@@ -456,8 +456,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.2139E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.7861E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.3659E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.5338E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.3659E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.5338E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      7.5213E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -489,22 +489,22 @@
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      9.4410E+01 OP 
  Confinement_scaling_law_________________________________________________ (tauelaw)_____________________     "IPB98(y,2)"
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.1808E+00 ITV
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.2379E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.2379E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.2379E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.6225E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.2095E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      2.8997E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.2379E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.2379E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.2379E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.6225E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.2095E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      2.8997E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      8.9376E+01 OP 
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      2.2315E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      6.8919E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      2.8266E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      2.2315E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      6.8919E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      2.8266E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.7123E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      2.0262E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.7167E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6815E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6815E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.6973E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.3365E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -1346,11 +1346,11 @@ icc = 60
 ixc = 106 * ftmargoh
 tmargmin_cs = 1.5
 
-* Lower limit on taup/taueff (ratio alpha particle/energy confinement times) *
+* Lower limit on f_alpha_energy_confinement (ratio alpha particle/energy confinement times) *
 *-------------------------------------------------------------------------------*
 icc = 62 
-ixc = 110 * ftaulimit
-taulimit = 5.0
+ixc = 110 * falpha_energy_confinement
+f_alpha_energy_confinement_min = 5.0
 
 * dump time constraint for VV stresses *
 *--------------------------------------*
@@ -1582,9 +1582,6 @@ i_density_limit = 7
 * Switch for fast alpha pressure calculation
 i_beta_fast_alpha = 1
 
-* Switch for inverse quadrature in l-mode scaling laws 5 and 9
-iinvqd = 1
-
 * Switch for pedestal profiles
 ipedestal = 1
 
@@ -1616,7 +1613,7 @@ tesep = 0.1
 iprofile = 1
 
 * Switch for energy confinement time scaling law
-isc = 34
+i_confinement_time = 34
 
 * Safety factor on axis
 q0 = 1.0
diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT
index 08cd3a26af..40b059ade4 100644
--- a/examples/data/large_tokamak_1_MFILE.DAT
+++ b/examples/data/large_tokamak_1_MFILE.DAT
@@ -177,7 +177,7 @@
  J_winding_pack/J_protection_limit_normalised_residue____________________ (normres017)__________________     -2.9894E-07    
  TF_coil_temp._margin_lower_limit__normalised_residue____________________ (normres018)__________________     -1.0631E-06    
  CS_temperature_margin_lower_limit_normalised_residue____________________ (normres019)__________________      8.0251E-08    
- taup/taueff_______________________normalised_residue____________________ (normres020)__________________     -1.8772E-08    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (normres020)__________________     -1.8772E-08    
  Dump_time_set_by_VV_stress________normalised_residue____________________ (normres021)__________________     -1.0026E-07    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (normres022)__________________     -1.6044E-07    
  ne0_>_neped_______________________normalised_residue____________________ (normres023)__________________     -1.9637E-08    
@@ -453,8 +453,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.1828E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.8172E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.4013E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.5772E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.4013E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.5772E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      8.0143E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -485,22 +485,22 @@
  L-H_threshold_power_(enforced)_(MW)_____________________________________ (boundl(103)*plhthresh)_______      9.7416E+01 OP 
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      9.7416E+01 OP 
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.1886E+00 ITV
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.2037E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.2037E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.2037E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.5843E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.2275E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      2.9785E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.2037E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.2037E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.2037E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.5843E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.2275E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      2.9785E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      9.1650E+01 OP 
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      2.2270E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      6.9512E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      2.8018E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      2.2270E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      6.9512E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      2.8018E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.4553E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      1.9603E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.7266E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6815E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6815E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.5616E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.3585E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -1341,11 +1341,11 @@ icc = 60
 ixc = 106 * ftmargoh
 tmargmin_cs = 1.5
 
-* Lower limit on taup/taueff (ratio alpha particle/energy confinement times) *
+* Lower limit on f_alpha_energy_confinement (ratio alpha particle/energy confinement times) *
 *-------------------------------------------------------------------------------*
 icc = 62 
-ixc = 110 * ftaulimit
-taulimit = 5.0
+ixc = 110 * falpha_energy_confinement
+f_alpha_energy_confinement_min = 5.0
 
 * dump time constraint for VV stresses *
 *--------------------------------------*
@@ -1576,9 +1576,6 @@ i_density_limit = 7
 * Switch for fast alpha pressure calculation
 i_beta_fast_alpha = 1
 
-* Switch for inverse quadrature in l-mode scaling laws 5 and 9
-iinvqd = 1
-
 * Switch for pedestal profiles
 ipedestal = 1
 
@@ -1610,7 +1607,7 @@ tesep = 0.1
 iprofile = 1
 
 * Switch for energy confinement time scaling law
-isc = 34
+i_confinement_time = 34
 
 * Safety factor on axis
 q0 = 1.0
diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT
index 996702e0a9..60fac31f8a 100644
--- a/examples/data/large_tokamak_2_MFILE.DAT
+++ b/examples/data/large_tokamak_2_MFILE.DAT
@@ -177,7 +177,7 @@
  J_winding_pack/J_protection_limit_normalised_residue____________________ (normres017)__________________     -2.9894E-07    
  TF_coil_temp._margin_lower_limit__normalised_residue____________________ (normres018)__________________     -1.0631E-06    
  CS_temperature_margin_lower_limit_normalised_residue____________________ (normres019)__________________      8.0251E-08    
- taup/taueff_______________________normalised_residue____________________ (normres020)__________________     -1.8772E-08    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (normres020)__________________     -1.8772E-08    
  Dump_time_set_by_VV_stress________normalised_residue____________________ (normres021)__________________     -1.0026E-07    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (normres022)__________________     -1.6044E-07    
  ne0_>_neped_______________________normalised_residue____________________ (normres023)__________________     -1.9637E-08    
@@ -453,8 +453,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.1828E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.8172E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.4013E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.5772E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.4013E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.5772E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      8.0143E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -485,22 +485,22 @@
  L-H_threshold_power_(enforced)_(MW)_____________________________________ (boundl(103)*plhthresh)_______      9.7416E+01 OP 
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      9.7416E+01 OP 
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.1886E+00 ITV
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.2037E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.2037E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.2037E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.5843E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.2275E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      2.9785E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.2037E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.2037E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.2037E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.5843E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.2275E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      2.9785E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      9.1650E+01 OP 
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      2.2270E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      6.9512E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      2.8018E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      2.2270E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      6.9512E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      2.8018E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.4553E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      1.9603E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.7266E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6815E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6815E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.5616E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.3585E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -1341,11 +1341,11 @@ icc = 60
 ixc = 106 * ftmargoh
 tmargmin_cs = 1.5
 
-* Lower limit on taup/taueff (ratio alpha particle/energy confinement times) *
+* Lower limit on f_alpha_energy_confinement (ratio alpha particle/energy confinement times) *
 *-------------------------------------------------------------------------------*
 icc = 62 
-ixc = 110 * ftaulimit
-taulimit = 5.0
+ixc = 110 * falpha_energy_confinement
+f_alpha_energy_confinement_min = 5.0
 
 * dump time constraint for VV stresses *
 *--------------------------------------*
@@ -1576,9 +1576,6 @@ i_density_limit = 7
 * Switch for fast alpha pressure calculation
 i_beta_fast_alpha = 1
 
-* Switch for inverse quadrature in l-mode scaling laws 5 and 9
-iinvqd = 1
-
 * Switch for pedestal profiles
 ipedestal = 1
 
@@ -1610,7 +1607,7 @@ tesep = 0.1
 iprofile = 1
 
 * Switch for energy confinement time scaling law
-isc = 34
+i_confinement_time = 34
 
 * Safety factor on axis
 q0 = 1.0
diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT
index 14466747cd..3d9ad7a0ca 100644
--- a/examples/data/large_tokamak_3_MFILE.DAT
+++ b/examples/data/large_tokamak_3_MFILE.DAT
@@ -177,7 +177,7 @@
  J_winding_pack/J_protection_limit_normalised_residue____________________ (normres017)__________________     -2.9894E-07    
  TF_coil_temp._margin_lower_limit__normalised_residue____________________ (normres018)__________________     -1.0631E-06    
  CS_temperature_margin_lower_limit_normalised_residue____________________ (normres019)__________________      8.0251E-08    
- taup/taueff_______________________normalised_residue____________________ (normres020)__________________     -1.8772E-08    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (normres020)__________________     -1.8772E-08    
  Dump_time_set_by_VV_stress________normalised_residue____________________ (normres021)__________________     -1.0026E-07    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (normres022)__________________     -1.6044E-07    
  ne0_>_neped_______________________normalised_residue____________________ (normres023)__________________     -1.9637E-08    
@@ -453,8 +453,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.1828E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.8172E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.4013E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.5772E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.4013E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.5772E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      8.0143E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -485,22 +485,22 @@
  L-H_threshold_power_(enforced)_(MW)_____________________________________ (boundl(103)*plhthresh)_______      9.7416E+01 OP 
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      9.7416E+01 OP 
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.1886E+00 ITV
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.2037E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.2037E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.2037E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.5843E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.2275E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      2.9785E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.2037E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.2037E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.2037E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.5843E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.2275E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      2.9785E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      9.1650E+01 OP 
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      2.2270E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      6.9512E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      2.8018E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      2.2270E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      6.9512E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      2.8018E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.4553E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      1.9603E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.7266E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6815E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6815E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.5616E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.3585E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -1341,11 +1341,11 @@ icc = 60
 ixc = 106 * ftmargoh
 tmargmin_cs = 1.5
 
-* Lower limit on taup/taueff (ratio alpha particle/energy confinement times) *
+* Lower limit on f_alpha_energy_confinement (ratio alpha particle/energy confinement times) *
 *-------------------------------------------------------------------------------*
 icc = 62 
-ixc = 110 * ftaulimit
-taulimit = 5.0
+ixc = 110 * falpha_energy_confinement
+f_alpha_energy_confinement_min = 5.0
 
 * dump time constraint for VV stresses *
 *--------------------------------------*
@@ -1576,8 +1576,6 @@ i_density_limit = 7
 * Switch for fast alpha pressure calculation
 i_beta_fast_alpha = 1
 
-* Switch for inverse quadrature in l-mode scaling laws 5 and 9
-iinvqd = 1
 
 * Switch for pedestal profiles
 ipedestal = 1
@@ -1610,7 +1608,7 @@ tesep = 0.1
 iprofile = 1
 
 * Switch for energy confinement time scaling law
-isc = 34
+i_confinement_time = 34
 
 * Safety factor on axis
 q0 = 1.0
diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT
index cce76ccd92..e8e1b49ddc 100644
--- a/examples/data/large_tokamak_4_MFILE.DAT
+++ b/examples/data/large_tokamak_4_MFILE.DAT
@@ -177,7 +177,7 @@
  J_winding_pack/J_protection_limit_normalised_residue____________________ (normres017)__________________     -2.9894E-07    
  TF_coil_temp._margin_lower_limit__normalised_residue____________________ (normres018)__________________     -1.0631E-06    
  CS_temperature_margin_lower_limit_normalised_residue____________________ (normres019)__________________      8.0251E-08    
- taup/taueff_______________________normalised_residue____________________ (normres020)__________________     -1.8772E-08    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (normres020)__________________     -1.8772E-08    
  Dump_time_set_by_VV_stress________normalised_residue____________________ (normres021)__________________     -1.0026E-07    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (normres022)__________________     -1.6044E-07    
  ne0_>_neped_______________________normalised_residue____________________ (normres023)__________________     -1.9637E-08    
@@ -453,8 +453,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.1828E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.8172E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.4013E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.5772E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.4013E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.5772E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      8.0143E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -485,22 +485,22 @@
  L-H_threshold_power_(enforced)_(MW)_____________________________________ (boundl(103)*plhthresh)_______      9.7416E+01 OP 
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      9.7416E+01 OP 
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.1886E+00 ITV
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.2037E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.2037E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.2037E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.5843E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.2275E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      2.9785E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.2037E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.2037E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.2037E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.5843E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.2275E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      2.9785E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      9.1650E+01 OP 
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      2.2270E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      6.9512E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      2.8018E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      2.2270E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      6.9512E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      2.8018E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.4553E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      1.9603E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.7266E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6815E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6815E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.5616E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.3585E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -1341,11 +1341,11 @@ icc = 60
 ixc = 106 * ftmargoh
 tmargmin_cs = 1.5
 
-* Lower limit on taup/taueff (ratio alpha particle/energy confinement times) *
+* Lower limit on f_alpha_energy_confinement (ratio alpha particle/energy confinement times) *
 *-------------------------------------------------------------------------------*
 icc = 62 
-ixc = 110 * ftaulimit
-taulimit = 5.0
+ixc = 110 * falpha_energy_confinement
+f_alpha_energy_confinement_min = 5.0
 
 * dump time constraint for VV stresses *
 *--------------------------------------*
@@ -1576,8 +1576,6 @@ i_density_limit = 7
 * Switch for fast alpha pressure calculation
 i_beta_fast_alpha = 1
 
-* Switch for inverse quadrature in l-mode scaling laws 5 and 9
-iinvqd = 1
 
 * Switch for pedestal profiles
 ipedestal = 1
@@ -1610,7 +1608,7 @@ tesep = 0.1
 iprofile = 1
 
 * Switch for energy confinement time scaling law
-isc = 34
+i_confinement_time = 34
 
 * Safety factor on axis
 q0 = 1.0
diff --git a/examples/data/large_tokamak_IN.DAT b/examples/data/large_tokamak_IN.DAT
index fabb66df82..954c779ae8 100644
--- a/examples/data/large_tokamak_IN.DAT
+++ b/examples/data/large_tokamak_IN.DAT
@@ -151,11 +151,11 @@ icc = 60
 ixc = 106 * ftmargoh
 tmargmin_cs = 1.5
 
-* Lower limit on taup/taueff (ratio alpha particle/energy confinement times) *
+* Lower limit on f_alpha_energy_confinement (ratio alpha particle/energy confinement times) *
 *-------------------------------------------------------------------------------*
 icc = 62 
-ixc = 110 * ftaulimit
-taulimit = 5.0
+ixc = 110 * falpha_energy_confinement
+f_alpha_energy_confinement_min = 5.0
 
 * dump time constraint for VV stresses *
 *--------------------------------------*
@@ -386,8 +386,6 @@ i_density_limit = 7
 * Switch for fast alpha pressure calculation
 i_beta_fast_alpha = 1
 
-* Switch for inverse quadrature in l-mode scaling laws 5 and 9
-iinvqd = 1
 
 * Switch for pedestal profiles
 ipedestal = 1
@@ -420,7 +418,7 @@ tesep = 0.1
 iprofile = 1
 
 * Switch for energy confinement time scaling law
-isc = 34
+i_confinement_time = 34
 
 * Safety factor on axis
 q0 = 1.0
diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT
index 03be68e9fc..7f888ab8d3 100644
--- a/examples/data/scan_MFILE.DAT
+++ b/examples/data/scan_MFILE.DAT
@@ -163,7 +163,7 @@
  CS_temperature_margin_lower_limit_normalised_residue____________________ (normres021)__________________      2.1072E-13    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (normres022)__________________      9.0616E-13    
  Peak_toroidal_field_upper_limit___normalised_residue____________________ (normres023)__________________     -9.2149E-15    
- taup/taueff_______________________normalised_residue____________________ (normres024)__________________      7.0988E-13    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (normres024)__________________      7.0988E-13    
  # Final Feasible Point #
  # Plant Availability #
  Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________      1.5000E+01    
@@ -309,8 +309,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.1857E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.8143E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.5736E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.7258E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.5736E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.7258E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      5.1000E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -342,22 +342,22 @@
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      1.1353E+02 OP 
  Confinement_scaling_law_________________________________________________ (tauelaw)_____________________     "IPB98(y,2)"
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.1000E+00    
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.6434E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.6434E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.6434E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.5918E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.1834E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      3.2994E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.6434E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.6434E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.6434E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.5918E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.1834E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      3.2994E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      1.0500E+02 OP 
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      1.8217E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      5.0000E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      3.1997E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      1.8217E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      5.0000E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      3.1997E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.1498E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      1.7778E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.7276E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6812E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6812E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.9243E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.9934E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -1158,7 +1158,7 @@
  CS_temperature_margin_lower_limit_normalised_residue____________________ (normres021)__________________      6.4393E-15    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (normres022)__________________      1.3700E-13    
  Peak_toroidal_field_upper_limit___normalised_residue____________________ (normres023)__________________     -4.4409E-16    
- taup/taueff_______________________normalised_residue____________________ (normres024)__________________      4.7518E-14    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (normres024)__________________      4.7518E-14    
  # Final Feasible Point #
  # Plant Availability #
  Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________      1.5000E+01    
@@ -1304,8 +1304,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.1857E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.8143E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.5736E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.7258E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.5736E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.7258E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      5.1000E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -1337,22 +1337,22 @@
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      1.1353E+02 OP 
  Confinement_scaling_law_________________________________________________ (tauelaw)_____________________     "IPB98(y,2)"
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.1000E+00    
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.6434E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.6434E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.6434E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.5918E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.1834E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      3.2994E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.6434E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.6434E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.6434E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.5918E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.1834E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      3.2994E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      1.0500E+02 OP 
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      1.8217E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      5.0000E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      3.1997E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      1.8217E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      5.0000E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      3.1997E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.1498E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      1.7778E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.7276E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6812E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6812E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.9243E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.9934E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -2153,7 +2153,7 @@
  CS_temperature_margin_lower_limit_normalised_residue____________________ (normres021)__________________      3.7748E-15    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (normres022)__________________      1.2701E-13    
  Peak_toroidal_field_upper_limit___normalised_residue____________________ (normres023)__________________     -7.7716E-16    
- taup/taueff_______________________normalised_residue____________________ (normres024)__________________      4.7296E-14    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (normres024)__________________      4.7296E-14    
  # Final Feasible Point #
  # Plant Availability #
  Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________      1.5000E+01    
@@ -2299,8 +2299,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.1857E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.8143E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.5736E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.7258E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.5736E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.7258E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      5.1000E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -2332,22 +2332,22 @@
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      1.1353E+02 OP 
  Confinement_scaling_law_________________________________________________ (tauelaw)_____________________     "IPB98(y,2)"
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.1000E+00    
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.6434E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.6434E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.6434E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.5918E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.1834E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      3.2994E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.6434E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.6434E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.6434E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.5918E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.1834E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      3.2994E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      1.0500E+02 OP 
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      1.8217E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      5.0000E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      3.1997E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      1.8217E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      5.0000E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      3.1997E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.1498E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      1.7778E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.7276E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6812E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6812E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.9243E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.9934E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -3148,7 +3148,7 @@
  CS_temperature_margin_lower_limit_normalised_residue____________________ (normres021)__________________      2.2204E-15    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (normres022)__________________      1.1480E-13    
  Peak_toroidal_field_upper_limit___normalised_residue____________________ (normres023)__________________     -3.3307E-16    
- taup/taueff_______________________normalised_residue____________________ (normres024)__________________      4.5963E-14    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (normres024)__________________      4.5963E-14    
  # Final Feasible Point #
  # Plant Availability #
  Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________      1.5000E+01    
@@ -3294,8 +3294,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.1857E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.8143E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.5736E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.7258E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.5736E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.7258E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      5.1000E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -3327,22 +3327,22 @@
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      1.1353E+02 OP 
  Confinement_scaling_law_________________________________________________ (tauelaw)_____________________     "IPB98(y,2)"
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.1000E+00    
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.6434E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.6434E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.6434E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.5918E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.1834E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      3.2994E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.6434E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.6434E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.6434E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.5918E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.1834E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      3.2994E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      1.0500E+02 OP 
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      1.8217E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      5.0000E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      3.1997E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      1.8217E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      5.0000E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      3.1997E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.1498E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      1.7778E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.7276E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6812E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6812E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.9243E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.9934E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -4143,7 +4143,7 @@
  CS_temperature_margin_lower_limit_normalised_residue____________________ (normres021)__________________      5.7732E-15    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (normres022)__________________      1.0392E-13    
  Peak_toroidal_field_upper_limit___normalised_residue____________________ (normres023)__________________     -9.9920E-16    
- taup/taueff_______________________normalised_residue____________________ (normres024)__________________      4.8406E-14    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (normres024)__________________      4.8406E-14    
  # Final Feasible Point #
  # Plant Availability #
  Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________      1.5000E+01    
@@ -4289,8 +4289,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.1857E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.8143E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.5736E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.7258E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.5736E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.7258E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      5.1000E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -4322,22 +4322,22 @@
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      1.1353E+02 OP 
  Confinement_scaling_law_________________________________________________ (tauelaw)_____________________     "IPB98(y,2)"
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.1000E+00    
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.6434E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.6434E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.6434E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.5918E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.1834E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      3.2994E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.6434E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.6434E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.6434E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.5918E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.1834E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      3.2994E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      1.0500E+02 OP 
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      1.8217E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      5.0000E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      3.1997E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      1.8217E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      5.0000E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      3.1997E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.1498E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      1.7778E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.7276E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6812E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6812E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.9243E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.9934E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -5138,7 +5138,7 @@
  CS_temperature_margin_lower_limit_normalised_residue____________________ (normres021)__________________      6.8834E-15    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (normres022)__________________      9.5257E-14    
  Peak_toroidal_field_upper_limit___normalised_residue____________________ (normres023)__________________     -1.2212E-15    
- taup/taueff_______________________normalised_residue____________________ (normres024)__________________      4.9738E-14    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (normres024)__________________      4.9738E-14    
  # Final Feasible Point #
  # Plant Availability #
  Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________      1.5000E+01    
@@ -5284,8 +5284,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.1857E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.8143E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.5736E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.7258E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.5736E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.7258E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      5.1000E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -5317,22 +5317,22 @@
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      1.1353E+02 OP 
  Confinement_scaling_law_________________________________________________ (tauelaw)_____________________     "IPB98(y,2)"
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.1000E+00    
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.6434E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.6434E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.6434E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.5918E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.1834E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      3.2994E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.6434E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.6434E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.6434E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.5918E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.1834E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      3.2994E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      1.0500E+02 OP 
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      1.8217E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      5.0000E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      3.1997E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      1.8217E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      5.0000E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      3.1997E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.1498E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      1.7778E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.7276E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6812E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6812E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.9243E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.9934E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -6133,7 +6133,7 @@
  CS_temperature_margin_lower_limit_normalised_residue____________________ (normres021)__________________      1.9984E-15    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (normres022)__________________      8.0380E-14    
  Peak_toroidal_field_upper_limit___normalised_residue____________________ (normres023)__________________     -1.2212E-15    
- taup/taueff_______________________normalised_residue____________________ (normres024)__________________      4.9516E-14    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (normres024)__________________      4.9516E-14    
  # Final Feasible Point #
  # Plant Availability #
  Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________      1.5000E+01    
@@ -6279,8 +6279,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.1857E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.8143E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.5736E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.7258E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.5736E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.7258E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      5.1000E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -6312,22 +6312,22 @@
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      1.1353E+02 OP 
  Confinement_scaling_law_________________________________________________ (tauelaw)_____________________     "IPB98(y,2)"
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.1000E+00    
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.6434E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.6434E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.6434E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.5918E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.1834E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      3.2994E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.6434E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.6434E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.6434E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.5918E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.1834E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      3.2994E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      1.0500E+02 OP 
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      1.8217E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      5.0000E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      3.1997E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      1.8217E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      5.0000E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      3.1997E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.1498E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      1.7778E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.7276E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6812E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6812E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.9243E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.9934E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -7128,7 +7128,7 @@
  CS_temperature_margin_lower_limit_normalised_residue____________________ (normres021)__________________      1.1102E-15    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (normres022)__________________      7.8382E-14    
  Peak_toroidal_field_upper_limit___normalised_residue____________________ (normres023)__________________     -7.7716E-16    
- taup/taueff_______________________normalised_residue____________________ (normres024)__________________      5.2847E-14    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (normres024)__________________      5.2847E-14    
  # Final Feasible Point #
  # Plant Availability #
  Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________      1.5000E+01    
@@ -7274,8 +7274,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.1857E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.8143E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.5736E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.7258E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.5736E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.7258E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      5.1000E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -7307,22 +7307,22 @@
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      1.1353E+02 OP 
  Confinement_scaling_law_________________________________________________ (tauelaw)_____________________     "IPB98(y,2)"
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.1000E+00    
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.6434E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.6434E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.6434E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.5918E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.1834E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      3.2994E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.6434E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.6434E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.6434E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.5918E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.1834E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      3.2994E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      1.0500E+02 OP 
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      1.8217E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      5.0000E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      3.1997E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      1.8217E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      5.0000E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      3.1997E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.1498E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      1.7778E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.7276E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6812E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6812E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.9243E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.9934E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -8123,7 +8123,7 @@
  CS_temperature_margin_lower_limit_normalised_residue____________________ (normres021)__________________      4.2188E-15    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (normres022)__________________      6.8168E-14    
  Peak_toroidal_field_upper_limit___normalised_residue____________________ (normres023)__________________     -1.2212E-15    
- taup/taueff_______________________normalised_residue____________________ (normres024)__________________      5.6399E-14    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (normres024)__________________      5.6399E-14    
  # Final Feasible Point #
  # Plant Availability #
  Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________      1.5000E+01    
@@ -8269,8 +8269,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.1857E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.8143E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.5736E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.7258E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.5736E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.7258E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      5.1000E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -8302,22 +8302,22 @@
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      1.1353E+02 OP 
  Confinement_scaling_law_________________________________________________ (tauelaw)_____________________     "IPB98(y,2)"
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.1000E+00    
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.6434E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.6434E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.6434E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.5918E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.1834E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      3.2994E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.6434E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.6434E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.6434E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.5918E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.1834E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      3.2994E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      1.0500E+02 OP 
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      1.8217E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      5.0000E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      3.1997E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      1.8217E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      5.0000E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      3.1997E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.1498E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      1.7778E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.7276E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6812E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6812E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.9243E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.9934E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -9000,7 +9000,7 @@ icc = 65 * dumpt time by VV stresses
 icc = 60 * OH coil temp margin
 icc = 72 * OH stress limit
 icc = 25 * Max TF field
-icc = 62 * taulimit
+icc = 62 * f_alpha_energy_confinement_min
 
 *---------------Iteration Variables----------------*
 
@@ -9069,7 +9069,7 @@ ixc = 106 * ftmargoh
 ixc = 122 * oh_steel_frac
 ixc = 123 * foh_stress
 ixc = 109 * f_nd_alpha_electron
-ixc = 110 * ftaulimit
+ixc = 110 * falpha_energy_confinement
 
 isweep = 9
 nsweep = 60
@@ -9244,7 +9244,6 @@ i_plasma_current    = 4 * Switch for plasma current scaling to use;
 i_density_limit   = 7 * Switch for density limit to enforce (constraint equation 5);
 i_beta_fast_alpha = 1 * Switch for fast alpha pressure calculation;
 ifispact = 0 * Switch for neutronics calculations;
-iinvqd   = 1 * Switch for inverse quadrature in l-mode scaling laws 5 and 9;
 ipedestal = 1 * Switch for pedestal profiles;
 fgwped = 0.85 * fraction of Greenwald density to set as pedestal-top density
 neped    = 0.678e20 * Electron density of pedestal (/m3) (ipedestal=1) INITIAL VALUE
@@ -9255,7 +9254,7 @@ tbeta    = 2.0 * Temperature profile index beta  (ipedestal=1)
 teped    = 5.5 * Electron temperature of pedestal (kev) (ipedestal=1)
 tesep    = 0.1 * Electron temperature at separatrix (kev) (ipedestal=1)
 iprofile = 1 * Switch for current profile consistency;
-isc      = 34 * Switch for energy confinement time scaling law
+i_confinement_time      = 34 * Switch for energy confinement time scaling law
 i_plasma_geometry   = 0 * Switch for plasma cross-sectional shape calculation: use input kappa & triang
 *kappa = 1.7808
 kappa = 1.848
@@ -9353,4 +9352,4 @@ t_burn    = 1.0d4 * Burn time (s) (calculated if lpulse=1)
                      oh_steel_frac  =  5.7875E-01
                      foh_stress     =  1.0000E+00
                      f_nd_alpha_electron         =  6.8940E-02
-                     ftaulimit      =  1.0000E+00
\ No newline at end of file
+                     falpha_energy_confinement      =  1.0000E+00
\ No newline at end of file
diff --git a/examples/data/scan_example_file_IN.DAT b/examples/data/scan_example_file_IN.DAT
index 25a6c7c19e..c79826c230 100644
--- a/examples/data/scan_example_file_IN.DAT
+++ b/examples/data/scan_example_file_IN.DAT
@@ -151,11 +151,11 @@ icc = 60
 ixc = 106 * ftmargoh
 tmargmin_cs = 1.5
 
-* Lower limit on taup/taueff (ratio alpha particle/energy confinement times) *
+* Lower limit on f_alpha_energy_confinement (ratio alpha particle/energy confinement times) *
 *-------------------------------------------------------------------------------*
 icc = 62 
-ixc = 110 * ftaulimit
-taulimit = 5.0
+ixc = 110 * falpha_energy_confinement
+f_alpha_energy_confinement_min = 5.0
 
 * dump time constraint for VV stresses *
 *--------------------------------------*
@@ -386,8 +386,6 @@ i_density_limit = 7
 * Switch for fast alpha pressure calculation
 i_beta_fast_alpha = 1
 
-* Switch for inverse quadrature in l-mode scaling laws 5 and 9
-iinvqd = 1
 
 * Switch for pedestal profiles
 ipedestal = 1
@@ -420,7 +418,7 @@ tesep = 0.1
 iprofile = 1
 
 * Switch for energy confinement time scaling law
-isc = 34
+i_confinement_time = 34
 
 * Safety factor on axis
 q0 = 1.0
diff --git a/mkdocs.yml b/mkdocs.yml
index b0228303f0..36a7f10dde 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -67,6 +67,7 @@ nav:
                       - Inductive Current: physics-models/plasma_current/inductive_plasma_current.md
                       - Plasma Resistive Heating: physics-models/plasma_current/plasma_resistive_heating.md
               - Confinement time: physics-models/plasma_confinement.md
+              - H-mode: physics-models/plasma_h_mode.md
               - Plasma Core Power Balance: physics-models/plasma_power_balance.md
           - Pulsed Plant Operation: physics-models/pulsed-plant.md
       - Engineering Models:
diff --git a/process/confinement_time.py b/process/confinement_time.py
new file mode 100644
index 0000000000..7654eb7764
--- /dev/null
+++ b/process/confinement_time.py
@@ -0,0 +1,2131 @@
+import numpy as np
+
+
+def neo_alcator_confinement_time(
+    dene20: float, rminor: float, rmajor: float, qstar: float
+) -> float:
+    """
+    Calculate the Nec-Alcator(NA) OH scaling confinement time
+
+    Parameters:
+    dene20 (float): Volume averaged electron density in units of 10**20 m**-3
+    rminor (float): Plasma minor radius [m]
+    rmajor (float): Plasma major radius [m]
+    qstar (float): Equivalent cylindrical edge safety factor
+
+    Returns:
+    float: Neo-Alcator confinement time [s]
+
+    Notes:
+
+    References:
+        - N. A. Uckan, International Atomic Energy Agency, Vienna (Austria)and ITER Physics Group,
+         "ITER physics design guidelines: 1989", no. No. 10. Feb. 1990.
+
+    """
+    return 0.07e0 * dene20 * rminor * rmajor * rmajor * qstar
+
+
+def mirnov_confinement_time(rminor: float, kappa95: float, pcur: float) -> float:
+    """
+    Calculate the Mirnov scaling (H-mode) confinement time
+
+    Parameters:
+    hfact (float): H-factor
+    rminor (float): Plasma minor radius [m]
+    kappa95 (float): Plasma elongation at 95% flux surface
+    pcur (float): Plasma current [MA]
+
+    Returns:
+    float: Mirnov scaling confinement time [s]
+
+    Notes:
+
+    References:
+        - N. A. Uckan, International Atomic Energy Agency, Vienna (Austria)and ITER Physics Group,
+         "ITER physics design guidelines: 1989", no. No. 10. Feb. 1990.
+    """
+    return 0.2e0 * rminor * np.sqrt(kappa95) * pcur
+
+
+def merezhkin_muhkovatov_confinement_time(
+    rmajor: float,
+    rminor: float,
+    kappa95: float,
+    qstar: float,
+    dnla20: float,
+    afuel: float,
+    ten: float,
+) -> float:
+    """
+    Calculate the Merezhkin-Mukhovatov (MM) OH/L-mode scaling confinement time
+
+    Parameters:
+    rmajor (float): Plasma major radius [m]
+    rminor (float): Plasma minor radius [m]
+    kappa95 (float): Plasma elongation at 95% flux surface
+    qstar (float): Equivalent cylindrical edge safety factor
+    dnla20 (float): Line averaged electron density in units of 10**20 m**-3
+    afuel (float): Fuel atomic mass number
+    ten (float): Electron temperature [keV]
+
+    Returns:
+    float: Merezhkin-Mukhovatov confinement time [s]
+
+     Notes:
+
+    References:
+        - N. A. Uckan, International Atomic Energy Agency, Vienna (Austria)and ITER Physics Group,
+         "ITER physics design guidelines: 1989", no. No. 10. Feb. 1990.
+    """
+    return (
+        3.5e-3
+        * rmajor**2.75e0
+        * rminor**0.25e0
+        * kappa95**0.125e0
+        * qstar
+        * dnla20
+        * np.sqrt(afuel)
+        / np.sqrt(ten / 10.0e0)
+    )
+
+
+def shimomura_confinement_time(
+    rmajor: float, rminor: float, bt: float, kappa95: float, afuel: float
+) -> float:
+    """
+    Calculate the  Shimomura (S) optimized H-mode scaling confinement time
+
+    Parameters:
+    rmajor (float): Plasma major radius [m]
+    rminor (float): Plasma minor radius [m]
+    bt (float): Toroidal magnetic field [T]
+    kappa95 (float): Plasma elongation at 95% flux surface
+    afuel (float): Fuel atomic mass number
+
+    Returns:
+    float: Shimomura confinement time [s]
+
+    Notes:
+
+    References:
+        - N. A. Uckan, International Atomic Energy Agency, Vienna (Austria)and ITER Physics Group,
+         "ITER physics design guidelines: 1989", no. No. 10. Feb. 1990.
+    """
+    return 0.045e0 * rmajor * rminor * bt * np.sqrt(kappa95) * np.sqrt(afuel)
+
+
+def kaye_goldston_confinement_time(
+    kappa95: float,
+    pcur: float,
+    n20: float,
+    rmajor: float,
+    afuel: float,
+    bt: float,
+    rminor: float,
+    p_plasma_loss_mw: float,
+) -> float:
+    """
+    Calculate the Kaye-Goldston (KG) L-mode scaling confinement time
+
+    Parameters:
+    hfact (float): H-factor
+    kappa95 (float): Plasma elongation at 95% flux surface
+    pcur (float): Plasma current [MA]
+    n20 (float): Line averaged electron density in units of 10**20 m**-3
+    rmajor (float): Plasma major radius [m]
+    afuel (float): Fuel atomic mass number
+    bt (float): Toroidal magnetic field [T]
+    rminor (float): Plasma minor radius [m]
+    p_plasma_loss_mw (float): Net Heating power [MW]
+
+    Returns:
+    float: Kaye-Goldston confinement time [s]
+
+    Notes:
+        - An isotope correction factor (M_i/1.5)^0.5 is added to the original scaling to reflect the fact
+          that the empirical fits to the data were from experiments with H and D mixture, M_i = 1.5
+
+    References:
+        - N. A. Uckan, International Atomic Energy Agency, Vienna (Austria)and ITER Physics Group,
+         "ITER physics design guidelines: 1989", no. No. 10. Feb. 1990.
+    """
+    return (
+        0.055e0
+        * kappa95**0.28e0
+        * pcur**1.24e0
+        * n20**0.26e0
+        * rmajor**1.65e0
+        * np.sqrt(afuel / 1.5e0)
+        / (bt**0.09e0 * rminor**0.49e0 * p_plasma_loss_mw**0.58e0)
+    )
+
+
+def iter_89p_confinement_time(
+    pcur: float,
+    rmajor: float,
+    rminor: float,
+    kappa: float,
+    dnla20: float,
+    bt: float,
+    afuel: float,
+    p_plasma_loss_mw: float,
+) -> float:
+    """
+    Calculate the ITER Power scaling - ITER 89-P (L-mode) confinement time
+
+    Parameters:
+    pcur (float): Plasma current [MA]
+    rmajor (float): Plasma major radius [m]
+    rminor (float): Plasma minor radius [m]
+    kappa (float): Plasma elongation
+    dnla20 (float): Line averaged electron density in units of 10**20 m**-3
+    bt (float): Toroidal magnetic field [T]
+    afuel (float): Fuel atomic mass number
+    p_plasma_loss_mw (float): Net Heating power [MW]
+
+    Returns:
+    float: ITER 89-P confinement time [s]
+
+    Notes:
+
+    References:
+        - T.C.Hender et.al., 'Physics Assesment of the European Reactor Study', AEA FUS 172, 1992
+
+        - N. A. Uckan, International Atomic Energy Agency, Vienna (Austria)and ITER Physics Group,
+          "ITER physics design guidelines: 1989", no. No. 10. Feb. 1990.
+    """
+    return (
+        0.048e0
+        * pcur**0.85e0
+        * rmajor**1.2e0
+        * rminor**0.3e0
+        * np.sqrt(kappa)
+        * dnla20**0.1e0
+        * bt**0.2e0
+        * np.sqrt(afuel)
+        / np.sqrt(p_plasma_loss_mw)
+    )
+
+
+def iter_89_0_confinement_time(
+    pcur: float,
+    rmajor: float,
+    rminor: float,
+    kappa: float,
+    dnla20: float,
+    bt: float,
+    afuel: float,
+    p_plasma_loss_mw: float,
+) -> float:
+    """
+    Calculate the ITER Offset linear scaling - ITER 89-O (L-mode) confinement time
+
+    Parameters:
+    pcur (float): Plasma current [MA]
+    rmajor (float): Plasma major radius [m]
+    rminor (float): Plasma minor radius [m]
+    kappa (float): Plasma elongation
+    dnla20 (float): Line averaged electron density in units of 10**20 m**-3
+    bt (float): Toroidal magnetic field [T]
+    afuel (float): Fuel atomic mass number
+    p_plasma_loss_mw (float): Net Heating power [MW]
+
+    Returns:
+    float: ITER 89-O confinement time [s]
+
+    Notes:
+
+    References:
+        - T.C.Hender et.al., 'Physics Assesment of the European Reactor Study', AEA FUS 172, 1992
+
+    """
+    term1 = (
+        0.04e0
+        * pcur**0.5e0
+        * rmajor**0.3e0
+        * rminor**0.8e0
+        * kappa**0.6e0
+        * afuel**0.5e0
+    )
+    term2 = (
+        0.064e0
+        * pcur**0.8e0
+        * rmajor**1.6e0
+        * rminor**0.6e0
+        * kappa**0.5e0
+        * dnla20**0.6e0
+        * bt**0.35e0
+        * afuel**0.2e0
+        / p_plasma_loss_mw
+    )
+    return term1 + term2
+
+
+def rebut_lallia_confinement_time(
+    rminor: float,
+    rmajor: float,
+    kappa: float,
+    afuel: float,
+    pcur: float,
+    zeff: float,
+    dnla20: float,
+    bt: float,
+    p_plasma_loss_mw: float,
+) -> float:
+    """
+    Calculate the Rebut-Lallia offset linear scaling (L-mode) confinement time
+
+    Parameters:
+    rminor (float): Plasma minor radius [m]
+    rmajor (float): Plasma major radius [m]
+    kappa (float): Plasma elongation at 95% flux surface
+    afuel (float): Fuel atomic mass number
+    pcur (float): Plasma current [MA]
+    zeff (float): Effective charge
+    dnla20 (float): Line averaged electron density in units of 10**20 m**-3
+    bt (float): Toroidal magnetic field [T]
+    p_plasma_loss_mw (float): Net Heating power [MW]
+
+    Returns:
+    float: Rebut-Lallia confinement time [s]
+
+    Notes:
+
+    References:
+        - T.C.Hender et.al., 'Physics Assesment of the European Reactor Study', AEA FUS 172, 1992
+    """
+    rll = (rminor**2 * rmajor * kappa) ** (1.0e0 / 3.0e0)
+    term1 = 1.2e-2 * pcur * rll**1.5e0 / np.sqrt(zeff)
+    term2 = (
+        0.146e0
+        * dnla20**0.75e0
+        * np.sqrt(pcur)
+        * np.sqrt(bt)
+        * rll**2.75e0
+        * zeff**0.25e0
+        / p_plasma_loss_mw
+    )
+    return 1.65e0 * np.sqrt(afuel / 2.0e0) * (term1 + term2)
+
+
+def goldston_confinement_time(
+    pcur: float,
+    rmajor: float,
+    rminor: float,
+    kappa95: float,
+    afuel: float,
+    p_plasma_loss_mw: float,
+) -> float:
+    """
+    Calculate the Goldston scaling (L-mode) confinement time
+
+    Parameters:
+    pcur (float): Plasma current [MA]
+    rmajor (float): Plasma major radius [m]
+    rminor (float): Plasma minor radius [m]
+    kappa95 (float): Plasma elongation at 95% flux surface
+    afuel (float): Fuel atomic mass number
+    p_plasma_loss_mw (float): Net Heating power [MW]
+
+    Returns:
+    float: Goldston confinement time [s]
+
+    Notes:
+
+    References:
+        - N. A. Uckan, International Atomic Energy Agency, Vienna (Austria)and ITER Physics Group,
+        "ITER physics design guidelines: 1989", no. No. 10. Feb. 1990.
+
+    """
+    return (
+        0.037e0
+        * pcur
+        * rmajor**1.75e0
+        * rminor ** (-0.37e0)
+        * np.sqrt(kappa95)
+        * np.sqrt(afuel / 1.5e0)
+        / np.sqrt(p_plasma_loss_mw)
+    )
+
+
+def t10_confinement_time(
+    dnla20: float,
+    rmajor: float,
+    qstar: float,
+    bt: float,
+    rminor: float,
+    kappa95: float,
+    p_plasma_loss_mw: float,
+    zeff: float,
+    pcur: float,
+) -> float:
+    """
+    Calculate the T-10 scaling confinement time
+
+    Parameters:
+    dnla20 (float): Line averaged electron density in units of 10**20 m**-3
+    rmajor (float): Plasma major radius [m]
+    qstar (float): Equivalent cylindrical edge safety factor
+    bt (float): Toroidal magnetic field [T]
+    rminor (float): Plasma minor radius [m]
+    kappa95 (float): Plasma elongation at 95% flux surface
+    p_plasma_loss_mw (float): Net Heating power [MW]
+    zeff (float): Effective charge
+    pcur (float): Plasma current [MA]
+
+    Returns:
+    float: T-10 confinement time [s]
+
+    Notes:
+
+    References:
+        - N. A. Uckan, International Atomic Energy Agency, Vienna (Austria)and ITER Physics Group,
+            "ITER physics design guidelines: 1989", no. No. 10. Feb. 1990.
+    """
+    denfac = dnla20 * rmajor * qstar / (1.3e0 * bt)
+    denfac = min(1.0e0, denfac)
+    return (
+        0.095e0
+        * rmajor
+        * rminor
+        * bt
+        * np.sqrt(kappa95)
+        * denfac
+        / p_plasma_loss_mw**0.4e0
+        * (zeff**2 * pcur**4 / (rmajor * rminor * qstar**3 * kappa95**1.5e0)) ** 0.08e0
+    )
+
+
+def jaeri_confinement_time(
+    kappa95: float,
+    rminor: float,
+    afuel: float,
+    n20: float,
+    pcur: float,
+    bt: float,
+    rmajor: float,
+    qstar: float,
+    zeff: float,
+    p_plasma_loss_mw: float,
+) -> float:
+    """
+    Calculate the JAERI / Odajima-Shimomura L-mode scaling confinement time
+
+    Parameters:
+    kappa95 (float): Plasma elongation at 95% flux surface
+    rminor (float): Plasma minor radius [m]
+    afuel (float): Fuel atomic mass number
+    n20 (float): Line averaged electron density in units of 10**20 m**-3
+    pcur (float): Plasma current [MA]
+    bt (float): Toroidal magnetic field [T]
+    rmajor (float): Plasma major radius [m]
+    qstar (float): Equivalent cylindrical edge safety factor
+    zeff (float): Effective charge
+    p_plasma_loss_mw (float): Net Heating power [MW]
+
+    Returns:
+    float: JAERI confinement time [s]
+
+    Notes:
+
+    References:
+        - N. A. Uckan, International Atomic Energy Agency, Vienna (Austria)and ITER Physics Group,
+          "ITER physics design guidelines: 1989", no. No. 10. Feb. 1990.
+    """
+    gjaeri = (
+        zeff**0.4e0
+        * ((15.0e0 - zeff) / 20.0e0) ** 0.6e0
+        * (3.0e0 * qstar * (qstar + 5.0e0) / ((qstar + 2.0e0) * (qstar + 7.0e0)))
+        ** 0.6e0
+    )
+    return (
+        0.085e0 * kappa95 * rminor**2 * np.sqrt(afuel)
+        + 0.069e0
+        * n20**0.6e0
+        * pcur
+        * bt**0.2e0
+        * rminor**0.4e0
+        * rmajor**1.6e0
+        * np.sqrt(afuel)
+        * gjaeri
+        * kappa95**0.2e0
+        / p_plasma_loss_mw
+    )
+
+
+def kaye_big_confinement_time(
+    rmajor: float,
+    rminor: float,
+    bt: float,
+    kappa95: float,
+    pcur: float,
+    n20: float,
+    afuel: float,
+    p_plasma_loss_mw: float,
+) -> float:
+    """
+    Calculate the Kaye-Big scaling confinement time
+
+    Parameters:
+    rmajor (float): Plasma major radius [m]
+    rminor (float): Plasma minor radius [m]
+    bt (float): Toroidal magnetic field [T]
+    kappa95 (float): Plasma elongation at 95% flux surface
+    pcur (float): Plasma current [MA]
+    n20 (float): Line averaged electron density in units of 10**20 m**-3
+    afuel (float): Fuel atomic mass number
+    p_plasma_loss_mw (float): Net Heating power [MW]
+
+    Returns:
+    float: Kaye-Big confinement time [s]
+
+    Notes:
+
+    References:
+        - N. A. Uckan, International Atomic Energy Agency, Vienna (Austria)and ITER Physics Group,
+            "ITER physics design guidelines: 1989", no. No. 10. Feb. 1990.
+    """
+    return (
+        0.105e0
+        * np.sqrt(rmajor)
+        * rminor**0.8e0
+        * bt**0.3e0
+        * kappa95**0.25e0
+        * pcur**0.85e0
+        * n20**0.1e0
+        * np.sqrt(afuel)
+        / np.sqrt(p_plasma_loss_mw)
+    )
+
+
+def iter_h90_p_confinement_time(
+    pcur: float,
+    rmajor: float,
+    rminor: float,
+    kappa: float,
+    dnla20: float,
+    bt: float,
+    afuel: float,
+    p_plasma_loss_mw: float,
+) -> float:
+    """
+    Calculate the ITER H-mode scaling - ITER H90-P confinement time
+
+    Parameters:
+    pcur (float): Plasma current [MA]
+    rmajor (float): Plasma major radius [m]
+    rminor (float): Plasma minor radius [m]
+    kappa (float): Plasma elongation
+    dnla20 (float): Line averaged electron density in units of 10**20 m**-3
+    bt (float): Toroidal magnetic field [T]
+    afuel (float): Fuel atomic mass number
+    p_plasma_loss_mw (float): Net Heating power [MW]
+
+    Returns:
+    float: ITER H90-P confinement time [s]
+
+    Notes:
+
+    References:
+        - T.C.Hender et.al., 'Physics Assesment of the European Reactor Study', AEA FUS 172, 1992
+    """
+    return (
+        0.064e0
+        * pcur**0.87e0
+        * rmajor**1.82e0
+        * rminor ** (-0.12e0)
+        * kappa**0.35e0
+        * dnla20**0.09e0
+        * bt**0.15e0
+        * np.sqrt(afuel)
+        / np.sqrt(p_plasma_loss_mw)
+    )
+
+
+def riedel_l_confinement_time(
+    pcur: float,
+    rmajor: float,
+    rminor: float,
+    kappa95: float,
+    dnla20: float,
+    bt: float,
+    p_plasma_loss_mw: float,
+) -> float:
+    """
+    Calculate the Riedel scaling (L-mode) confinement time
+
+    Parameters:
+    pcur (float): Plasma current [MA]
+    rmajor (float): Plasma major radius [m]
+    rminor (float): Plasma minor radius [m]
+    kappa95 (float): Plasma elongation at 95% flux surface
+    dnla20 (float): Line averaged electron density in units of 10**20 m**-3
+    bt (float): Toroidal magnetic field [T]
+    p_plasma_loss_mw (float): Net Heating power [MW]
+
+    Returns:
+    float: Riedel confinement time [s]
+
+    Notes:
+
+    References:
+        - T.C.Hender et.al., 'Physics Assesment of the European Reactor Study', AEA FUS 172, 1992
+    """
+    return (
+        0.044e0
+        * pcur**0.93e0
+        * rmajor**1.37e0
+        * rminor ** (-0.049e0)
+        * kappa95**0.588e0
+        * dnla20**0.078e0
+        * bt**0.152e0
+        / p_plasma_loss_mw**0.537e0
+    )
+
+
+def christiansen_confinement_time(
+    pcur: float,
+    rmajor: float,
+    rminor: float,
+    kappa95: float,
+    dnla20: float,
+    bt: float,
+    p_plasma_loss_mw: float,
+    afuel: float,
+) -> float:
+    """
+    Calculate the Christiansen et al scaling (L-mode) confinement time
+
+    Parameters:
+    pcur (float): Plasma current [MA]
+    rmajor (float): Plasma major radius [m]
+    rminor (float): Plasma minor radius [m]
+    kappa95 (float): Plasma elongation at 95% flux surface
+    dnla20 (float): Line averaged electron density in units of 10**20 m**-3
+    bt (float): Toroidal magnetic field [T]
+    p_plasma_loss_mw (float): Net Heating power [MW]
+    afuel (float): Fuel atomic mass number
+
+    Returns:
+    float: Christiansen confinement time [s]
+
+    Notes:
+
+    References:
+        - T.C.Hender et.al., 'Physics Assesment of the European Reactor Study', AEA FUS 172, 1992
+    """
+    return (
+        0.24e0
+        * pcur**0.79e0
+        * rmajor**0.56e0
+        * rminor**1.46e0
+        * kappa95**0.73e0
+        * dnla20**0.41e0
+        * bt**0.29e0
+        / (p_plasma_loss_mw**0.79e0 * afuel**0.02e0)
+    )
+
+
+def lackner_gottardi_confinement_time(
+    pcur: float,
+    rmajor: float,
+    rminor: float,
+    kappa95: float,
+    dnla20: float,
+    bt: float,
+    p_plasma_loss_mw: float,
+) -> float:
+    """
+    Calculate the Lackner-Gottardi scaling (L-mode) confinement time
+
+    Parameters:
+    pcur (float): Plasma current [MA]
+    rmajor (float): Plasma major radius [m]
+    rminor (float): Plasma minor radius [m]
+    kappa95 (float): Plasma elongation at 95% flux surface
+    dnla20 (float): Line averaged electron density in units of 10**20 m**-3
+    bt (float): Toroidal magnetic field [T]
+    p_plasma_loss_mw (float): Net Heating power [MW]
+
+    Returns:
+    float: Lackner-Gottardi confinement time [s]
+
+    Notes:
+
+    References:
+        - T.C.Hender et.al., 'Physics Assesment of the European Reactor Study', AEA FUS 172, 1992
+
+    """
+    qhat = (1.0e0 + kappa95**2) * rminor**2 * bt / (0.4e0 * pcur * rmajor)
+    return (
+        0.12e0
+        * pcur**0.8e0
+        * rmajor**1.8e0
+        * rminor**0.4e0
+        * kappa95
+        * (1.0e0 + kappa95) ** (-0.8e0)
+        * dnla20**0.6e0
+        * qhat**0.4e0
+        / p_plasma_loss_mw**0.6e0
+    )
+
+
+def neo_kaye_confinement_time(
+    pcur: float,
+    rmajor: float,
+    rminor: float,
+    kappa95: float,
+    dnla20: float,
+    bt: float,
+    p_plasma_loss_mw: float,
+) -> float:
+    """
+    Calculate the Neo-Kaye scaling (L-mode) confinement time
+
+    Parameters:
+    pcur (float): Plasma current [MA]
+    rmajor (float): Plasma major radius [m]
+    rminor (float): Plasma minor radius [m]
+    kappa95 (float): Plasma elongation at 95% flux surface
+    dnla20 (float): Line averaged electron density in units of 10**20 m**-3
+    bt (float): Toroidal magnetic field [T]
+    p_plasma_loss_mw (float): Net Heating power [MW]
+
+    Returns:
+    float: Neo-Kaye confinement time [s]
+
+    Notes:
+
+    References:
+        - T.C.Hender et.al., 'Physics Assesment of the European Reactor Study', AEA FUS 172, 1992
+    """
+    return (
+        0.063e0
+        * pcur**1.12e0
+        * rmajor**1.3e0
+        * rminor ** (-0.04e0)
+        * kappa95**0.28e0
+        * dnla20**0.14e0
+        * bt**0.04e0
+        / p_plasma_loss_mw**0.59e0
+    )
+
+
+def riedel_h_confinement_time(
+    pcur: float,
+    rmajor: float,
+    rminor: float,
+    kappa95: float,
+    dnla20: float,
+    bt: float,
+    afuel: float,
+    p_plasma_loss_mw: float,
+) -> float:
+    """
+    Calculate the Riedel scaling (H-mode) confinement time
+
+    Parameters:
+    pcur (float): Plasma current [MA]
+    rmajor (float): Plasma major radius [m]
+    rminor (float): Plasma minor radius [m]
+    kappa95 (float): Plasma elongation at 95% flux surface
+    dnla20 (float): Line averaged electron density in units of 10**20 m**-3
+    bt (float): Toroidal magnetic field [T]
+    afuel (float): Fuel atomic mass number
+    p_plasma_loss_mw (float): Net Heating power [MW]
+
+    Returns:
+    float: Riedel H-mode confinement time [s]
+
+    Notes:
+
+    References:
+        - T.C.Hender et.al., 'Physics Assesment of the European Reactor Study', AEA FUS 172, 1992
+    """
+    return (
+        0.1e0
+        * np.sqrt(afuel)
+        * pcur**0.884e0
+        * rmajor**1.24e0
+        * rminor ** (-0.23e0)
+        * kappa95**0.317e0
+        * bt**0.207e0
+        * dnla20**0.105e0
+        / p_plasma_loss_mw**0.486e0
+    )
+
+
+def iter_h90_p_amended_confinement_time(
+    pcur: float,
+    bt: float,
+    afuel: float,
+    rmajor: float,
+    p_plasma_loss_mw: float,
+    kappa: float,
+) -> float:
+    """
+        Calculate the amended ITER H90-P confinement time
+
+        Parameters:
+        pcur (float): Plasma current [MA]
+        bt (float): Toroidal magnetic field [T]
+        afuel (float): Fuel atomic mass number
+        rmajor (float): Plasma major radius [m]
+        p_plasma_loss_mw (float): Net Heating power [MW]
+        kappa (float): Plasma elongation
+
+        Returns:
+        float: Amended ITER H90-P confinement time [s]
+
+        Notes:
+
+        References:
+            - J. P. Christiansen et al., “Global energy confinement H-mode database for ITER,”
+            Nuclear Fusion, vol. 32, no. 2, pp. 291-338, Feb. 1992,
+            doi: https://doi.org/10.1088/0029-5515/32/2/i11.
+    ‌
+    """
+    return (
+        0.082e0
+        * pcur**1.02e0
+        * bt**0.15e0
+        * np.sqrt(afuel)
+        * rmajor**1.60e0
+        / (p_plasma_loss_mw**0.47e0 * kappa**0.19e0)
+    )
+
+
+def sudo_et_al_confinement_time(
+    rmajor: float,
+    rminor: float,
+    dnla20: float,
+    bt: float,
+    p_plasma_loss_mw: float,
+) -> float:
+    """
+        Calculate the Sudo et al. scaling confinement time
+
+        Parameters:
+        rmajor (float): Plasma major radius [m]
+        rminor (float): Plasma minor radius [m]
+        dnla20 (float): Line averaged electron density in units of 10**20 m**-3
+        bt (float): Toroidal magnetic field [T]
+        p_plasma_loss_mw (float): Net Heating power [MW]
+
+        Returns:
+        float: Sudo et al. confinement time [s]
+
+        Notes:
+
+        References:
+            - S. Sudo et al., “Scalings of energy confinement and density limit in stellarator/heliotron devices,”
+            Nuclear Fusion, vol. 30, no. 1, pp. 11-21, Jan. 1990,
+            doi: https://doi.org/10.1088/0029-5515/30/1/002.
+    ‌"""
+
+    return (
+        0.17e0
+        * rmajor**0.75e0
+        * rminor**2
+        * dnla20**0.69e0
+        * bt**0.84e0
+        * p_plasma_loss_mw ** (-0.58e0)
+    )
+
+
+def gyro_reduced_bohm_confinement_time(
+    bt: float,
+    dnla20: float,
+    p_plasma_loss_mw: float,
+    rminor: float,
+    rmajor: float,
+) -> float:
+    """
+    Calculate the Gyro-reduced Bohm scaling confinement time
+
+    Parameters:
+    bt (float): Toroidal magnetic field [T]
+    dnla20 (float): Line averaged electron density in units of 10**20 m**-3
+    p_plasma_loss_mw (float): Net Heating power [MW]
+    rminor (float): Plasma minor radius [m]
+    rmajor (float): Plasma major radius [m]
+
+    Returns:
+    float: Gyro-reduced Bohm confinement time [s]
+
+    Notes:
+
+    References:
+        - Goldston, R. J., H. Biglari, and G. W. Hammett. "E x B/B 2 vs. µ B/B as the Cause of Transport in Tokamaks."
+          Bull. Am. Phys. Soc 34 (1989): 1964.
+    """
+    return (
+        0.25e0
+        * bt**0.8e0
+        * dnla20**0.6e0
+        * p_plasma_loss_mw ** (-0.6e0)
+        * rminor**2.4e0
+        * rmajor**0.6e0
+    )
+
+
+def lackner_gottardi_stellarator_confinement_time(
+    rmajor: float,
+    rminor: float,
+    dnla20: float,
+    bt: float,
+    p_plasma_loss_mw: float,
+    q: float,
+) -> float:
+    """
+        Calculate the Lackner-Gottardi stellarator scaling confinement time
+
+        Parameters:
+        rmajor (float): Plasma major radius [m]
+        rminor (float): Plasma minor radius [m]
+        dnla20 (float): Line averaged electron density in units of 10**20 m**-3
+        bt (float): Toroidal magnetic field [T]
+        p_plasma_loss_mw (float): Net Heating power [MW]
+        q (float): Edge safety factor
+
+        Returns:
+        float: Lackner-Gottardi stellarator confinement time [s]
+
+        Notes:
+
+        References:
+            - K. Lackner and N. A. O. Gottardi, “Tokamak confinement in relation to plateau scaling,”
+            Nuclear Fusion, vol. 30, no. 4, pp. 767-770, Apr. 1990,
+            doi: https://doi.org/10.1088/0029-5515/30/4/018.
+    ‌
+    """
+    return (
+        0.17e0
+        * rmajor
+        * rminor**2
+        * dnla20**0.6e0
+        * bt**0.8e0
+        * p_plasma_loss_mw ** (-0.6e0)
+        * q**0.4e0
+    )
+
+
+def iter_93h_confinement_time(
+    pcur: float,
+    bt: float,
+    p_plasma_loss_mw: float,
+    afuel: float,
+    rmajor: float,
+    dnla20: float,
+    aspect: float,
+    kappa: float,
+) -> float:
+    """
+    Calculate the ITER-93H scaling ELM-free confinement time
+
+    Parameters:
+    pcur (float): Plasma current [MA]
+    bt (float): Toroidal magnetic field [T]
+    p_plasma_loss_mw (float): Net Heating power [MW]
+    afuel (float): Fuel atomic mass number
+    rmajor (float): Plasma major radius [m]
+    dnla20 (float): Line averaged electron density in units of 10**20 m**-3
+    aspect (float): Aspect ratio
+    kappa (float): Plasma elongation
+
+    Returns:
+    float: ITER-93H confinement time [s]
+
+    Notes:
+
+    References:
+        - K. Thomsen et al., “ITER H mode confinement database update,”
+        vol. 34, no. 1, pp. 131-167, Jan. 1994, doi: https://doi.org/10.1088/0029-5515/34/1/i10.
+
+    """
+    return (
+        0.036e0
+        * pcur**1.06e0
+        * bt**0.32e0
+        * p_plasma_loss_mw ** (-0.67e0)
+        * afuel**0.41e0
+        * rmajor**1.79e0
+        * dnla20**0.17e0
+        * aspect**0.11e0
+        * kappa**0.66e0
+    )
+
+
+def iter_h97p_confinement_time(
+    pcur: float,
+    bt: float,
+    p_plasma_loss_mw: float,
+    dnla19: float,
+    rmajor: float,
+    aspect: float,
+    kappa: float,
+    afuel: float,
+) -> float:
+    """
+        Calculate the ELM-free ITER H-mode scaling - ITER H97-P confinement time
+
+        Parameters:
+        pcur (float): Plasma current [MA]
+        bt (float): Toroidal magnetic field [T]
+        p_plasma_loss_mw (float): Net Heating power [MW]
+        dnla19 (float): Line averaged electron density in units of 10**19 m**-3
+        rmajor (float): Plasma major radius [m]
+        aspect (float): Aspect ratio
+        kappa (float): Plasma elongation
+        afuel (float): Fuel atomic mass number
+
+        Returns:
+        float: ITER H97-P confinement time [s]
+
+        Notes:
+
+        References:
+            - I. C. Database and M. W. G. (presented Cordey), “Energy confinement scaling and the extrapolation to ITER,”
+            Plasma Physics and Controlled Fusion, vol. 39, no. 12B, pp. B115-B127, Dec. 1997,
+            doi: https://doi.org/10.1088/0741-3335/39/12b/009.
+    ‌
+    """
+    return (
+        0.031e0
+        * pcur**0.95e0
+        * bt**0.25e0
+        * p_plasma_loss_mw ** (-0.67e0)
+        * dnla19**0.35e0
+        * rmajor**1.92e0
+        * aspect ** (-0.08e0)
+        * kappa**0.63e0
+        * afuel**0.42e0
+    )
+
+
+def iter_h97p_elmy_confinement_time(
+    pcur: float,
+    bt: float,
+    p_plasma_loss_mw: float,
+    dnla19: float,
+    rmajor: float,
+    aspect: float,
+    kappa: float,
+    afuel: float,
+) -> float:
+    """
+    Calculate the ELMy ITER H-mode scaling - ITER H97-P(y) confinement time
+
+    Parameters:
+    pcur (float): Plasma current [MA]
+    bt (float): Toroidal magnetic field [T]
+    p_plasma_loss_mw (float): Net Heating power [MW]
+    dnla19 (float): Line averaged electron density in units of 10**19 m**-3
+    rmajor (float): Plasma major radius [m]
+    aspect (float): Aspect ratio
+    kappa (float): Plasma elongation
+    afuel (float): Fuel atomic mass number
+
+    Returns:
+    float: ITER H97-P(y) confinement time [s]
+
+    Notes:
+
+    References:
+        - I. C. Database and M. W. G. (presented Cordey), “Energy confinement scaling and the extrapolation to ITER,”
+          Plasma Physics and Controlled Fusion, vol. 39, no. 12B, pp. B115-B127, Dec. 1997,
+          doi: https://doi.org/10.1088/0741-3335/39/12b/009.
+
+        - International Atomic Energy Agency, Vienna (Austria), "Technical basis for the ITER final design report, cost review and safety analysis (FDR)",
+        no.16. Dec. 1998.
+    """
+    return (
+        0.029e0
+        * pcur**0.90e0
+        * bt**0.20e0
+        * p_plasma_loss_mw ** (-0.66e0)
+        * dnla19**0.40e0
+        * rmajor**2.03e0
+        * aspect ** (-0.19e0)
+        * kappa**0.92e0
+        * afuel**0.2e0
+    )
+
+
+def iter_96p_confinement_time(
+    pcur: float,
+    bt: float,
+    kappa95: float,
+    rmajor: float,
+    aspect: float,
+    dnla19: float,
+    afuel: float,
+    p_plasma_loss_mw: float,
+) -> float:
+    """
+        Calculate the ITER-96P (= ITER-97L) L-mode scaling confinement time
+
+        Parameters:
+        pcur (float): Plasma current [MA]
+        bt (float): Toroidal magnetic field [T]
+        kappa95 (float): Plasma elongation at 95% flux surface
+        rmajor (float): Plasma major radius [m]
+        aspect (float): Aspect ratio
+        dnla19 (float): Line averaged electron density in units of 10**19 m**-3
+        afuel (float): Fuel atomic mass number
+        p_plasma_loss_mw (float): Net Heating power [MW]
+
+        Returns:
+        float: ITER-96P confinement time [s]
+
+        Notes:
+            - The thermal energy confinement time is given below
+
+        References:
+            - S. B. Kaye et al., “ITER L mode confinement database,”
+            Nuclear Fusion, vol. 37, no. 9, pp. 1303-1328, Sep. 1997,
+            doi: https://doi.org/10.1088/0029-5515/37/9/i10.
+    ‌
+    """
+    return (
+        0.023e0
+        * pcur**0.96e0
+        * bt**0.03e0
+        * kappa95**0.64e0
+        * rmajor**1.83e0
+        * aspect**0.06e0
+        * dnla19**0.40e0
+        * afuel**0.20e0
+        * p_plasma_loss_mw ** (-0.73e0)
+    )
+
+
+def valovic_elmy_confinement_time(
+    pcur: float,
+    bt: float,
+    dnla19: float,
+    afuel: float,
+    rmajor: float,
+    rminor: float,
+    kappa: float,
+    p_plasma_loss_mw: float,
+) -> float:
+    """
+    Calculate the Valovic modified ELMy-H mode scaling confinement time
+
+    Parameters:
+    hfact (float): H-factor
+    pcur (float): Plasma current [MA]
+    bt (float): Toroidal magnetic field [T]
+    dnla19 (float): Line averaged electron density in units of 10**19 m**-3
+    afuel (float): Fuel atomic mass number
+    rmajor (float): Plasma major radius [m]
+    rminor (float): Plasma minor radius [m]
+    kappa (float): Plasma elongation
+    p_plasma_loss_mw (float): Net Heating power [MW]
+
+    Returns:
+    float: Valovic modified ELMy-H mode confinement time [s]
+
+    Notes:
+
+    References:
+    """
+    return (
+        0.067e0
+        * pcur**0.9e0
+        * bt**0.17e0
+        * dnla19**0.45e0
+        * afuel**0.05e0
+        * rmajor**1.316e0
+        * rminor**0.79e0
+        * kappa**0.56e0
+        * p_plasma_loss_mw ** (-0.68e0)
+    )
+
+
+def kaye_confinement_time(
+    pcur: float,
+    bt: float,
+    kappa: float,
+    rmajor: float,
+    aspect: float,
+    dnla19: float,
+    afuel: float,
+    p_plasma_loss_mw: float,
+) -> float:
+    """
+    Calculate the Kaye PPPL Workshop April 1998 L-mode scaling confinement time
+
+    Parameters:
+    pcur (float): Plasma current [MA]
+    bt (float): Toroidal magnetic field [T]
+    kappa (float): Plasma elongation
+    rmajor (float): Plasma major radius [m]
+    aspect (float): Aspect ratio
+    dnla19 (float): Line averaged electron density in units of 10**19 m**-3
+    afuel (float): Fuel atomic mass number
+    p_plasma_loss_mw (float): Net Heating power [MW]
+
+    Returns:
+    float: Kaye PPPL Workshop confinement time [s]
+
+    Notes:
+
+    References:
+        - Kaye PPPL Workshop April 1998
+    """
+    return (
+        0.021e0
+        * pcur**0.81e0
+        * bt**0.14e0
+        * kappa**0.7e0
+        * rmajor**2.01e0
+        * aspect ** (-0.18e0)
+        * dnla19**0.47e0
+        * afuel**0.25e0
+        * p_plasma_loss_mw ** (-0.73e0)
+    )
+
+
+def iter_pb98py_confinement_time(
+    pcur: float,
+    bt: float,
+    dnla19: float,
+    p_plasma_loss_mw: float,
+    rmajor: float,
+    kappa: float,
+    aspect: float,
+    afuel: float,
+) -> float:
+    """
+    Calculate the ITERH-PB98P(y) ELMy H-mode scaling confinement time
+
+    Parameters:
+    pcur (float): Plasma current [MA]
+    bt (float): Toroidal magnetic field [T]
+    dnla19 (float): Line averaged electron density in units of 10**19 m**-3
+    p_plasma_loss_mw (float): Net Heating power [MW]
+    rmajor (float): Plasma major radius [m]
+    kappa (float): Plasma elongation
+    aspect (float): Aspect ratio
+    afuel (float): Fuel atomic mass number
+
+    Returns:
+    float: ITERH-PB98P(y) ELMy H-mode confinement time [s]
+
+    Notes:
+
+    References:
+
+    """
+    return (
+        0.0615e0
+        * pcur**0.9e0
+        * bt**0.1e0
+        * dnla19**0.4e0
+        * p_plasma_loss_mw ** (-0.66e0)
+        * rmajor**2
+        * kappa**0.75e0
+        * aspect ** (-0.66e0)
+        * afuel**0.2e0
+    )
+
+
+def iter_ipb98y_confinement_time(
+    pcur: float,
+    bt: float,
+    dnla19: float,
+    p_plasma_loss_mw: float,
+    rmajor: float,
+    kappa: float,
+    aspect: float,
+    afuel: float,
+) -> float:
+    """
+    Calculate the IPB98(y) ELMy H-mode scaling confinement time
+
+    Parameters:
+    pcur (float): Plasma current [MA]
+    bt (float): Toroidal magnetic field [T]
+    dnla19 (float): Line averaged electron density in units of 10**19 m**-3
+    p_plasma_loss_mw (float): Net Heating power [MW]
+    rmajor (float): Plasma major radius [m]
+    kappa (float): Plasma separatrix elongation
+    aspect (float): Aspect ratio
+    afuel (float): Fuel atomic mass number
+
+    Returns:
+    float: IPB98(y) ELMy H-mode confinement time [s]
+
+    Notes:
+        - Unlike the other IPB98 scaling laws, the IPB98(y) scaling law uses the true separatrix elongation.
+        - See correction paper below for more information
+
+    References:
+        - I. P. E. G. on C. Transport, I. P. E. G. on C. Database, and I. P. B. Editors, “Chapter 2: Plasma confinement and transport,”
+        Nuclear Fusion, vol. 39, no. 12, pp. 2175-2249, Dec. 1999, doi: https://doi.org/10.1088/0029-5515/39/12/302.
+
+        - None Otto Kardaun, N. K. Thomsen, and None Alexander Chudnovskiy, “Corrections to a sequence of papers in Nuclear Fusion,”
+          Nuclear Fusion, vol. 48, no. 9, pp. 099801-099801, Aug. 2008, doi: https://doi.org/10.1088/0029-5515/48/9/099801.
+
+    """
+    return (
+        0.0365e0
+        * pcur**0.97e0
+        * bt**0.08e0
+        * dnla19**0.41e0
+        * p_plasma_loss_mw ** (-0.63e0)
+        * rmajor**1.93e0
+        * kappa**0.67e0
+        * aspect ** (-0.23e0)
+        * afuel**0.2e0
+    )
+
+
+def iter_ipb98y1_confinement_time(
+    pcur: float,
+    bt: float,
+    dnla19: float,
+    p_plasma_loss_mw: float,
+    rmajor: float,
+    kappa_ipb: float,
+    aspect: float,
+    afuel: float,
+) -> float:
+    """
+    Calculate the IPB98(y,1) ELMy H-mode scaling confinement time
+
+    Parameters:
+    pcur (float): Plasma current [MA]
+    bt (float): Toroidal magnetic field [T]
+    dnla19 (float): Line averaged electron density in units of 10**19 m**-3
+    p_plasma_loss_mw (float): Net Heating power [MW]
+    rmajor (float): Plasma major radius [m]
+    kappa_ipb (float): IPB sprcific plasma separatrix elongation
+    aspect (float): Aspect ratio
+    afuel (float): Fuel atomic mass number
+
+    Returns:
+    float: IPB98(y,1) ELMy H-mode confinement time [s]
+
+    Notes:
+        - See correction paper below for more information about the re-definition of the elongation used.
+
+    References:
+        - I. P. E. G. on C. Transport, I. P. E. G. on C. Database, and I. P. B. Editors, “Chapter 2: Plasma confinement and transport,”
+        Nuclear Fusion, vol. 39, no. 12, pp. 2175-2249, Dec. 1999, doi: https://doi.org/10.1088/0029-5515/39/12/302.
+
+        - None Otto Kardaun, N. K. Thomsen, and None Alexander Chudnovskiy, “Corrections to a sequence of papers in Nuclear Fusion,”
+          Nuclear Fusion, vol. 48, no. 9, pp. 099801-099801, Aug. 2008, doi: https://doi.org/10.1088/0029-5515/48/9/099801.
+
+    """
+    return (
+        0.0503e0
+        * pcur**0.91e0
+        * bt**0.15e0
+        * dnla19**0.44e0
+        * p_plasma_loss_mw ** (-0.65e0)
+        * rmajor**2.05e0
+        * kappa_ipb**0.72e0
+        * aspect ** (-0.57e0)
+        * afuel**0.13e0
+    )
+
+
+def iter_ipb98y2_confinement_time(
+    pcur: float,
+    bt: float,
+    dnla19: float,
+    p_plasma_loss_mw: float,
+    rmajor: float,
+    kappa_ipb: float,
+    aspect: float,
+    afuel: float,
+) -> float:
+    """
+    Calculate the IPB98(y,2) ELMy H-mode scaling confinement time
+
+    Parameters:
+    pcur (float): Plasma current [MA]
+    bt (float): Toroidal magnetic field [T]
+    dnla19 (float): Line averaged electron density in units of 10**19 m**-3
+    p_plasma_loss_mw (float): Net Heating power [MW]
+    rmajor (float): Plasma major radius [m]
+    kappa_ipb (float): IPB specific plasma separatrix elongation
+    aspect (float): Aspect ratio
+    afuel (float): Fuel atomic mass number
+
+    Returns:
+    float: IPB98(y,2) ELMy H-mode confinement time [s]
+
+    Notes:
+        - See correction paper below for more information about the re-definition of the elongation used.
+
+    References:
+        - I. P. E. G. on C. Transport, I. P. E. G. on C. Database, and I. P. B. Editors, “Chapter 2: Plasma confinement and transport,”
+        Nuclear Fusion, vol. 39, no. 12, pp. 2175-2249, Dec. 1999, doi: https://doi.org/10.1088/0029-5515/39/12/302.
+
+        - None Otto Kardaun, N. K. Thomsen, and None Alexander Chudnovskiy, “Corrections to a sequence of papers in Nuclear Fusion,”
+          Nuclear Fusion, vol. 48, no. 9, pp. 099801-099801, Aug. 2008, doi: https://doi.org/10.1088/0029-5515/48/9/099801.
+    """
+    return (
+        0.0562e0
+        * pcur**0.93e0
+        * bt**0.15e0
+        * dnla19**0.41e0
+        * p_plasma_loss_mw ** (-0.69e0)
+        * rmajor**1.97e0
+        * kappa_ipb**0.78e0
+        * aspect ** (-0.58e0)
+        * afuel**0.19e0
+    )
+
+
+def iter_ipb98y3_confinement_time(
+    pcur: float,
+    bt: float,
+    dnla19: float,
+    p_plasma_loss_mw: float,
+    rmajor: float,
+    kappa_ipb: float,
+    aspect: float,
+    afuel: float,
+) -> float:
+    """
+    Calculate the IPB98(y,3) ELMy H-mode scaling confinement time
+
+    Parameters:
+    pcur (float): Plasma current [MA]
+    bt (float): Toroidal magnetic field [T]
+    dnla19 (float): Line averaged electron density in units of 10**19 m**-3
+    p_plasma_loss_mw (float): Net Heating power [MW]
+    rmajor (float): Plasma major radius [m]
+    kappa_ipb (float): IPB specific plasma separatrix elongation
+    aspect (float): Aspect ratio
+    afuel (float): Fuel atomic mass number
+
+    Returns:
+    float: IPB98(y,3) ELMy H-mode confinement time [s]
+
+    Notes:
+        - See correction paper below for more information about the re-definition of the elongation used.
+
+    References:
+        - I. P. E. G. on C. Transport, I. P. E. G. on C. Database, and I. P. B. Editors, “Chapter 2: Plasma confinement and transport,”
+        Nuclear Fusion, vol. 39, no. 12, pp. 2175-2249, Dec. 1999, doi: https://doi.org/10.1088/0029-5515/39/12/302.
+
+        - None Otto Kardaun, N. K. Thomsen, and None Alexander Chudnovskiy, “Corrections to a sequence of papers in Nuclear Fusion,”
+          Nuclear Fusion, vol. 48, no. 9, pp. 099801-099801, Aug. 2008, doi: https://doi.org/10.1088/0029-5515/48/9/099801.
+    """
+    return (
+        0.0564e0
+        * pcur**0.88e0
+        * bt**0.07e0
+        * dnla19**0.40e0
+        * p_plasma_loss_mw ** (-0.69e0)
+        * rmajor**2.15e0
+        * kappa_ipb**0.78e0
+        * aspect ** (-0.64e0)
+        * afuel**0.20e0
+    )
+
+
+def iter_ipb98y4_confinement_time(
+    pcur: float,
+    bt: float,
+    dnla19: float,
+    p_plasma_loss_mw: float,
+    rmajor: float,
+    kappa_ipb: float,
+    aspect: float,
+    afuel: float,
+) -> float:
+    """
+    Calculate the IPB98(y,4) ELMy H-mode scaling confinement time
+
+    Parameters:
+    pcur (float): Plasma current [MA]
+    bt (float): Toroidal magnetic field [T]
+    dnla19 (float): Line averaged electron density in units of 10**19 m**-3
+    p_plasma_loss_mw (float): Net Heating power [MW]
+    rmajor (float): Plasma major radius [m]
+    kappa_ipb (float): IPB specific plasma separatrix elongation
+    aspect (float): Aspect ratio
+    afuel (float): Fuel atomic mass number
+
+    Returns:
+    float: IPB98(y,4) ELMy H-mode confinement time [s]
+
+    Notes:
+        - See correction paper below for more information about the re-definition of the elongation used.
+
+    References:
+        - I. P. E. G. on C. Transport, I. P. E. G. on C. Database, and I. P. B. Editors, “Chapter 2: Plasma confinement and transport,”
+        Nuclear Fusion, vol. 39, no. 12, pp. 2175-2249, Dec. 1999, doi: https://doi.org/10.1088/0029-5515/39/12/302.
+
+        - None Otto Kardaun, N. K. Thomsen, and None Alexander Chudnovskiy, “Corrections to a sequence of papers in Nuclear Fusion,”
+          Nuclear Fusion, vol. 48, no. 9, pp. 099801-099801, Aug. 2008, doi: https://doi.org/10.1088/0029-5515/48/9/099801.
+    """
+    return (
+        0.0587e0
+        * pcur**0.85e0
+        * bt**0.29e0
+        * dnla19**0.39e0
+        * p_plasma_loss_mw ** (-0.70e0)
+        * rmajor**2.08e0
+        * kappa_ipb**0.76e0
+        * aspect ** (-0.69e0)
+        * afuel**0.17e0
+    )
+
+
+def iss95_stellarator_confinement_time(
+    rminor: float,
+    rmajor: float,
+    dnla19: float,
+    bt: float,
+    p_plasma_loss_mw: float,
+    iotabar: float,
+) -> float:
+    """
+        Calculate the ISS95 stellarator scaling confinement time
+
+        Parameters:
+        rminor (float): Plasma minor radius [m]
+        rmajor (float): Plasma major radius [m]
+        dnla19 (float): Line averaged electron density in units of 10**19 m**-3
+        bt (float): Toroidal magnetic field [T]
+        p_plasma_loss_mw (float): Net Heating power [MW]
+        iotabar (float): Rotational transform
+
+        Returns:
+        float: ISS95 stellarator confinement time [s]
+
+        Notes:
+
+        References:
+            - U. Stroth et al., “Energy confinement scaling from the international stellarator database,”
+              vol. 36, no. 8, pp. 1063-1077, Aug. 1996, doi: https://doi.org/10.1088/0029-5515/36/8/i11.
+    ‌
+    """
+    return (
+        0.079e0
+        * rminor**2.21e0
+        * rmajor**0.65e0
+        * dnla19**0.51e0
+        * bt**0.83e0
+        * p_plasma_loss_mw ** (-0.59e0)
+        * iotabar**0.4e0
+    )
+
+
+def iss04_stellarator_confinement_time(
+    rminor: float,
+    rmajor: float,
+    dnla19: float,
+    bt: float,
+    p_plasma_loss_mw: float,
+    iotabar: float,
+) -> float:
+    """
+        Calculate the ISS04 stellarator scaling confinement time
+
+        Parameters:
+        rminor (float): Plasma minor radius [m]
+        rmajor (float): Plasma major radius [m]
+        dnla19 (float): Line averaged electron density in units of 10**19 m**-3
+        bt (float): Toroidal magnetic field [T]
+        p_plasma_loss_mw (float): Net Heating power [MW]
+        iotabar (float): Rotational transform
+
+        Returns:
+        float: ISS04 stellarator confinement time [s]
+
+        Notes:
+
+        References:
+            - H. Yamada et al., “Characterization of energy confinement in net-current free plasmas using the extended International Stellarator Database,”
+              vol. 45, no. 12, pp. 1684-1693, Nov. 2005, doi: https://doi.org/10.1088/0029-5515/45/12/024.
+    ‌
+    """
+    return (
+        0.134e0
+        * rminor**2.28e0
+        * rmajor**0.64e0
+        * dnla19**0.54e0
+        * bt**0.84e0
+        * p_plasma_loss_mw ** (-0.61e0)
+        * iotabar**0.41e0
+    )
+
+
+def ds03_confinement_time(
+    pcur: float,
+    bt: float,
+    dnla19: float,
+    p_plasma_loss_mw: float,
+    rmajor: float,
+    kappa95: float,
+    aspect: float,
+    afuel: float,
+) -> float:
+    """
+        Calculate the DS03 beta-independent H-mode scaling confinement time
+
+        Parameters:
+        pcur (float): Plasma current [MA]
+        bt (float): Toroidal magnetic field [T]
+        dnla19 (float): Line averaged electron density in units of 10**19 m**-3
+        p_plasma_loss_mw (float): Net Heating power [MW]
+        rmajor (float): Plasma major radius [m]
+        kappa95 (float): Plasma elongation at 95% flux surface
+        aspect (float): Aspect ratio
+        afuel (float): Fuel atomic mass number
+
+        Returns:
+        float: DS03 beta-independent H-mode confinement time [s]
+
+        Notes:
+
+        References:
+            - T. C. Luce, C. C. Petty, and J. G. Cordey, “Application of dimensionless parameter scaling techniques to the design and interpretation of magnetic fusion experiments,”
+             Plasma Physics and Controlled Fusion, vol. 50, no. 4, p. 043001, Mar. 2008,
+             doi: https://doi.org/10.1088/0741-3335/50/4/043001.
+    ‌
+    """
+    return (
+        0.028e0
+        * pcur**0.83e0
+        * bt**0.07e0
+        * dnla19**0.49e0
+        * p_plasma_loss_mw ** (-0.55e0)
+        * rmajor**2.11e0
+        * kappa95**0.75e0
+        * aspect ** (-0.3e0)
+        * afuel**0.14e0
+    )
+
+
+def murari_confinement_time(
+    pcur: float,
+    rmajor: float,
+    kappa_ipb: float,
+    dnla19: float,
+    bt: float,
+    p_plasma_loss_mw: float,
+) -> float:
+    """
+        Calculate the Murari H-mode energy confinement scaling time
+
+        Parameters:
+        pcur (float): Plasma current [MA]
+        rmajor (float): Plasma major radius [m]
+        kappa_ipb (float): IPB specific plasma separatrix elongation
+        dnla19 (float): Line averaged electron density in units of 10**19 m**-3
+        bt (float): Toroidal magnetic field [T]
+        p_plasma_loss_mw (float): Net Heating power [MW]
+
+        Returns:
+        float: Murari confinement time [s]
+
+        Notes:
+            - This scaling uses the IPB defintiion of elongation, see reference for more information.
+
+        References:
+            - A. Murari, E. Peluso, Michela Gelfusa, I. Lupelli, and P. Gaudio, “A new approach to the formulation and validation of scaling expressions for plasma confinement in tokamaks,”
+             Nuclear Fusion, vol. 55, no. 7, pp. 073009-073009, Jun. 2015, doi: https://doi.org/10.1088/0029-5515/55/7/073009.
+
+            - None Otto Kardaun, N. K. Thomsen, and None Alexander Chudnovskiy, “Corrections to a sequence of papers in Nuclear Fusion,”
+              Nuclear Fusion, vol. 48, no. 9, pp. 099801-099801, Aug. 2008, doi: https://doi.org/10.1088/0029-5515/48/9/099801.
+    ‌
+    """
+    return (
+        0.0367
+        * pcur**1.006
+        * rmajor**1.731
+        * kappa_ipb**1.450
+        * p_plasma_loss_mw ** (-0.735)
+        * (dnla19**0.448 / (1.0 + np.exp(-9.403 * (dnla19 / bt) ** -1.365)))
+    )
+
+
+def petty08_confinement_time(
+    pcur: float,
+    bt: float,
+    dnla19: float,
+    p_plasma_loss_mw: float,
+    rmajor: float,
+    kappa_ipb: float,
+    aspect: float,
+) -> float:
+    """
+        Calculate the beta independent dimensionless Petty08 confinement time
+
+        Parameters:
+        pcur (float): Plasma current [MA]
+        bt (float): Toroidal magnetic field [T]
+        dnla19 (float): Line averaged electron density in units of 10**19 m**-3
+        p_plasma_loss_mw (float): Net Heating power [MW]
+        rmajor (float): Plasma major radius [m]
+        kappa_ipb (float): IPB specific plasma separatrix elongation
+        aspect (float): Aspect ratio
+
+        Returns:
+        float: Petty08 confinement time [s]
+
+        Notes:
+            - This scaling uses the IPB defintiion of elongation, see reference for more information.
+
+        References:
+            - C. C. Petty, “Sizing up plasmas using dimensionless parameters,”
+            Physics of Plasmas, vol. 15, no. 8, Aug. 2008, doi: https://doi.org/10.1063/1.2961043.
+
+            - None Otto Kardaun, N. K. Thomsen, and None Alexander Chudnovskiy, “Corrections to a sequence of papers in Nuclear Fusion,”
+            Nuclear Fusion, vol. 48, no. 9, pp. 099801-099801, Aug. 2008, doi: https://doi.org/10.1088/0029-5515/48/9/099801.
+    ‌
+    """
+    return (
+        0.052e0
+        * pcur**0.75e0
+        * bt**0.3e0
+        * dnla19**0.32e0
+        * p_plasma_loss_mw ** (-0.47e0)
+        * rmajor**2.09e0
+        * kappa_ipb**0.88e0
+        * aspect ** (-0.84e0)
+    )
+
+
+def lang_high_density_confinement_time(
+    plasma_current: float,
+    bt: float,
+    dnla: float,
+    p_plasma_loss_mw: float,
+    rmajor: float,
+    rminor: float,
+    q: float,
+    qstar: float,
+    aspect: float,
+    afuel: float,
+    kappa_ipb: float,
+) -> float:
+    """
+        Calculate the high density relevant confinement time
+
+        Parameters:
+        plasma_current (float): Plasma current [MA]
+        bt (float): Toroidal magnetic field [T]
+        dnla (float): Line averaged electron density [m**-3]
+        p_plasma_loss_mw (float): Net Heating power [MW]
+        rmajor (float): Plasma major radius [m]
+        rminor (float): Plasma minor radius [m]
+        q (float): Safety factor
+        qstar (float): Equivalent cylindrical edge safety factor
+        aspect (float): Aspect ratio
+        afuel (float): Fuel atomic mass number
+        kappa_ipb (float): Plasma elongation at 95% flux surface
+
+        Returns:
+        float: High density relevant confinement time [s]
+
+        Notes:
+
+        References:
+            - P. T. Lang, C. Angioni, R. M. M. Dermott, R. Fischer, and H. Zohm, “Pellet Induced High Density Phases during ELM Suppression in ASDEX Upgrade,”
+             24th IAEA Conference Fusion Energy, 2012, Oct. 2012,
+             Available: https://www.researchgate.net/publication/274456104_Pellet_Induced_High_Density_Phases_during_ELM_Suppression_in_ASDEX_Upgrade
+    ‌
+    """
+    qratio = q / qstar
+    n_gw = 1.0e14 * plasma_current / (np.pi * rminor * rminor)
+    nratio = dnla / n_gw
+    return (
+        6.94e-7
+        * plasma_current**1.3678e0
+        * bt**0.12e0
+        * dnla**0.032236e0
+        * (p_plasma_loss_mw * 1.0e6) ** (-0.74e0)
+        * rmajor**1.2345e0
+        * kappa_ipb**0.37e0
+        * aspect**2.48205e0
+        * afuel**0.2e0
+        * qratio**0.77e0
+        * aspect ** (-0.9e0 * np.log(aspect))
+        * nratio ** (-0.22e0 * np.log(nratio))
+    )
+
+
+def hubbard_nominal_confinement_time(
+    pcur: float,
+    bt: float,
+    dnla20: float,
+    p_plasma_loss_mw: float,
+) -> float:
+    """
+        Calculate the Hubbard 2017 I-mode confinement time scaling - nominal
+
+        Parameters:
+        pcur (float): Plasma current [MA]
+        bt (float): Toroidal magnetic field [T]
+        dnla20 (float): Line averaged electron density in units of 10**20 m**-3
+        p_plasma_loss_mw (float): Net Heating power [MW]
+
+        Returns:
+        float: Hubbard confinement time [s]
+
+        Notes:
+
+        References:
+            - A. E. Hubbard et al., “Physics and performance of the I-mode regime over an expanded operating space on Alcator C-Mod,”
+            Nuclear Fusion, vol. 57, no. 12, p. 126039, Oct. 2017, doi: https://doi.org/10.1088/1741-4326/aa8570.
+    ‌
+    """
+    return (
+        0.014e0
+        * pcur**0.68e0
+        * bt**0.77e0
+        * dnla20**0.02e0
+        * p_plasma_loss_mw ** (-0.29e0)
+    )
+
+
+def hubbard_lower_confinement_time(
+    pcur: float,
+    bt: float,
+    dnla20: float,
+    p_plasma_loss_mw: float,
+) -> float:
+    """
+        Calculate the Hubbard 2017 I-mode confinement time scaling - lower
+
+        Parameters:
+        pcur (float): Plasma current [MA]
+        bt (float): Toroidal magnetic field [T]
+        dnla20 (float): Line averaged electron density in units of 10**20 m**-3
+        p_plasma_loss_mw (float): Net Heating power [MW]
+
+        Returns:
+        float: Hubbard confinement time [s]
+
+        Notes:
+
+        References:
+            - A. E. Hubbard et al., “Physics and performance of the I-mode regime over an expanded operating space on Alcator C-Mod,”
+            Nuclear Fusion, vol. 57, no. 12, p. 126039, Oct. 2017, doi: https://doi.org/10.1088/1741-4326/aa8570.
+    ‌
+    """
+    return (
+        0.014e0
+        * pcur**0.60e0
+        * bt**0.70e0
+        * dnla20 ** (-0.03e0)
+        * p_plasma_loss_mw ** (-0.33e0)
+    )
+
+
+def hubbard_upper_confinement_time(
+    pcur: float,
+    bt: float,
+    dnla20: float,
+    p_plasma_loss_mw: float,
+) -> float:
+    """
+        Calculate the Hubbard 2017 I-mode confinement time scaling - upper
+
+        Parameters:
+        pcur (float): Plasma current [MA]
+        bt (float): Toroidal magnetic field [T]
+        dnla20 (float): Line averaged electron density in units of 10**20 m**-3
+        p_plasma_loss_mw (float): Net Heating power [MW]
+
+        Returns:
+        float: Hubbard confinement time [s]
+
+        Notes:
+
+        References:
+            - A. E. Hubbard et al., “Physics and performance of the I-mode regime over an expanded operating space on Alcator C-Mod,”
+            Nuclear Fusion, vol. 57, no. 12, p. 126039, Oct. 2017, doi: https://doi.org/10.1088/1741-4326/aa8570.
+    ‌
+    """
+    return (
+        0.014e0
+        * pcur**0.76e0
+        * bt**0.84e0
+        * dnla20**0.07
+        * p_plasma_loss_mw ** (-0.25e0)
+    )
+
+
+def menard_nstx_confinement_time(
+    pcur: float,
+    bt: float,
+    dnla19: float,
+    p_plasma_loss_mw: float,
+    rmajor: float,
+    kappa_ipb: float,
+    aspect: float,
+    afuel: float,
+) -> float:
+    """
+        Calculate the Menard NSTX ELMy H-mode scaling confinement time
+
+        Parameters:
+        pcur (float): Plasma current [MA]
+        bt (float): Toroidal magnetic field [T]
+        dnla19 (float): Line averaged electron density in units of 10**19 m**-3
+        p_plasma_loss_mw (float): Net Heating power [MW]
+        rmajor (float): Plasma major radius [m]
+        kappa_ipb (float): IPB specific plasma separatrix elongation
+        aspect (float): Aspect ratio
+        afuel (float): Fuel atomic mass number
+
+        Returns:
+        float: Menard NSTX ELMy H-mode confinement time [s]
+
+        Notes:
+            - "The leading NSTX confinement scaling coefficient is chosen such that the ITER and ST energy confinement times are
+              identical for a reference NSTX scenario"
+            - Assumes IPB98(y,2) exponents are applicable where the ST exponents are not yet determined, i.e.
+              the species mass, major radius, inverse aspect ratio and elongation. Hence here we use the IPB98(y,2) definition
+              of elongation.
+
+        References:
+            - J. E. Menard, “Compact steady-state tokamak performance dependence on magnet and core physics limits,”
+             Philosophical Transactions of the Royal Society A, vol. 377, no. 2141, pp. 20170440-20170440, Feb. 2019,
+             doi: https://doi.org/10.1098/rsta.2017.0440.
+    ‌
+
+    """
+    return (
+        0.095e0
+        * pcur**0.57e0
+        * bt**1.08e0
+        * dnla19**0.44e0
+        * p_plasma_loss_mw ** (-0.73e0)
+        * rmajor**1.97e0
+        * kappa_ipb**0.78e0
+        * aspect ** (-0.58e0)
+        * afuel**0.19e0
+    )
+
+
+def menard_nstx_petty08_hybrid_confinement_time(
+    pcur: float,
+    bt: float,
+    dnla19: float,
+    p_plasma_loss_mw: float,
+    rmajor: float,
+    kappa_ipb: float,
+    aspect: float,
+    afuel: float,
+) -> float:
+    """
+    Calculate the Menard NSTX-Petty hybrid confinement time
+
+    Parameters:
+    pcur (float): Plasma current [MA]
+    bt (float): Toroidal magnetic field [T]
+    dnla19 (float): Line averaged electron density in units of 10**19 m**-3
+    p_plasma_loss_mw (float): Net Heating power [MW]
+    rmajor (float): Plasma major radius [m]
+    kappa_ipb (float): IPB specific plasma separatrix elongation
+    aspect (float): Aspect ratio
+    afuel (float): Fuel atomic mass number
+
+    Returns:
+    float: Menard NSTX-Petty hybrid confinement time [s]
+
+    Notes:
+        - Assuming a linear interpolation in (1/aspect) between the two scalings
+
+    References:
+        - J. E. Menard, “Compact steady-state tokamak performance dependence on magnet and core physics limits,”
+         Philosophical Transactions of the Royal Society A, vol. 377, no. 2141, pp. 20170440-20170440, Feb. 2019,
+         doi: https://doi.org/10.1098/rsta.2017.0440.
+    ‌
+    """
+    # Equivalent to A > 2.5, use Petty scaling
+    if (1.0e0 / aspect) <= 0.4e0:
+        return petty08_confinement_time(
+            pcur,
+            bt,
+            dnla19,
+            p_plasma_loss_mw,
+            rmajor,
+            kappa_ipb,
+            aspect,
+        )
+
+    #  Equivalent to A < 1.7, use NSTX scaling
+    if (1.0e0 / aspect) >= 0.6e0:
+        return menard_nstx_confinement_time(
+            pcur,
+            bt,
+            dnla19,
+            p_plasma_loss_mw,
+            rmajor,
+            kappa_ipb,
+            aspect,
+            afuel,
+        )
+    return (((1.0e0 / aspect) - 0.4e0) / (0.6e0 - 0.4e0)) * (
+        menard_nstx_confinement_time(
+            pcur,
+            bt,
+            dnla19,
+            p_plasma_loss_mw,
+            rmajor,
+            kappa_ipb,
+            aspect,
+            afuel,
+        )
+    ) + ((0.6e0 - (1.0e0 / aspect)) / (0.6e0 - 0.4e0)) * (
+        petty08_confinement_time(
+            pcur,
+            bt,
+            dnla19,
+            p_plasma_loss_mw,
+            rmajor,
+            kappa_ipb,
+            aspect,
+        )
+    )
+
+
+def nstx_gyro_bohm_confinement_time(
+    pcur: float,
+    bt: float,
+    p_plasma_loss_mw: float,
+    rmajor: float,
+    dnla20: float,
+) -> float:
+    """
+        Calculate the NSTX gyro-Bohm confinement time
+
+        Parameters:
+        pcur (float): Plasma current [MA]
+        bt (float): Toroidal magnetic field [T]
+        p_plasma_loss_mw (float): Net Heating power [MW]
+        rmajor (float): Plasma major radius [m]
+        dnla20 (float): Line averaged electron density in units of 10**20 m**-3
+
+        Returns:
+        float: NSTX gyro-Bohm confinement time [s]
+
+        Notes:
+
+        References:
+            - P. F. Buxton, L. Connor, A. E. Costley, Mikhail Gryaznevich, and S. McNamara,
+            “On the energy confinement time in spherical tokamaks: implications for the design of pilot plants and fusion reactors,”
+            vol. 61, no. 3, pp. 035006-035006, Jan. 2019, doi: https://doi.org/10.1088/1361-6587/aaf7e5.
+    ‌
+    """
+    return (
+        0.21e0
+        * pcur**0.54e0
+        * bt**0.91e0
+        * p_plasma_loss_mw ** (-0.38e0)
+        * rmajor**2.14e0
+        * dnla20 ** (-0.05e0)
+    )
+
+
+def itpa20_confinement_time(
+    pcur: float,
+    bt: float,
+    dnla19: float,
+    p_plasma_loss_mw: float,
+    rmajor: float,
+    triang: float,
+    kappa_ipb: float,
+    eps: float,
+    aion: float,
+) -> float:
+    """
+    Calculate the ITPA20 Issue #3164 confinement time
+
+    Parameters:
+    pcur (float): Plasma current [MA]
+    bt (float): Toroidal magnetic field [T]
+    dnla19 (float): Central line-averaged electron density in units of 10**19 m**-3
+    p_plasma_loss_mw (float): Thermal power lost due to transport through the LCFS [MW]
+    rmajor (float): Plasma major radius [m]
+    triang (float): Triangularity
+    kappa_ipb (float): IPB specific plasma separatrix elongation
+    eps (float): Inverse aspect ratio
+    aion (float): Average mass of all ions (amu)
+
+    Returns:
+    float: ITPA20 confinement time [s]
+
+    Notes:
+        - Mass term is the effective mass of the plasma, so we assume the total ion mass here
+        - This scaling uses the IPB defintiion of elongation, see reference for more information.
+
+    References:
+        - G. Verdoolaege et al., “The updated ITPA global H-mode confinement database: description and analysis,”
+          Nuclear Fusion, vol. 61, no. 7, pp. 076006-076006, Jan. 2021, doi: https://doi.org/10.1088/1741-4326/abdb91.
+    """
+    return (
+        0.053
+        * pcur**0.98
+        * bt**0.22
+        * dnla19**0.24
+        * p_plasma_loss_mw ** (-0.669)
+        * rmajor**1.71
+        * (1 + triang) ** 0.36
+        * kappa_ipb**0.8
+        * eps**0.35
+        * aion**0.2
+    )
+
+
+def itpa20_il_confinement_time(
+    pcur: float,
+    bt: float,
+    p_plasma_loss_mw: float,
+    dnla19: float,
+    aion: float,
+    rmajor: float,
+    triang: float,
+    kappa_ipb: float,
+) -> float:
+    """
+    Calculate the ITPA20-IL Issue #1852 confinement time
+
+    Parameters:
+    pcur (float): Plasma current [MA]
+    bt (float): Toroidal magnetic field [T]
+    p_plasma_loss_mw (float): Thermal power lost due to transport through the LCFS [MW]
+    dnla19 (float): Central line-averaged electron density in units of 10**19 m**-3
+    aion (float): Average mass of all ions (amu)
+    rmajor (float): Plasma major radius [m]
+    triang (float): Triangularity
+    kappa_ipb (float): IPB specific plasma separatrix elongation
+
+    Returns:
+    float: ITPA20-IL confinement time [s]
+
+    Notes:
+        - Mass term is the effective mass of the plasma, so we assume the total ion mass here
+        - This scaling uses the IPB defintiion of elongation, see reference for more information.
+
+    References:
+        - T. Luda et al., “Validation of a full-plasma integrated modeling approach on ASDEX Upgrade,”
+        Nuclear Fusion, vol. 61, no. 12, pp. 126048-126048, Nov. 2021, doi: https://doi.org/10.1088/1741-4326/ac3293.
+    """
+
+    return (
+        0.067
+        * pcur**1.29
+        * bt**-0.13
+        * p_plasma_loss_mw ** (-0.644)
+        * dnla19**0.15
+        * aion**0.3
+        * rmajor**1.19
+        * (1 + triang) ** 0.56
+        * kappa_ipb**0.67
+    )
diff --git a/process/init.py b/process/init.py
index 3501f2b204..a809f3aa7d 100644
--- a/process/init.py
+++ b/process/init.py
@@ -1207,19 +1207,22 @@ def check_process():
 
     if (
         fortran.physics_variables.tauee_in > 1e-10
-        and fortran.physics_variables.isc != 48
+        and fortran.physics_variables.i_confinement_time != 48
     ):
         # Report error if confinement time is in the input
         # but the scaling to use it is not selected.
-        warn("tauee_in is for use with isc=48 only", stacklevel=2)
+        warn("tauee_in is for use with i_confinement_time=48 only", stacklevel=2)
 
-    if fortran.physics_variables.aspect > 1.7 and fortran.physics_variables.isc == 46:
+    if (
+        fortran.physics_variables.aspect > 1.7
+        and fortran.physics_variables.i_confinement_time == 46
+    ):
         # NSTX scaling is for A<1.7
         warn("NSTX scaling is for A<1.7", stacklevel=2)
 
     if (
         fortran.physics_variables.i_plasma_current == 2
-        and fortran.physics_variables.isc == 42
+        and fortran.physics_variables.i_confinement_time == 42
     ):
         raise ProcessValidationError(
             "Lang 2012 confinement scaling cannot be used for i_plasma_current=2 due to wrong q"
diff --git a/process/io/mfile_comparison.py b/process/io/mfile_comparison.py
index 7f7c762e7a..054127c07e 100644
--- a/process/io/mfile_comparison.py
+++ b/process/io/mfile_comparison.py
@@ -90,7 +90,7 @@
     "inductive_current_fraction",
     "gamnb",
     "beam_energy",
-    "powerht",
+    "p_plasma_loss_mw",
 ]
 
 BASELINE_LIST = [
@@ -130,7 +130,7 @@
     "neped",
     "zeff",
     "nd_impurities",
-    "taueff",
+    "t_energy_confinement",
     "hfact",
     "tauelaw",
     "f_nd_alpha_electron",
@@ -179,7 +179,7 @@
     "inductive_current_fraction",
     "gamnb",
     "beam_energy",
-    "powerht",
+    "p_plasma_loss_mw",
     "pdivt",
     "vssoft",
     "vstot",
diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py
index 482fb764be..1a494a494b 100644
--- a/process/io/obsolete_vars.py
+++ b/process/io/obsolete_vars.py
@@ -184,6 +184,11 @@
     "d_vv_in": "dr_vv_inboard",
     "d_vv_out": "dr_vv_outboard",
     "iblnkith": "i_blkt_inboard",
+    "taulimit": "f_alpha_energy_confinement_min",
+    "ftaulimit": "falpha_energy_confinement",
+    "isc": "i_confinement_time",
+    "iradloss": "i_rad_loss",
+    "ipnlaws": "n_confinement_scalings",
 }
 
 OBS_VARS_HELP = {
diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py
index 8a53dcfefe..139dfacd37 100644
--- a/process/io/plot_proc.py
+++ b/process/io/plot_proc.py
@@ -2442,7 +2442,7 @@ def plot_physics_info(axis, mfile_data, scan):
         (nepeak, r"$n_{e0} \ / \ \langle n_{\mathrm{e, vol}} \rangle$", ""),
         ("zeff", r"$Z_{\mathrm{eff}}$", ""),
         (nd_impurities, r"$n_Z \ / \  \langle n_{\mathrm{e, vol}} \rangle$", ""),
-        ("taueff", r"$\tau_e$", "s"),
+        ("t_energy_confinement", r"$\tau_e$", "s"),
         ("hfact", "H-factor", ""),
         (pthresh, "H-mode threshold", "MW"),
         ("tauelaw", "Scaling law", ""),
@@ -2771,7 +2771,7 @@ def plot_current_drive_info(axis, mfile_data, scan):
             ("bootstrap_current_fraction", "Bootstrap fraction", ""),
             ("aux_current_fraction", "Auxiliary fraction", ""),
             ("inductive_current_fraction", "Inductive fraction", ""),
-            ("powerht", "Plasma heating used for H factor", "MW"),
+            ("p_plasma_loss_mw", "Plasma heating used for H factor", "MW"),
             (
                 "effcd",
                 "Current drive efficiency",
@@ -2803,7 +2803,7 @@ def plot_current_drive_info(axis, mfile_data, scan):
             ("inductive_current_fraction", "Inductive fraction", ""),
             ("gamnb", "NB gamma", "$10^{20}$ A W$^{-1}$ m$^{-2}$"),
             ("beam_energy", "NB energy", "keV"),
-            ("powerht", "Plasma heating used for H factor", "MW"),
+            ("p_plasma_loss_mw", "Plasma heating used for H factor", "MW"),
             (pdivr, r"$\frac{P_{\mathrm{div}}}{R_{0}}$", "MW m$^{-1}$"),
             (
                 pdivnr,
@@ -2827,7 +2827,7 @@ def plot_current_drive_info(axis, mfile_data, scan):
             ("bootstrap_current_fraction", "Bootstrap fraction", ""),
             ("aux_current_fraction", "Auxiliary fraction", ""),
             ("inductive_current_fraction", "Inductive fraction", ""),
-            ("powerht", "Plasma heating used for H factor", "MW"),
+            ("p_plasma_loss_mw", "Plasma heating used for H factor", "MW"),
             (
                 "gamcd",
                 "Normalised current drive efficiency",
@@ -2856,7 +2856,7 @@ def plot_current_drive_info(axis, mfile_data, scan):
             ("bootstrap_current_fraction", "Bootstrap fraction", ""),
             ("aux_current_fraction", "Auxiliary fraction", ""),
             ("inductive_current_fraction", "Inductive fraction", ""),
-            ("powerht", "Plasma heating used for H factor", "MW"),
+            ("p_plasma_loss_mw", "Plasma heating used for H factor", "MW"),
             (
                 "gamcd",
                 "Normalised current drive efficiency",
@@ -2885,7 +2885,7 @@ def plot_current_drive_info(axis, mfile_data, scan):
             ("bootstrap_current_fraction", "Bootstrap fraction", ""),
             ("aux_current_fraction", "Auxiliary fraction", ""),
             ("inductive_current_fraction", "Inductive fraction", ""),
-            ("powerht", "Plasma heating used for H factor", "MW"),
+            ("p_plasma_loss_mw", "Plasma heating used for H factor", "MW"),
             (
                 "gamcd",
                 "Normalised current drive efficiency",
diff --git a/process/io/plot_radial_build.py b/process/io/plot_radial_build.py
index 686ee0b8d9..b5c3fb5417 100644
--- a/process/io/plot_radial_build.py
+++ b/process/io/plot_radial_build.py
@@ -178,7 +178,7 @@ def main(args=None):
         "bt",
         "coreradius",
         "Obsolete",  # Removed
-        "taulimit",
+        "f_alpha_energy_confinement_min",
         "epsvmc",
         "ttarget",
         "qtargettotal",
diff --git a/process/io/plot_scans.py b/process/io/plot_scans.py
index 03151fec3a..b6c1ad66f2 100644
--- a/process/io/plot_scans.py
+++ b/process/io/plot_scans.py
@@ -227,7 +227,7 @@ def main(args=None):
         28: "bt",
         29: "coreradius",
         30: "",  # OBSOLETE
-        31: "taulimit",
+        31: "f_alpha_energy_confinement_min",
         32: "epsvmc",
         33: "ttarget",
         34: "qtargettotal",
diff --git a/process/io/variable_metadata.py b/process/io/variable_metadata.py
index 405c44a760..3093b52cd3 100644
--- a/process/io/variable_metadata.py
+++ b/process/io/variable_metadata.py
@@ -39,7 +39,7 @@ class VariableMetadata:
         description="Net electrical power",
         units="MW",
     ),
-    "taueff": VariableMetadata(
+    "t_energy_confinement": VariableMetadata(
         latex=r"$\tau_\mathrm{E}$ [s]",
         description="Effective energy confinement time",
         units="s",
@@ -54,7 +54,7 @@ class VariableMetadata:
         description="Average electron temperature",
         units="keV",
     ),
-    "taulimit": VariableMetadata(
+    "f_alpha_energy_confinement_min": VariableMetadata(
         latex=r"$max : \frac{\tau_\mathrm{\alpha}}{\tau_\mathrm{E}}$",
         description="Ratio of alpha heating time to energy confinement time",
         units="",
@@ -388,7 +388,7 @@ class VariableMetadata:
         description="Efficiency of electron cyclotron heating",
         units="",
     ),
-    "tauee": VariableMetadata(
+    "t_electron_energy_confinement": VariableMetadata(
         latex=r"$\tau_E$",
         description="Electron energy confinement time (sec)",
         units="s",
diff --git a/process/output.py b/process/output.py
index 25cce160b7..272d5a03c6 100644
--- a/process/output.py
+++ b/process/output.py
@@ -42,9 +42,6 @@ def write(models, _outfile):
     # Writing the output from physics.f90 into OUT.DAT + MFILE.DAT
     models.physics.outplas()
 
-    # TODO what is this? not in caller.f90
-    models.physics.igmarcal()
-
     # TODO what is this? Not in caller.f90?
     models.current_drive.cudriv(output=True)
 
diff --git a/process/physics.py b/process/physics.py
index dfab8b8002..5a4cbf3086 100644
--- a/process/physics.py
+++ b/process/physics.py
@@ -6,6 +6,7 @@
 import scipy.integrate as integrate
 from scipy.optimize import root_scalar
 
+import process.confinement_time as confinement
 import process.impurity_radiation as impurity_radiation
 import process.physics_functions as physics_funcs
 from process.fortran import (
@@ -2247,14 +2248,13 @@ def physics(self):
         # Calculate transport losses and energy confinement time using the
         # chosen scaling law
         (
-            physics_variables.kappaa,
-            physics_variables.ptrepv,
-            physics_variables.ptripv,
-            physics_variables.tauee,
-            physics_variables.taueff,
-            physics_variables.tauei,
-            physics_variables.powerht,
-        ) = self.pcond(
+            physics_variables.pden_electron_transport_loss_mw,
+            physics_variables.pden_ion_transport_loss_mw,
+            physics_variables.t_electron_energy_confinement,
+            physics_variables.t_energy_confinement,
+            physics_variables.t_ion_energy_confinement,
+            physics_variables.p_plasma_loss_mw,
+        ) = self.calculate_confinement_time(
             physics_variables.m_fuel_amu,
             physics_variables.alpha_power_total,
             physics_variables.aspect,
@@ -2264,8 +2264,7 @@ def physics(self):
             physics_variables.dnla,
             physics_variables.eps,
             physics_variables.hfact,
-            physics_variables.iinvqd,
-            physics_variables.isc,
+            physics_variables.i_confinement_time,
             physics_variables.ignite,
             physics_variables.kappa,
             physics_variables.kappa95,
@@ -2275,24 +2274,22 @@ def physics(self):
             physics_variables.pcoreradpv,
             physics_variables.rmajor,
             physics_variables.rminor,
-            physics_variables.te,
             physics_variables.ten,
             physics_variables.tin,
             physics_variables.q95,
             physics_variables.qstar,
             physics_variables.vol_plasma,
-            physics_variables.a_plasma_poloidal,
             physics_variables.zeff,
         )
 
-        physics_variables.ptremw = (
-            physics_variables.ptrepv * physics_variables.vol_plasma
+        # Total transport power from scaling law (MW)
+        physics_variables.p_electron_transport_loss_mw = (
+            physics_variables.pden_electron_transport_loss_mw
+            * physics_variables.vol_plasma
         )
-        physics_variables.ptrimw = (
-            physics_variables.ptripv * physics_variables.vol_plasma
+        physics_variables.p_ion_transport_loss_mw = (
+            physics_variables.pden_ion_transport_loss_mw * physics_variables.vol_plasma
         )
-        # Total transport power from scaling law (MW)
-        # pscalingmw = physics_variables.ptremw + physics_variables.ptrimw #KE - why is this commented?
 
         # Calculate Volt-second requirements
         (
@@ -2321,30 +2318,32 @@ def physics(self):
         sbar = 1.0e0
         (
             physics_variables.burnup,
-            physics_variables.dntau,
+            physics_variables.ntau,
+            physics_variables.nTtau,
             physics_variables.figmer,
             physics_module.fusrat,
             physics_variables.qfuel,
             physics_variables.rndfuel,
-            physics_variables.taup,
+            physics_variables.t_alpha_confinement,
+            physics_variables.f_alpha_energy_confinement,
         ) = self.phyaux(
             physics_variables.aspect,
             physics_variables.dene,
+            physics_variables.te,
             physics_variables.nd_fuel_ions,
             physics_variables.fusion_rate_density_total,
             physics_variables.alpha_rate_density_total,
             physics_variables.plasma_current,
             sbar,
             physics_variables.nd_alphas,
-            physics_variables.taueff,
+            physics_variables.t_energy_confinement,
             physics_variables.vol_plasma,
         )
 
-        # ptremw = physics_variables.ptrepv*physics_variables.vol_plasma
-        # ptrimw = physics_variables.ptripv*physics_variables.vol_plasma
         # Total transport power from scaling law (MW)
         physics_variables.pscalingmw = (
-            physics_variables.ptremw + physics_variables.ptrimw
+            physics_variables.p_electron_transport_loss_mw
+            + physics_variables.p_ion_transport_loss_mw
         )
 
         # Calculate physics_variables.beta limit
@@ -2502,10 +2501,6 @@ def physics(self):
             physics_variables.rad_fraction_sol * physics_variables.pdivt
         )
 
-        physics_module.total_energy_conf_time = (
-            physics_module.e_plasma_beta / physics_module.total_loss_power
-        )
-
         if any(numerics.icc == 78):
             po.write(
                 self.outfile,
@@ -2956,61 +2951,65 @@ def plasma_composition() -> None:
 
     @staticmethod
     def phyaux(
-        aspect,
-        dene,
-        nd_fuel_ions,
-        fusion_rate_density_total,
-        alpha_rate_density_total,
-        plasma_current,
-        sbar,
-        nd_alphas,
-        taueff,
-        vol_plasma,
-    ):
+        aspect: float,
+        dene: float,
+        te: float,
+        nd_fuel_ions: float,
+        fusion_rate_density_total: float,
+        alpha_rate_density_total: float,
+        plasma_current: float,
+        sbar: float,
+        nd_alphas: float,
+        t_energy_confinement: float,
+        vol_plasma: float,
+    ) -> tuple[float, float, float, float, float, float, float, float]:
         """Auxiliary physics quantities
-        author: P J Knight, CCFE, Culham Science Centre
-        aspect : input real :  plasma aspect ratio
-        dene   : input real :  electron density (/m3)
-        nd_fuel_ions   : input real :  fuel ion density (/m3)
-        nd_alphas  : input real :  alpha ash density (/m3)
-        fusion_rate_density_total : input real :  fusion reaction rate from plasma and beams (/m3/s)
-        alpha_rate_density_total  : input real :  alpha particle production rate (/m3/s)
-        plasma_current: input real :  plasma current (A)
-        sbar   : input real :  exponent for aspect ratio (normally 1)
-        taueff : input real :  global energy confinement time (s)
-        vol_plasma    : input real :  plasma volume (m3)
-        burnup : output real : fractional plasma burnup
-        dntau  : output real : plasma average n-tau (s/m3)
-        figmer : output real : physics figure of merit
-        fusrat : output real : number of fusion reactions per second
-        qfuel  : output real : fuelling rate for D-T (nucleus-pairs/sec)
-        rndfuel: output real : fuel burnup rate (reactions/s)
-        taup   : output real : (alpha) particle confinement time (s)
-        This subroutine calculates extra physics related items
-        needed by other parts of the code
-        """
 
+        Args:
+            aspect (float): Plasma aspect ratio.
+            dene (float): Electron density (/m3).
+            te (float): Volume avergaed electron temperature (keV).
+            nd_fuel_ions (float): Fuel ion density (/m3).
+            fusion_rate_density_total (float): Fusion reaction rate from plasma and beams (/m3/s).
+            alpha_rate_density_total (float): Alpha particle production rate (/m3/s).
+            plasma_current (float): Plasma current (A).
+            sbar (float): Exponent for aspect ratio (normally 1).
+            nd_alphas (float): Alpha ash density (/m3).
+            t_energy_confinement (float): Global energy confinement time (s).
+            vol_plasma (float): Plasma volume (m3).
+
+        Returns:
+            tuple: A tuple containing:
+                - burnup (float): Fractional plasma burnup.
+                - ntau (float): Plasma average n-tau (s/m3).
+                - nTtau (float): Plasma triple product nT-tau (s/m3).
+                - figmer (float): Physics figure of merit.
+                - fusrat (float): Number of fusion reactions per second.
+                - qfuel (float): Fuelling rate for D-T (nucleus-pairs/sec).
+                - rndfuel (float): Fuel burnup rate (reactions/s).
+                - t_alpha_confinement (float): Alpha particle confinement time (s).
+                - f_alpha_energy_confinement (float): Fraction of alpha energy confinement.
+
+        This subroutine calculates extra physics related items needed by other parts of the code.
+        """
         figmer = 1e-6 * plasma_current * aspect**sbar
 
-        dntau = taueff * dene
+        ntau = t_energy_confinement * dene
+        nTtau = ntau * te
 
         # Fusion reactions per second
-
         fusrat = fusion_rate_density_total * vol_plasma
 
         # Alpha particle confinement time (s)
         # Number of alphas / alpha production rate
-
         if alpha_rate_density_total != 0.0:
-            taup = nd_alphas / alpha_rate_density_total
+            t_alpha_confinement = nd_alphas / alpha_rate_density_total
         else:  # only likely if DD is only active fusion reaction
-            taup = 0.0
+            t_alpha_confinement = 0.0
 
         # Fractional burnup
-
         # (Consider detailed model in: G. L. Jackson, V. S. Chan, R. D. Stambaugh,
         # Fusion Science and Technology, vol.64, no.1, July 2013, pp.8-12)
-
         # The ratio of ash to fuel particle confinement times is given by
         # tauratio
         # Possible logic...
@@ -3026,15 +3025,26 @@ def phyaux(
             )
         else:
             burnup = physics_variables.burnup_in
-        # Fuel burnup rate (reactions/second) (previously Amps)
 
+        # Fuel burnup rate (reactions/second) (previously Amps)
         rndfuel = fusrat
 
         # Required fuelling rate (fuel ion pairs/second) (previously Amps)
-
         qfuel = rndfuel / burnup
 
-        return burnup, dntau, figmer, fusrat, qfuel, rndfuel, taup
+        f_alpha_energy_confinement = t_alpha_confinement / t_energy_confinement
+
+        return (
+            burnup,
+            ntau,
+            nTtau,
+            figmer,
+            fusrat,
+            qfuel,
+            rndfuel,
+            t_alpha_confinement,
+            f_alpha_energy_confinement,
+        )
 
     @staticmethod
     def plasma_ohmic_heating(
@@ -3538,14 +3548,6 @@ def outplas(self):
                     "OP ",
                 )
 
-            po.ovarrf(
-                self.outfile,
-                "Elongation, area ratio calc.",
-                "(kappaa)",
-                physics_variables.kappaa,
-                "OP ",
-            )
-
             if physics_variables.i_plasma_geometry in [0, 2, 6, 8, 9, 10, 11]:
                 po.ovarrf(
                     self.outfile,
@@ -3748,7 +3750,9 @@ def outplas(self):
                 "(iotabar)",
                 stellarator_variables.iotabar,
             )
-
+        po.oblnkl(self.outfile)
+        po.ostars(self.outfile, 110)
+        po.oblnkl(self.outfile)
         po.osubhd(self.outfile, "Beta Information :")
         if physics_variables.i_beta_component == 0:
             po.ovarrf(
@@ -3942,6 +3946,10 @@ def outplas(self):
             "OP",
         )
 
+        po.oblnkl(self.outfile)
+        po.ostars(self.outfile, 110)
+        po.oblnkl(self.outfile)
+
         po.osubhd(self.outfile, "Temperature and Density (volume averaged) :")
         po.ovarrf(
             self.outfile,
@@ -4086,9 +4094,12 @@ def outplas(self):
             "OP ",
         )
 
+        po.oblnkl(self.outfile)
+        po.oblnkl(self.outfile)
+        po.ostars(self.outfile, 110)
         po.oblnkl(self.outfile)
 
-        po.ocmmnt(self.outfile, "Impurities")
+        po.ocmmnt(self.outfile, "Impurities:")
         po.oblnkl(self.outfile)
         po.ocmmnt(self.outfile, "Plasma ion densities / electron density:")
 
@@ -4279,6 +4290,10 @@ def outplas(self):
             physics_variables.alphap,
         )
 
+        po.oblnkl(self.outfile)
+        po.ostars(self.outfile, 110)
+        po.oblnkl(self.outfile)
+
         if stellarator_variables.istell == 0:
             po.osubhd(self.outfile, "Density Limit using different models :")
             po.ovarre(
@@ -4353,6 +4368,10 @@ def outplas(self):
                     "OP ",
                 )
 
+        po.oblnkl(self.outfile)
+        po.ostars(self.outfile, 110)
+        po.oblnkl(self.outfile)
+
         po.osubhd(self.outfile, "Fuel Constituents :")
         po.ovarrf(
             self.outfile,
@@ -4564,6 +4583,10 @@ def outplas(self):
             "OP ",
         )
 
+        po.oblnkl(self.outfile)
+        po.ostars(self.outfile, 110)
+        po.oblnkl(self.outfile)
+
         po.osubhd(self.outfile, "Radiation Power (excluding SOL):")
         po.ovarre(
             self.outfile,
@@ -4802,15 +4825,15 @@ def outplas(self):
         po.ovarre(
             self.outfile,
             "Ion transport (MW)",
-            "(ptrimw)",
-            physics_variables.ptrimw,
+            "(p_ion_transport_loss_mw)",
+            physics_variables.p_ion_transport_loss_mw,
             "OP ",
         )
         po.ovarre(
             self.outfile,
             "Electron transport (MW)",
-            "(ptremw)",
-            physics_variables.ptremw,
+            "(p_electron_transport_loss_mw)",
+            physics_variables.p_electron_transport_loss_mw,
             "OP ",
         )
         po.ovarre(
@@ -4909,6 +4932,10 @@ def outplas(self):
                 "OP ",
             )
 
+        po.oblnkl(self.outfile)
+        po.ostars(self.outfile, 110)
+        po.oblnkl(self.outfile)
+
         if stellarator_variables.istell == 0:
             po.osubhd(self.outfile, "H-mode Power Threshold Scalings :")
 
@@ -5151,7 +5178,9 @@ def outplas(self):
             po.oblnkl(self.outfile)
 
         tauelaw = f2py_compatible_to_string(
-            physics_variables.tauscl[physics_variables.isc - 1]
+            physics_variables.labels_confinement_scalings[
+                physics_variables.i_confinement_time
+            ]
         )
 
         po.ocmmnt(
@@ -5171,57 +5200,64 @@ def outplas(self):
         )
         po.ovarrf(
             self.outfile,
-            "Global thermal energy confinement time (s)",
-            "(taueff)",
-            physics_variables.taueff,
+            "Global thermal energy confinement time, from scaling (s)",
+            "(t_energy_confinement)",
+            physics_variables.t_energy_confinement,
             "OP ",
         )
         po.ovarrf(
             self.outfile,
-            "Ion energy confinement time (s)",
-            "(tauei)",
-            physics_variables.tauei,
+            "Directly calculated total energy confinement time (s)",
+            "(t_energy_confinement_beta)",
+            physics_module.t_energy_confinement_beta,
             "OP ",
         )
+        po.ocmmnt(
+            self.outfile,
+            "(Total thermal energy derived from total plasma beta / loss power)",
+        )
         po.ovarrf(
             self.outfile,
-            "Electron energy confinement time (s)",
-            "(tauee)",
-            physics_variables.tauee,
+            "Ion energy confinement time, from scaling (s)",
+            "(t_ion_energy_confinement)",
+            physics_variables.t_ion_energy_confinement,
             "OP ",
         )
-        po.ovarre(
+        po.ovarrf(
             self.outfile,
-            "n.tau = Volume-average electron density x Energy confinement time (s/m3)",
-            "(dntau)",
-            physics_variables.dntau,
+            "Electron energy confinement time, from scaling (s)",
+            "(t_electron_energy_confinement)",
+            physics_variables.t_electron_energy_confinement,
             "OP ",
         )
-        po.ocmmnt(
+        po.ovarre(
             self.outfile,
-            "Triple product = Vol-av electron density x Vol-av electron temp x Energy confinement time:",
+            "Fusion double product (s/m3)",
+            "(ntau)",
+            physics_variables.ntau,
+            "OP ",
         )
         po.ovarre(
             self.outfile,
-            "Triple product  (keV s/m3)",
-            "(dntau*te)",
-            physics_variables.dntau * physics_variables.te,
+            "Lawson Triple product (keV s/m3)",
+            "(nTtau)",
+            physics_variables.nTtau,
             "OP ",
         )
         po.ovarre(
             self.outfile,
             "Transport loss power assumed in scaling law (MW)",
-            "(powerht)",
-            physics_variables.powerht,
+            "(p_plasma_loss_mw)",
+            physics_variables.p_plasma_loss_mw,
             "OP ",
         )
         po.ovarin(
             self.outfile,
             "Switch for radiation loss term usage in power balance",
-            "(iradloss)",
-            physics_variables.iradloss,
+            "(i_rad_loss)",
+            physics_variables.i_rad_loss,
         )
-        if physics_variables.iradloss == 0:
+        if physics_variables.i_rad_loss == 0:
             po.ovarre(
                 self.outfile,
                 "Radiation power subtracted from plasma power balance (MW)",
@@ -5230,7 +5266,7 @@ def outplas(self):
                 "OP ",
             )
             po.ocmmnt(self.outfile, "  (Radiation correction is total radiation power)")
-        elif physics_variables.iradloss == 1:
+        elif physics_variables.i_rad_loss == 1:
             po.ovarre(
                 self.outfile,
                 "Radiation power subtracted from plasma power balance (MW)",
@@ -5247,16 +5283,16 @@ def outplas(self):
                 0.0e0,
             )
             po.ocmmnt(self.outfile, "  (No radiation correction applied)")
-        if physics_variables.iradloss == 1:
+        if physics_variables.i_rad_loss == 1:
             po.ovarrf(
                 self.outfile,
                 "H* non-radiation corrected",
                 "(hstar)",
                 physics_variables.hfact
                 * (
-                    physics_variables.powerht
+                    physics_variables.p_plasma_loss_mw
                     / (
-                        physics_variables.powerht
+                        physics_variables.p_plasma_loss_mw
                         + physics_variables.pden_plasma_sync_mw
                         + physics_variables.p_plasma_inner_rad_mw
                     )
@@ -5264,16 +5300,16 @@ def outplas(self):
                 ** 0.31,
                 "OP",
             )
-        elif physics_variables.iradloss == 0:
+        elif physics_variables.i_rad_loss == 0:
             po.ovarrf(
                 self.outfile,
                 "H* non-radiation corrected",
                 "(hstar)",
                 physics_variables.hfact
                 * (
-                    physics_variables.powerht
+                    physics_variables.p_plasma_loss_mw
                     / (
-                        physics_variables.powerht
+                        physics_variables.p_plasma_loss_mw
                         + physics_variables.pden_plasma_rad_mw
                         * physics_variables.vol_plasma
                     )
@@ -5281,7 +5317,7 @@ def outplas(self):
                 ** 0.31,
                 "OP",
             )
-        elif physics_variables.iradloss == 2:
+        elif physics_variables.i_rad_loss == 2:
             po.ovarrf(
                 self.outfile,
                 "H* non-radiation corrected",
@@ -5293,36 +5329,28 @@ def outplas(self):
         po.ovarrf(
             self.outfile,
             "Alpha particle confinement time (s)",
-            "(taup)",
-            physics_variables.taup,
+            "(t_alpha_confinement)",
+            physics_variables.t_alpha_confinement,
             "OP ",
         )
         # Note alpha confinement time is no longer equal to fuel particle confinement time.
         po.ovarrf(
             self.outfile,
             "Alpha particle/energy confinement time ratio",
-            "(taup/taueff)",
-            physics_variables.taup / physics_variables.taueff,
+            "(f_alpha_energy_confinement)",
+            physics_variables.f_alpha_energy_confinement,
             "OP ",
         )
         po.ovarrf(
             self.outfile,
-            "Lower limit on taup/taueff",
-            "(taulimit)",
-            constraint_variables.taulimit,
-        )
-        po.ovarrf(
-            self.outfile,
-            "Total energy confinement time including radiation loss (s)",
-            "(total_energy_conf_time)",
-            physics_module.total_energy_conf_time,
-            "OP ",
-        )
-        po.ocmmnt(
-            self.outfile,
-            "  (= stored energy including fast particles / loss power including radiation",
+            "Lower limit on f_alpha_energy_confinement",
+            "(f_alpha_energy_confinement_min)",
+            constraint_variables.f_alpha_energy_confinement_min,
         )
 
+        # Plot table of al the H-factor scalings and coparison values
+        self.output_confinement_comparison()
+
         if stellarator_variables.istell == 0:
             # Issues 363 Output dimensionless plasma parameters MDK
             po.osubhd(self.outfile, "Dimensionless plasma parameters")
@@ -5358,12 +5386,16 @@ def outplas(self):
             )
             po.ovarre(
                 self.outfile,
-                "Volume measure of elongation",
-                "(kappaa_IPB)",
-                physics_variables.kappaa_ipb,
+                "ITER Physics Basis definition of elongation",
+                "(kappa_ipb)",
+                physics_variables.kappa_ipb,
                 "OP ",
             )
 
+            po.oblnkl(self.outfile)
+            po.ostars(self.outfile, 110)
+            po.oblnkl(self.outfile)
+
             po.osubhd(self.outfile, "Plasma Volt-second Requirements :")
             po.ovarre(
                 self.outfile,
@@ -5708,36 +5740,57 @@ def outplas(self):
                 reinke_variables.fzactual,
             )
 
-    def igmarcal(self):
-        """Routine to calculate ignition margin
-        author: P J Knight, CCFE, Culham Science Centre
-        outfile   : input integer : Fortran output unit identifier
-        This routine calculates the ignition margin at the final point
-        with different scalings.
+    def output_confinement_comparison(self) -> None:
+        """
+        Routine to calculate ignition margin for different confinement scalings and equivalent confinement times for H=1.
+
+        This routine calculates the ignition margin at the final point with different scalings and outputs the results to a file.
+
+        The output includes:
+        - Energy confinement times
+        - Required H-factors for power balance
+
+        The routine iterates over a range of confinement times, skipping the first user input and a specific index (25). For each confinement time, it calculates various parameters related to confinement and ignition using the `calculate_confinement_time` method. It then calculates the H-factor for when the plasma is ignited using the `fhfac` method and writes the results to the output file.
+
+        Output format:
+        - Header: "Energy confinement times, and required H-factors :"
+        - Columns: "Scaling law", "Confinement time [s]", "H-factor for power balance"
+
+        Methods used:
+        - `calculate_confinement_time`: Calculates confinement-related parameters.
+        - `fhfac`: Calculates the H-factor for a given confinement time.
+
+        Parameters:
+        - None
+
+        Returns:
+        - None
         """
 
         po.oheadr(self.outfile, "Energy confinement times, and required H-factors :")
         po.ocmmnt(
             self.outfile,
-            f"{'':>5}{'scaling law':<25}{'confinement time (s)':<25}H-factor for",
+            f"{'':>2}{'Scaling law':<27}{'Electron confinement time [s]':<32}Equivalent H-factor for",
         )
         po.ocmmnt(
             self.outfile,
-            f"{'':>34}{'for H = 1':<20}power balance",
+            f"{'':>38}{'for H = 1':<23}same confinement time",
         )
+        po.oblnkl(self.outfile)
 
-        # for iisc in range(32, 48):
-        # Put the ITPA value first
-        for iisc in [50, 34, 37, 38, 39, 46, 47, 48]:
+        # Plot all of the confinement scalings for comparison when H = 1
+        # Start from range 1 as the first i_confinement_time is a user input
+        for i_confinement_time in range(1, physics_variables.n_confinement_scalings):
+            if i_confinement_time == 25:
+                continue
             (
-                physics_variables.kappaa,
-                ptrez,
-                ptriz,
+                _,
+                _,
                 taueez,
-                taueiz,
-                taueffz,
-                powerhtz,
-            ) = self.pcond(
+                _,
+                _,
+                _,
+            ) = self.calculate_confinement_time(
                 physics_variables.m_fuel_amu,
                 physics_variables.alpha_power_total,
                 physics_variables.aspect,
@@ -5747,8 +5800,7 @@ def igmarcal(self):
                 physics_variables.dnla,
                 physics_variables.eps,
                 1.0,
-                physics_variables.iinvqd,
-                iisc,
+                i_confinement_time,
                 physics_variables.ignite,
                 physics_variables.kappa,
                 physics_variables.kappa95,
@@ -5758,24 +5810,28 @@ def igmarcal(self):
                 physics_variables.pcoreradpv,
                 physics_variables.rmajor,
                 physics_variables.rminor,
-                physics_variables.te,
                 physics_variables.ten,
                 physics_variables.tin,
                 physics_variables.q,
                 physics_variables.qstar,
                 physics_variables.vol_plasma,
-                physics_variables.a_plasma_poloidal,
                 physics_variables.zeff,
             )
 
-            physics_variables.hfac[iisc - 1] = self.fhfac(iisc)
+            # Calculate the H-factor for the same confinement time in other scalings
+            physics_variables.hfac[i_confinement_time - 1] = self.find_other_h_factors(
+                i_confinement_time
+            )
 
             po.ocmmnt(
                 self.outfile,
-                f"{'':>2}{f2py_compatible_to_string(physics_variables.tauscl[iisc - 1]):<32}"
-                f"{taueez:<26.3f}{physics_variables.hfac[iisc - 1]:.3f}",
+                f"{'':>2}{f2py_compatible_to_string(physics_variables.labels_confinement_scalings[i_confinement_time]):<38}"
+                f"{taueez:<28.3f}{physics_variables.hfac[i_confinement_time - 1]:.3f}",
             )
 
+        po.oblnkl(self.outfile)
+        po.ostars(self.outfile, 110)
+
     @staticmethod
     def bootstrap_fraction_iter89(
         aspect: float,
@@ -6499,198 +6555,159 @@ def bootstrap_fraction_gi_II(  # noqa: N802
 
         return c_bs * np.sqrt(inverse_aspect) * beta_poloidal
 
-    def fhfac(self, is_):
-        """Function to find H-factor for power balance
-        author: P J Knight, CCFE, Culham Science Centre
-        is : input integer : confinement time scaling law of interest
-        This function calculates the H-factor required for power balance,
-        using the given energy confinement scaling law.
+    def find_other_h_factors(self, i_confinement_time: int) -> float:
         """
+        Function to find H-factor for the equivalent confinement time in other scalings.
 
-        physics_module.iscz = is_
-
-        return root_scalar(self.fhz, bracket=(0.01, 150), xtol=0.003).root
+        Args:
+            i_confinement_time (int): Index of the confinement time scaling to use.
 
-    def fhz(self, hhh):
-        """Function used to find power balance
-        author: P J Knight, CCFE, Culham Science Centre
-        hhh : input real : test value for confinement time H-factor
-        This function is used to find power balance.
-        <CODE>FHZ</CODE> is zero at power balance, which is achieved
-        using routine <A HREF="zeroin.html">ZEROIN</A> to adjust the
-        value of <CODE>hhh</CODE>, the confinement time H-factor.
+        Returns:
+            float: The calculated H-factor.
         """
 
-        (
-            physics_variables.kappaa,
-            ptrez,
-            ptriz,
-            taueezz,
-            taueiz,
-            taueffz,
-            powerhtz,
-        ) = self.pcond(
-            physics_variables.m_fuel_amu,
-            physics_variables.alpha_power_total,
-            physics_variables.aspect,
-            physics_variables.bt,
-            physics_variables.nd_ions_total,
-            physics_variables.dene,
-            physics_variables.dnla,
-            physics_variables.eps,
-            hhh,
-            physics_variables.iinvqd,
-            physics_module.iscz,
-            physics_variables.ignite,
-            physics_variables.kappa,
-            physics_variables.kappa95,
-            physics_variables.non_alpha_charged_power,
-            current_drive_variables.pinjmw,
-            physics_variables.plasma_current,
-            physics_variables.pcoreradpv,
-            physics_variables.rmajor,
-            physics_variables.rminor,
-            physics_variables.te,
-            physics_variables.ten,
-            physics_variables.tin,
-            physics_variables.q,
-            physics_variables.qstar,
-            physics_variables.vol_plasma,
-            physics_variables.a_plasma_poloidal,
-            physics_variables.zeff,
-        )
+        def fhz(hfact: float) -> float:
+            """
+            Function used to find power balance.
 
-        # At power balance, fhz is zero.
+            Args:
+                hfact (float): H-factor to be used in the calculation.
 
-        fhz = (
-            ptrez
-            + ptriz
-            - physics_variables.f_alpha_plasma
-            * physics_variables.alpha_power_density_total
-            - physics_variables.charged_power_density
-            - physics_variables.pden_plasma_ohmic_mw
-        )
+            Returns:
+                float: The difference between the calculated power and the required power for balance.
+            """
+            (
+                ptrez,
+                ptriz,
+                _,
+                _,
+                _,
+                _,
+            ) = self.calculate_confinement_time(
+                physics_variables.m_fuel_amu,
+                physics_variables.alpha_power_total,
+                physics_variables.aspect,
+                physics_variables.bt,
+                physics_variables.nd_ions_total,
+                physics_variables.dene,
+                physics_variables.dnla,
+                physics_variables.eps,
+                hfact,
+                i_confinement_time,
+                physics_variables.ignite,
+                physics_variables.kappa,
+                physics_variables.kappa95,
+                physics_variables.non_alpha_charged_power,
+                current_drive_variables.pinjmw,
+                physics_variables.plasma_current,
+                physics_variables.pcoreradpv,
+                physics_variables.rmajor,
+                physics_variables.rminor,
+                physics_variables.ten,
+                physics_variables.tin,
+                physics_variables.q,
+                physics_variables.qstar,
+                physics_variables.vol_plasma,
+                physics_variables.zeff,
+            )
 
-        # Take into account whether injected power is included in tau_e
-        # calculation (i.e. whether device is ignited)
+            # At power balance, fhz is zero.
+            fhz_value = (
+                ptrez
+                + ptriz
+                - physics_variables.f_alpha_plasma
+                * physics_variables.alpha_power_density_total
+                - physics_variables.charged_power_density
+                - physics_variables.pden_plasma_ohmic_mw
+            )
 
-        if physics_variables.ignite == 0:
-            fhz -= current_drive_variables.pinjmw / physics_variables.vol_plasma
+            # Take into account whether injected power is included in tau_e calculation (i.e. whether device is ignited)
+            if physics_variables.ignite == 0:
+                fhz_value -= (
+                    current_drive_variables.pinjmw / physics_variables.vol_plasma
+                )
 
-        # Include the radiation power if requested
+            # Include the radiation power if requested
+            if physics_variables.i_rad_loss == 0:
+                fhz_value += physics_variables.pden_plasma_rad_mw
+            elif physics_variables.i_rad_loss == 1:
+                fhz_value += physics_variables.pcoreradpv
 
-        if physics_variables.iradloss == 0:
-            fhz += physics_variables.pden_plasma_rad_mw
-        elif physics_variables.iradloss == 1:
-            fhz += physics_variables.pcoreradpv
+            return fhz_value
 
-        return fhz
+        return root_scalar(fhz, bracket=(0.01, 150), xtol=0.00001).root
 
     @staticmethod
-    def pcond(
-        m_fuel_amu,
-        alpha_power_total,
-        aspect,
-        bt,
-        nd_ions_total,
-        dene,
-        dnla,
-        eps,
-        hfact,
-        iinvqd,
-        isc,
-        ignite,
-        kappa,
-        kappa95,
-        non_alpha_charged_power,
-        pinjmw,
-        plasma_current,
-        pcoreradpv,
-        rmajor,
-        rminor,
-        _te,
-        ten,
-        tin,
-        q,
-        qstar,
-        vol_plasma,
-        a_plasma_poloidal,
-        zeff,
-    ):
-        """Routine to calculate the confinement times and
-        the transport power loss terms.
-        author: P J Knight, CCFE, Culham Science Centre
-        m_fuel_amu     : input real :  average mass of fuel (amu)
-        alpha_power_total    : input real :  alpha particle power (MW)
-        aspect    : input real :  aspect ratio
-        bt        : input real :  toroidal field on axis (T)
-        dene      : input real :  volume averaged electron density (/m3)
-        nd_ions_total    : input real :  total ion density (/m3)
-        dnla      : input real :  line-averaged electron density (/m3)
-        eps       : input real :  inverse aspect ratio
-        hfact     : input real :  H factor on energy confinement scalings
-        iinvqd    : input integer :  switch for inverse quadrature
-        isc       : input integer :  switch for energy confinement scaling to use
-        ignite    : input integer :  switch for ignited calculation
-        kappa     : input real :  plasma elongation
-        kappa95   : input real :  plasma elongation at 95% surface
-        kappaa    : output real : plasma elongation calculated using area ratio
-        non_alpha_charged_power : input real :  non-alpha charged particle fusion power (MW)
-        pinjmw    : input real :  auxiliary power to ions and electrons (MW)
-        plasma_current   : input real :  plasma current (A)
-        pcoreradpv: input real :  total core radiation power (MW/m3)
-        q         : input real :  edge safety factor (tokamaks), or
-        rotational transform iotabar (stellarators)
-        qstar     : input real :  equivalent cylindrical edge safety factor
-        rmajor    : input real :  plasma major radius (m)
-        rminor    : input real :  plasma minor radius (m)
-        te        : input real :  average electron temperature (keV)
-        ten       : input real :  density weighted average electron temp. (keV)
-        tin       : input real :  density weighted average ion temperature (keV)
-        vol_plasma       : input real :  plasma volume (m3)
-        a_plasma_poloidal     : input real :  plasma cross-sectional area (m2)
-        zeff      : input real :  plasma effective charge
-        ptrepv    : output real : electron transport power (MW/m3)
-        ptripv    : output real : ion transport power (MW/m3)
-        tauee     : output real : electron energy confinement time (s)
-        taueff    : output real : global energy confinement time (s)
-        tauei     : output real : ion energy confinement time (s)
-        powerht   : output real : heating power (MW) assumed in calculation
-        This subroutine calculates the energy confinement time
-        using one of a large number of scaling laws, and the
-        transport power loss terms.
-        N. A. Uckan and ITER Physics Group,
-        "ITER Physics Design Guidelines: 1989",
-        ITER Documentation Series, No. 10, IAEA/ITER/DS/10 (1990)
-        A. Murari et al 2015 Nucl. Fusion, 55, 073009
-        C.C. Petty 2008 Phys. Plasmas, 15, 080501
-        P.T. Lang et al. 2012 IAEA conference proceeding EX/P4-01
-        ITER physics basis Chapter 2, 1999 Nuclear Fusion 39 2175
-        Nuclear Fusion corrections, 2008 Nuclear Fusion 48 099801
-        Menard 2019, Phil. Trans. R. Soc. A 377:20170440
-        Kaye et al. 2006, Nucl. Fusion 46 848
+    def calculate_confinement_time(
+        m_fuel_amu: float,
+        alpha_power_total: float,
+        aspect: float,
+        bt: float,
+        nd_ions_total: float,
+        dene: float,
+        dnla: float,
+        eps: float,
+        hfact: float,
+        i_confinement_time: int,
+        ignite: int,
+        kappa: float,
+        kappa95: float,
+        non_alpha_charged_power: float,
+        pinjmw: float,
+        plasma_current: float,
+        pcoreradpv: float,
+        rmajor: float,
+        rminor: float,
+        ten: float,
+        tin: float,
+        q: float,
+        qstar: float,
+        vol_plasma: float,
+        zeff: float,
+    ) -> tuple[float, float, float, float, float, float, float]:
+        """
+        Calculate the confinement times and the transport power loss terms.
+
+        :param m_fuel_amu: Average mass of fuel (amu)
+        :param alpha_power_total: Alpha particle power (MW)
+        :param aspect: Aspect ratio
+        :param bt: Toroidal field on axis (T)
+        :param nd_ions_total: Total ion density (/m3)
+        :param dene: Volume averaged electron density (/m3)
+        :param dnla: Line-averaged electron density (/m3)
+        :param eps: Inverse aspect ratio
+        :param hfact: H factor on energy confinement scalings
+        :param i_confinement_time: Switch for energy confinement scaling to use
+        :param ignite: Switch for ignited calculation
+        :param kappa: Plasma elongation
+        :param kappa95: Plasma elongation at 95% surface
+        :param non_alpha_charged_power: Non-alpha charged particle fusion power (MW)
+        :param pinjmw: Auxiliary power to ions and electrons (MW)
+        :param plasma_current: Plasma current (A)
+        :param pcoreradpv: Total core radiation power (MW/m3)
+        :param q: Edge safety factor (tokamaks), or rotational transform iotabar (stellarators)
+        :param qstar: Equivalent cylindrical edge safety factor
+        :param rmajor: Plasma major radius (m)
+        :param rminor: Plasma minor radius (m)
+        :param ten: Density weighted average electron temperature (keV)
+        :param tin: Density weighted average ion temperature (keV)
+        :param vol_plasma: Plasma volume (m3)
+        :param a_plasma_poloidal: Plasma cross-sectional area (m2)
+        :param zeff: Plasma effective charge
+
+        :return: Tuple containing:
+            - pden_electron_transport_loss_mw (float): Electron transport power (MW/m3)
+            - pden_ion_transport_loss_mw (float): Ion transport power (MW/m3)
+            - t_electron_energy_confinement (float): Electron energy confinement time (s)
+            - t_ion_energy_confinement (float): Ion energy confinement time (s)
+            - t_energy_confinement (float): Global energy confinement time (s)
+            - p_plasma_loss_mw (float): Heating power (MW) assumed in calculation
         """
 
-        eps2 = eps / 2.0e0
-        str5 = 2.0e0 / (1.0e0 + (kappa**2))
-        ck2 = (0.66e0 + (1.88e0 * (np.sqrt(eps2))) - (1.54e0 * eps2)) * (
-            1.0e0 + (1.5e0 * (eps2**2))
-        )
-        chii = (
-            (6.5e-22)
-            * ck2
-            * zeff
-            * (aspect**1.5e0)
-            * dene
-            * (q**2)
-            * str5
-            / ((np.sqrt(tin)) * (bt**2))
-        )
-        str2 = 2.0e0 * (kappa**2) / (1.0e0 + (kappa**2))
-        tauei = 0.375e0 * rminor**2 / chii * str2
+        # ========================================================================
 
         # Calculate heating power (MW)
-        powerht = (
+        p_plasma_loss_mw = (
             physics_variables.f_alpha_plasma * alpha_power_total
             + non_alpha_charged_power
             + physics_variables.p_plasma_ohmic_mw
@@ -6698,19 +6715,23 @@ def pcond(
 
         # If the device is not ignited, add the injected auxiliary power
         if ignite == 0:
-            powerht = powerht + pinjmw
+            p_plasma_loss_mw = p_plasma_loss_mw + pinjmw
 
         # Include the radiation as a loss term if requested
-        if physics_variables.iradloss == 0:
-            powerht = powerht - physics_variables.pden_plasma_rad_mw * vol_plasma
-        elif physics_variables.iradloss == 1:
-            powerht = (
-                powerht - pcoreradpv * vol_plasma
+        if physics_variables.i_rad_loss == 0:
+            p_plasma_loss_mw = (
+                p_plasma_loss_mw - physics_variables.pden_plasma_rad_mw * vol_plasma
+            )
+        elif physics_variables.i_rad_loss == 1:
+            p_plasma_loss_mw = (
+                p_plasma_loss_mw - pcoreradpv * vol_plasma
             )  # shouldn't this be vol_core instead of vol_plasma?
-        # else do not adjust powerht for radiation
+        # else do not adjust p_plasma_loss_mw for radiation
 
         # Ensure heating power is positive (shouldn't be necessary)
-        powerht = max(powerht, 1.0e-3)
+        p_plasma_loss_mw = max(p_plasma_loss_mw, 1.0e-3)
+
+        # ========================================================================
 
         # Line averaged electron density in scaled units
         dnla20 = dnla * 1.0e-20
@@ -6722,828 +6743,748 @@ def pcond(
         # Plasma current in MA
         pcur = plasma_current / 1.0e6
 
-        # Separatrix kappa defined with X-section for general use
-        kappaa = a_plasma_poloidal / (np.pi * rminor * rminor)
-
         # Separatrix kappa defined with plasma volume for IPB scalings
-        physics_variables.kappaa_ipb = vol_plasma / (
-            2.0e0 * np.pi**2 * rminor * rminor * rmajor
-        )
+        # Updated version of kappa used by the IPB98 scalings correction in:
+
+        # None Otto Kardaun, N. K. Thomsen, and None Alexander Chudnovskiy,
+        # “Corrections to a sequence of papers in Nuclear Fusion,” Nuclear Fusion,
+        # vol. 48, no. 9, pp. 099801099801, Aug. 2008,
+        # doi: https://doi.org/10.1088/0029-5515/48/9/099801.
 
-        # Calculate Neo-Alcator confinement time (used in several scalings)
-        taueena = 0.07e0 * n20 * rminor * rmajor * rmajor * qstar
+        physics_variables.kappa_ipb = (vol_plasma / (2.0 * np.pi * rmajor)) / (
+            np.pi * rminor**2
+        )
 
         # Electron energy confinement times
 
-        if isc == 1:  # Neo-Alcator scaling (ohmic)
-            # tauee = taueena
-            tauee = hfact * taueena
-
-        elif isc == 2:  # Mirnov scaling (H-mode)
-            tauee = hfact * 0.2e0 * rminor * np.sqrt(kappa95) * pcur
-
-        elif isc == 3:  # Merezhkin-Muhkovatov scaling (L-mode)
-            tauee = (
-                hfact
-                * 3.5e-3
-                * rmajor**2.75e0
-                * rminor**0.25e0
-                * kappa95**0.125e0
-                * qstar
-                * dnla20
-                * np.sqrt(m_fuel_amu)
-                / np.sqrt(ten / 10.0e0)
-            )
-
-        elif isc == 4:  # Shimomura scaling (H-mode)
-            tauee = (
-                hfact
-                * 0.045e0
-                * rmajor
-                * rminor
-                * bt
-                * np.sqrt(kappa95)
-                * np.sqrt(m_fuel_amu)
-            )
-
-        elif isc == 5:  # Kaye-Goldston scaling (L-mode)
-            tauee = (
-                hfact
-                * 0.055e0
-                * kappa95**0.28e0
-                * pcur**1.24e0
-                * n20**0.26e0
-                * rmajor**1.65e0
-                * np.sqrt(m_fuel_amu / 1.5e0)
-                / (bt**0.09e0 * rminor**0.49e0 * powerht**0.58e0)
-            )
-
-            if iinvqd != 0:
-                tauee = 1.0e0 / np.sqrt(1.0e0 / taueena**2 + 1.0e0 / tauee**2)
-
-        elif isc == 6:  # ITER Power scaling - ITER 89-P (L-mode)
-            tauee = (
-                hfact
-                * 0.048e0
-                * pcur**0.85e0
-                * rmajor**1.2e0
-                * rminor**0.3e0
-                * np.sqrt(kappa)
-                * dnla20**0.1e0
-                * bt**0.2e0
-                * np.sqrt(m_fuel_amu)
-                / np.sqrt(powerht)
-            )
-
-        elif isc == 7:  # ITER Offset linear scaling - ITER 89-O (L-mode)
-            term1 = (
-                0.04e0
-                * pcur**0.5e0
-                * rmajor**0.3e0
-                * rminor**0.8e0
-                * kappa**0.6e0
-                * m_fuel_amu**0.5e0
-            )
-            term2 = (
-                0.064e0
-                * pcur**0.8e0
-                * rmajor**1.6e0
-                * rminor**0.6e0
-                * kappa**0.5e0
-                * dnla20**0.6e0
-                * bt**0.35e0
-                * m_fuel_amu**0.2e0
-                / powerht
-            )
-            tauee = hfact * (term1 + term2)
-
-        elif isc == 8:  # Rebut-Lallia offset linear scaling (L-mode)
-            rll = (rminor**2 * rmajor * kappa95) ** 0.333e0
-            tauee = (
-                hfact
-                * 1.65e0
-                * np.sqrt(m_fuel_amu / 2.0e0)
-                * (
-                    1.2e-2 * pcur * rll**1.5e0 / np.sqrt(zeff)
-                    + 0.146e0
-                    * dnla20**0.75e0
-                    * np.sqrt(pcur)
-                    * np.sqrt(bt)
-                    * rll**2.75e0
-                    * zeff**0.25e0
-                    / powerht
-                )
+        # ========================================================================
+
+        # User defined confinement time
+        if i_confinement_time == 0:  # t_electron_energy_confinement is an input
+            t_electron_confinement = physics_variables.tauee_in
+
+        # ========================================================================
+
+        # Nec-Alcator(NA) OH scaling
+        if i_confinement_time == 1:
+            t_electron_confinement = confinement.neo_alcator_confinement_time(
+                n20, rminor, rmajor, qstar
             )
 
-        elif isc == 9:  # Goldston scaling (L-mode)
-            tauee = (
-                hfact
-                * 0.037e0
-                * pcur
-                * rmajor**1.75e0
-                * rminor ** (-0.37e0)
-                * np.sqrt(kappa95)
-                * np.sqrt(m_fuel_amu / 1.5e0)
-                / np.sqrt(powerht)
-            )
-
-            if iinvqd != 0:
-                tauee = 1.0e0 / np.sqrt(1.0e0 / taueena**2 + 1.0e0 / tauee**2)
-
-        elif isc == 10:  # T10 scaling
-            denfac = dnla20 * rmajor * qstar / (1.3e0 * bt)
-            denfac = min(1.0e0, denfac)
-            tauee = (
-                hfact
-                * 0.095e0
-                * rmajor
-                * rminor
-                * bt
-                * np.sqrt(kappa95)
-                * denfac
-                / powerht**0.4e0
-                * (zeff**2 * pcur**4 / (rmajor * rminor * qstar**3 * kappa95**1.5e0))
-                ** 0.08e0
+        # ========================================================================
+
+        # "Mirnov"-like scaling (H-mode)
+        elif i_confinement_time == 2:  # Mirnov scaling (H-mode)
+            t_electron_confinement = confinement.mirnov_confinement_time(
+                rminor, kappa95, pcur
             )
 
-        elif isc == 11:  # JAERI scaling
-            gjaeri = (
-                zeff**0.4e0
-                * ((15.0e0 - zeff) / 20.0e0) ** 0.6e0
-                * (
-                    3.0e0
-                    * qstar
-                    * (qstar + 5.0e0)
-                    / ((qstar + 2.0e0) * (qstar + 7.0e0))
+        # ========================================================================
+
+        # Merezhkin-Mukhovatov (MM) OH/L-mode scaling
+        elif i_confinement_time == 3:
+            t_electron_confinement = confinement.merezhkin_muhkovatov_confinement_time(
+                rmajor, rminor, kappa95, qstar, dnla20, m_fuel_amu, ten
+            )
+
+        # ========================================================================
+
+        # Shimomura (S) optimized H-mode scaling
+        elif i_confinement_time == 4:
+            t_electron_confinement = confinement.shimomura_confinement_time(
+                rmajor, rminor, bt, kappa95, m_fuel_amu
+            )
+
+        # ========================================================================
+
+        # Kaye-Goldston scaling (L-mode)
+        elif i_confinement_time == 5:
+            t_electron_confinement = confinement.kaye_goldston_confinement_time(
+                pcur, rmajor, rminor, kappa, dnla20, bt, m_fuel_amu, p_plasma_loss_mw
+            )
+
+        # ========================================================================
+
+        # ITER Power scaling - ITER 89-P (L-mode)
+        elif i_confinement_time == 6:
+            t_electron_confinement = confinement.iter_89p_confinement_time(
+                pcur, rmajor, rminor, kappa, dnla20, bt, m_fuel_amu, p_plasma_loss_mw
+            )
+
+        # ========================================================================
+
+        # ITER Offset linear scaling - ITER 89-O (L-mode)
+        elif i_confinement_time == 7:
+            t_electron_confinement = confinement.iter_89_0_confinement_time(
+                pcur, rmajor, rminor, kappa, dnla20, bt, m_fuel_amu, p_plasma_loss_mw
+            )
+        # ========================================================================
+
+        # Rebut-Lallia offset linear scaling (L-mode)
+        elif i_confinement_time == 8:
+            t_electron_confinement = confinement.rebut_lallia_confinement_time(
+                rminor,
+                rmajor,
+                kappa,
+                m_fuel_amu,
+                pcur,
+                zeff,
+                dnla20,
+                bt,
+                p_plasma_loss_mw,
+            )
+
+        # ========================================================================
+
+        # Goldston scaling (L-mode)
+        elif i_confinement_time == 9:  # Goldston scaling (L-mode)
+            t_electron_confinement = confinement.goldston_confinement_time(
+                pcur, rmajor, rminor, kappa95, m_fuel_amu, p_plasma_loss_mw
+            )
+
+        # ========================================================================
+
+        # T-10 scaling (L-mode)
+        elif i_confinement_time == 10:
+            t_electron_confinement = confinement.t10_confinement_time(
+                dnla20, rmajor, qstar, bt, rminor, kappa95, p_plasma_loss_mw, zeff, pcur
+            )
+
+        # ========================================================================
+
+        # JAERI / Odajima-Shimomura L-mode scaling
+        elif i_confinement_time == 11:  # JAERI scaling
+            t_electron_confinement = confinement.jaeri_confinement_time(
+                kappa95,
+                rminor,
+                m_fuel_amu,
+                n20,
+                pcur,
+                bt,
+                rmajor,
+                qstar,
+                zeff,
+                p_plasma_loss_mw,
+            )
+
+        # ========================================================================
+
+        # Kaye "big"  L-mode scaling (based only on big tokamak data)
+        elif i_confinement_time == 12:
+            t_electron_confinement = confinement.kaye_big_confinement_time(
+                rmajor,
+                rminor,
+                bt,
+                kappa95,
+                pcur,
+                n20,
+                m_fuel_amu,
+                p_plasma_loss_mw,
+            )
+
+        # ========================================================================
+
+        # ITER H90-P H-mode scaling
+        elif i_confinement_time == 13:
+            t_electron_confinement = confinement.iter_h90_p_confinement_time(
+                pcur,
+                rmajor,
+                rminor,
+                kappa,
+                dnla20,
+                bt,
+                m_fuel_amu,
+                p_plasma_loss_mw,
+            )
+
+        # ========================================================================
+
+        # Minimum of ITER 89-P and ITER 89-O
+        elif i_confinement_time == 14:
+            t_electron_confinement = min(
+                confinement.iter_89p_confinement_time(
+                    pcur,
+                    rmajor,
+                    rminor,
+                    kappa,
+                    dnla20,
+                    bt,
+                    m_fuel_amu,
+                    p_plasma_loss_mw,
+                ),
+                confinement.iter_89_0_confinement_time(
+                    pcur,
+                    rmajor,
+                    rminor,
+                    kappa,
+                    dnla20,
+                    bt,
+                    m_fuel_amu,
+                    p_plasma_loss_mw,
+                ),
+            )
+
+        # ========================================================================
+
+        # Riedel scaling (L-mode)
+        elif i_confinement_time == 15:
+            t_electron_confinement = confinement.riedel_l_confinement_time(
+                pcur,
+                rmajor,
+                rminor,
+                kappa95,
+                dnla20,
+                bt,
+                p_plasma_loss_mw,
+            )
+
+        # ========================================================================
+
+        # Christiansen et al scaling (L-mode)
+        elif i_confinement_time == 16:
+            t_electron_confinement = confinement.christiansen_confinement_time(
+                pcur,
+                rmajor,
+                rminor,
+                kappa95,
+                dnla20,
+                bt,
+                p_plasma_loss_mw,
+                m_fuel_amu,
+            )
+
+        # ========================================================================
+
+        # Lackner-Gottardi scaling (L-mode)
+        elif i_confinement_time == 17:
+            t_electron_confinement = confinement.lackner_gottardi_confinement_time(
+                pcur,
+                rmajor,
+                rminor,
+                kappa95,
+                dnla20,
+                bt,
+                p_plasma_loss_mw,
+            )
+
+        # ========================================================================
+
+        # Neo-Kaye scaling (L-mode)
+        elif i_confinement_time == 18:
+            t_electron_confinement = confinement.neo_kaye_confinement_time(
+                pcur,
+                rmajor,
+                rminor,
+                kappa95,
+                dnla20,
+                bt,
+                p_plasma_loss_mw,
+            )
+
+        # ======== ================================================================
+
+        # Riedel scaling (H-mode)
+        elif i_confinement_time == 19:
+            t_electron_confinement = confinement.riedel_h_confinement_time(
+                pcur,
+                rmajor,
+                rminor,
+                kappa95,
+                dnla20,
+                bt,
+                m_fuel_amu,
+                p_plasma_loss_mw,
+            )
+
+        # ========================================================================
+
+        # Amended version of ITER H90-P law
+        elif i_confinement_time == 20:
+            t_electron_confinement = confinement.iter_h90_p_amended_confinement_time(
+                pcur,
+                bt,
+                m_fuel_amu,
+                rmajor,
+                p_plasma_loss_mw,
+                kappa,
+            )
+
+        # ==========================================================================
+
+        # Sudo et al. scaling (stellarators/heliotron)
+        elif i_confinement_time == 21:
+            t_electron_confinement = confinement.sudo_et_al_confinement_time(
+                rmajor,
+                rminor,
+                dnla20,
+                bt,
+                p_plasma_loss_mw,
+            )
+
+        # ==========================================================================
+
+        # Gyro-reduced Bohm scaling
+        elif i_confinement_time == 22:
+            t_electron_confinement = confinement.gyro_reduced_bohm_confinement_time(
+                bt,
+                dnla20,
+                p_plasma_loss_mw,
+                rminor,
+                rmajor,
+            )
+
+        # ==========================================================================
+
+        # Lackner-Gottardi stellarator scaling
+        elif i_confinement_time == 23:
+            t_electron_confinement = (
+                confinement.lackner_gottardi_stellarator_confinement_time(
+                    rmajor,
+                    rminor,
+                    dnla20,
+                    bt,
+                    p_plasma_loss_mw,
+                    q,
                 )
-                ** 0.6e0
-            )
-            tauee = hfact * (
-                0.085e0 * kappa95 * rminor**2 * np.sqrt(m_fuel_amu)
-                + 0.069e0
-                * n20**0.6e0
-                * pcur
-                * bt**0.2e0
-                * rminor**0.4e0
-                * rmajor**1.6e0
-                * np.sqrt(m_fuel_amu)
-                * gjaeri
-                * kappa95**0.2e0
-                / powerht
-            )
-
-        elif isc == 12:  # Kaye-Big scaling
-            tauee = (
-                hfact
-                * 0.105e0
-                * np.sqrt(rmajor)
-                * rminor**0.8e0
-                * bt**0.3e0
-                * kappa95**0.25e0
-                * pcur**0.85e0
-                * n20**0.1e0
-                * m_fuel_amu**0.5e0
-                / powerht**0.5e0
-            )
-
-        elif isc == 13:  # ITER H-mode scaling - ITER H90-P
-            tauee = (
-                hfact
-                * 0.064e0
-                * pcur**0.87e0
-                * rmajor**1.82e0
-                * rminor ** (-0.12e0)
-                * kappa**0.35e0
-                * dnla20**0.09e0
-                * bt**0.15e0
-                * np.sqrt(m_fuel_amu)
-                / np.sqrt(powerht)
-            )
-
-        elif isc == 14:  # Minimum of ITER 89-P (isc=6) and ITER 89-O (isc=7)
-            tauit1 = (
-                hfact
-                * 0.048e0
-                * pcur**0.85e0
-                * rmajor**1.2e0
-                * rminor**0.3e0
-                * np.sqrt(kappa)
-                * dnla20**0.1e0
-                * bt**0.2e0
-                * np.sqrt(m_fuel_amu)
-                / np.sqrt(powerht)
-            )
-            term1 = (
-                0.04e0
-                * pcur**0.5e0
-                * rmajor**0.3e0
-                * rminor**0.8e0
-                * kappa**0.6e0
-                * m_fuel_amu**0.5e0
-            )
-            term2 = (
-                0.064e0
-                * pcur**0.8e0
-                * rmajor**1.6e0
-                * rminor**0.6e0
-                * kappa**0.5e0
-                * dnla20**0.6e0
-                * bt**0.35e0
-                * m_fuel_amu**0.2e0
-                / powerht
-            )
-            tauit2 = hfact * (term1 + term2)
-            tauee = min(tauit1, tauit2)
-
-        elif isc == 15:  # Riedel scaling (L-mode)
-            tauee = (
-                hfact
-                * 0.044e0
-                * pcur**0.93e0
-                * rmajor**1.37e0
-                * rminor ** (-0.049e0)
-                * kappa95**0.588e0
-                * dnla20**0.078e0
-                * bt**0.152e0
-                / powerht**0.537e0
-            )
-
-        elif isc == 16:  # Christiansen et al scaling (L-mode)
-            tauee = (
-                hfact
-                * 0.24e0
-                * pcur**0.79e0
-                * rmajor**0.56e0
-                * rminor**1.46e0
-                * kappa95**0.73e0
-                * dnla20**0.41e0
-                * bt**0.29e0
-                / (powerht**0.79e0 * m_fuel_amu**0.02e0)
-            )
-
-        elif isc == 17:  # Lackner-Gottardi scaling (L-mode)
-            qhat = (1.0e0 + kappa95**2) * rminor**2 * bt / (0.4e0 * pcur * rmajor)
-            tauee = (
-                hfact
-                * 0.12e0
-                * pcur**0.8e0
-                * rmajor**1.8e0
-                * rminor**0.4e0
-                * kappa95
-                * (1.0e0 + kappa95) ** (-0.8e0)
-                * dnla20**0.6e0
-                * qhat**0.4e0
-                / powerht**0.6e0
-            )
-
-        elif isc == 18:  # Neo-Kaye scaling (L-mode)
-            tauee = (
-                hfact
-                * 0.063e0
-                * pcur**1.12e0
-                * rmajor**1.3e0
-                * rminor ** (-0.04e0)
-                * kappa95**0.28e0
-                * dnla20**0.14e0
-                * bt**0.04e0
-                * np.sqrt(m_fuel_amu)
-                / powerht**0.59e0
-            )
-
-        elif isc == 19:  # Riedel scaling (H-mode)
-            tauee = (
-                hfact
-                * 0.1e0
-                * np.sqrt(m_fuel_amu)
-                * pcur**0.884e0
-                * rmajor**1.24e0
-                * rminor ** (-0.23e0)
-                * kappa95**0.317e0
-                * bt**0.207e0
-                * dnla20**0.105e0
-                / powerht**0.486e0
-            )
-
-        elif isc == 20:  # Amended version of ITER H90-P law
-            # Nuclear Fusion 32 (1992) 318
-            tauee = (
-                hfact
-                * 0.082e0
-                * pcur**1.02e0
-                * bt**0.15e0
-                * np.sqrt(m_fuel_amu)
-                * rmajor**1.60e0
-                / (powerht**0.47e0 * kappa**0.19e0)
-            )
-
-        elif isc == 21:  # Large Helical Device scaling (stellarators)
-            # S.Sudo, Y.Takeiri, H.Zushi et al., Nuclear Fusion 30 (1990) 11
-            tauee = (
-                hfact
-                * 0.17e0
-                * rmajor**0.75e0
-                * rminor**2
-                * dnla20**0.69e0
-                * bt**0.84e0
-                * powerht ** (-0.58e0)
-            )
-
-        elif isc == 22:  # Gyro-reduced Bohm scaling
-            # R.J.Goldston, H.Biglari, G.W.Hammett et al., Bull.Am.Phys.Society,
-            # volume 34, 1964 (1989)
-            tauee = (
-                hfact
-                * 0.25e0
-                * bt**0.8e0
-                * dnla20**0.6e0
-                * powerht ** (-0.6e0)
-                * rminor**2.4e0
-                * rmajor**0.6e0
-            )
-
-        elif isc == 23:  # Lackner-Gottardi stellarator scaling
-            # K.Lackner and N.A.O.Gottardi, Nuclear Fusion, 30, p.767 (1990)
-            iotabar = q  # dummy argument q is actual argument iotabar for stellarators
-            tauee = (
-                hfact
-                * 0.17e0
-                * rmajor
-                * rminor**2
-                * dnla20**0.6e0
-                * bt**0.8e0
-                * powerht ** (-0.6e0)
-                * iotabar**0.4e0
-            )
-
-        elif (
-            isc == 24
-        ):  # ITER-93H scaling (ELM-free; multiply by 0.85 for ELMy version)
-            # S.Kaye and the ITER Joint Central Team and Home Teams, in Plasma
-            # Physics and Controlled Nuclear Fusion Research (Proc. 15th
-            # Int. Conf., Seville, 1994) IAEA-CN-60/E-P-3
-            tauee = (
-                hfact
-                * 0.053e0
-                * pcur**1.06e0
-                * bt**0.32e0
-                * powerht ** (-0.67e0)
-                * m_fuel_amu**0.41e0
-                * rmajor**1.79e0
-                * dnla20**0.17e0
-                * aspect**0.11e0
-                * kappa**0.66e0
-            )
-
-        # Next two are ITER-97 H-mode scalings
-        # J. G. Cordey et al., EPS Berchtesgaden, 1997
-
-        elif isc == 26:  # ELM-free: ITERH-97P
-            tauee = (
-                hfact
-                * 0.031e0
-                * pcur**0.95e0
-                * bt**0.25e0
-                * powerht ** (-0.67e0)
-                * dnla19**0.35e0
-                * rmajor**1.92e0
-                * aspect ** (-0.08e0)
-                * kappa**0.63e0
-                * m_fuel_amu**0.42e0
-            )
-
-        elif isc == 27:  # ELMy: ITERH-97P(y)
-            tauee = (
-                hfact
-                * 0.029e0
-                * pcur**0.90e0
-                * bt**0.20e0
-                * powerht ** (-0.66e0)
-                * dnla19**0.40e0
-                * rmajor**2.03e0
-                * aspect ** (-0.19e0)
-                * kappa**0.92e0
-                * m_fuel_amu**0.2e0
-            )
-
-        elif isc == 28:  # ITER-96P (= ITER-97L) L-mode scaling
-            # S.M.Kaye and the ITER Confinement Database Working Group,
-            # Nuclear Fusion 37 (1997) 1303
-            # N.B. tau_th formula used
-            tauee = (
-                hfact
-                * 0.023e0
-                * pcur**0.96e0
-                * bt**0.03e0
-                * kappa95**0.64e0
-                * rmajor**1.83e0
-                * aspect**0.06e0
-                * dnla19**0.40e0
-                * m_fuel_amu**0.20e0
-                * powerht ** (-0.73e0)
-            )
-
-        elif isc == 29:  # Valovic modified ELMy-H mode scaling
-            tauee = (
-                hfact
-                * 0.067e0
-                * pcur**0.9e0
-                * bt**0.17e0
-                * dnla19**0.45e0
-                * m_fuel_amu**0.05e0
-                * rmajor**1.316e0
-                * rminor**0.79e0
-                * kappa**0.56e0
-                * powerht ** (-0.68e0)
-            )
-
-        elif isc == 30:  # Kaye PPPL Workshop April 1998 L-mode scaling
-            tauee = (
-                hfact
-                * 0.021e0
-                * pcur**0.81e0
-                * bt**0.14e0
-                * kappa**0.7e0
-                * rmajor**2.01e0
-                * aspect ** (-0.18e0)
-                * dnla19**0.47e0
-                * m_fuel_amu**0.25e0
-                * powerht ** (-0.73e0)
-            )
-
-        elif isc == 31:  # ITERH-PB98P(y), ELMy H-mode scaling
-            tauee = (
-                hfact
-                * 0.0615e0
-                * pcur**0.9e0
-                * bt**0.1e0
-                * dnla19**0.4e0
-                * powerht ** (-0.66e0)
-                * rmajor**2
-                * kappaa**0.75e0
-                * aspect ** (-0.66e0)
-                * m_fuel_amu**0.2e0
-            )
-
-        elif isc == 32:  # IPB98(y), ELMy H-mode scaling
-            # Data selection : full ITERH.DB3
-            # Nuclear Fusion 39 (1999) 2175, Table 5
-            tauee = (
-                hfact
-                * 0.0365e0
-                * pcur**0.97e0
-                * bt**0.08e0
-                * dnla19**0.41e0
-                * powerht ** (-0.63e0)
-                * rmajor**1.93e0
-                * kappa**0.67e0
-                * aspect ** (-0.23e0)
-                * m_fuel_amu**0.2e0
-            )
-
-        elif isc == 33:  # IPB98(y,1), ELMy H-mode scaling
-            # Data selection : full ITERH.DB3
-            # Nuclear Fusion 39 (1999) 2175, Table 5
-            tauee = (
-                hfact
-                * 0.0503e0
-                * pcur**0.91e0
-                * bt**0.15e0
-                * dnla19**0.44e0
-                * powerht ** (-0.65e0)
-                * rmajor**2.05e0
-                * physics_variables.kappaa_ipb**0.72e0
-                * aspect ** (-0.57e0)
-                * m_fuel_amu**0.13e0
-            )
-
-        elif isc == 34:  # IPB98(y,2), ELMy H-mode scaling
-            # Data selection : ITERH.DB3, NBI only
-            # Nuclear Fusion 39 (1999) 2175, Table 5
-            tauee = (
-                hfact
-                * 0.0562e0
-                * pcur**0.93e0
-                * bt**0.15e0
-                * dnla19**0.41e0
-                * powerht ** (-0.69e0)
-                * rmajor**1.97e0
-                * physics_variables.kappaa_ipb**0.78e0
-                * aspect ** (-0.58e0)
-                * m_fuel_amu**0.19e0
-            )
-
-        elif isc == 35:  # IPB98(y,3), ELMy H-mode scaling
-            # Data selection : ITERH.DB3, NBI only, no C-Mod
-            # Nuclear Fusion 39 (1999) 2175, Table 5
-            tauee = (
-                hfact
-                * 0.0564e0
-                * pcur**0.88e0
-                * bt**0.07e0
-                * dnla19**0.40e0
-                * powerht ** (-0.69e0)
-                * rmajor**2.15e0
-                * physics_variables.kappaa_ipb**0.78e0
-                * aspect ** (-0.64e0)
-                * m_fuel_amu**0.20e0
-            )
-
-        elif isc == 36:  # IPB98(y,4), ELMy H-mode scaling
-            # Data selection : ITERH.DB3, NBI only, ITER like devices
-            # Nuclear Fusion 39 (1999) 2175, Table 5
-            tauee = (
-                hfact
-                * 0.0587e0
-                * pcur**0.85e0
-                * bt**0.29e0
-                * dnla19**0.39e0
-                * powerht ** (-0.70e0)
-                * rmajor**2.08e0
-                * physics_variables.kappaa_ipb**0.76e0
-                * aspect ** (-0.69e0)
-                * m_fuel_amu**0.17e0
-            )
-
-        elif isc == 37:  # ISS95 stellarator scaling
-            # U. Stroth et al., Nuclear Fusion, 36, p.1063 (1996)
-            # Assumes kappa = 1.0, triang = 0.0
+            )
+
+        # ==========================================================================
+
+        # ITER_93 ELM-free H-mode scaling
+        elif i_confinement_time == 24:
+            t_electron_confinement = confinement.iter_93h_confinement_time(
+                pcur,
+                bt,
+                p_plasma_loss_mw,
+                m_fuel_amu,
+                rmajor,
+                dnla20,
+                aspect,
+                kappa,
+            )
+
+        # ==========================================================================
+        # Scaling removed
+        elif i_confinement_time == 25:
+            raise ValueError("Scaling removed")
+        # ==========================================================================
+
+        # ELM-free: ITERH-97P
+        elif i_confinement_time == 26:
+            t_electron_confinement = confinement.iter_h97p_confinement_time(
+                pcur,
+                bt,
+                p_plasma_loss_mw,
+                dnla19,
+                rmajor,
+                aspect,
+                kappa,
+                m_fuel_amu,
+            )
+
+        # ==========================================================================
+
+        # ELMy: ITERH-97P(y)
+        elif i_confinement_time == 27:
+            t_electron_confinement = confinement.iter_h97p_elmy_confinement_time(
+                pcur,
+                bt,
+                p_plasma_loss_mw,
+                dnla19,
+                rmajor,
+                aspect,
+                kappa,
+                m_fuel_amu,
+            )
+
+        # ==========================================================================
+
+        # ITER-96P (= ITER-97L) L-mode scaling
+        elif i_confinement_time == 28:
+            t_electron_confinement = confinement.iter_96p_confinement_time(
+                pcur,
+                bt,
+                kappa95,
+                rmajor,
+                aspect,
+                dnla19,
+                m_fuel_amu,
+                p_plasma_loss_mw,
+            )
+
+        # ==========================================================================
+
+        # Valovic modified ELMy-H mode scaling
+        # WARNING: No reference found for this scaling. This may not be its real name
+        elif i_confinement_time == 29:
+            t_electron_confinement = confinement.valovic_elmy_confinement_time(
+                pcur,
+                bt,
+                dnla19,
+                m_fuel_amu,
+                rmajor,
+                rminor,
+                kappa,
+                p_plasma_loss_mw,
+            )
+
+        # ==========================================================================
+
+        # Kaye PPPL Workshop April 1998 L-mode scaling
+        # WARNING: No reference found for this scaling. This may not be its real name
+        elif i_confinement_time == 30:
+            t_electron_confinement = confinement.kaye_confinement_time(
+                pcur,
+                bt,
+                kappa,
+                rmajor,
+                aspect,
+                dnla19,
+                m_fuel_amu,
+                p_plasma_loss_mw,
+            )
+
+        # ==========================================================================
+
+        # ITERH-PB98P(y), ELMy H-mode scaling
+        # WARNING: No reference found for this scaling. This may not be its real name
+        elif i_confinement_time == 31:
+            t_electron_confinement = confinement.iter_pb98py_confinement_time(
+                pcur,
+                bt,
+                dnla19,
+                p_plasma_loss_mw,
+                rmajor,
+                physics_variables.kappa_ipb,
+                aspect,
+                m_fuel_amu,
+            )
+
+        # ==========================================================================
+
+        # IPB98(y), ELMy H-mode scaling
+        elif i_confinement_time == 32:
+            t_electron_confinement = confinement.iter_ipb98y_confinement_time(
+                pcur,
+                bt,
+                dnla19,
+                p_plasma_loss_mw,
+                rmajor,
+                kappa,
+                aspect,
+                m_fuel_amu,
+            )
+
+        # ==========================================================================
+
+        # IPB98(y,1), ELMy H-mode scaling
+        elif i_confinement_time == 33:
+            t_electron_confinement = confinement.iter_ipb98y1_confinement_time(
+                pcur,
+                bt,
+                dnla19,
+                p_plasma_loss_mw,
+                rmajor,
+                physics_variables.kappa_ipb,
+                aspect,
+                m_fuel_amu,
+            )
+
+        # ==========================================================================
+
+        # IPB98(y,2), ELMy H-mode scaling
+        elif i_confinement_time == 34:
+            t_electron_confinement = confinement.iter_ipb98y2_confinement_time(
+                pcur,
+                bt,
+                dnla19,
+                p_plasma_loss_mw,
+                rmajor,
+                physics_variables.kappa_ipb,
+                aspect,
+                m_fuel_amu,
+            )
+
+        # ==========================================================================
+
+        # IPB98(y,3), ELMy H-mode scaling
+        elif i_confinement_time == 35:
+            t_electron_confinement = confinement.iter_ipb98y3_confinement_time(
+                pcur,
+                bt,
+                dnla19,
+                p_plasma_loss_mw,
+                rmajor,
+                physics_variables.kappa_ipb,
+                aspect,
+                m_fuel_amu,
+            )
+
+        # ==========================================================================
+
+        # IPB98(y,4), ELMy H-mode scaling
+        elif i_confinement_time == 36:
+            t_electron_confinement = confinement.iter_ipb98y4_confinement_time(
+                pcur,
+                bt,
+                dnla19,
+                p_plasma_loss_mw,
+                rmajor,
+                physics_variables.kappa_ipb,
+                aspect,
+                m_fuel_amu,
+            )
+
+        # ==========================================================================
+
+        # ISS95 stellarator scaling
+        elif i_confinement_time == 37:
             iotabar = q  # dummy argument q is actual argument iotabar for stellarators
-            tauee = (
-                hfact
-                * 0.079e0
-                * rminor**2.21e0
-                * rmajor**0.65e0
-                * dnla19**0.51e0
-                * bt**0.83e0
-                * powerht ** (-0.59e0)
-                * iotabar**0.4e0
-            )
-
-        elif isc == 38:  # ISS04 stellarator scaling
-            # H. Yamada et al., Nuclear Fusion, 45, p.1684 (2005)
-            # Assumes kappa = 1.0, triang = 0.0
+            t_electron_confinement = confinement.iss95_stellarator_confinement_time(
+                rminor,
+                rmajor,
+                dnla19,
+                bt,
+                p_plasma_loss_mw,
+                iotabar,
+            )
+
+        # ==========================================================================
+
+        # ISS04 stellarator scaling
+        elif i_confinement_time == 38:
             iotabar = q  # dummy argument q is actual argument iotabar for stellarators
-            tauee = (
-                hfact
-                * 0.134e0
-                * rminor**2.28e0
-                * rmajor**0.64e0
-                * dnla19**0.54e0
-                * bt**0.84e0
-                * powerht ** (-0.61e0)
-                * iotabar**0.41e0
-            )
-
-        elif isc == 39:  # DS03 beta-independent H-mode scaling
-            # T. C. Luce, C. C. Petty and J. G. Cordey,
-            # Plasma Phys. Control. Fusion 50 (2008) 043001, eqn.4.13, p.67
-            tauee = (
-                hfact
-                * 0.028e0
-                * pcur**0.83e0
-                * bt**0.07e0
-                * dnla19**0.49e0
-                * powerht ** (-0.55e0)
-                * rmajor**2.11e0
-                * kappa95**0.75e0
-                * aspect ** (-0.3e0)
-                * m_fuel_amu**0.14e0
-            )
-
-        elif isc == 40:  # "Non-power law" (NPL) Murari energy confinement scaling
-            #  Based on the ITPA database of H-mode discharges
-            #  A new approach to the formulation and validation of scaling expressions for plasma confinement in tokamaks
-            #  A. Murari et al 2015 Nucl. Fusion 55 073009, doi:10.1088/0029-5515/55/7/073009
-            #  Table 4.  (Issue #311)
-            # Note that aspect ratio and M (m_fuel_amu) do not appear, and B (bt) only
-            # appears in the "saturation factor" h.
-            h = dnla19**0.448e0 / (1.0e0 + np.exp(-9.403e0 * (bt / dnla19) ** 1.365e0))
-            tauee = (
-                hfact
-                * 0.0367e0
-                * pcur**1.006e0
-                * rmajor**1.731e0
-                * kappaa**1.450e0
-                * powerht ** (-0.735e0)
-                * h
-            )
-
-        elif isc == 41:  # Beta independent dimensionless confinement scaling
-            # C.C. Petty 2008 Phys. Plasmas 15, 080501, equation 36
-            # Note that there is no dependence on the average fuel mass 'm_fuel_amu'
-            tauee = (
-                hfact
-                * 0.052e0
-                * pcur**0.75e0
-                * bt**0.3e0
-                * dnla19**0.32e0
-                * powerht ** (-0.47e0)
-                * rmajor**2.09e0
-                * kappaa**0.88e0
-                * aspect ** (-0.84e0)
-            )
-
-        elif isc == 42:  # High density relevant confinement scaling
-            # P.T. Lang et al. 2012, IAEA conference proceeding EX/P4-01
-            # q should be q95: incorrect if i_plasma_current = 2 (ST current scaling)
-            qratio = q / qstar
-            # Greenwald density in m^-3
-            n_gw = 1.0e14 * plasma_current / (np.pi * rminor * rminor)
-            nratio = dnla / n_gw
-            tauee = (
-                hfact
-                * 6.94e-7
-                * plasma_current**1.3678e0
-                * bt**0.12e0
-                * dnla**0.032236e0
-                * (powerht * 1.0e6) ** (-0.74e0)
-                * rmajor**1.2345e0
-                * physics_variables.kappaa_ipb**0.37e0
-                * aspect**2.48205e0
-                * m_fuel_amu**0.2e0
-                * qratio**0.77e0
-                * aspect ** (-0.9e0 * np.log(aspect))
-                * nratio ** (-0.22e0 * np.log(nratio))
-            )
-
-        elif isc == 43:  # Hubbard et al. 2017 I-mode confinement time scaling - nominal
-            tauee = (
-                hfact
-                * 0.014e0
-                * (plasma_current / 1.0e6) ** 0.68e0
-                * bt**0.77e0
-                * dnla20**0.02e0
-                * powerht ** (-0.29e0)
-            )
-
-        elif isc == 44:  # Hubbard et al. 2017 I-mode confinement time scaling - lower
-            tauee = (
-                hfact
-                * 0.014e0
-                * (plasma_current / 1.0e6) ** 0.60e0
-                * bt**0.70e0
-                * dnla20 ** (-0.03e0)
-                * powerht ** (-0.33e0)
-            )
-
-        elif isc == 45:  # Hubbard et al. 2017 I-mode confinement time scaling - upper
-            tauee = (
-                hfact
-                * 0.014e0
-                * (plasma_current / 1.0e6) ** 0.76e0
-                * bt**0.84e0
-                * dnla20**0.07
-                * powerht ** (-0.25e0)
-            )
-
-        elif isc == 46:  # NSTX, ELMy H-mode scaling
-            # NSTX scaling with IPB98(y,2) for other variables
-            # Menard 2019, Phil. Trans. R. Soc. A 377:20170440
-            # Kaye et al. 2006, Nucl. Fusion 46 848
-            tauee = (
-                hfact
-                * 0.095e0
-                * pcur**0.57e0
-                * bt**1.08e0
-                * dnla19**0.44e0
-                * powerht ** (-0.73e0)
-                * rmajor**1.97e0
-                * physics_variables.kappaa_ipb**0.78e0
-                * aspect ** (-0.58e0)
-                * m_fuel_amu**0.19e0
-            )
-
-        elif isc == 47:  # NSTX-Petty08 Hybrid
-            # Linear interpolation between NSTX and Petty08 in eps
-            # Menard 2019, Phil. Trans. R. Soc. A 377:20170440
-            if (1.0e0 / aspect) <= 0.4e0:
-                # Petty08, i.e. case (41)
-                tauee = (
-                    hfact
-                    * 0.052e0
-                    * pcur**0.75e0
-                    * bt**0.3e0
-                    * dnla19**0.32e0
-                    * powerht ** (-0.47e0)
-                    * rmajor**2.09e0
-                    * kappaa**0.88e0
-                    * aspect ** (-0.84e0)
-                )
+            t_electron_confinement = confinement.iss04_stellarator_confinement_time(
+                rminor,
+                rmajor,
+                dnla19,
+                bt,
+                p_plasma_loss_mw,
+                iotabar,
+            )
 
-            elif (1.0e0 / aspect) >= 0.6e0:
-                # NSTX, i.e.case (46)
-                tauee = (
-                    hfact
-                    * 0.095e0
-                    * pcur**0.57e0
-                    * bt**1.08e0
-                    * dnla19**0.44e0
-                    * powerht ** (-0.73e0)
-                    * rmajor**1.97e0
-                    * physics_variables.kappaa_ipb**0.78e0
-                    * aspect ** (-0.58e0)
-                    * m_fuel_amu**0.19e0
-                )
+        # ==========================================================================
 
-            else:
-                taupetty = (
-                    0.052e0
-                    * pcur**0.75e0
-                    * bt**0.3e0
-                    * dnla19**0.32e0
-                    * powerht ** (-0.47e0)
-                    * rmajor**2.09e0
-                    * kappaa**0.88e0
-                    * aspect ** (-0.84e0)
-                )
-                taunstx = (
-                    0.095e0
-                    * pcur**0.57e0
-                    * bt**1.08e0
-                    * dnla19**0.44e0
-                    * powerht ** (-0.73e0)
-                    * rmajor**1.97e0
-                    * physics_variables.kappaa_ipb**0.78e0
-                    * aspect ** (-0.58e0)
-                    * m_fuel_amu**0.19e0
-                )
+        # DS03 beta-independent H-mode scaling
+        elif i_confinement_time == 39:
+            t_electron_confinement = confinement.ds03_confinement_time(
+                pcur,
+                bt,
+                dnla19,
+                p_plasma_loss_mw,
+                rmajor,
+                kappa95,
+                aspect,
+                m_fuel_amu,
+            )
+
+        # ==========================================================================
 
-                tauee = hfact * (
-                    (((1.0e0 / aspect) - 0.4e0) / (0.6e0 - 0.4e0)) * taunstx
-                    + ((0.6e0 - (1.0e0 / aspect)) / (0.6e0 - 0.4e0)) * taupetty
+        #  Murari "Non-power law" scaling
+        elif i_confinement_time == 40:
+            t_electron_confinement = confinement.murari_confinement_time(
+                pcur,
+                rmajor,
+                physics_variables.kappa_ipb,
+                dnla19,
+                bt,
+                p_plasma_loss_mw,
+            )
+
+        # ==========================================================================
+
+        # Petty08, beta independent dimensionless scaling
+        elif i_confinement_time == 41:
+            t_electron_confinement = confinement.petty08_confinement_time(
+                pcur,
+                bt,
+                dnla19,
+                p_plasma_loss_mw,
+                rmajor,
+                physics_variables.kappa_ipb,
+                aspect,
+            )
+
+        # ==========================================================================
+
+        # Lang high density relevant confinement scaling
+        elif i_confinement_time == 42:
+            t_electron_confinement = confinement.lang_high_density_confinement_time(
+                plasma_current,
+                bt,
+                dnla,
+                p_plasma_loss_mw,
+                rmajor,
+                rminor,
+                q,
+                qstar,
+                aspect,
+                m_fuel_amu,
+                physics_variables.kappa_ipb,
+            )
+
+        # ==========================================================================
+
+        # Hubbard 2017 I-mode confinement time scaling - nominal
+        elif i_confinement_time == 43:
+            t_electron_confinement = confinement.hubbard_nominal_confinement_time(
+                pcur,
+                bt,
+                dnla20,
+                p_plasma_loss_mw,
+            )
+
+        # ==========================================================================
+
+        # Hubbard 2017 I-mode confinement time scaling - lower
+        elif i_confinement_time == 44:
+            t_electron_confinement = confinement.hubbard_lower_confinement_time(
+                pcur,
+                bt,
+                dnla20,
+                p_plasma_loss_mw,
+            )
+
+        # ==========================================================================
+
+        # Hubbard 2017 I-mode confinement time scaling - upper
+        elif i_confinement_time == 45:
+            t_electron_confinement = confinement.hubbard_upper_confinement_time(
+                pcur,
+                bt,
+                dnla20,
+                p_plasma_loss_mw,
+            )
+
+        # ==========================================================================
+
+        # Menard NSTX, ELMy H-mode scaling
+        elif i_confinement_time == 46:
+            t_electron_confinement = confinement.menard_nstx_confinement_time(
+                pcur,
+                bt,
+                dnla19,
+                p_plasma_loss_mw,
+                rmajor,
+                physics_variables.kappa_ipb,
+                aspect,
+                m_fuel_amu,
+            )
+
+        # ==========================================================================
+
+        # Menard NSTX-Petty08 Hybrid
+        elif i_confinement_time == 47:
+            t_electron_confinement = (
+                confinement.menard_nstx_petty08_hybrid_confinement_time(
+                    pcur,
+                    bt,
+                    dnla19,
+                    p_plasma_loss_mw,
+                    rmajor,
+                    physics_variables.kappa_ipb,
+                    aspect,
+                    m_fuel_amu,
                 )
+            )
+
+        # ==========================================================================
+
+        # NSTX gyro-Bohm (Buxton)
+        elif i_confinement_time == 48:
+            t_electron_confinement = confinement.nstx_gyro_bohm_confinement_time(
+                pcur,
+                bt,
+                p_plasma_loss_mw,
+                rmajor,
+                dnla20,
+            )
+
+        # ==========================================================================
+
+        # ITPA20 H-mode scaling
+        elif i_confinement_time == 49:
+            t_electron_confinement = confinement.itpa20_confinement_time(
+                pcur,
+                bt,
+                dnla19,
+                p_plasma_loss_mw,
+                rmajor,
+                physics_variables.triang,
+                physics_variables.kappa_ipb,
+                eps,
+                physics_variables.m_ions_total_amu,
+            )
 
-        elif isc == 48:  # NSTX gyro-Bohm (Buxton)
-            # P F Buxton et al. 2019 Plasma Phys. Control. Fusion 61 035006
-            tauee = (
-                hfact
-                * 0.21e0
-                * pcur**0.54e0
-                * bt**0.91e0
-                * powerht ** (-0.38e0)
-                * rmajor**2.14e0
-                * dnla20 ** (-0.05e0)
-            )
-
-        elif isc == 49:  # tauee is an input
-            tauee = hfact * physics_variables.tauee_in
-
-        elif isc == 50:  # ITPA20 Issue #3164
-            # The updated ITPA global H-mode confinement database: description and analysis
-            # G. Verdoolaege et al 2021 Nucl. Fusion 61 076006 DOI 10.1088/1741-4326/abdb91
-
-            # thermal energy confinement time
-            # plasma current Ip (MA),
-            # on-axis vacuum toroidal magnetic field Bt (T)
-            # "central line-averaged electron density" nebar (1019 m-3)
-            # thermal power lost due to transport through the LCFS Pl,th (MW)
-            # major radius Rgeo (m)
-            # elongation of the LCFS, defined as κa = V/(2πRgeo πa2)
-            # (with V (m3) the plasma volume inside the LCFS),
-            # inverse aspect ratio epsilon = a/Rgeo
-            # effective atomic mass Meff of the plasma - NOT defined, but I have taken it equal to
-            # m_ions_total_amu = average mass of all ions (amu).
-            # energy confinement time is given by τE,th = Wth/Pl,th, where Wth is the thermal stored energy.
-            # The latter is derived from the total stored energy Wtot by subtracting the energy
-            # content associated to fast particles originating from plasma heating.
-
-            tauee = (
-                hfact
-                * 0.053
-                * pcur**0.98
-                * bt**0.22
-                * dnla19**0.24
-                * powerht ** (-0.669)
-                * rmajor**1.71
-                * (1 + physics_variables.triang) ** 0.36
-                * physics_variables.kappaa_ipb**0.8
-                * eps**0.35
-                * physics_variables.m_ions_total_amu**0.2
+        # ==========================================================================
+
+        # ITPA20-IL confinement time scaling
+        elif i_confinement_time == 50:
+            t_electron_confinement = confinement.itpa20_il_confinement_time(
+                pcur,
+                bt,
+                p_plasma_loss_mw,
+                dnla19,
+                physics_variables.m_ions_total_amu,
+                rmajor,
+                physics_variables.triang,
+                physics_variables.kappa_ipb,
             )
 
+        # ==========================================================================
+
         else:
-            error_handling.idiags[0] = isc
+            error_handling.idiags[0] = i_confinement_time
             error_handling.report_error(81)
 
-        # Ion energy confinement time
-        # N.B. Overwrites earlier calculation above
+        # Apply H-factor correction to chosen scaling
+        t_electron_energy_confinement = hfact * t_electron_confinement
 
-        tauei = tauee
+        # Ion energy confinement time
+        t_ion_energy_confinement = t_electron_energy_confinement
 
         # Calculation of the transport power loss terms
         # Transport losses in Watts/m3 are 3/2 * n.e.T / tau , with T in eV
-        # (here, tin and ten are in keV, and ptrepv and ptripv are in MW/m3)
-
-        ptripv = 2.403e-22 * nd_ions_total * tin / tauei
-        ptrepv = 2.403e-22 * dene * ten / tauee
+        # (here, tin and ten are in keV, and pden_electron_transport_loss_mw and pden_ion_transport_loss_mw are in MW/m3)
+
+        # The transport losses is just the electron and ion thermal energies divided by the confinement time.
+        pden_ion_transport_loss_mw = (
+            (3 / 2)
+            * (constants.electron_charge / 1e3)
+            * nd_ions_total
+            * tin
+            / t_ion_energy_confinement
+        )
+        pden_electron_transport_loss_mw = (
+            (3 / 2)
+            * (constants.electron_charge / 1e3)
+            * dene
+            * ten
+            / t_electron_energy_confinement
+        )
 
-        ratio = nd_ions_total / dene * tin / ten
+        ratio = (nd_ions_total / dene) * (tin / ten)
 
         # Global energy confinement time
 
-        taueff = (ratio + 1.0e0) / (ratio / tauei + 1.0e0 / tauee)
+        t_energy_confinement = (ratio + 1.0e0) / (
+            ratio / t_ion_energy_confinement + 1.0e0 / t_electron_energy_confinement
+        )
+
+        # For comparison directly calculate the confinement time from the stored energy calculated
+        # from the total plasma beta and the loss power used above.
+        physics_module.t_energy_confinement_beta = (
+            physics_module.e_plasma_beta / 1e6
+        ) / p_plasma_loss_mw
 
-        return kappaa, ptrepv, ptripv, tauee, tauei, taueff, powerht
+        return (
+            pden_electron_transport_loss_mw,
+            pden_ion_transport_loss_mw,
+            t_electron_energy_confinement,
+            t_ion_energy_confinement,
+            t_energy_confinement,
+            p_plasma_loss_mw,
+        )
 
 
 def calculate_poloidal_beta(btot, bp, beta):
diff --git a/process/power.py b/process/power.py
index 0ac6924aac..6dd504f92f 100644
--- a/process/power.py
+++ b/process/power.py
@@ -1554,10 +1554,10 @@ def power2(self, output: bool):
         po.ocmmnt(self.outfile, "-------------------------------")
         po.ocmmnt(self.outfile, "Only energy deposited in the plasma is included here.")
 
-        if physics_variables.iradloss == 0:
+        if physics_variables.i_rad_loss == 0:
             po.ocmmnt(
                 self.outfile,
-                "Total power loss is scaling power plus radiation (physics_variables.iradloss = 0)",
+                "Total power loss is scaling power plus radiation (physics_variables.i_rad_loss = 0)",
             )
             po.ovarrf(
                 self.outfile,
@@ -1575,10 +1575,10 @@ def power2(self, output: bool):
             )
             total = physics_variables.pscalingmw + physics_variables.p_plasma_rad_mw
             po.ovarrf(self.outfile, "Total (MW)", "", total, "OP ")
-        elif physics_variables.iradloss == 1:
+        elif physics_variables.i_rad_loss == 1:
             po.ocmmnt(
                 self.outfile,
-                "Total power loss is scaling power plus core radiation only (physics_variables.iradloss = 1)",
+                "Total power loss is scaling power plus core radiation only (physics_variables.i_rad_loss = 1)",
             )
             po.ovarrf(
                 self.outfile,
@@ -1604,10 +1604,10 @@ def power2(self, output: bool):
             total = (
                 physics_variables.pscalingmw + physics_variables.p_plasma_inner_rad_mw
             )
-        elif physics_variables.iradloss == 2:
+        elif physics_variables.i_rad_loss == 2:
             po.ocmmnt(
                 self.outfile,
-                "Total power loss is scaling power only (physics_variables.iradloss = 2).",
+                "Total power loss is scaling power only (physics_variables.i_rad_loss = 2).",
             )
             po.ocmmnt(self.outfile, "This is not recommended for power plant models.")
             po.ovarrf(
@@ -1623,11 +1623,11 @@ def power2(self, output: bool):
             total = physics_variables.pscalingmw
         else:
             logger.error(
-                f"{'The value of physics_variables.iradloss appears to be invalid.'}"
+                f"{'The value of physics_variables.i_rad_loss appears to be invalid.'}"
             )
             po.ocmmnt(
                 self.outfile,
-                "ERROR: The value of physics_variables.iradloss appears to be invalid.",
+                "ERROR: The value of physics_variables.i_rad_loss appears to be invalid.",
             )
 
         po.oblnkl(self.outfile)
diff --git a/process/stellarator.py b/process/stellarator.py
index 5cda95e2f0..367664852c 100644
--- a/process/stellarator.py
+++ b/process/stellarator.py
@@ -213,14 +213,13 @@ def stigma(self):
 
         for iisc, i in enumerate(istlaw):
             (
-                physics_variables.kappaa,
-                physics_variables.ptrepv,
-                physics_variables.ptripv,
-                physics_variables.tauee,
-                physics_variables.tauei,
-                physics_variables.taueff,
-                physics_variables.powerht,
-            ) = self.physics.pcond(
+                physics_variables.pden_electron_transport_loss_mw,
+                physics_variables.pden_ion_transport_loss_mw,
+                physics_variables.t_electron_energy_confinement,
+                physics_variables.t_ion_energy_confinement,
+                physics_variables.t_energy_confinement,
+                physics_variables.p_plasma_loss_mw,
+            ) = self.physics.calculate_confinement_time(
                 physics_variables.m_fuel_amu,
                 physics_variables.alpha_power_total,
                 physics_variables.aspect,
@@ -230,8 +229,7 @@ def stigma(self):
                 physics_variables.dnla,
                 physics_variables.eps,
                 2.0,
-                physics_variables.iinvqd,
-                physics_variables.isc,
+                physics_variables.i_confinement_time,
                 physics_variables.ignite,
                 physics_variables.kappa,
                 physics_variables.kappa95,
@@ -251,7 +249,7 @@ def stigma(self):
                 physics_variables.zeff,
             )
 
-            physics_variables.hfac[iisc] = self.physics.fhfac(i)
+            physics_variables.hfac[iisc] = self.physics.find_other_h_factors(i)
 
     def stnewconfig(self):
         """author: J Lion, IPP Greifswald
@@ -354,7 +352,7 @@ def stopt(self, output: bool):
 
         physics_variables.dnelimt = self.stdlim(
             physics_variables.bt,
-            physics_variables.powerht,
+            physics_variables.p_plasma_loss_mw,
             physics_variables.rmajor,
             physics_variables.rminor,
         )
@@ -3551,7 +3549,7 @@ def power_at_ignition_point(self, gyro_frequency_max, te0_available):
         )  # The second call seems to be necessary for all values to "converge" (and is sufficient)
 
         powerht_out = max(
-            copy(physics_variables.powerht), 0.00001e0
+            copy(physics_variables.p_plasma_loss_mw), 0.00001e0
         )  # the radiation module sometimes returns negative heating power
         pscalingmw_out = copy(physics_variables.pscalingmw)
 
@@ -4454,14 +4452,13 @@ def stphys(self, output):
         #  N.B. stellarator_variables.iotabar replaces tokamak physics_variables.q95 in argument list
 
         (
-            physics_variables.kappaa,
-            physics_variables.ptrepv,
-            physics_variables.ptripv,
-            physics_variables.tauee,
-            physics_variables.tauei,
-            physics_variables.taueff,
-            physics_variables.powerht,
-        ) = self.physics.pcond(
+            physics_variables.pden_electron_transport_loss_mw,
+            physics_variables.pden_ion_transport_loss_mw,
+            physics_variables.t_electron_energy_confinement,
+            physics_variables.t_ion_energy_confinement,
+            physics_variables.t_energy_confinement,
+            physics_variables.p_plasma_loss_mw,
+        ) = self.physics.calculate_confinement_time(
             physics_variables.m_fuel_amu,
             physics_variables.alpha_power_total,
             physics_variables.aspect,
@@ -4471,8 +4468,7 @@ def stphys(self, output):
             physics_variables.dnla,
             physics_variables.eps,
             physics_variables.hfact,
-            physics_variables.iinvqd,
-            physics_variables.isc,
+            physics_variables.i_confinement_time,
             physics_variables.ignite,
             physics_variables.kappa,
             physics_variables.kappa95,
@@ -4492,15 +4488,17 @@ def stphys(self, output):
             physics_variables.zeff,
         )
 
-        physics_variables.ptremw = (
-            physics_variables.ptrepv * physics_variables.vol_plasma
+        physics_variables.p_electron_transport_loss_mw = (
+            physics_variables.pden_electron_transport_loss_mw
+            * physics_variables.vol_plasma
         )
-        physics_variables.ptrimw = (
-            physics_variables.ptripv * physics_variables.vol_plasma
+        physics_variables.p_ion_transport_loss_mw = (
+            physics_variables.pden_ion_transport_loss_mw * physics_variables.vol_plasma
         )
 
         physics_variables.pscalingmw = (
-            physics_variables.ptremw + physics_variables.ptrimw
+            physics_variables.p_electron_transport_loss_mw
+            + physics_variables.p_ion_transport_loss_mw
         )
 
         #  Calculate auxiliary physics related information
@@ -4509,12 +4507,12 @@ def stphys(self, output):
         sbar = 1.0e0
         (
             physics_variables.burnup,
-            physics_variables.dntau,
+            physics_variables.ntau,
             physics_variables.figmer,
             fusrat,
             physics_variables.qfuel,
             physics_variables.rndfuel,
-            physics_variables.taup,
+            physics_variables.t_alpha_confinement,
         ) = self.physics.phyaux(
             physics_variables.aspect,
             physics_variables.dene,
@@ -4524,7 +4522,7 @@ def stphys(self, output):
             physics_variables.plasma_current,
             sbar,
             physics_variables.nd_alphas,
-            physics_variables.taueff,
+            physics_variables.t_energy_confinement,
             physics_variables.vol_plasma,
         )
 
diff --git a/process/utilities/errorlist.json b/process/utilities/errorlist.json
index 273809dc7f..8c8d066782 100644
--- a/process/utilities/errorlist.json
+++ b/process/utilities/errorlist.json
@@ -413,7 +413,7 @@
     {
       "no": 81,
       "level": 3,
-      "message": "PCOND: Illegal value for isc"
+      "message": "PCOND: Illegal value for i_confinement_time"
     },
     {
       "no": 82,
@@ -1108,7 +1108,7 @@
     {
       "no": 220,
       "level": 1,
-      "message": "CHECK: tauee_in is for use with isc=48 only"
+      "message": "CHECK: tauee_in is for use with i_confinement_time=48 only"
     },
     {
       "no": 221,
diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90
index 94c3f87c5d..3ab65fdea9 100755
--- a/source/fortran/constraint_equations.f90
+++ b/source/fortran/constraint_equations.f90
@@ -227,7 +227,7 @@ subroutine constraint_eqns(m,ieqn,cc,con,err,symbol,units)
         case (60); call constraint_eqn_060(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units)
 	      ! Equation for availability limit
         case (61); call constraint_eqn_061(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units)
-	      ! Lower limit on taup/taueff the ratio of alpha particle to energy confinement times
+	      ! Lower limit on f_alpha_energy_confinement the ratio of alpha particle to energy confinement times
         case (62); call constraint_eqn_062(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units)
 	      ! Upper limit on niterpump (vacuum_model = simple)
         case (63); call constraint_eqn_063(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units)
@@ -440,7 +440,7 @@ subroutine constraint_eqn_002(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units)
     !! \begin{equation} c_i =
     !! \end{equation}
     !!
-    !! iradloss : input integer : switch for radiation loss term usage in power balance (see User Guide):<UL>
+    !! i_rad_loss : input integer : switch for radiation loss term usage in power balance (see User Guide):<UL>
     !! <LI> = 0 total power lost is scaling power plus radiation (needed for ipedestal=2,3)
     !! <LI> = 1 total power lost is scaling power plus core radiation only
     !! <LI> = 2 total power lost is scaling power only, with no additional
@@ -448,8 +448,8 @@ subroutine constraint_eqn_002(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units)
     !! ignite : input integer : switch for ignition assumption:<UL>
     !! <LI> = 0 do not assume plasma ignition;
     !! <LI> = 1 assume ignited (but include auxiliary power in costs)</UL>
-    !! ptrepv : input real : electron transport power per volume (MW/m3)
-    !! ptripv : input real :  ion transport power per volume (MW/m3)
+    !! pden_electron_transport_loss_mw : input real : electron transport power per volume (MW/m3)
+    !! pden_ion_transport_loss_mw : input real :  ion transport power per volume (MW/m3)
     !! pden_plasma_rad_mw : input real : total radiation power per volume (MW/m3)
     !! pcoreradpv : input real : total core radiation power per volume (MW/m3)
     !! f_alpha_plasma : input real : fraction of alpha power deposited in plasma
@@ -459,7 +459,7 @@ subroutine constraint_eqn_002(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units)
     !! pinjmw : input real : total auxiliary injected power (MW)
     !! vol_plasma : input real : plasma volume (m3)
 
-    use physics_variables, only: iradloss, ignite, ptrepv, ptripv, pden_plasma_rad_mw, &
+    use physics_variables, only: i_rad_loss, ignite, pden_electron_transport_loss_mw, pden_ion_transport_loss_mw, pden_plasma_rad_mw, &
                                   pcoreradpv, f_alpha_plasma, alpha_power_density_total, charged_power_density, &
                                   pden_plasma_ohmic_mw, vol_plasma
     use current_drive_variables, only: pinjmw
@@ -476,11 +476,11 @@ subroutine constraint_eqn_002(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units)
     ! pscaling : Local real : total transport power per volume (MW/m3)
     real(dp) :: pscaling
     real(dp) :: pnumerator, pdenom
-    pscaling = ptrepv + ptripv
+    pscaling = pden_electron_transport_loss_mw + pden_ion_transport_loss_mw
     ! Total power lost is scaling power plus radiation:
-    if (iradloss == 0) then
+    if (i_rad_loss == 0) then
         pnumerator = pscaling + pden_plasma_rad_mw
-    else if (iradloss == 1) then
+    else if (i_rad_loss == 1) then
         pnumerator = pscaling + pcoreradpv
     else
         pnumerator = pscaling
@@ -515,13 +515,13 @@ subroutine constraint_eqn_003(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units)
       !! ignite : input integer : switch for ignition assumption:<UL>
       !! <LI> = 0 do not assume plasma ignition;
       !! <LI> = 1 assume ignited (but include auxiliary power in costs)</UL>
-      !! ptripv : input real :  ion transport power per volume (MW/m3)
+      !! pden_ion_transport_loss_mw : input real :  ion transport power per volume (MW/m3)
       !! piepv : input real : ion/electron equilibration power per volume (MW/m3)
       !! f_alpha_plasma : input real : fraction of alpha power deposited in plasma
       !! alpha_power_ions_density : input real : alpha power per volume to ions (MW/m3)
       !! pinjimw : input real : auxiliary injected power to ions (MW)
       !! vol_plasma : input real : plasma volume (m3)
-      use physics_variables, only: ignite, ptripv, piepv, f_alpha_plasma, alpha_power_ions_density, vol_plasma
+      use physics_variables, only: ignite, pden_ion_transport_loss_mw, piepv, f_alpha_plasma, alpha_power_ions_density, vol_plasma
       use current_drive_variables, only: pinjimw
       implicit none
             real(dp), intent(out) :: tmp_cc
@@ -532,14 +532,14 @@ subroutine constraint_eqn_003(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units)
 
 	   ! No assume plasma ignition:
       if (ignite == 0) then
-         tmp_cc     = 1.0D0 - (ptripv + piepv) / (f_alpha_plasma*alpha_power_ions_density + pinjimw/vol_plasma)
+         tmp_cc     = 1.0D0 - (pden_ion_transport_loss_mw + piepv) / (f_alpha_plasma*alpha_power_ions_density + pinjimw/vol_plasma)
          tmp_con    = (f_alpha_plasma*alpha_power_ions_density + pinjimw/vol_plasma) * (1.0D0 - tmp_cc)
          tmp_err    = (f_alpha_plasma*alpha_power_ions_density + pinjimw/vol_plasma) * tmp_cc
          tmp_symbol = '='
          tmp_units  = 'MW/m3'
 	   ! Plasma ignited:
       else
-         tmp_cc     = 1.0D0 - (ptripv+piepv) / (f_alpha_plasma*alpha_power_ions_density)
+         tmp_cc     = 1.0D0 - (pden_ion_transport_loss_mw+piepv) / (f_alpha_plasma*alpha_power_ions_density)
          tmp_con    = (f_alpha_plasma*alpha_power_ions_density) * (1.0D0 - tmp_cc)
          tmp_err    = (f_alpha_plasma*alpha_power_ions_density) * tmp_cc
          tmp_symbol = '='
@@ -560,7 +560,7 @@ subroutine constraint_eqn_004(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units)
       !! #=#=# consistency
       !! and hence also optional here.
       !! Logic change during pre-factoring: err, symbol, units will be assigned only if present.
-      !! iradloss : input integer : switch for radiation loss term usage in power balance (see User Guide):<UL>
+      !! i_rad_loss : input integer : switch for radiation loss term usage in power balance (see User Guide):<UL>
       !! <LI> = 0 total power lost is scaling power plus radiation (needed for ipedestal=2,3)
       !! <LI> = 1 total power lost is scaling power plus core radiation only
       !! <LI> = 2 total power lost is scaling power only, with no additional
@@ -568,7 +568,7 @@ subroutine constraint_eqn_004(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units)
       !! ignite : input integer : switch for ignition assumption:<UL>
       !! <LI> = 0 do not assume plasma ignition;
       !! <LI> = 1 assume ignited (but include auxiliary power in costs)</UL>
-      !! ptrepv : input real : electron transport power per volume (MW/m3)
+      !! pden_electron_transport_loss_mw : input real : electron transport power per volume (MW/m3)
       !! pden_plasma_rad_mw : input real : total radiation power per volume (MW/m3)
       !! pcoreradpv : input real : total core radiation power per volume (MW/m3)
       !! f_alpha_plasma : input real : fraction of alpha power deposited in plasma
@@ -576,7 +576,7 @@ subroutine constraint_eqn_004(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units)
       !! piepv : input real : ion/electron equilibration power per volume (MW/m3)
       !! pinjemw : input real : auxiliary injected power to electrons (MW)
       !! vol_plasma : input real : plasma volume (m3)
-      use physics_variables, only: iradloss, ignite, ptrepv, pcoreradpv, f_alpha_plasma, &
+      use physics_variables, only: i_rad_loss, ignite, pden_electron_transport_loss_mw, pcoreradpv, f_alpha_plasma, &
                                  alpha_power_electron_density, piepv, vol_plasma, pden_plasma_rad_mw
       use current_drive_variables, only: pinjemw
       implicit none
@@ -589,11 +589,11 @@ subroutine constraint_eqn_004(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units)
       ! pscaling : Local real : total transport power per volume (MW/m3)
       real(dp) :: pscaling
       real(dp) :: pnumerator, pdenom
-      pscaling = ptrepv
+      pscaling = pden_electron_transport_loss_mw
 	   ! Total power lost is scaling power plus radiation:
-      if (iradloss == 0) then
+      if (i_rad_loss == 0) then
          pnumerator = pscaling + pden_plasma_rad_mw
-      else if (iradloss == 1) then
+      else if (i_rad_loss == 1) then
          pnumerator = pscaling + pcoreradpv
       else
          pnumerator = pscaling
@@ -2446,21 +2446,21 @@ subroutine constraint_eqn_061(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units)
    end subroutine constraint_eqn_061
 
    subroutine constraint_eqn_062(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units)
-      !! Lower limit on taup/taueff the ratio of alpha particle to energy confinement times
+      !! Lower limit on f_alpha_energy_confinement the ratio of alpha particle to energy confinement times
       !! author: P B Lloyd, CCFE, Culham Science Centre
       !! args : output structure : residual error; constraint value;
       !! residual error in physical units; output string; units string
-      !! Lower limit on taup/taueff the ratio of alpha particle to energy confinement times
+      !! Lower limit on f_alpha_energy_confinement the ratio of alpha particle to energy confinement times
       !! #=# physics
-      !! #=#=# ftaulimit, taulimit
+      !! #=#=# falpha_energy_confinement, f_alpha_energy_confinement_min
       !! and hence also optional here.
       !! Logic change during pre-factoring: err, symbol, units will be assigned only if present.
-      !! ftaulimit : input real : f-value for lower limit on taup/taueff the ratio of alpha particle to energy confinement
-      !! taup : input real : alpha particle confinement time (s)
-      !! taueff : input real : global thermal energy confinement time (sec)
-      !! taulimit : input real : Lower limit on taup/taueff the ratio of alpha particle to energy confinement times
-      use constraint_variables, only: ftaulimit, taulimit
-      use physics_variables, only: taup, taueff
+      !! falpha_energy_confinement : input real : f-value for lower limit on f_alpha_energy_confinement the ratio of alpha particle to energy confinement
+      !! t_alpha_confinement : input real : alpha particle confinement time (s)
+      !! t_energy_confinement : input real : global thermal energy confinement time (sec)
+      !! f_alpha_energy_confinement_min : input real : Lower limit on f_alpha_energy_confinement the ratio of alpha particle to energy confinement times
+      use constraint_variables, only: falpha_energy_confinement, f_alpha_energy_confinement_min
+      use physics_variables, only: t_alpha_confinement, t_energy_confinement
       implicit none
             real(dp), intent(out) :: tmp_cc
       real(dp), intent(out) :: tmp_con
@@ -2468,9 +2468,9 @@ subroutine constraint_eqn_062(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units)
       character(len=1), intent(out) :: tmp_symbol
       character(len=10), intent(out) :: tmp_units
 
-      tmp_cc = 1.0D0 - ftaulimit * (taup / taueff) / taulimit
-      tmp_con = taulimit
-      tmp_err = (taup / taueff) * tmp_cc
+      tmp_cc = 1.0D0 - falpha_energy_confinement * (t_alpha_confinement / t_energy_confinement) / f_alpha_energy_confinement_min
+      tmp_con = f_alpha_energy_confinement_min
+      tmp_err = (t_alpha_confinement / t_energy_confinement) * tmp_cc
       tmp_symbol = '>'
       tmp_units = ''
 
diff --git a/source/fortran/constraint_variables.f90 b/source/fortran/constraint_variables.f90
index 0c954b5847..5292ff4936 100644
--- a/source/fortran/constraint_variables.f90
+++ b/source/fortran/constraint_variables.f90
@@ -279,12 +279,12 @@ module constraint_variables
   real(dp) :: walalw
   !! allowable neutron wall-load (MW/m2) (`constraint equation 8`)
 
-  real(dp) :: taulimit
-  !! Lower limit on taup/taueff the ratio of alpha particle to energy confinement
+  real(dp) :: f_alpha_energy_confinement_min
+  !! Lower limit on f_alpha_energy_confinement the ratio of alpha particle to energy confinement
   !! times (`constraint equation 62`)
 
-  real(dp) :: ftaulimit
-  !! f-value for lower limit on taup/taueff the ratio of alpha particle to energy
+  real(dp) :: falpha_energy_confinement
+  !! f-value for lower limit on f_alpha_energy_confinement the ratio of alpha particle to energy
   !! confinement times (`constraint equation 62`, `iteration variable 110`)
 
   real(dp) :: fniterpump
@@ -390,8 +390,8 @@ subroutine init_constraint_variables
     t_current_ramp_up_min = 1.0D0
     vvhealw = 1.0D0
     walalw = 1.0D0
-    taulimit = 5.0D0
-    ftaulimit = 1.0D0
+    f_alpha_energy_confinement_min = 5.0D0
+    falpha_energy_confinement = 1.0D0
     fniterpump = 1.0D0
     zeffmax = 3.6D0
     fpoloidalpower = 1.0D0
diff --git a/source/fortran/input.f90 b/source/fortran/input.f90
index e3aa4079b9..b4f4695920 100644
--- a/source/fortran/input.f90
+++ b/source/fortran/input.f90
@@ -231,10 +231,10 @@ subroutine parse_input_file(in_file,out_file,show_changes)
     use constraint_variables, only: flhthresh, fpeakb, fpsep, fdivcol, ftcycl, &
       beta_poloidal_max, fpsepbqar, ftmargtf, fradwall, fptfnuc, fnesep, fportsz, tbrmin, &
       maxradwallload, pseprmax, fdene, fniterpump, fpinj, pnetelin, powfmax, &
-      fgamcd, ftbr, mvalim, taulimit, walalw, fmva, fradpwr, nflutfmax, fipir, &
+      fgamcd, ftbr, mvalim, f_alpha_energy_confinement_min, walalw, fmva, fradpwr, nflutfmax, fipir, &
       fauxmn, fiooic,fr_conducting_wall, fjohc0, frminor, psepbqarmax, ftpeak, bigqmin, &
       fstrcond, fptemp, ftmargoh, fvs, fbeta_max, vvhealw, fpnetel, ft_burn, &
-      ffuspow, fpsepr, ptfnucmax, fvdump, pdivtlim, ftaulimit, nbshinefmax, &
+      ffuspow, fpsepr, ptfnucmax, fvdump, pdivtlim, falpha_energy_confinement, nbshinefmax, &
       fcqt, fzeffmax, fstrcase, fhldiv, foh_stress, fwalld, gammax, fjprot, &
       ft_current_ramp_up, tcycmn, auxmin, zeffmax, f_fw_rad_max, fdtmp, fpoloidalpower, &
       fnbshinef, freinke, fvvhe, fqval, fq, fmaxvvstress, fbeta_poloidal, fbeta_poloidal_eps, fjohc, &
@@ -305,14 +305,14 @@ subroutine parse_input_file(in_file,out_file,show_changes)
       ccl0_ma, ccls_ma, ld_ratio_cst
     use physics_variables, only: ipedestal, taumax, i_single_null, fvsbrnni, &
       rhopedt, f_vol_plasma, f_deuterium, ffwal, i_beta_component, itartpf, ilhthresh, &
-      fpdivlim, beta_poloidal_eps_max, isc, kappa95, aspect, f_r_conducting_wall, nesep, c_beta, csawth, dene, &
+      fpdivlim, beta_poloidal_eps_max, i_confinement_time, kappa95, aspect, f_r_conducting_wall, nesep, c_beta, csawth, dene, &
       ftar, plasma_res_factor, f_sync_reflect, f_nd_beam_electron, beta, neped, hfact, beta_norm_max, &
       fgwsep, rhopedn, tratio, q0, i_plasma_geometry, i_plasma_shape, fne0, ignite, f_tritium, &
       i_beta_fast_alpha, tauee_in, alphaj, alphat, i_plasma_current, q, ti, tesep, rli, triang, &
       itart, f_nd_alpha_electron, iprofile, triang95, rad_fraction_sol, betbm0, f_nd_protium_electrons, &
       teped, f_helium3, iwalld, gamma, f_alpha_plasma, fgwped, tbeta, i_bootstrap_current, &
-      iradloss, te, alphan, rmajor, plasma_square, kappa, iinvqd, fkzohm, beamfus0, &
-      tauratio, i_density_limit, bt, i_plasma_wall_gap, ipnlaws, beta_max, beta_min, &
+      i_rad_loss, te, alphan, rmajor, plasma_square, kappa, fkzohm, beamfus0, &
+      tauratio, i_density_limit, bt, i_plasma_wall_gap, n_confinement_scalings, beta_max, beta_min, &
       i_diamagnetic_current, i_pfirsch_schluter_current, m_s_limit, burnup_in
     use pf_power_variables, only: iscenr, maxpoloidalpower
     use pulse_variables, only: lpulse, dtstor, itcycl, istore, bctmp
@@ -602,9 +602,9 @@ subroutine parse_input_file(in_file,out_file,show_changes)
        case ('fnesep')
           call parse_real_variable('fnesep', fnesep, 0.1D0, 2.0D1, &
                'f-value for Eich critical separatrix density')
-       case ('ftaulimit')
-          call parse_real_variable('ftaulimit', ftaulimit, 0.001D0, 1.0D0, &
-               'f-value for lower limit on taup/taueff the ratio of alpha particle to energy confinement times')
+       case ('falpha_energy_confinement')
+          call parse_real_variable('falpha_energy_confinement', falpha_energy_confinement, 0.001D0, 1.0D0, &
+               'f-value for lower limit on f_alpha_energy_confinement the ratio of alpha particle to energy confinement times')
        case ('f_tritium')
           call parse_real_variable('f_tritium', f_tritium, 0.0D0, 1.0D0, &
                'Tritium fuel fraction')
@@ -641,9 +641,6 @@ subroutine parse_input_file(in_file,out_file,show_changes)
        case ('ignite')
           call parse_int_variable('ignite', ignite, 0, 1, &
                'Switch for ignited plasma assumption')
-       case ('iinvqd')
-          call parse_int_variable('iinvqd', iinvqd, 0, 1, &
-               'Switch for inverse quadrature')
        case ('ilhthresh')
           call parse_int_variable('ilhthresh', ilhthresh, 1, 21, &
                'Switch for L-H power threshold to enforce')
@@ -657,11 +654,11 @@ subroutine parse_input_file(in_file,out_file,show_changes)
        case ('i_pfirsch_schluter_current')
           call parse_int_variable('i_pfirsch_schluter_current', i_pfirsch_schluter_current, 0, 1, &
                'Switch for Pfirsch-Schlüter scaling')
-       case ('iradloss')
-          call parse_int_variable('iradloss', iradloss, 0, 2, &
+       case ('i_rad_loss')
+          call parse_int_variable('i_rad_loss', i_rad_loss, 0, 2, &
                'Switch for radiation loss term inclusion in power balance')
-       case ('isc')
-          call parse_int_variable('isc', isc, 1, ipnlaws, &
+       case ('i_confinement_time')
+          call parse_int_variable('i_confinement_time', i_confinement_time, 0, n_confinement_scalings-1, &
                'Switch for confinement scaling law')
        case ('i_plasma_wall_gap')
           call parse_int_variable('i_plasma_wall_gap', i_plasma_wall_gap, 0, 1, &
@@ -750,10 +747,10 @@ subroutine parse_input_file(in_file,out_file,show_changes)
                'Electron temperature (keV)')
        case ('tauee_in')
            call parse_real_variable('tauee_in', tauee_in, 0.0D0, 100.0D0, &
-                    'Input electron energy confinement time (sec) (isc=48 only)')
-       case ('taulimit')
-          call parse_real_variable('taulimit', taulimit, 1.0D0, 100.0D0, &
-               'Lower limit on taup/taueff the ratio of alpha particle to energy confinement times')
+                    'Input electron energy confinement time (sec) (i_confinement_time=48 only)')
+       case ('f_alpha_energy_confinement_min')
+          call parse_real_variable('f_alpha_energy_confinement_min', f_alpha_energy_confinement_min, 1.0D0, 100.0D0, &
+               'Lower limit on f_alpha_energy_confinement the ratio of alpha particle to energy confinement times')
 
        case ('teped')
           call parse_real_variable('teped', teped, 0.0D0, 20.0D0, &
diff --git a/source/fortran/iteration_variables.f90 b/source/fortran/iteration_variables.f90
index 3ec8a1714d..8a6ef5058e 100755
--- a/source/fortran/iteration_variables.f90
+++ b/source/fortran/iteration_variables.f90
@@ -2387,26 +2387,26 @@ end subroutine set_itv_109
   !---------------------------------
 
   subroutine init_itv_110
-    !! <LI> (110) ftaulimit: Lower limit on taup/taueff the ratio of alpha
+    !! <LI> (110) falpha_energy_confinement: Lower limit on f_alpha_energy_confinement the ratio of alpha
     use numerics, only: lablxc, boundl, boundu
     implicit none
     !!      particle to energy confinement times (f-value for equation 62)
-    lablxc(110) = 'ftaulimit     '
+    lablxc(110) = 'falpha_energy_confinement     '
     boundl(110) = 0.001D0
     boundu(110) = 1.000D0
   end subroutine init_itv_110
 
   real(kind(1.d0)) function itv_110()
-    use constraint_variables, only: ftaulimit
+    use constraint_variables, only: falpha_energy_confinement
     implicit none
-    itv_110 = ftaulimit
+    itv_110 = falpha_energy_confinement
   end function itv_110
 
   subroutine set_itv_110(ratio)
-    use constraint_variables, only: ftaulimit
+    use constraint_variables, only: falpha_energy_confinement
     implicit none
     real(kind(1.d0)) :: ratio
-    ftaulimit = ratio
+    falpha_energy_confinement = ratio
   end subroutine set_itv_110
 
   !---------------------------------
diff --git a/source/fortran/numerics.f90 b/source/fortran/numerics.f90
index 742c8844d4..ed437e58f4 100755
--- a/source/fortran/numerics.f90
+++ b/source/fortran/numerics.f90
@@ -162,7 +162,7 @@ module numerics
   !!  <LI> (59) Neutral beam shine-through fraction upper limit (NBI) (itv 105,6,19,4 )
   !!  <LI> (60) Central solenoid temperature margin lower limit (SCTF) (itv 106)
   !!  <LI> (61) Minimum availability value (itv 107)
-  !!  <LI> (62) taup/taueff the ratio of particle to energy confinement times (itv 110)
+  !!  <LI> (62) f_alpha_energy_confinement the ratio of particle to energy confinement times (itv 110)
   !!  <LI> (63) The number of ITER-like vacuum pumps niterpump < tfno (itv 111)
   !!  <LI> (64) Zeff less than or equal to zeffmax (itv 112)
   !!  <LI> (65) Dump time set by VV loads (itv 56, 113)
@@ -311,7 +311,7 @@ module numerics
   !! <LI> (107) favail (f-value for equation 61)
   !! <LI> (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)
   !! <LI> (109) f_nd_alpha_electron: thermal alpha density / electron density
-  !! <LI> (110) ftaulimit: Lower limit on taup/taueff the ratio of alpha
+  !! <LI> (110) falpha_energy_confinement: Lower limit on f_alpha_energy_confinement the ratio of alpha
   !! <LI> (111) fniterpump: f-value for constraint that number
   !! <LI> (112) fzeffmax: f-value for max Zeff (f-value for equation 64)
   !! <LI> (113) ftaucq: f-value for minimum quench time (f-value for equation 65)
@@ -516,7 +516,7 @@ subroutine init_numerics()
       'NB shine-through frac upper limit', &
       'CS temperature margin lower limit', &
       'Minimum availability value       ', &
-      'taup/taueff                      ', &
+      'f_alpha_energy_confinement       ', &
       'number of ITER-like vacuum pumps ', &
       'Zeff limit                       ', &
       'Dump time set by VV stress       ', &
diff --git a/source/fortran/physics.f90 b/source/fortran/physics.f90
index aca5b8b383..9598f1d98f 100644
--- a/source/fortran/physics.f90
+++ b/source/fortran/physics.f90
@@ -21,7 +21,7 @@ module physics_module
   real(dp) :: rad_fraction_LCFS
   real(dp) :: e_plasma_beta  ! [J]
   real(dp) :: total_loss_power        ! [W]
-  real(dp) :: total_energy_conf_time  ! [s]
+  real(dp) :: t_energy_confinement_beta  ! [s]
   real(dp) :: ptarmw, lambdaio, drsep
   real(dp) :: fio, fLI, fLO, fUI, fUO, pLImw, pLOmw, pUImw, pUOmw
   real(dp) :: rho_star
@@ -46,7 +46,7 @@ subroutine init_physics_module
     rad_fraction_LCFS = 0.0D0
     e_plasma_beta = 0.0D0
     total_loss_power = 0.0D0
-    total_energy_conf_time = 0.0D0
+    t_energy_confinement_beta = 0.0D0
     ptarmw = 0.0D0
     lambdaio = 0.0D0
     drsep = 0.0D0
diff --git a/source/fortran/physics_variables.f90 b/source/fortran/physics_variables.f90
index 2807c0958d..7506fc5fd0 100644
--- a/source/fortran/physics_variables.f90
+++ b/source/fortran/physics_variables.f90
@@ -14,7 +14,7 @@ module physics_variables
 
   public
 
-  integer, parameter :: ipnlaws = 50
+  integer, parameter :: n_confinement_scalings = 51
   !! number of energy confinement time scaling laws
 
   real(dp) :: m_beam_amu
@@ -171,8 +171,11 @@ module physics_variables
   real(dp) :: nd_protons
   !! proton ash density (/m3)
 
-  real(dp) :: dntau
-  !! plasma average "n-tau" (seconds/m3)
+  real(dp) :: ntau
+  !! Fusion double product (s/m3)
+
+  real(dp) :: nTtau
+  !! Lawson triple product [keV s / m3]
 
   real(dp) :: nd_impurities
   !! high Z ion density (/m3)
@@ -263,7 +266,7 @@ module physics_variables
   real(dp) :: f_beta_alpha_beam_thermal
   !! ratio of (fast alpha + neutral beam beta) to thermal beta
 
-  real(dp), dimension(ipnlaws) :: hfac
+  real(dp), dimension(n_confinement_scalings) :: hfac
   !! H factors for an ignited plasma for each energy confinement time scaling law
 
   real(dp) :: hfact
@@ -344,12 +347,6 @@ module physics_variables
   !! - =0 do not assume plasma ignition
   !! - =1 assume ignited (but include auxiliary power in costs)</UL
 
-  integer :: iinvqd
-  !! switch for inverse quadrature in L-mode scaling laws 5 and 9:
-  !!
-  !! - =0 inverse quadrature not used
-  !! - =1 inverse quadrature with Neo-Alcator tau-E used
-
   integer :: ipedestal
   !! switch for pedestal profiles:
   !!
@@ -410,7 +407,7 @@ module physics_variables
   !! - =5 use input value for alphaj.  Set rli and beta_norm_max from Menard scaling
   !! - =6 use input values for alphaj, c_beta.  Set rli from Menard and beta_norm_max from Tholerus
 
-  integer :: iradloss
+  integer :: i_rad_loss
   !! switch for radiation loss term usage in power balance (see User Guide):
   !!
   !! - =0 total power lost is scaling power plus radiation
@@ -418,110 +415,62 @@ module physics_variables
   !! - =2 total power lost is scaling power only, with no additional
   !!   allowance for radiation. This is not recommended for power plant models.
 
-  integer :: isc
-  !! switch for energy confinement time scaling law (see description in `tauscl`)
-
-  character*24, parameter, dimension(ipnlaws) :: tauscl = (/ &
-    'Neo-Alcator      (ohmic)', &
-    'Mirnov               (H)', &
-    'Merezkhin-Muhkovatov (L)', &
-    'Shimomura            (H)', &
-    'Kaye-Goldston        (L)', &
-    'ITER 89-P            (L)', &
-    'ITER 89-O            (L)', &
-    'Rebut-Lallia         (L)', &
-    'Goldston             (L)', &
-    'T10                  (L)', &
-    'JAERI-88             (L)', &
-    'Kaye-Big Complex     (L)', &
-    'ITER H90-P           (H)', &
-    'ITER Mix             (L)', &
-    'Riedel               (L)', &
-    'Christiansen         (L)', &
-    'Lackner-Gottardi     (L)', &
-    'Neo-Kaye             (L)', &
-    'Riedel               (H)', &
-    'ITER H90-P amended   (H)', &
-    'LHD              (stell)', &
-    'Gyro-reduced Bohm(stell)', &
-    'Lackner-Gottardi (stell)', &
-    'ITER-93H             (H)', &
-    'TITAN RFP OBSOLETE      ', &
-    'ITER H-97P ELM-free  (H)', &
-    'ITER H-97P ELMy      (H)', &
-    'ITER-96P             (L)', &
-    'Valovic modified ELMy(H)', &
-    'Kaye PPPL April 98   (L)', &
-    'ITERH-PB98P(y)       (H)', &
-    'IPB98(y)             (H)', &
-    'IPB98(y,1)           (H)', &
-    'IPB98(y,2)           (H)', &
-    'IPB98(y,3)           (H)', &
-    'IPB98(y,4)           (H)', &
-    'ISS95            (stell)', &
-    'ISS04            (stell)', &
-    'DS03                 (H)', &
-    'Murari et al NPL     (H)', &
-    'Petty 2008           (H)', &
-    'Lang et al. 2012     (H)', &
-    'Hubbard 2017 - nom   (I)', &
-    'Hubbard 2017 - lower (I)', &
-    'Hubbard 2017 - upper (I)', &
-    'NSTX (Spherical)     (H)', &
-    'NSTX-Petty08 Hybrid  (H)', &
-    'NSTX gyro-Bohm Buxton(H)', &
-    'Input tauee_in          ', &
-    'ITPA20               (H)' /)
-  !! tauscl(ipnlaws) : labels describing energy confinement scaling laws:<UL>
-  !! <LI> ( 1)  Neo-Alcator (ohmic)
-  !! <LI> ( 2)  Mirnov (H-mode)
-  !! <LI> ( 3)  Merezkhin-Muhkovatov (L-mode)
-  !! <LI> ( 4)  Shimomura (H-mode)
-  !! <LI> ( 5)  Kaye-Goldston (L-mode)
-  !! <LI> ( 6)  ITER 89-P (L-mode)
-  !! <LI> ( 7)  ITER 89-O (L-mode)
-  !! <LI> ( 8)  Rebut-Lallia (L-mode)
-  !! <LI> ( 9)  Goldston (L-mode)
-  !! <LI> (10)  T10 (L-mode)
-  !! <LI> (11)  JAERI-88 (L-mode)
-  !! <LI> (12)  Kaye-Big Complex (L-mode)
-  !! <LI> (13)  ITER H90-P (H-mode)
-  !! <LI> (14)  ITER Mix (L-mode)
-  !! <LI> (15)  Riedel (L-mode)
-  !! <LI> (16)  Christiansen (L-mode)
-  !! <LI> (17)  Lackner-Gottardi (L-mode)
-  !! <LI> (18)  Neo-Kaye (L-mode)
-  !! <LI> (19)  Riedel (H-mode)
-  !! <LI> (20)  ITER H90-P amended (H-mode)
-  !! <LI> (21)  LHD (stellarator)
-  !! <LI> (22)  Gyro-reduced Bohm (stellarator)
-  !! <LI> (23)  Lackner-Gottardi (stellarator)
-  !! <LI> (24)  ITER-93H (H-mode)
-  !! <LI> (25) OBSOLETE
-  !! <LI> (26)  ITER H-97P ELM-free (H-mode)
-  !! <LI> (27)  ITER H-97P ELMy (H-mode)
-  !! <LI> (28)  ITER-96P (=ITER-97L) (L-mode)
-  !! <LI> (29)  Valovic modified ELMy (H-mode)
-  !! <LI> (30)  Kaye PPPL April 98 (L-mode)
-  !! <LI> (31)  ITERH-PB98P(y) (H-mode)
-  !! <LI> (32)  IPB98(y) (H-mode)
-  !! <LI> (33)  IPB98(y,1) (H-mode)
-  !! <LI> (34)  IPB98(y,2) (H-mode)
-  !! <LI> (35)  IPB98(y,3) (H-mode)
-  !! <LI> (36)  IPB98(y,4) (H-mode)
-  !! <LI> (37)  ISS95 (stellarator)
-  !! <LI> (38)  ISS04 (stellarator)
-  !! <LI> (39)  DS03 (H-mode)
-  !! <LI> (40)  Murari et al non-power law (H-mode)
-  !! <LI> (41)  Petty 2008 (H-mode)
-  !! <LI> (42)  Lang et al. 2012 (H-mode)
-  !! <LI> (43)  Hubbard 2017 (I-mode) - nominal
-  !! <LI> (44)  Hubbard 2017 (I-mode) - lower bound
-  !! <LI> (45)  Hubbard 2017 (I-mode) - upper bound
-  !! <LI> (46)  NSTX (H-mode; Spherical tokamak)
-  !! <LI> (47)  NSTX-Petty08 Hybrid (H-mode)
-  !! <LI> (48)  NSTX gyro-Bohm (Buxton) (H-mode; Spherical tokamak)
-  !! <LI> (49)  Use input tauee_in </UL>
+  integer :: i_confinement_time
+  !! switch for energy confinement time scaling law (see description in `labels_confinement_scalings`)
+
+  !! labels_confinement_scalings(n_confinement_scalings) : labels describing energy confinement scaling laws
+  character*34, parameter, dimension(n_confinement_scalings) :: labels_confinement_scalings = (/  &
+    'User input electron confinement   ', &
+    'Neo-Alcator                (Ohmic)', &
+    'Mirnov                         (H)', &
+    'Merezkhin-Muhkovatov    (Ohmic)(L)', &
+    'Shimomura                      (H)', &
+    'Kaye-Goldston                  (L)', &
+    'ITER 89-P                      (L)', &
+    'ITER 89-O                      (L)', &
+    'Rebut-Lallia                   (L)', &
+    'Goldston                       (L)', &
+    'T10                            (L)', &
+    'JAERI / Odajima-Shimomura      (L)', &
+    'Kaye-Big Complex               (L)', &
+    'ITER H90-P                     (H)', &
+    'ITER 89-P & 89-O min           (L)', &
+    'Riedel                         (L)', &
+    'Christiansen                   (L)', &
+    'Lackner-Gottardi               (L)', &
+    'Neo-Kaye                       (L)', &
+    'Riedel                         (H)', &
+    'ITER H90-P amended             (H)', &
+    'LHD                        (Stell)', &
+    'Gyro-reduced Bohm          (Stell)', &
+    'Lackner-Gottardi           (Stell)', &
+    'ITER-93H  ELM-free             (H)', &
+    'TITAN RFP OBSOLETE                ', &
+    'ITER H-97P ELM-free            (H)', &
+    'ITER H-97P ELMy                (H)', &
+    'ITER-96P (ITER-97L)            (L)', &
+    'Valovic modified ELMy          (H)', &
+    'Kaye 98 modified               (L)', &
+    'ITERH-PB98P(y)                 (H)', &
+    'IPB98(y)                       (H)', &
+    'IPB98(y,1)                     (H)', &
+    'IPB98(y,2)                     (H)', &
+    'IPB98(y,3)                     (H)', &
+    'IPB98(y,4)                     (H)', &
+    'ISS95                      (Stell)', &
+    'ISS04                      (Stell)', &
+    'DS03 beta-independent          (H)', &
+    'Murari "Non-power law"         (H)', &
+    'Petty 2008                 (ST)(H)', &
+    'Lang high density              (H)', &
+    'Hubbard 2017 - nominal         (I)', &
+    'Hubbard 2017 - lower           (I)', &
+    'Hubbard 2017 - upper           (I)', &
+    'Menard NSTX                (ST)(H)', &
+    'Menard NSTX-Petty08 hybrid (ST)(H)', &
+    'Buxton NSTX gyro-Bohm      (ST)(H)', &
+    'ITPA20                         (H)', &
+    'ITPA20-IL                      (H)' /)
 
   integer :: i_plasma_wall_gap
   !! Switch for plasma-first wall clearances at the mid-plane:
@@ -578,11 +527,9 @@ module physics_variables
   real(dp) :: kappa95
   !! plasma elongation at 95% surface (calculated if `i_plasma_geometry = 0-3, 6, or 8-10`)
 
-  real(dp) :: kappaa
-  !! plasma elongation calculated as a_plasma_poloidal/(pi.a^2)
 
-  real(dp) :: kappaa_IPB
-  !! Volume measure of plasma elongation
+  real(dp) :: kappa_ipb
+  !! Separatrix elongation calculated for IPB scalings
 
   real(dp) :: ne0
   !! central electron density (/m3)
@@ -707,7 +654,7 @@ module physics_variables
   real(dp) :: pden_plasma_ohmic_mw
   !! ohmic heating power per volume (MW/m3)
 
-  real(dp) :: powerht
+  real(dp) :: p_plasma_loss_mw
   !! heating power (= transport loss power) (MW) used in confinement time calculation
 
   real(dp) :: fusion_power
@@ -766,19 +713,19 @@ module physics_variables
   !! - =20 Martin 2008 aspect ratio corrected scaling: 95% upper bound
   !! - =21 Martin 2008 aspect ratio corrected scaling: 95% lower bound
 
-  real(dp) :: ptremw
+  real(dp) :: p_electron_transport_loss_mw
   !! electron transport power (MW)
 
-  real(dp) :: ptrepv
+  real(dp) :: pden_electron_transport_loss_mw
   !! electron transport power per volume (MW/m3)
 
-  real(dp) :: ptrimw
+  real(dp) :: p_ion_transport_loss_mw
   !! ion transport power (MW)
 
   real(dp) :: pscalingmw
   !! Total transport power from scaling law (MW)
 
-  real(dp) :: ptripv
+  real(dp) :: pden_ion_transport_loss_mw
   !! ion transport power per volume (MW/m3)
 
   real(dp) :: q
@@ -866,21 +813,24 @@ module physics_variables
   real(dp) :: f_sync_reflect
   !! synchrotron wall reflectivity factor
 
-  real(dp) :: tauee
+  real(dp) :: t_electron_energy_confinement
   !! electron energy confinement time (sec)
 
   real(dp) :: tauee_in
-  !! Input electron energy confinement time (sec) (`isc=48 only`)
+  !! Input electron energy confinement time (sec) (`i_confinement_time=48 only`)
 
-  real(dp) :: taueff
+  real(dp) :: t_energy_confinement
   !! global thermal energy confinement time (sec)
 
-  real(dp) :: tauei
+  real(dp) :: t_ion_energy_confinement
   !! ion energy confinement time (sec)
 
-  real(dp) :: taup
+  real(dp) :: t_alpha_confinement
   !! alpha particle confinement time (sec)
 
+  real(dp) :: f_alpha_energy_confinement
+  !! alpha particle to energy confinement time ratio
+
   real(dp) :: te
   !! volume averaged electron temperature (keV) (`iteration variable 4`)
 
@@ -998,7 +948,8 @@ subroutine init_physics_variables
     nd_ions_total = 0.0D0
     dnla = 0.0D0
     nd_protons = 0.0D0
-    dntau = 0.0D0
+    ntau = 0.0D0
+    nTtau = 0.0D0
     nd_impurities = 0.0D0
     beta_poloidal_eps_max = 1.38D0
     eps = 0.34399724802D0
@@ -1035,7 +986,6 @@ subroutine init_physics_variables
     idivrt = 2
     i_beta_fast_alpha = 1
     ignite = 0
-    iinvqd = 1
     ipedestal = 1
     i_pfirsch_schluter_current = 0
     neped = 4.0D19
@@ -1049,8 +999,8 @@ subroutine init_physics_variables
     teped = 1.0D0
     tesep = 0.1D0
     iprofile = 1
-    iradloss = 1
-    isc = 34
+    i_rad_loss = 1
+    i_confinement_time = 34
     i_plasma_wall_gap = 1
     i_plasma_geometry = 0
     i_plasma_shape = 0
@@ -1060,8 +1010,8 @@ subroutine init_physics_variables
     plasma_square = 0.0D0
     kappa = 1.792D0
     kappa95 = 1.6D0
-    kappaa = 0.0D0
-    kappaa_IPB = 0.d0
+
+    kappa_ipb = 0.d0
     ne0 = 0.0D0
     ni0 = 0.0D0
     m_s_limit = 0.3D0
@@ -1102,7 +1052,7 @@ subroutine init_physics_variables
     neutron_power_density_plasma = 0.0D0
     p_plasma_ohmic_mw = 0.0D0
     pden_plasma_ohmic_mw = 0.0D0
-    powerht = 0.0D0
+    p_plasma_loss_mw = 0.0D0
     fusion_power = 0.0D0
     len_plasma_poloidal = 0.0D0
     p_plasma_rad_mw = 0.0D0
@@ -1114,11 +1064,11 @@ subroutine init_physics_variables
     ilhthresh = 19
     plhthresh = 0.0D0
     pthrmw = 0.0D0
-    ptremw = 0.0D0
-    ptrepv = 0.0D0
-    ptrimw = 0.0D0
+    p_electron_transport_loss_mw = 0.0D0
+    pden_electron_transport_loss_mw = 0.0D0
+    p_ion_transport_loss_mw = 0.0D0
     pscalingmw = 0.0D0
-    ptripv = 0.0D0
+    pden_ion_transport_loss_mw = 0.0D0
     q = 3.0D0
     q0 = 1.0D0
     q95 = 0.0D0
@@ -1146,11 +1096,12 @@ subroutine init_physics_variables
     a_plasma_surface_outboard = 0.0D0
     i_single_null = 1
     f_sync_reflect = 0.6D0
-    tauee = 0.0D0
+    t_electron_energy_confinement = 0.0D0
     tauee_in = 0.0D0
-    taueff = 0.0D0
-    tauei = 0.0D0
-    taup = 0.0D0
+    t_energy_confinement = 0.0D0
+    t_ion_energy_confinement = 0.0D0
+    t_alpha_confinement = 0.0D0
+    f_alpha_energy_confinement = 0.0D0
     te = 12.9D0
     te0 = 0.0D0
     ten = 0.0D0
diff --git a/source/fortran/scan.f90 b/source/fortran/scan.f90
index a7cdf9d51b..71f80dc436 100644
--- a/source/fortran/scan.f90
+++ b/source/fortran/scan.f90
@@ -67,7 +67,7 @@ module scan_module
   !!         <LI> 28 bt
   !!         <LI> 29 coreradius
   !!         <LI> 30 fimpvar # OBSOLETE
-  !!         <LI> 31 taulimit
+  !!         <LI> 31 f_alpha_energy_confinement_min
   !!         <LI> 32 epsvmc
   !!         <LI> 33 ttarget
   !!         <LI> 34 qtargettotal
@@ -179,7 +179,7 @@ subroutine scan_1d_write_point_header(iscan)
   end subroutine scan_1d_write_point_header
 
   subroutine scan_1d_store_output(iscan, ifail, noutvars_, ipnscns_, outvar)
-    use constraint_variables, only: taulimit
+    use constraint_variables, only: f_alpha_energy_confinement_min
     use cost_variables, only: cdirt, coe, coeoam, coefuelt, c222, ireactor, &
       capcost, coecap, c221
     use current_drive_variables, only: pheat, pinjmw, bootstrap_current_fraction, beam_energy, bigq
@@ -274,7 +274,7 @@ subroutine scan_1d_store_output(iscan, ifail, noutvars_, ipnscns_, outvar)
     outvar(55,iscan) = (wwp1+wwp2)*dr_tf_wp
     outvar(56,iscan) = acond
     outvar(57,iscan) = tfareain/n_tf
-    outvar(58,iscan) = taulimit
+    outvar(58,iscan) = f_alpha_energy_confinement_min
     outvar(66,iscan) = f_nd_alpha_electron
     outvar(69,iscan) = fimp(1)
     outvar(70,iscan) = fimp(2)
@@ -368,7 +368,7 @@ subroutine scan_1d_write_plot(iscan, outvar)
         plabel(55) = 'Winding_pack_area_TFC(m2)'
         plabel(56) = 'Conductor_area_TFC_(m2)__'
         plabel(57) = 'Area_TF_inboard_leg_(m2)_'
-        plabel(58) = 'Taup/taueff_lower_limit__'
+        plabel(58) = 't_alpha_confinement/taueff_lower_limit__'
         plabel(59) = 'Plasma_temp_at_sep_[keV]_'
         plabel(60) = 'SOL_density_at_OMP_______'
         plabel(61) = 'Power_through__separatrix'
@@ -556,7 +556,7 @@ subroutine scan_2d_write_plot(iscan, outvar, sweep_1_vals, sweep_2_vals)
     plabel(55) = 'Winding_pack_area_TFC(m2)'
     plabel(56) = 'Conductor_area_TFC_(m2)__'
     plabel(57) = 'Area_TF_inboard_leg_(m2)_'
-    plabel(58) = 'Taup/taueff_lower_limit__'
+    plabel(58) = 't_alpha_confinement/taueff_lower_limit__'
     plabel(59) = 'Plasma_temp_at_sep_[keV]_'
     plabel(60) = 'SOL_density_at_OMP_______'
     plabel(61) = 'Power_through__separatrix'
@@ -594,7 +594,7 @@ subroutine scan_select(nwp, swp, iscn, vlab, xlab)
     ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 	use build_variables, only: dr_blkt_outboard, dr_shld_inboard, dr_fw_plasma_gap_inboard, dr_fw_plasma_gap_outboard, dr_cs
-    use constraint_variables, only: fiooic, walalw, bmxlim, fqval, taulimit, &
+    use constraint_variables, only: fiooic, walalw, bmxlim, fqval, f_alpha_energy_confinement_min, &
         gammax, t_burn_min, tbrmin, fjprot, pnetelin, powfmax
 	use cost_variables, only: cfactr, iavail, fkind, startupratio
 	use current_drive_variables, only: bootstrap_current_fraction_max, etaech
@@ -716,8 +716,8 @@ subroutine scan_select(nwp, swp, iscn, vlab, xlab)
             !fimpvar = swp(iscn)
             vlab = 'OBSOLETE' ; xlab = 'OBSOLETE'
         case (31)
-            taulimit = swp(iscn)
-            vlab = 'taulimit' ; xlab = 'Taup/taueff_lower_limit'
+            f_alpha_energy_confinement_min = swp(iscn)
+            vlab = 'f_alpha_energy_confinement_min' ; xlab = 't_alpha_confinement/taueff_lower_limit'
         case (32)
             epsvmc = swp(iscn)
             vlab = 'epsvmc' ; xlab = 'VMCON error tolerance'
diff --git a/source/fortran/stellarator.f90 b/source/fortran/stellarator.f90
index 0a63f54018..081dabba3d 100644
--- a/source/fortran/stellarator.f90
+++ b/source/fortran/stellarator.f90
@@ -55,7 +55,7 @@ subroutine stinit
     use current_drive_variables, only: irfcd
     use pfcoil_variables, only: ohhghf
     use physics_variables, only: aspect, beta_norm_max, kappa, kappa95, q, rmajor, &
-      triang, hfac, tauscl
+      triang, hfac, labels_confinement_scalings
     use numerics, only: boundl, boundu
     use stellarator_variables, only: istell
     use tfcoil_variables, only: n_tf
diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT
index d9ac205485..d2aa3d84f4 100644
--- a/tests/integration/data/large_tokamak_1_MFILE.DAT
+++ b/tests/integration/data/large_tokamak_1_MFILE.DAT
@@ -176,7 +176,7 @@
  J_winding_pack/J_protection_limit_normalised_residue____________________ (normres017)__________________     -2.9894E-07    
  TF_coil_temp._margin_lower_limit__normalised_residue____________________ (normres018)__________________     -1.0631E-06    
  CS_temperature_margin_lower_limit_normalised_residue____________________ (normres019)__________________      8.0251E-08    
- taup/taueff_______________________normalised_residue____________________ (normres020)__________________     -1.8772E-08    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (normres020)__________________     -1.8772E-08    
  Dump_time_set_by_VV_stress________normalised_residue____________________ (normres021)__________________     -1.0026E-07    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (normres022)__________________     -1.6044E-07    
  ne0_>_neped_______________________normalised_residue____________________ (normres023)__________________     -1.9637E-08    
@@ -452,8 +452,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.1828E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.8172E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.4013E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.5772E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.4013E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.5772E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      8.0143E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -484,22 +484,22 @@
  L-H_threshold_power_(enforced)_(MW)_____________________________________ (boundl(103)*plhthresh)_______      9.7416E+01 OP 
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      9.7416E+01 OP 
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.1886E+00 ITV
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.2037E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.2037E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.2037E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.5843E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.2275E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      2.9785E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.2037E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.2037E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.2037E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.5843E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.2275E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      2.9785E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      9.1650E+01 OP 
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      2.2270E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      6.9512E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      2.8018E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      2.2270E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      6.9512E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      2.8018E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.4553E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      1.9603E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.7266E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6815E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6815E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.5616E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.3585E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -1340,11 +1340,11 @@ icc = 60
 ixc = 106 * ftmargoh
 tmargmin_cs = 1.5
 
-* Lower limit on taup/taueff (ratio alpha particle/energy confinement times) *
+* Lower limit on f_alpha_energy_confinement (ratio alpha particle/energy confinement times) *
 *-------------------------------------------------------------------------------*
 icc = 62 
-ixc = 110 * ftaulimit
-taulimit = 5.0
+ixc = 110 * falpha_energy_confinement
+f_alpha_energy_confinement_min = 5.0
 
 * dump time constraint for VV stresses *
 *--------------------------------------*
@@ -1575,9 +1575,6 @@ i_density_limit = 7
 * Switch for fast alpha pressure calculation
 i_beta_fast_alpha = 1
 
-* Switch for inverse quadrature in l-mode scaling laws 5 and 9
-iinvqd = 1
-
 * Switch for pedestal profiles
 ipedestal = 1
 
@@ -1609,7 +1606,7 @@ tesep = 0.1
 iprofile = 1
 
 * Switch for energy confinement time scaling law
-isc = 34
+i_confinement_time = 34
 
 * Safety factor on axis
 q0 = 1.0
diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT
index cf209d9964..d2eba7fec3 100644
--- a/tests/integration/data/large_tokamak_2_MFILE.DAT
+++ b/tests/integration/data/large_tokamak_2_MFILE.DAT
@@ -177,7 +177,7 @@
  J_winding_pack/J_protection_limit_normalised_residue____________________ (normres017)__________________     -2.9894E-07    
  TF_coil_temp._margin_lower_limit__normalised_residue____________________ (normres018)__________________     -1.0631E-06    
  CS_temperature_margin_lower_limit_normalised_residue____________________ (normres019)__________________      8.0251E-08    
- taup/taueff_______________________normalised_residue____________________ (normres020)__________________     -1.8772E-08    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (normres020)__________________     -1.8772E-08    
  Dump_time_set_by_VV_stress________normalised_residue____________________ (normres021)__________________     -1.0026E-07    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (normres022)__________________     -1.6044E-07    
  ne0_>_neped_______________________normalised_residue____________________ (normres023)__________________     -1.9637E-08    
@@ -453,8 +453,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.1828E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.8172E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.4013E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.5772E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.4013E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.5772E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      8.0143E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -485,22 +485,22 @@
  L-H_threshold_power_(enforced)_(MW)_____________________________________ (boundl(103)*plhthresh)_______      9.7416E+01 OP 
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      9.7416E+01 OP 
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.1886E+00 ITV
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.2037E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.2037E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.2037E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.5843E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.2275E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      2.9785E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.2037E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.2037E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.2037E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.5843E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.2275E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      2.9785E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      9.1650E+01 OP 
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      2.2270E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      6.9512E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      2.8018E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      2.2270E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      6.9512E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      2.8018E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.4553E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      1.9603E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.7266E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6815E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6815E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.5616E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.3585E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -1341,11 +1341,11 @@ icc = 60
 ixc = 106 * ftmargoh
 tmargmin_cs = 1.5
 
-* Lower limit on taup/taueff (ratio alpha particle/energy confinement times) *
+* Lower limit on f_alpha_energy_confinement (ratio alpha particle/energy confinement times) *
 *-------------------------------------------------------------------------------*
 icc = 62 
-ixc = 110 * ftaulimit
-taulimit = 5.0
+ixc = 110 * falpha_energy_confinement
+f_alpha_energy_confinement_min = 5.0
 
 * dump time constraint for VV stresses *
 *--------------------------------------*
@@ -1576,9 +1576,6 @@ i_density_limit = 7
 * Switch for fast alpha pressure calculation
 i_beta_fast_alpha = 1
 
-* Switch for inverse quadrature in l-mode scaling laws 5 and 9
-iinvqd = 1
-
 * Switch for pedestal profiles
 ipedestal = 1
 
@@ -1610,7 +1607,7 @@ tesep = 0.1
 iprofile = 1
 
 * Switch for energy confinement time scaling law
-isc = 34
+i_confinement_time = 34
 
 * Safety factor on axis
 q0 = 1.0
diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT
index 5bf41086d4..4cde49adbe 100644
--- a/tests/integration/data/large_tokamak_3_MFILE.DAT
+++ b/tests/integration/data/large_tokamak_3_MFILE.DAT
@@ -177,7 +177,7 @@
  J_winding_pack/J_protection_limit_normalised_residue____________________ (normres017)__________________     -2.9894E-07    
  TF_coil_temp._margin_lower_limit__normalised_residue____________________ (normres018)__________________     -1.0631E-06    
  CS_temperature_margin_lower_limit_normalised_residue____________________ (normres019)__________________      8.0251E-08    
- taup/taueff_______________________normalised_residue____________________ (normres020)__________________     -1.8772E-08    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (normres020)__________________     -1.8772E-08    
  Dump_time_set_by_VV_stress________normalised_residue____________________ (normres021)__________________     -1.0026E-07    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (normres022)__________________     -1.6044E-07    
  ne0_>_neped_______________________normalised_residue____________________ (normres023)__________________     -1.9637E-08    
@@ -453,8 +453,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.1828E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.8172E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.4013E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.5772E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.4013E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.5772E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      8.0143E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -485,22 +485,22 @@
  L-H_threshold_power_(enforced)_(MW)_____________________________________ (boundl(103)*plhthresh)_______      9.7416E+01 OP 
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      9.7416E+01 OP 
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.1886E+00 ITV
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.2037E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.2037E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.2037E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.5843E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.2275E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      2.9785E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.2037E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.2037E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.2037E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.5843E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.2275E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      2.9785E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      9.1650E+01 OP 
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      2.2270E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      6.9512E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      2.8018E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      2.2270E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      6.9512E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      2.8018E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.4553E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      1.9603E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.7266E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6815E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6815E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.5616E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.3585E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -1341,11 +1341,11 @@ icc = 60
 ixc = 106 * ftmargoh
 tmargmin_cs = 1.5
 
-* Lower limit on taup/taueff (ratio alpha particle/energy confinement times) *
+* Lower limit on f_alpha_energy_confinement (ratio alpha particle/energy confinement times) *
 *-------------------------------------------------------------------------------*
 icc = 62 
-ixc = 110 * ftaulimit
-taulimit = 5.0
+ixc = 110 * falpha_energy_confinement
+f_alpha_energy_confinement_min = 5.0
 
 * dump time constraint for VV stresses *
 *--------------------------------------*
@@ -1576,9 +1576,6 @@ i_density_limit = 7
 * Switch for fast alpha pressure calculation
 i_beta_fast_alpha = 1
 
-* Switch for inverse quadrature in l-mode scaling laws 5 and 9
-iinvqd = 1
-
 * Switch for pedestal profiles
 ipedestal = 1
 
@@ -1610,7 +1607,7 @@ tesep = 0.1
 iprofile = 1
 
 * Switch for energy confinement time scaling law
-isc = 34
+i_confinement_time = 34
 
 * Safety factor on axis
 q0 = 1.0
diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT
index b5f81c21a5..f1f7af53ae 100644
--- a/tests/integration/data/large_tokamak_4_MFILE.DAT
+++ b/tests/integration/data/large_tokamak_4_MFILE.DAT
@@ -177,7 +177,7 @@
  J_winding_pack/J_protection_limit_normalised_residue____________________ (normres017)__________________     -2.9894E-07    
  TF_coil_temp._margin_lower_limit__normalised_residue____________________ (normres018)__________________     -1.0631E-06    
  CS_temperature_margin_lower_limit_normalised_residue____________________ (normres019)__________________      8.0251E-08    
- taup/taueff_______________________normalised_residue____________________ (normres020)__________________     -1.8772E-08    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (normres020)__________________     -1.8772E-08    
  Dump_time_set_by_VV_stress________normalised_residue____________________ (normres021)__________________     -1.0026E-07    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (normres022)__________________     -1.6044E-07    
  ne0_>_neped_______________________normalised_residue____________________ (normres023)__________________     -1.9637E-08    
@@ -453,8 +453,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.1828E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.8172E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.4013E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.5772E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.4013E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.5772E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      8.0143E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -485,22 +485,22 @@
  L-H_threshold_power_(enforced)_(MW)_____________________________________ (boundl(103)*plhthresh)_______      9.7416E+01 OP 
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      9.7416E+01 OP 
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.1886E+00 ITV
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.2037E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.2037E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.2037E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.5843E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.2275E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      2.9785E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.2037E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.2037E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.2037E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.5843E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.2275E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      2.9785E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      9.1650E+01 OP 
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      2.2270E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      6.9512E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      2.8018E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      2.2270E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      6.9512E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      2.8018E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.4553E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      1.9603E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.7266E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6815E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6815E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.5616E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.3585E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -1341,11 +1341,11 @@ icc = 60
 ixc = 106 * ftmargoh
 tmargmin_cs = 1.5
 
-* Lower limit on taup/taueff (ratio alpha particle/energy confinement times) *
+* Lower limit on f_alpha_energy_confinement (ratio alpha particle/energy confinement times) *
 *-------------------------------------------------------------------------------*
 icc = 62 
-ixc = 110 * ftaulimit
-taulimit = 5.0
+ixc = 110 * falpha_energy_confinement
+f_alpha_energy_confinement_min = 5.0
 
 * dump time constraint for VV stresses *
 *--------------------------------------*
@@ -1576,9 +1576,6 @@ i_density_limit = 7
 * Switch for fast alpha pressure calculation
 i_beta_fast_alpha = 1
 
-* Switch for inverse quadrature in l-mode scaling laws 5 and 9
-iinvqd = 1
-
 * Switch for pedestal profiles
 ipedestal = 1
 
@@ -1610,7 +1607,7 @@ tesep = 0.1
 iprofile = 1
 
 * Switch for energy confinement time scaling law
-isc = 34
+i_confinement_time = 34
 
 * Safety factor on axis
 q0 = 1.0
diff --git a/tests/integration/data/large_tokamak_IN.DAT b/tests/integration/data/large_tokamak_IN.DAT
index fabb66df82..550b519893 100644
--- a/tests/integration/data/large_tokamak_IN.DAT
+++ b/tests/integration/data/large_tokamak_IN.DAT
@@ -151,11 +151,11 @@ icc = 60
 ixc = 106 * ftmargoh
 tmargmin_cs = 1.5
 
-* Lower limit on taup/taueff (ratio alpha particle/energy confinement times) *
+* Lower limit on f_alpha_energy_confinement (ratio alpha particle/energy confinement times) *
 *-------------------------------------------------------------------------------*
 icc = 62 
-ixc = 110 * ftaulimit
-taulimit = 5.0
+ixc = 110 * falpha_energy_confinement
+f_alpha_energy_confinement_min = 5.0
 
 * dump time constraint for VV stresses *
 *--------------------------------------*
@@ -386,9 +386,6 @@ i_density_limit = 7
 * Switch for fast alpha pressure calculation
 i_beta_fast_alpha = 1
 
-* Switch for inverse quadrature in l-mode scaling laws 5 and 9
-iinvqd = 1
-
 * Switch for pedestal profiles
 ipedestal = 1
 
@@ -420,7 +417,7 @@ tesep = 0.1
 iprofile = 1
 
 * Switch for energy confinement time scaling law
-isc = 34
+i_confinement_time = 34
 
 * Safety factor on axis
 q0 = 1.0
diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT
index 1ba5f943a7..fe8238ad7b 100644
--- a/tests/integration/data/large_tokamak_MFILE.DAT
+++ b/tests/integration/data/large_tokamak_MFILE.DAT
@@ -173,7 +173,7 @@
  J_winding_pack/J_protection_limit_normalised_residue____________________ (eq_con035)___________________      2.5260E-08    
  TF_coil_temp._margin_lower_limit__normalised_residue____________________ (eq_con036)___________________     -5.6001E-07    
  CS_temperature_margin_lower_limit_normalised_residue____________________ (eq_con060)___________________      2.0134E-08    
- taup/taueff_______________________normalised_residue____________________ (eq_con062)___________________      8.9807E-09    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (eq_con062)___________________      8.9807E-09    
  Dump_time_set_by_VV_stress________normalised_residue____________________ (eq_con065)___________________     -2.4337E-07    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (eq_con072)___________________      9.6351E-09    
  ne0_>_neped_______________________normalised_residue____________________ (eq_con081)___________________     -4.2434E-10    
@@ -449,8 +449,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.1742E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.8258E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.3990E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.5739E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.3990E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.5739E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      7.9710E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -481,23 +481,23 @@
  L-H_threshold_power_(enforced)_(MW)_____________________________________ (boundl(103)*plhthresh)_______      9.7733E+01 OP 
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      9.7733E+01 OP 
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.1976E+00 ITV
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.2080E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.2080E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.2080E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.5706E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.2284E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      2.9729E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.2080E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.2080E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.2080E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.5706E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.2284E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      2.9729E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      9.1277E+01 OP 
  H*_non-radiation_corrected______________________________________________ (hstar)_______________________      1.1022E+00    
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      2.2016E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      6.8629E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      2.8098E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      2.2016E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      6.8629E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      2.8098E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.3909E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      1.9482E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.7112E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6815E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6815E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.5011E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.3534E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -1342,11 +1342,11 @@ icc = 60
 ixc = 106 * ftmargoh
 tmargmin_cs = 1.5
 
-* Lower limit on taup/taueff (ratio alpha particle/energy confinement times) *
+* Lower limit on f_alpha_energy_confinement (ratio alpha particle/energy confinement times) *
 *-------------------------------------------------------------------------------*
 icc = 62 
-ixc = 110 * ftaulimit
-taulimit = 5.0
+ixc = 110 * falpha_energy_confinement
+f_alpha_energy_confinement_min = 5.0
 
 * dump time constraint for VV stresses *
 *--------------------------------------*
@@ -1577,9 +1577,6 @@ i_density_limit = 7
 * Switch for fast alpha pressure calculation
 i_beta_fast_alpha = 1
 
-* Switch for inverse quadrature in l-mode scaling laws 5 and 9
-iinvqd = 1
-
 * Switch for pedestal profiles
 ipedestal = 1
 
@@ -1611,7 +1608,7 @@ tesep = 0.1
 iprofile = 1
 
 * Switch for energy confinement time scaling law
-isc = 34
+i_confinement_time = 34
 
 * Safety factor on axis
 q0 = 1.0
diff --git a/tests/integration/data/large_tokamak_once_through.IN.DAT b/tests/integration/data/large_tokamak_once_through.IN.DAT
index f82d9ea7f3..4ed427dd3f 100644
--- a/tests/integration/data/large_tokamak_once_through.IN.DAT
+++ b/tests/integration/data/large_tokamak_once_through.IN.DAT
@@ -28,7 +28,7 @@ icc = 34 * Dump voltage upper limit
 icc = 35 * J_winding pack
 icc = 36 * TF coil temperature margin lower limit
 icc = 60 * Central solenoid temperature margin lower limit
-icc = 62 * taup
+icc = 62 * t_alpha_confinement
 icc = 65 * Dump time set by VV loads
 icc = 72 * central solenoid shear stress limit
 icc = 81 * Ne
@@ -143,7 +143,7 @@ powfmax  = 3000 * maximum fusion power (MW) (`constraint equation 9`)
 psepbqarmax = 10.0 * maximum ratio of Psep*Bt/qAR (MWT/m) (`constraint equation 68`)
 t_burn_min   = 7200.0 * minimum burn time (s) (KE - no longer itv;; see issue #706)
 walalw   = 2.0 * allowable neutron wall-load (MW/m2) (`constraint equation 8`)
-taulimit = 5.0 * Lower limit on taup/taueff the ratio of alpha particle to energy confinement
+f_alpha_energy_confinement_min = 5.0 * Lower limit on f_alpha_energy_confinement the ratio of alpha particle to energy confinement
 
 *-------------------Constraints--------------------*
 
@@ -329,7 +329,6 @@ i_beta_component   = 1 * switch for beta limit scaling (`constraint equation 24`
 i_plasma_current = 4 * switch for plasma current scaling to use
 i_density_limit   = 7 * switch for density limit to enforce (`constraint equation 5`)
 i_beta_fast_alpha = 1 * switch for fast alpha pressure calculation
-iinvqd   = 1 * switch for inverse quadrature in L-mode scaling laws 5 and 9;
 ipedestal = 1 * switch for pedestal profiles;
 neped    = 0.5e20 * electron density of pedestal [m-3] (`ipedestal==1)
 nesep    = 0.2e20 * electron density at separatrix [m-3] (`ipedestal==1)
@@ -340,7 +339,7 @@ tbeta    = 2.0 * temperature profile index beta  (`ipedestal==1)
 teped    = 5.5 * electron temperature of pedestal (keV) (`ipedestal==1')
 tesep    = 0.1 * electron temperature at separatrix (keV) (`ipedestal==1`) calculated if reinke
 iprofile = 1 * switch for current profile consistency;
-isc      = 34 * switch for energy confinement time scaling law (see description in `tauscl`)
+i_confinement_time      = 34 * switch for energy confinement time scaling law (see description in `labels_confinement_scalings`)
 i_plasma_geometry   = 0 * switch for plasma cross-sectional shape calculation;
 kappa    = 1.85 * plasma separatrix elongation (calculated if `i_plasma_geometry = 1-5; 7 or 9-10`)
 q        = 3.7339078193128556 * Safety factor 'near' plasma edge (`iteration variable 18`) equal to q95
diff --git a/tests/integration/data/ref_IN.DAT b/tests/integration/data/ref_IN.DAT
index 9abff7e2d2..424924ace1 100644
--- a/tests/integration/data/ref_IN.DAT
+++ b/tests/integration/data/ref_IN.DAT
@@ -23,7 +23,7 @@ icc = 65 * dumpt time by VV stresses
 icc = 60 * OH coil temp margin
 icc = 72 * OH stress limit
 icc = 25 * Max TF field
-icc = 62 * taulimit
+icc = 62 * f_alpha_energy_confinement_min
 
 *---------------Iteration Variables----------------*
 
@@ -90,7 +90,7 @@ ixc = 106 * ftmargoh
 ixc = 122 * oh_steel_frac
 ixc = 123 * foh_stress
 ixc = 109 * f_nd_alpha_electron
-ixc = 110 * ftaulimit
+ixc = 110 * falpha_energy_confinement
 
 *isweep = 3
 *nsweep = 17
@@ -265,7 +265,6 @@ i_plasma_current    = 4 * Switch for plasma current scaling to use;
 i_density_limit   = 7 * Switch for density limit to enforce (constraint equation 5);
 i_beta_fast_alpha = 1 * Switch for fast alpha pressure calculation;
 ifispact = 0 * Switch for neutronics calculations;
-iinvqd   = 1 * Switch for inverse quadrature in l-mode scaling laws 5 and 9;
 ipedestal = 1 * Switch for pedestal profiles;
 fgwped = 0.85 * fraction of Greenwald density to set as pedestal-top density
 neped    = 0.678e20 * Electron density of pedestal (/m3) (ipedestal=1) INITIAL VALUE
@@ -276,7 +275,7 @@ tbeta    = 2.0 * Temperature profile index beta  (ipedestal=1)
 teped    = 5.5 * Electron temperature of pedestal (kev) (ipedestal=1)
 tesep    = 0.1 * Electron temperature at separatrix (kev) (ipedestal=1)
 iprofile = 1 * Switch for current profile consistency;
-isc      = 34 * Switch for energy confinement time scaling law
+i_confinement_time      = 34 * Switch for energy confinement time scaling law
 i_plasma_geometry   = 0 * Switch for plasma cross-sectional shape calculation: use input kappa & triang
 *kappa = 1.7808
 kappa = 1.848
@@ -373,4 +372,4 @@ t_burn    = 1.0d4 * Burn time (s) (calculated if lpulse=1)
                      oh_steel_frac  =  5.7875E-01
                      foh_stress     =  1.0000E+00
                      f_nd_alpha_electron         =  6.8940E-02
-                     ftaulimit      =  1.0000E+00
\ No newline at end of file
+                     falpha_energy_confinement      =  1.0000E+00
\ No newline at end of file
diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT
index 60eb72c3fc..e772741b55 100644
--- a/tests/integration/data/scan_2D_MFILE.DAT
+++ b/tests/integration/data/scan_2D_MFILE.DAT
@@ -178,7 +178,7 @@
  J_winding_pack/J_protection_limit_normalised_residue____________________ (normres017)__________________      7.8000E-07    
  TF_coil_temp._margin_lower_limit__normalised_residue____________________ (normres018)__________________     -2.4213E-06    
  CS_temperature_margin_lower_limit_normalised_residue____________________ (normres019)__________________      4.6484E-05    
- taup/taueff_______________________normalised_residue____________________ (normres020)__________________     -9.6978E-09    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (normres020)__________________     -9.6978E-09    
  Dump_time_set_by_VV_stress________normalised_residue____________________ (normres021)__________________     -2.8820E-06    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (normres022)__________________      5.1115E-08    
  ne0_>_neped_______________________normalised_residue____________________ (normres023)__________________     -4.5348E-10    
@@ -454,8 +454,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.2311E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.7689E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.3844E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.5405E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.3844E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.5405E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      7.5000E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -487,22 +487,22 @@
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      9.6488E+01 OP 
  Confinement_scaling_law_________________________________________________ (tauelaw)_____________________     "IPB98(y,2)"
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.1671E+00 ITV
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.1609E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.1609E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.1609E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.5403E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.0737E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      2.9249E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.1609E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.1609E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.1609E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.5403E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.0737E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      2.9249E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      8.7889E+01 OP 
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      1.9961E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      6.3150E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      2.7855E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      1.9961E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      6.3150E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      2.7855E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.4772E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      1.9629E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.8476E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6815E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6815E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.8020E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.3405E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -1341,7 +1341,7 @@
  J_winding_pack/J_protection_limit_normalised_residue____________________ (normres017)__________________     -2.4472E-07    
  TF_coil_temp._margin_lower_limit__normalised_residue____________________ (normres018)__________________     -2.8789E-06    
  CS_temperature_margin_lower_limit_normalised_residue____________________ (normres019)__________________      4.7630E-07    
- taup/taueff_______________________normalised_residue____________________ (normres020)__________________      1.6466E-07    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (normres020)__________________      1.6466E-07    
  Dump_time_set_by_VV_stress________normalised_residue____________________ (normres021)__________________     -1.5585E-07    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (normres022)__________________      2.5270E-07    
  ne0_>_neped_______________________normalised_residue____________________ (normres023)__________________     -1.8388E-07    
@@ -1617,8 +1617,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.2311E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.7689E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.3962E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.5532E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.3962E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.5532E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      7.5000E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -1650,22 +1650,22 @@
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      9.5263E+01 OP 
  Confinement_scaling_law_________________________________________________ (tauelaw)_____________________     "IPB98(y,2)"
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.1660E+00 ITV
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.1472E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.1472E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.1472E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.5390E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.0722E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      2.9493E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.1472E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.1472E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.1472E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.5390E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.0722E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      2.9493E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      8.8240E+01 OP 
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      1.9751E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      6.2760E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      2.7767E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      1.9751E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      6.2760E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      2.7767E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.6299E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      2.0016E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.7709E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6815E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6815E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.8701E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.3345E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -2504,7 +2504,7 @@
  J_winding_pack/J_protection_limit_normalised_residue____________________ (normres017)__________________     -9.1601E-07    
  TF_coil_temp._margin_lower_limit__normalised_residue____________________ (normres018)__________________     -2.4938E-05    
  CS_temperature_margin_lower_limit_normalised_residue____________________ (normres019)__________________      1.2148E-07    
- taup/taueff_______________________normalised_residue____________________ (normres020)__________________      4.0204E-07    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (normres020)__________________      4.0204E-07    
  Dump_time_set_by_VV_stress________normalised_residue____________________ (normres021)__________________      8.6457E-09    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (normres022)__________________      2.7688E-07    
  ne0_>_neped_______________________normalised_residue____________________ (normres023)__________________     -2.0499E-07    
@@ -2780,8 +2780,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.2311E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.7689E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.4019E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.5603E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.4019E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.5603E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      7.5559E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -2813,22 +2813,22 @@
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      9.3914E+01 OP 
  Confinement_scaling_law_________________________________________________ (tauelaw)_____________________     "IPB98(y,2)"
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.1665E+00 ITV
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.1421E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.1421E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.1421E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.5425E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.0764E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      2.9622E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.1421E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.1421E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.1421E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.5425E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.0764E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      2.9622E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      8.8985E+01 OP 
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      1.9727E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      6.2781E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      2.7693E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      1.9727E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      6.2781E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      2.7693E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.7864E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      2.0417E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.6995E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6815E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6815E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.9230E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.3268E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -3667,7 +3667,7 @@
  J_winding_pack/J_protection_limit_normalised_residue____________________ (normres017)__________________     -4.5992E-08    
  TF_coil_temp._margin_lower_limit__normalised_residue____________________ (normres018)__________________     -1.3423E-07    
  CS_temperature_margin_lower_limit_normalised_residue____________________ (normres019)__________________      2.7461E-09    
- taup/taueff_______________________normalised_residue____________________ (normres020)__________________      5.0140E-09    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (normres020)__________________      5.0140E-09    
  Dump_time_set_by_VV_stress________normalised_residue____________________ (normres021)__________________     -4.9924E-09    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (normres022)__________________     -7.2194E-09    
  ne0_>_neped_______________________normalised_residue____________________ (normres023)__________________     -1.2207E-08    
@@ -3943,8 +3943,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.2187E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.7813E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.4011E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.5610E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.4011E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.5610E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      7.5000E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -3976,22 +3976,22 @@
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      9.3549E+01 OP 
  Confinement_scaling_law_________________________________________________ (tauelaw)_____________________     "IPB98(y,2)"
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.1778E+00 ITV
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.1540E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.1540E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.1540E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.5409E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.0999E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      2.9622E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.1540E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.1540E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.1540E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.5409E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.0999E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      2.9622E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      8.8956E+01 OP 
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      1.9773E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      6.2692E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      2.7816E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      1.9773E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      6.2692E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      2.7816E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.8030E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      2.0515E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.6373E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6815E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6815E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.9186E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.3194E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -4830,7 +4830,7 @@
  J_winding_pack/J_protection_limit_normalised_residue____________________ (normres017)__________________     -5.4139E-07    
  TF_coil_temp._margin_lower_limit__normalised_residue____________________ (normres018)__________________     -1.1524E-05    
  CS_temperature_margin_lower_limit_normalised_residue____________________ (normres019)__________________      2.9374E-04    
- taup/taueff_______________________normalised_residue____________________ (normres020)__________________      1.9112E-07    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (normres020)__________________      1.9112E-07    
  Dump_time_set_by_VV_stress________normalised_residue____________________ (normres021)__________________     -1.9676E-10    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (normres022)__________________      2.1794E-07    
  ne0_>_neped_______________________normalised_residue____________________ (normres023)__________________     -1.4200E-07    
@@ -5106,8 +5106,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.2187E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.7813E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.4038E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.5630E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.4038E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.5630E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      7.5000E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -5139,22 +5139,22 @@
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      9.5075E+01 OP 
  Confinement_scaling_law_________________________________________________ (tauelaw)_____________________     "IPB98(y,2)"
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.1743E+00 ITV
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.1491E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.1491E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.1491E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.5361E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.0940E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      2.9667E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.1491E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.1491E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.1491E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.5361E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.0940E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      2.9667E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      8.8995E+01 OP 
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      1.9645E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      6.2382E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      2.7788E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      1.9645E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      6.2382E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      2.7788E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.6562E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      2.0113E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.7056E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6815E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6815E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.8754E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.3316E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -5993,7 +5993,7 @@
  J_winding_pack/J_protection_limit_normalised_residue____________________ (normres017)__________________     -7.7137E-08    
  TF_coil_temp._margin_lower_limit__normalised_residue____________________ (normres018)__________________     -6.1117E-07    
  CS_temperature_margin_lower_limit_normalised_residue____________________ (normres019)__________________      1.5638E-07    
- taup/taueff_______________________normalised_residue____________________ (normres020)__________________      7.4437E-08    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (normres020)__________________      7.4437E-08    
  Dump_time_set_by_VV_stress________normalised_residue____________________ (normres021)__________________     -1.9285E-08    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (normres022)__________________      9.9959E-08    
  ne0_>_neped_______________________normalised_residue____________________ (normres023)__________________     -7.1825E-08    
@@ -6269,8 +6269,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.2187E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.7813E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.4013E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.5588E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.4013E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.5588E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      7.5000E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -6302,22 +6302,22 @@
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      9.6401E+01 OP 
  Confinement_scaling_law_________________________________________________ (tauelaw)_____________________     "IPB98(y,2)"
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.1735E+00 ITV
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.1469E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.1469E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.1469E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.5258E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.0815E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      2.9600E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.1469E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.1469E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.1469E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.5258E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.0815E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      2.9600E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      8.8676E+01 OP 
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      1.9471E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      6.1873E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      2.7790E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      1.9471E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      6.1873E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      2.7790E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.5083E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      1.9729E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.7718E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6815E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6815E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.8065E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.3384E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -7156,7 +7156,7 @@
  J_winding_pack/J_protection_limit_normalised_residue____________________ (normres017)__________________     -2.5874E-10    
  TF_coil_temp._margin_lower_limit__normalised_residue____________________ (normres018)__________________     -7.0445E-09    
  CS_temperature_margin_lower_limit_normalised_residue____________________ (normres019)__________________      4.0051E-07    
- taup/taueff_______________________normalised_residue____________________ (normres020)__________________      1.4231E-10    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (normres020)__________________      1.4231E-10    
  Dump_time_set_by_VV_stress________normalised_residue____________________ (normres021)__________________     -5.6338E-10    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (normres022)__________________      3.8021E-10    
  ne0_>_neped_______________________normalised_residue____________________ (normres023)__________________     -2.1321E-10    
@@ -7432,8 +7432,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.2063E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.7937E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.4026E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.5618E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.4026E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.5618E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      7.5000E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -7465,22 +7465,22 @@
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      9.6041E+01 OP 
  Confinement_scaling_law_________________________________________________ (tauelaw)_____________________     "IPB98(y,2)"
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.1842E+00 ITV
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.1547E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.1547E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.1547E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.5216E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.1016E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      2.9644E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.1547E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.1547E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.1547E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.5216E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.1016E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      2.9644E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      8.8858E+01 OP 
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      1.9508E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      6.1836E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      2.7872E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      1.9508E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      6.1836E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      2.7872E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.5242E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      1.9822E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.7090E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6815E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6815E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.8016E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.3314E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -8319,7 +8319,7 @@
  J_winding_pack/J_protection_limit_normalised_residue____________________ (normres017)__________________     -8.8298E-07    
  TF_coil_temp._margin_lower_limit__normalised_residue____________________ (normres018)__________________     -2.6561E-05    
  CS_temperature_margin_lower_limit_normalised_residue____________________ (normres019)__________________      3.7655E-07    
- taup/taueff_______________________normalised_residue____________________ (normres020)__________________      3.7289E-07    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (normres020)__________________      3.7289E-07    
  Dump_time_set_by_VV_stress________normalised_residue____________________ (normres021)__________________      8.1912E-09    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (normres022)__________________      3.4642E-07    
  ne0_>_neped_______________________normalised_residue____________________ (normres023)__________________     -8.6625E-08    
@@ -8595,8 +8595,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.2063E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.7937E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.4038E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.5636E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.4038E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.5636E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      7.5000E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -8628,22 +8628,22 @@
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      9.4593E+01 OP 
  Confinement_scaling_law_________________________________________________ (tauelaw)_____________________     "IPB98(y,2)"
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.1867E+00 ITV
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.1544E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.1544E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.1544E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.5240E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.1045E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      2.9674E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.1544E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.1544E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.1544E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.5240E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.1045E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      2.9674E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      8.9000E+01 OP 
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      1.9498E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      6.1813E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      2.7862E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      1.9498E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      6.1813E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      2.7862E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.6667E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      2.0212E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.6394E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6815E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6815E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.8608E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.3207E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -9482,7 +9482,7 @@
  J_winding_pack/J_protection_limit_normalised_residue____________________ (normres017)__________________     -2.8347E-07    
  TF_coil_temp._margin_lower_limit__normalised_residue____________________ (normres018)__________________     -2.3019E-05    
  CS_temperature_margin_lower_limit_normalised_residue____________________ (normres019)__________________      6.7123E-08    
- taup/taueff_______________________normalised_residue____________________ (normres020)__________________      9.5743E-08    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (normres020)__________________      9.5743E-08    
  Dump_time_set_by_VV_stress________normalised_residue____________________ (normres021)__________________      2.0652E-08    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (normres022)__________________     -1.1469E-08    
  ne0_>_neped_______________________normalised_residue____________________ (normres023)__________________     -6.9271E-07    
@@ -9758,8 +9758,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.2063E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.7937E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.4002E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.5600E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.4002E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.5600E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      7.5000E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -9791,22 +9791,22 @@
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      9.2963E+01 OP 
  Confinement_scaling_law_________________________________________________ (tauelaw)_____________________     "IPB98(y,2)"
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.1917E+00 ITV
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.1563E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.1563E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.1563E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.5211E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.1009E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      2.9602E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.1563E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.1563E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.1563E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.5211E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.1009E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      2.9602E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      8.8564E+01 OP 
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      1.9521E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      6.1847E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      2.7894E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      1.9521E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      6.1847E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      2.7894E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.8077E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      2.0617E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.5690E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6815E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6815E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.9150E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.3051E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -10645,7 +10645,7 @@
  J_winding_pack/J_protection_limit_normalised_residue____________________ (normres017)__________________     -2.7863E-08    
  TF_coil_temp._margin_lower_limit__normalised_residue____________________ (normres018)__________________     -7.7700E-08    
  CS_temperature_margin_lower_limit_normalised_residue____________________ (normres019)__________________      6.4469E-09    
- taup/taueff_______________________normalised_residue____________________ (normres020)__________________      3.7281E-09    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (normres020)__________________      3.7281E-09    
  Dump_time_set_by_VV_stress________normalised_residue____________________ (normres021)__________________     -3.0400E-09    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (normres022)__________________     -5.2765E-09    
  ne0_>_neped_______________________normalised_residue____________________ (normres023)__________________     -1.5415E-08    
@@ -10921,8 +10921,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.1939E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.8061E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.4060E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.5683E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.4060E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.5683E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      7.5000E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -10954,22 +10954,22 @@
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      9.2792E+01 OP 
  Confinement_scaling_law_________________________________________________ (tauelaw)_____________________     "IPB98(y,2)"
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.2000E+00 ITV
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.1622E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.1622E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.1622E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.5225E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.1279E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      2.9743E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.1622E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.1622E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.1622E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.5225E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.1279E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      2.9743E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      8.9158E+01 OP 
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      1.9576E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      6.1905E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      2.7946E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      1.9576E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      6.1905E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      2.7946E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.8348E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      2.0713E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.5115E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6815E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6815E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.9148E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.3029E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -11808,7 +11808,7 @@
  J_winding_pack/J_protection_limit_normalised_residue____________________ (normres017)__________________     -7.2277E-07    
  TF_coil_temp._margin_lower_limit__normalised_residue____________________ (normres018)__________________     -2.5913E-05    
  CS_temperature_margin_lower_limit_normalised_residue____________________ (normres019)__________________      3.3506E-06    
- taup/taueff_______________________normalised_residue____________________ (normres020)__________________      5.5515E-07    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (normres020)__________________      5.5515E-07    
  Dump_time_set_by_VV_stress________normalised_residue____________________ (normres021)__________________      9.6315E-09    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (normres022)__________________      8.0210E-07    
  ne0_>_neped_______________________normalised_residue____________________ (normres023)__________________     -1.3476E-07    
@@ -12084,8 +12084,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.1939E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.8061E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.4104E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.5733E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.4104E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.5733E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      7.5000E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -12117,22 +12117,22 @@
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      9.4497E+01 OP 
  Confinement_scaling_law_________________________________________________ (tauelaw)_____________________     "IPB98(y,2)"
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.1940E+00 ITV
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.1621E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.1621E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.1621E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.5304E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.1377E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      2.9837E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.1621E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.1621E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.1621E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.5304E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.1377E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      2.9837E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      9.0058E+01 OP 
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      1.9558E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      6.1851E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      2.7900E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      1.9558E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      6.1851E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      2.7900E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.6972E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      2.0306E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.5818E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6815E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6815E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.8616E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.3208E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -12971,7 +12971,7 @@
  J_winding_pack/J_protection_limit_normalised_residue____________________ (normres017)__________________     -6.1107E-07    
  TF_coil_temp._margin_lower_limit__normalised_residue____________________ (normres018)__________________     -1.1757E-05    
  CS_temperature_margin_lower_limit_normalised_residue____________________ (normres019)__________________     -1.5934E-05    
- taup/taueff_______________________normalised_residue____________________ (normres020)__________________      3.1734E-07    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (normres020)__________________      3.1734E-07    
  Dump_time_set_by_VV_stress________normalised_residue____________________ (normres021)__________________     -9.9875E-10    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (normres022)__________________      3.6338E-07    
  ne0_>_neped_______________________normalised_residue____________________ (normres023)__________________     -2.3810E-07    
@@ -13247,8 +13247,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.1939E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.8061E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.4100E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.5722E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.4100E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.5722E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      7.5000E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -13280,22 +13280,22 @@
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      9.5964E+01 OP 
  Confinement_scaling_law_________________________________________________ (tauelaw)_____________________     "IPB98(y,2)"
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.1912E+00 ITV
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.1617E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.1617E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.1617E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.5280E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.1347E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      2.9823E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.1617E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.1617E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.1617E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.5280E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.1347E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      2.9823E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      9.0074E+01 OP 
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      1.9518E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      6.1733E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      2.7896E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      1.9518E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      6.1733E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      2.7896E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.5548E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      1.9915E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.6496E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6815E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6815E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.8033E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.3319E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -14134,7 +14134,7 @@
  J_winding_pack/J_protection_limit_normalised_residue____________________ (normres017)__________________     -3.5323E-08    
  TF_coil_temp._margin_lower_limit__normalised_residue____________________ (normres018)__________________     -1.0064E-07    
  CS_temperature_margin_lower_limit_normalised_residue____________________ (normres019)__________________     -1.7649E-07    
- taup/taueff_______________________normalised_residue____________________ (normres020)__________________      4.2442E-09    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (normres020)__________________      4.2442E-09    
  Dump_time_set_by_VV_stress________normalised_residue____________________ (normres021)__________________     -3.9280E-09    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (normres022)__________________     -5.1050E-09    
  ne0_>_neped_______________________normalised_residue____________________ (normres023)__________________     -1.8063E-08    
@@ -14410,8 +14410,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.1815E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.8185E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.4146E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.5792E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.4146E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.5792E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      7.5000E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -14443,22 +14443,22 @@
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      9.5754E+01 OP 
  Confinement_scaling_law_________________________________________________ (tauelaw)_____________________     "IPB98(y,2)"
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.2000E+00 ITV
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.1687E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.1687E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.1687E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.5289E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.1612E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      2.9938E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.1687E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.1687E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.1687E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.5289E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.1612E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      2.9938E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      9.0607E+01 OP 
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      1.9571E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      6.1764E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      2.7957E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      1.9571E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      6.1764E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      2.7957E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.5780E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      2.0007E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.5910E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6815E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6815E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.8020E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.3288E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -15297,7 +15297,7 @@
  J_winding_pack/J_protection_limit_normalised_residue____________________ (normres017)__________________     -2.6215E-07    
  TF_coil_temp._margin_lower_limit__normalised_residue____________________ (normres018)__________________     -2.1735E-05    
  CS_temperature_margin_lower_limit_normalised_residue____________________ (normres019)__________________      3.3676E-04    
- taup/taueff_______________________normalised_residue____________________ (normres020)__________________      3.5009E-07    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (normres020)__________________      3.5009E-07    
  Dump_time_set_by_VV_stress________normalised_residue____________________ (normres021)__________________      1.4775E-09    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (normres022)__________________      4.1478E-07    
  ne0_>_neped_______________________normalised_residue____________________ (normres023)__________________     -7.9048E-07    
@@ -15573,8 +15573,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.1815E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.8185E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.4201E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.5863E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.4201E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.5863E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      7.5000E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -15606,22 +15606,22 @@
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      9.4477E+01 OP 
  Confinement_scaling_law_________________________________________________ (tauelaw)_____________________     "IPB98(y,2)"
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.2000E+00 ITV
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.1663E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.1663E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.1663E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.5365E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.1706E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      3.0064E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.1663E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.1663E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.1663E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.5365E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.1706E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      3.0064E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      9.1011E+01 OP 
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      1.9628E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      6.1990E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      2.7926E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      1.9628E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      6.1990E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      2.7926E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.7314E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      2.0398E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.5257E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6815E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6815E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.8639E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.3227E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -16460,7 +16460,7 @@
  J_winding_pack/J_protection_limit_normalised_residue____________________ (normres017)__________________     -1.5498E-07    
  TF_coil_temp._margin_lower_limit__normalised_residue____________________ (normres018)__________________     -2.3625E-05    
  CS_temperature_margin_lower_limit_normalised_residue____________________ (normres019)__________________     -1.3710E-04    
- taup/taueff_______________________normalised_residue____________________ (normres020)__________________      3.7519E-07    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (normres020)__________________      3.7519E-07    
  Dump_time_set_by_VV_stress________normalised_residue____________________ (normres021)__________________      2.9548E-08    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (normres022)__________________      8.1857E-10    
  ne0_>_neped_______________________normalised_residue____________________ (normres023)__________________     -8.6256E-07    
@@ -16736,8 +16736,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.1815E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.8185E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.4257E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.5936E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.4257E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.5936E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      7.5000E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -16769,22 +16769,22 @@
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      9.3198E+01 OP 
  Confinement_scaling_law_________________________________________________ (tauelaw)_____________________     "IPB98(y,2)"
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.2000E+00 ITV
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.1640E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.1640E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.1640E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.5446E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.1807E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      3.0193E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.1640E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.1640E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.1640E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.5446E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.1807E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      3.0193E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      9.1467E+01 OP 
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      1.9687E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      6.2221E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      2.7894E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      1.9687E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      6.2221E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      2.7894E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.8950E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      2.0806E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.4604E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6815E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6815E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.9259E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.3165E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -17636,11 +17636,11 @@ icc = 60
 ixc = 106 * ftmargoh
 tmargmin_cs = 1.5
 
-* Lower limit on taup/taueff (ratio alpha particle/energy confinement times) *
+* Lower limit on f_alpha_energy_confinement (ratio alpha particle/energy confinement times) *
 *-------------------------------------------------------------------------------*
 icc = 62 
-ixc = 110 * ftaulimit
-taulimit = 5.0
+ixc = 110 * falpha_energy_confinement
+f_alpha_energy_confinement_min = 5.0
 
 * dump time constraint for VV stresses *
 *--------------------------------------*
@@ -17862,8 +17862,6 @@ i_density_limit = 7
 * Switch for fast alpha pressure calculation
 i_beta_fast_alpha = 1
 
-* Switch for inverse quadrature in l-mode scaling laws 5 and 9
-iinvqd = 1
 
 * Switch for pedestal profiles
 ipedestal = 1
@@ -17896,7 +17894,7 @@ tesep = 0.1
 iprofile = 1
 
 * Switch for energy confinement time scaling law
-isc = 34
+i_confinement_time = 34
 
 * Safety factor on axis
 q0 = 1.0
diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT
index 639be5fc29..900fdb9b8b 100644
--- a/tests/integration/data/scan_MFILE.DAT
+++ b/tests/integration/data/scan_MFILE.DAT
@@ -163,7 +163,7 @@
  CS_temperature_margin_lower_limit_normalised_residue____________________ (normres021)__________________      2.1072E-13    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (normres022)__________________      9.0616E-13    
  Peak_toroidal_field_upper_limit___normalised_residue____________________ (normres023)__________________     -9.2149E-15    
- taup/taueff_______________________normalised_residue____________________ (normres024)__________________      7.0988E-13    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (normres024)__________________      7.0988E-13    
  # Final Feasible Point #
  # Plant Availability #
  Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________      1.5000E+01    
@@ -309,8 +309,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.1857E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.8143E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.5736E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.7258E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.5736E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.7258E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      5.1000E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -342,22 +342,22 @@
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      1.1353E+02 OP 
  Confinement_scaling_law_________________________________________________ (tauelaw)_____________________     "IPB98(y,2)"
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.1000E+00    
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.6434E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.6434E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.6434E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.5918E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.1834E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      3.2994E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.6434E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.6434E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.6434E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.5918E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.1834E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      3.2994E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      1.0500E+02 OP 
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      1.8217E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      5.0000E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      3.1997E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      1.8217E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      5.0000E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      3.1997E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.1498E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      1.7778E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.7276E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6812E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6812E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.9243E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.9934E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -1158,7 +1158,7 @@
  CS_temperature_margin_lower_limit_normalised_residue____________________ (normres021)__________________      6.4393E-15    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (normres022)__________________      1.3700E-13    
  Peak_toroidal_field_upper_limit___normalised_residue____________________ (normres023)__________________     -4.4409E-16    
- taup/taueff_______________________normalised_residue____________________ (normres024)__________________      4.7518E-14    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (normres024)__________________      4.7518E-14    
  # Final Feasible Point #
  # Plant Availability #
  Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________      1.5000E+01    
@@ -1304,8 +1304,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.1857E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.8143E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.5736E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.7258E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.5736E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.7258E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      5.1000E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -1337,22 +1337,22 @@
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      1.1353E+02 OP 
  Confinement_scaling_law_________________________________________________ (tauelaw)_____________________     "IPB98(y,2)"
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.1000E+00    
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.6434E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.6434E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.6434E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.5918E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.1834E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      3.2994E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.6434E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.6434E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.6434E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.5918E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.1834E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      3.2994E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      1.0500E+02 OP 
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      1.8217E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      5.0000E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      3.1997E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      1.8217E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      5.0000E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      3.1997E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.1498E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      1.7778E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.7276E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6812E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6812E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.9243E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.9934E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -2153,7 +2153,7 @@
  CS_temperature_margin_lower_limit_normalised_residue____________________ (normres021)__________________      3.7748E-15    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (normres022)__________________      1.2701E-13    
  Peak_toroidal_field_upper_limit___normalised_residue____________________ (normres023)__________________     -7.7716E-16    
- taup/taueff_______________________normalised_residue____________________ (normres024)__________________      4.7296E-14    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (normres024)__________________      4.7296E-14    
  # Final Feasible Point #
  # Plant Availability #
  Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________      1.5000E+01    
@@ -2299,8 +2299,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.1857E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.8143E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.5736E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.7258E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.5736E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.7258E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      5.1000E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -2332,22 +2332,22 @@
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      1.1353E+02 OP 
  Confinement_scaling_law_________________________________________________ (tauelaw)_____________________     "IPB98(y,2)"
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.1000E+00    
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.6434E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.6434E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.6434E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.5918E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.1834E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      3.2994E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.6434E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.6434E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.6434E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.5918E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.1834E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      3.2994E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      1.0500E+02 OP 
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      1.8217E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      5.0000E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      3.1997E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      1.8217E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      5.0000E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      3.1997E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.1498E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      1.7778E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.7276E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6812E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6812E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.9243E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.9934E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -3148,7 +3148,7 @@
  CS_temperature_margin_lower_limit_normalised_residue____________________ (normres021)__________________      2.2204E-15    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (normres022)__________________      1.1480E-13    
  Peak_toroidal_field_upper_limit___normalised_residue____________________ (normres023)__________________     -3.3307E-16    
- taup/taueff_______________________normalised_residue____________________ (normres024)__________________      4.5963E-14    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (normres024)__________________      4.5963E-14    
  # Final Feasible Point #
  # Plant Availability #
  Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________      1.5000E+01    
@@ -3294,8 +3294,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.1857E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.8143E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.5736E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.7258E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.5736E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.7258E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      5.1000E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -3327,22 +3327,22 @@
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      1.1353E+02 OP 
  Confinement_scaling_law_________________________________________________ (tauelaw)_____________________     "IPB98(y,2)"
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.1000E+00    
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.6434E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.6434E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.6434E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.5918E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.1834E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      3.2994E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.6434E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.6434E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.6434E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.5918E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.1834E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      3.2994E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      1.0500E+02 OP 
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      1.8217E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      5.0000E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      3.1997E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      1.8217E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      5.0000E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      3.1997E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.1498E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      1.7778E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.7276E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6812E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6812E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.9243E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.9934E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -4143,7 +4143,7 @@
  CS_temperature_margin_lower_limit_normalised_residue____________________ (normres021)__________________      5.7732E-15    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (normres022)__________________      1.0392E-13    
  Peak_toroidal_field_upper_limit___normalised_residue____________________ (normres023)__________________     -9.9920E-16    
- taup/taueff_______________________normalised_residue____________________ (normres024)__________________      4.8406E-14    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (normres024)__________________      4.8406E-14    
  # Final Feasible Point #
  # Plant Availability #
  Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________      1.5000E+01    
@@ -4289,8 +4289,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.1857E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.8143E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.5736E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.7258E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.5736E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.7258E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      5.1000E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -4322,22 +4322,22 @@
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      1.1353E+02 OP 
  Confinement_scaling_law_________________________________________________ (tauelaw)_____________________     "IPB98(y,2)"
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.1000E+00    
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.6434E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.6434E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.6434E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.5918E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.1834E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      3.2994E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.6434E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.6434E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.6434E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.5918E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.1834E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      3.2994E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      1.0500E+02 OP 
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      1.8217E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      5.0000E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      3.1997E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      1.8217E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      5.0000E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      3.1997E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.1498E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      1.7778E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.7276E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6812E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6812E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.9243E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.9934E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -5138,7 +5138,7 @@
  CS_temperature_margin_lower_limit_normalised_residue____________________ (normres021)__________________      6.8834E-15    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (normres022)__________________      9.5257E-14    
  Peak_toroidal_field_upper_limit___normalised_residue____________________ (normres023)__________________     -1.2212E-15    
- taup/taueff_______________________normalised_residue____________________ (normres024)__________________      4.9738E-14    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (normres024)__________________      4.9738E-14    
  # Final Feasible Point #
  # Plant Availability #
  Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________      1.5000E+01    
@@ -5284,8 +5284,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.1857E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.8143E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.5736E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.7258E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.5736E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.7258E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      5.1000E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -5317,22 +5317,22 @@
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      1.1353E+02 OP 
  Confinement_scaling_law_________________________________________________ (tauelaw)_____________________     "IPB98(y,2)"
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.1000E+00    
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.6434E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.6434E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.6434E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.5918E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.1834E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      3.2994E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.6434E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.6434E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.6434E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.5918E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.1834E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      3.2994E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      1.0500E+02 OP 
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      1.8217E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      5.0000E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      3.1997E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      1.8217E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      5.0000E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      3.1997E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.1498E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      1.7778E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.7276E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6812E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6812E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.9243E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.9934E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -6133,7 +6133,7 @@
  CS_temperature_margin_lower_limit_normalised_residue____________________ (normres021)__________________      1.9984E-15    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (normres022)__________________      8.0380E-14    
  Peak_toroidal_field_upper_limit___normalised_residue____________________ (normres023)__________________     -1.2212E-15    
- taup/taueff_______________________normalised_residue____________________ (normres024)__________________      4.9516E-14    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (normres024)__________________      4.9516E-14    
  # Final Feasible Point #
  # Plant Availability #
  Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________      1.5000E+01    
@@ -6279,8 +6279,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.1857E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.8143E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.5736E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.7258E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.5736E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.7258E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      5.1000E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -6312,22 +6312,22 @@
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      1.1353E+02 OP 
  Confinement_scaling_law_________________________________________________ (tauelaw)_____________________     "IPB98(y,2)"
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.1000E+00    
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.6434E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.6434E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.6434E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.5918E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.1834E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      3.2994E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.6434E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.6434E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.6434E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.5918E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.1834E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      3.2994E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      1.0500E+02 OP 
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      1.8217E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      5.0000E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      3.1997E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      1.8217E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      5.0000E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      3.1997E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.1498E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      1.7778E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.7276E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6812E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6812E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.9243E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.9934E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -7128,7 +7128,7 @@
  CS_temperature_margin_lower_limit_normalised_residue____________________ (normres021)__________________      1.1102E-15    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (normres022)__________________      7.8382E-14    
  Peak_toroidal_field_upper_limit___normalised_residue____________________ (normres023)__________________     -7.7716E-16    
- taup/taueff_______________________normalised_residue____________________ (normres024)__________________      5.2847E-14    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (normres024)__________________      5.2847E-14    
  # Final Feasible Point #
  # Plant Availability #
  Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________      1.5000E+01    
@@ -7274,8 +7274,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.1857E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.8143E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.5736E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.7258E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.5736E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.7258E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      5.1000E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -7307,22 +7307,22 @@
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      1.1353E+02 OP 
  Confinement_scaling_law_________________________________________________ (tauelaw)_____________________     "IPB98(y,2)"
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.1000E+00    
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.6434E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.6434E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.6434E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.5918E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.1834E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      3.2994E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.6434E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.6434E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.6434E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.5918E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.1834E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      3.2994E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      1.0500E+02 OP 
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      1.8217E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      5.0000E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      3.1997E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      1.8217E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      5.0000E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      3.1997E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.1498E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      1.7778E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.7276E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6812E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6812E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.9243E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.9934E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -8123,7 +8123,7 @@
  CS_temperature_margin_lower_limit_normalised_residue____________________ (normres021)__________________      4.2188E-15    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (normres022)__________________      6.8168E-14    
  Peak_toroidal_field_upper_limit___normalised_residue____________________ (normres023)__________________     -1.2212E-15    
- taup/taueff_______________________normalised_residue____________________ (normres024)__________________      5.6399E-14    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (normres024)__________________      5.6399E-14    
  # Final Feasible Point #
  # Plant Availability #
  Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________      1.5000E+01    
@@ -8269,8 +8269,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.1857E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.8143E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.5736E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.7258E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.5736E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.7258E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      5.1000E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -8302,22 +8302,22 @@
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      1.1353E+02 OP 
  Confinement_scaling_law_________________________________________________ (tauelaw)_____________________     "IPB98(y,2)"
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.1000E+00    
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.6434E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.6434E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.6434E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.5918E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.1834E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      3.2994E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.6434E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.6434E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.6434E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.5918E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.1834E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      3.2994E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      1.0500E+02 OP 
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      1.8217E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      5.0000E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      3.1997E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      1.8217E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      5.0000E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      3.1997E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.1498E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      1.7778E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.7276E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6812E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6812E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.9243E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.9934E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -9000,7 +9000,7 @@ icc = 65 * dumpt time by VV stresses
 icc = 60 * OH coil temp margin
 icc = 72 * OH stress limit
 icc = 25 * Max TF field
-icc = 62 * taulimit
+icc = 62 * f_alpha_energy_confinement_min
 
 *---------------Iteration Variables----------------*
 
@@ -9069,7 +9069,7 @@ ixc = 106 * ftmargoh
 ixc = 122 * oh_steel_frac
 ixc = 123 * foh_stress
 ixc = 109 * f_nd_alpha_electron
-ixc = 110 * ftaulimit
+ixc = 110 * falpha_energy_confinement
 
 isweep = 9
 nsweep = 60
@@ -9244,7 +9244,6 @@ i_plasma_current    = 4 * Switch for plasma current scaling to use;
 i_density_limit   = 7 * Switch for density limit to enforce (constraint equation 5);
 i_beta_fast_alpha = 1 * Switch for fast alpha pressure calculation;
 ifispact = 0 * Switch for neutronics calculations;
-iinvqd   = 1 * Switch for inverse quadrature in l-mode scaling laws 5 and 9;
 ipedestal = 1 * Switch for pedestal profiles;
 fgwped = 0.85 * fraction of Greenwald density to set as pedestal-top density
 neped    = 0.678e20 * Electron density of pedestal (/m3) (ipedestal=1) INITIAL VALUE
@@ -9255,7 +9254,7 @@ tbeta    = 2.0 * Temperature profile index beta  (ipedestal=1)
 teped    = 5.5 * Electron temperature of pedestal (kev) (ipedestal=1)
 tesep    = 0.1 * Electron temperature at separatrix (kev) (ipedestal=1)
 iprofile = 1 * Switch for current profile consistency;
-isc      = 34 * Switch for energy confinement time scaling law
+i_confinement_time      = 34 * Switch for energy confinement time scaling law
 i_plasma_geometry   = 0 * Switch for plasma cross-sectional shape calculation: use input kappa & triang
 *kappa = 1.7808
 kappa = 1.848
@@ -9353,4 +9352,4 @@ t_burn    = 1.0d4 * Burn time (s) (calculated if lpulse=1)
                      oh_steel_frac  =  5.7875E-01
                      foh_stress     =  1.0000E+00
                      f_nd_alpha_electron         =  6.8940E-02
-                     ftaulimit      =  1.0000E+00
\ No newline at end of file
+                     falpha_energy_confinement      =  1.0000E+00
\ No newline at end of file
diff --git a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT
index 22aff11a66..8502c1a43e 100644
--- a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT
+++ b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT
@@ -23,7 +23,7 @@ icc = 65 * dumpt time by VV stresses
 icc = 60 * OH coil temp margin
 icc = 72 * OH stress limit
 icc = 25 * Max TF field
-icc = 62 * taulimit
+icc = 62 * f_alpha_energy_confinement_min
 
 *---------------Iteration Variables----------------*
 
@@ -90,7 +90,7 @@ ixc = 106 * ftmargoh
 ixc = 122 * oh_steel_frac
 ixc = 123 * foh_stress
 ixc = 109 * f_nd_alpha_electron
-ixc = 110 * ftaulimit
+ixc = 110 * falpha_energy_confinement
 
 *isweep = 3
 *nsweep = 17
@@ -265,7 +265,6 @@ i_plasma_current    = 4 * Switch for plasma current scaling to use;
 i_density_limit   = 7 * Switch for density limit to enforce (constraint equation 5);
 i_beta_fast_alpha = 1 * Switch for fast alpha pressure calculation;
 ifispact = 0 * Switch for neutronics calculations;
-iinvqd   = 1 * Switch for inverse quadrature in l-mode scaling laws 5 and 9;
 ipedestal = 1 * Switch for pedestal profiles;
 fgwped = 0.85 * fraction of Greenwald density to set as pedestal-top density
 neped    = 0.678e20 * Electron density of pedestal (/m3) (ipedestal=1) INITIAL VALUE
@@ -276,7 +275,7 @@ tbeta    = 2.0 * Temperature profile index beta  (ipedestal=1)
 teped    = 5.5 * Electron temperature of pedestal (kev) (ipedestal=1)
 tesep    = 0.1 * Electron temperature at separatrix (kev) (ipedestal=1)
 iprofile = 1 * Switch for current profile consistency;
-isc      = 34 * Switch for energy confinement time scaling law
+i_confinement_time      = 34 * Switch for energy confinement time scaling law
 i_plasma_geometry   = 0 * Switch for plasma cross-sectional shape calculation: use input kappa & triang
 *kappa = 1.7808
 kappa = 1.848
@@ -373,4 +372,4 @@ t_burn    = 1.0d4 * Burn time (s) (calculated if lpulse=1)
                      oh_steel_frac  =  5.7875E-01
                      foh_stress     =  1.0000E+00
                      f_nd_alpha_electron         =  6.8940E-02
-                     ftaulimit      =  1.0000E+00
\ No newline at end of file
+                     falpha_energy_confinement      =  1.0000E+00
\ No newline at end of file
diff --git a/tests/integration/data/uncertainties_ref_IN.DAT b/tests/integration/data/uncertainties_ref_IN.DAT
index 28f0d8b390..bb32cbe88c 100644
--- a/tests/integration/data/uncertainties_ref_IN.DAT
+++ b/tests/integration/data/uncertainties_ref_IN.DAT
@@ -23,7 +23,7 @@ icc = 65 * dumpt time by VV stresses
 icc = 60 * OH coil temp margin
 icc = 72 * OH stress limit
 icc = 25 * Max TF field
-icc = 62 * taulimit
+icc = 62 * f_alpha_energy_confinement_min
 
 *---------------Iteration Variables----------------*
 
@@ -90,7 +90,7 @@ ixc = 106 * ftmargoh
 ixc = 122 * oh_steel_frac
 ixc = 123 * foh_stress
 ixc = 109 * f_nd_alpha_electron
-ixc = 110 * ftaulimit
+ixc = 110 * falpha_energy_confinement
 
 *isweep = 3
 *nsweep = 17
@@ -265,7 +265,6 @@ i_plasma_current    = 4 * Switch for plasma current scaling to use;
 i_density_limit   = 7 * Switch for density limit to enforce (constraint equation 5);
 i_beta_fast_alpha = 1 * Switch for fast alpha pressure calculation;
 ifispact = 0 * Switch for neutronics calculations;
-iinvqd   = 1 * Switch for inverse quadrature in l-mode scaling laws 5 and 9;
 ipedestal = 1 * Switch for pedestal profiles;
 fgwped = 0.85 * fraction of Greenwald density to set as pedestal-top density
 neped    = 0.678e20 * Electron density of pedestal (/m3) (ipedestal=1) INITIAL VALUE
@@ -276,7 +275,7 @@ tbeta    = 2.0 * Temperature profile index beta  (ipedestal=1)
 teped    = 5.5 * Electron temperature of pedestal (kev) (ipedestal=1)
 tesep    = 0.1 * Electron temperature at separatrix (kev) (ipedestal=1)
 iprofile = 1 * Switch for current profile consistency;
-isc      = 34 * Switch for energy confinement time scaling law
+i_confinement_time      = 34 * Switch for energy confinement time scaling law
 i_plasma_geometry   = 0 * Switch for plasma cross-sectional shape calculation: use input kappa & triang
 *kappa = 1.7808
 kappa = 1.848
@@ -373,4 +372,4 @@ t_burn    = 1.0d4 * Burn time (s) (calculated if lpulse=1)
                      oh_steel_frac  =  5.7875E-01
                      foh_stress     =  1.0000E+00
                      f_nd_alpha_electron         =  6.8940E-02
-                     ftaulimit      =  1.0000E+00
\ No newline at end of file
+                     falpha_energy_confinement      =  1.0000E+00
\ No newline at end of file
diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json
index bb4b24c2b1..ea27099b35 100644
--- a/tests/integration/ref_dicts.json
+++ b/tests/integration/ref_dicts.json
@@ -1676,7 +1676,7 @@
         "nd_ions_total": 0.0,
         "dnla": 0.0,
         "nd_protons": 0.0,
-        "dntau": 0.0,
+        "ntau": 0.0,
         "nd_impurities": 0.0,
         "double": "selected_real_kind(15, 300)",
         "dp_": 8.0,
@@ -2041,7 +2041,7 @@
         "fstrcond": 1.0,
         "ftar": 1.0,
         "ftaucq": 1.0,
-        "ftaulimit": 1.0,
+        "falpha_energy_confinement": 1.0,
         "ftbr": 1.0,
         "ft_burn": 1.0,
         "ftcycl": 1.0,
@@ -2458,7 +2458,6 @@
         "ifetyp": 0.0,
         "ifueltyp": 0.0,
         "ignite": 0.0,
-        "iinvqd": 1.0,
         "ikind": "int_def",
         "ilhthresh": 19.0,
         "ilower": null,
@@ -2646,7 +2645,7 @@
         "ipfres": 0.0,
         "ipnet": 0.0,
         "ipnfoms": 19.0,
-        "ipnlaws": 48.0,
+        "n_confinement_scalings": 48.0,
         "ipnscns": 1000.0,
         "ipnscnv": 64.0,
         "ipnvars": 175.0,
@@ -2660,12 +2659,12 @@
         "iptr": 0.0,
         "ipvlam": "ipeqns+2*ipnvars+1",
         "ipvp1": "ipnvars+1",
-        "iradloss": 1.0,
+        "i_rad_loss": 1.0,
         "ireactor": 1.0,
         "irefprop": 1.0,
         "irfcd": 1.0,
         "is_leg_cp_temp_same": 0.0,
-        "isc": 34.0,
+        "i_confinement_time": 34.0,
         "iscan_global": 0.0,
         "iscenr": 2.0,
         "i_plasma_wall_gap": 1.0,
@@ -2889,8 +2888,7 @@
         "kappa": 1.792,
         "kappa0": 2390.0,
         "kappa95": 1.6,
-        "kappaa": 0.0,
-        "kappaa_IPB": 0.0,
+        "kappa_ipb": 0.0,
         "keV_": "1000*e_",
         "kh2o": 0.651,
         "ki": null,
@@ -2958,7 +2956,7 @@
             "NBshine-throughfracupperlimit",
             "CStemperaturemarginlowerlimit",
             "Minimumavailabilityvalue",
-            "taup/taueff",
+            "f_alpha_energy_confinement",
             "numberofITER-likevacuumpumps",
             "Zefflimit",
             "DumptimesetbyVVstress",
@@ -3598,7 +3596,7 @@
         ],
         "porbitlossmw": 0.0,
         "p_plasma_outer_rad_mw": 0.0,
-        "powerht": 0.0,
+        "p_plasma_loss_mw": 0.0,
         "powfmax": 1500.0,
         "fusion_power": 0.0,
         "powohres": 0.0,
@@ -3680,10 +3678,10 @@
             0.0
         ],
         "ptpdiv": 0.0,
-        "ptremw": 0.0,
-        "ptrepv": 0.0,
-        "ptrimw": 0.0,
-        "ptripv": 0.0,
+        "p_electron_transport_loss_mw": 0.0,
+        "pden_electron_transport_loss_mw": 0.0,
+        "p_ion_transport_loss_mw": 0.0,
+        "pden_ion_transport_loss_mw": 0.0,
         "pulsetimings": 1.0,
         "pumpareafraction": 0.0203,
         "pumpspeedfactor": 0.167,
@@ -7424,16 +7422,16 @@
         "tau2": 0.0,
         "taubeam": 0.0,
         "taucq": 30.0,
-        "tauee": 0.0,
+        "t_electron_energy_confinement": 0.0,
         "tauee_in": 0.0,
-        "taueff": 0.0,
-        "tauei": 0.0,
+        "t_energy_confinement": 0.0,
+        "t_ion_energy_confinement": 0.0,
         "taufall": 0.0,
-        "taulimit": 5.0,
+        "f_alpha_energy_confinement_min": 5.0,
         "taumax": 10.0,
-        "taup": 0.0,
+        "t_alpha_confinement": 0.0,
         "tauratio": 1.0,
-        "tauscl": [
+        "labels_confinement_scalings": [
             "'Neo-Alcator&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(ohmic)'",
             "'Mirnov&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(H)'",
             "'Merezkhin-Muhkovatov (L)'",
@@ -7626,7 +7624,7 @@
         "toolow": ".false.",
         "toroidalgap": 1.0,
         "total_costs": 0.0,
-        "total_energy_conf_time": 0.0,
+        "t_energy_confinement_beta": 0.0,
         "total_loss_power": 0.0,
         "e_plasma_beta": 0.0,
         "totalpowerlost": null,
@@ -9323,7 +9321,7 @@
         "nd_ions_total": "total ion density (/m3)",
         "dnla": "line averaged electron density (/m3)",
         "nd_protons": "proton ash density (/m3)",
-        "dntau": "plasma average \"n-tau\" (seconds/m3)",
+        "ntau": "plasma average \"n-tau\" (seconds/m3)",
         "nd_impurities": "high Z ion density (/m3)",
         "double": "",
         "dp_": "",
@@ -9636,7 +9634,7 @@
         "fstrcond": "f-value for maxiumum TF coil conduit Tresca yield criterion\n (`constraint equation 32`, `iteration variable 49`)",
         "ftar": "fraction of power to the lower divertor in double null configuration\n (`i_single_null = 0` only) (default assumes SN)",
         "ftaucq": "f-value for calculated minimum TF quench time\n (`constraint equation 65`, `iteration variable 113`)",
-        "ftaulimit": "f-value for lower limit on taup/taueff the ratio of alpha particle to energy\n confinement times (`constraint equation 62`, `iteration variable 110`)",
+        "falpha_energy_confinement": "f-value for lower limit on f_alpha_energy_confinement the ratio of alpha particle to energy\n confinement times (`constraint equation 62`, `iteration variable 110`)",
         "ftbr": "f-value for minimum tritium breeding ratio (`constraint equation 52`, `iteration variable 89`)",
         "ft_burn": "f-value for minimum burn time (`constraint equation 13`, `iteration variable 21`)",
         "ftcycl": "f-value for cycle time (`constraint equation 42`, `iteration variable 67`)",
@@ -9836,7 +9834,6 @@
         "ifueltyp": "Switch for fuel type:\n<ul>\n<li>=2 treat initial blanket, divertor, first wall\n   as capital costs. Treat all later items and\n   fraction fcdfuel of CD equipment as fuel costs</li>\n<li>=1 treat blanket divertor, first wall and\n   fraction fcdfuel of CD equipment as fuel cost</li>\n<li>=0 treat these as capital cost</li>\n</ul>",
         "igeom": "switch for plasma geometry calculation:\n<ul>\n<li>=0 original method (possibly based on Peng ST modelling)</li>\n<li>=1 improved (and traceable) method</li>\n</ul>",
         "ignite": "switch for ignition assumption. Obviously, ignite must be zero if current drive\n is required. If ignite is 1, any auxiliary power is assumed to be used only during\n plasma start-up, and is excluded from all steady-state power balance calculations.\n<ul>\n<li>=0 do not assume plasma ignition</li>\n<li>=1 assume ignited (but include auxiliary power in costs)</UL</li>\n</ul>",
-        "iinvqd": "switch for inverse quadrature in L-mode scaling laws 5 and 9:\n<ul>\n<li>=0 inverse quadrature not used</li>\n<li>=1 inverse quadrature with Neo-Alcator tau-E used</li>\n</ul>",
         "ikind": "",
         "ilhthresh": "switch for L-H mode power threshold scaling to use (see pthrmw for list)",
         "ilower": "",
@@ -9886,7 +9883,7 @@
         "ipfres": "switch for PF coil type:\n<ul>\n<li>=0 superconducting PF coils</li>\n<li>=1 resistive PF coils</li>\n</ul>",
         "ipnet": "Switch for net electric power calculation:\n<ul>\n<li>=0 scale so that always > 0</li>\n<li>=1 let go < 0 (no c-o-e)</li>\n</ul>",
         "ipnfoms": "ipnfoms FIX : number of available figures of merit",
-        "ipnlaws": "number of energy confinement time scaling laws",
+        "n_confinement_scalings": "number of energy confinement time scaling laws",
         "ipnscns": "Maximum number of scan points",
         "ipnscnv": "Number of available scan variables",
         "ipnvars": "ipnvars FIX : total number of variables available for iteration",
@@ -9900,12 +9897,12 @@
         "iptr": "",
         "ipvlam": "",
         "ipvp1": "",
-        "iradloss": "switch for radiation loss term usage in power balance (see User Guide):\n<ul>\n<li>=0 total power lost is scaling power plus radiation (needed for `ipedestal=2,3`)</li>\n<li>=1 total power lost is scaling power plus core radiation only</li>\n<li>=2 total power lost is scaling power only, with no additional\n   allowance for radiation. This is not recommended for power plant models.</li>\n</ul>",
+        "i_rad_loss": "switch for radiation loss term usage in power balance (see User Guide):\n<ul>\n<li>=0 total power lost is scaling power plus radiation (needed for `ipedestal=2,3`)</li>\n<li>=1 total power lost is scaling power plus core radiation only</li>\n<li>=2 total power lost is scaling power only, with no additional\n   allowance for radiation. This is not recommended for power plant models.</li>\n</ul>",
         "ireactor": "Switch for net electric power and cost of electricity calculations:\n<ul>\n<li>=0 do not calculate MW(electric) or c-o-e</li>\n<li>=1 calculate MW(electric) and c-o-e</li>\n</ul>",
         "irefprop": "Switch to use REFPROP routines (stellarator only)",
         "irfcd": "Switch for current drive calculation:\n<ul>\n<li>=0 turned off</li>\n<li>=1 turned on</li>\n</ul>",
         "is_leg_cp_temp_same": "",
-        "isc": "switch for energy confinement time scaling law (see description in `tauscl`)",
+        "i_confinement_time": "switch for energy confinement time scaling law (see description in `labels_confinement_scalings`)",
         "iscan_global": "Makes iscan available globally.",
         "iscenr": "Switch for PF coil energy storage option:\n<ul>\n<li>=1 all power from MGF (motor-generator flywheel) units</li>\n<li>=2 all pulsed power from line</li>\n<li>=3 PF power from MGF, heating from line</li>\n</ul>",
         "i_plasma_wall_gap": "switch for plasma-first wall clearances:\n<ul>\n<li>=0 use 10% of rminor</li>\n<li>=1 use input (dr_fw_plasma_gap_inboard and dr_fw_plasma_gap_outboard)</li>\n</ul>",
@@ -9953,17 +9950,16 @@
         "kappa": "plasma separatrix elongation (calculated if `i_plasma_geometry = 1-5, 7 or 9-10`)",
         "kappa0": "",
         "kappa95": "plasma elongation at 95% surface (calculated if `i_plasma_geometry = 0-3, 6, or 8-10`)",
-        "kappaa": "plasma elongation calculated as a_plasma_poloidal/(pi.a^2)",
-        "kappaa_IPB": "Volume measure of plasma elongation",
+        "kappa_ipb": "Separatrix elongation calculated for IPB scalings",
         "keV_": "",
         "kh2o": "thermal conductivity of water (W/m/K)",
         "ki": "",
         "kron": "",
         "ksic": "power fraction for outboard double-null scrape-off plasma",
-        "lablcc": "lablcc(ipeqns) : labels describing constraint equations (corresponding itvs)<UL>\n<br>\n<LI> ( 1) Beta (consistency equation) (itv 5)\n  <LI> ( 2) Global power balance (consistency equation) (itv 10,1,2,3,4,6,11)\n  <LI> ( 3) Ion power balance DEPRECATED (itv 10,1,2,3,4,6,11)\n  <LI> ( 4) Electron power balance DEPRECATED (itv 10,1,2,3,4,6,11)\n  <LI> ( 5) Density upper limit (itv 9,1,2,3,4,5,6)\n  <LI> ( 6) (Epsilon x beta poloidal) upper limit (itv 8,1,2,3,4,6)\n  <LI> ( 7) Beam ion density (NBI) (consistency equation) (itv 7)\n  <LI> ( 8) Neutron wall load upper limit (itv 14,1,2,3,4,6)\n  <LI> ( 9) Fusion power upper limit (itv 26,1,2,3,4,6)\n  <LI> (10) Toroidal field 1/R (consistency equation) (itv 12,1,2,3,13 )\n  <LI> (11) Radial build (consistency equation) (itv 3,1,13,16,29,42,61)\n  <LI> (12) Volt second lower limit (STEADY STATE) (itv 15,1,2,3)\n  <LI> (13) Burn time lower limit (PULSE) (itv 21,1,16,17,29,42,44,61)\n            (itv 19,1,2,3,6)\n  <LI> (14) Neutral beam decay lengths to plasma centre (NBI) (consistency equation)\n  <LI> (15) LH power threshold limit (itv 103)\n  <LI> (16) Net electric power lower limit (itv 25,1,2,3)\n  <LI> (17) Radiation fraction upper limit (itv 28)\n  <LI> (18) Divertor heat load upper limit (itv 27)\n  <LI> (19) MVA upper limit (itv 30)\n  <LI> (20) Neutral beam tangency radius upper limit (NBI) (itv 33,31,3,13)\n  <LI> (21) Plasma minor radius lower limit (itv 32)\n  <LI> (22) Divertor collisionality upper limit (itv 34,43)\n  <LI> (23) Conducting shell to plasma minor radius ratio upper limit\n            (itv 104,1,74)\n  <LI> (24) Beta upper limit (itv 36,1,2,3,4,6,18)\n  <LI> (25) Peak toroidal field upper limit (itv 35,3,13,29)\n  <LI> (26) Central solenoid EOF current density upper limit (ipfres=0)\n            (itv 38,37,41,12)\n  <LI> (27) Central solenoid BOP current density upper limit (ipfres=0)\n            (itv 39,37,41,12)\n  <LI> (28) Fusion gain Q lower limit (itv 45,47,40)\n  <LI> (29) Inboard radial build consistency (itv 3,1,13,16,29,42,61)\n  <LI> (30) Injection power upper limit (itv 46,47,11)\n  <LI> (31) TF coil case stress upper limit (SCTF) (itv 48,56,57,58,59,60,24)\n  <LI> (32) TF coil conduit stress upper limit (SCTF) (itv 49,56,57,58,59,60,24)\n  <LI> (33) I_op / I_critical (TF coil) (SCTF) (itv 50,56,57,58,59,60,24)\n  <LI> (34) Dump voltage upper limit (SCTF) (itv 51,52,56,57,58,59,60,24)\n  <LI> (35) J_winding pack/J_protection upper limit (SCTF) (itv 53,56,57,58,59,60,24)\n  <LI> (36) TF coil temperature margin lower limit (SCTF) (itv 54,55,56,57,58,59,60,24)\n  <LI> (37) Current drive gamma upper limit (itv 40,47)\n  <LI> (38) First wall coolant temperature rise upper limit (itv 62)\n  <LI> (39) First wall peak temperature upper limit (itv 63)\n  <LI> (40) Start-up injection power lower limit (PULSE) (itv 64)\n  <LI> (41) Plasma current ramp-up time lower limit (PULSE) (itv  66,65)\n  <LI> (42) Cycle time lower limit (PULSE) (itv 17,67,65)\n  <LI> (43) Average centrepost temperature\n            (TART) (consistency equation) (itv 13,20,69,70)\n  <LI> (44) Peak centrepost temperature upper limit (TART) (itv 68,69,70)\n  <LI> (45) Edge safety factor lower limit (TART) (itv 71,1,2,3)\n  <LI> (46) Equation for Ip/Irod upper limit (TART) (itv 72,2,60)\n  <LI> (47) NOT USED\n  <LI> (48) Poloidal beta upper limit (itv 79,2,3,18)\n  <LI> (49) NOT USED\n  <LI> (50) IFE repetition rate upper limit (IFE)\n  <LI> (51) Startup volt-seconds consistency (PULSE) (itv 16,29,3,1)\n  <LI> (52) Tritium breeding ratio lower limit (itv 89,90,91)\n  <LI> (53) Neutron fluence on TF coil upper limit (itv 92,93,94)\n  <LI> (54) Peak TF coil nuclear heating upper limit (itv 95,93,94)\n  <LI> (55) Vacuum vessel helium concentration upper limit iblanket =2 (itv 96,93,94)\n  <LI> (56) Pseparatrix/Rmajor upper limit (itv 97,1,3)\n  <LI> (57) NOT USED\n  <LI> (58) NOT USED\n  <LI> (59) Neutral beam shine-through fraction upper limit (NBI) (itv 105,6,19,4 )\n  <LI> (60) Central solenoid temperature margin lower limit (SCTF) (itv 106)\n  <LI> (61) Minimum availability value (itv 107)\n  <LI> (62) taup/taueff the ratio of particle to energy confinement times (itv 110)\n  <LI> (63) The number of ITER-like vacuum pumps niterpump < tfno (itv 111)\n  <LI> (64) Zeff less than or equal to zeffmax (itv 112)\n  <LI> (65) Dump time set by VV loads (itv 56, 113)\n  <LI> (66) Limit on rate of change of energy in poloidal field\n            (Use iteration variable 65(t_current_ramp_up), 115)\n  <LI> (67) Simple Radiation Wall load limit (itv 116, 4,6)\n  <LI> (68) Psep * Bt / qAR upper limit (itv 117)\n  <LI> (69) ensure separatrix power = the value from Kallenbach divertor (itv 118)\n  <LI> (70) ensure that teomp = separatrix temperature in the pedestal profile,\n            (itv 119 (tesep))\n  <LI> (71) ensure that neomp = separatrix density (nesep) x neratio\n  <LI> (72) central solenoid shear stress limit (Tresca yield criterion) (itv 123 foh_stress)\n  <LI> (73) Psep >= Plh + Paux (itv 137 (fplhsep))\n  <LI> (74) TFC quench < tmax_croco (itv 141 (fcqt))\n  <LI> (75) TFC current/copper area < Maximum (itv 143 f_coppera_m2)\n  <LI> (76) Eich critical separatrix density\n  <LI> (77) TF coil current per turn upper limit\n  <LI> (78) Reinke criterion impurity fraction lower limit (itv  147 freinke)\n  <LI> (79) Peak CS field upper limit (itv  149 fbmaxcs)\n  <LI> (80) Divertor power lower limit pdivt (itv  153 fpdivlim)\n  <LI> (81) Ne(0) > ne(ped) constraint (itv  154 fne0)\n  <LI> (82) toroidalgap >  tftort constraint (itv  171 ftoroidalgap)\n  <LI> (83) Radial build consistency for stellarators (itv 172 f_avspace)\n  <LI> (84) Lower limit for beta (itv 173 fbeta_min)\n  <LI> (85) Constraint for CP lifetime\n  <LI> (86) Constraint for TF coil turn dimension\n  <LI> (87) Constraint for cryogenic power\n  <LI> (88) Constraint for TF coil strain absolute value\n  <LI> (89) Constraint for CS coil quench protection\n  <LI> (90) Checking if the design point is ECRH ignitable (itv 164 fecrh_ignition)</UL>\n\n\n\n",
+        "lablcc": "lablcc(ipeqns) : labels describing constraint equations (corresponding itvs)<UL>\n<br>\n<LI> ( 1) Beta (consistency equation) (itv 5)\n  <LI> ( 2) Global power balance (consistency equation) (itv 10,1,2,3,4,6,11)\n  <LI> ( 3) Ion power balance DEPRECATED (itv 10,1,2,3,4,6,11)\n  <LI> ( 4) Electron power balance DEPRECATED (itv 10,1,2,3,4,6,11)\n  <LI> ( 5) Density upper limit (itv 9,1,2,3,4,5,6)\n  <LI> ( 6) (Epsilon x beta poloidal) upper limit (itv 8,1,2,3,4,6)\n  <LI> ( 7) Beam ion density (NBI) (consistency equation) (itv 7)\n  <LI> ( 8) Neutron wall load upper limit (itv 14,1,2,3,4,6)\n  <LI> ( 9) Fusion power upper limit (itv 26,1,2,3,4,6)\n  <LI> (10) Toroidal field 1/R (consistency equation) (itv 12,1,2,3,13 )\n  <LI> (11) Radial build (consistency equation) (itv 3,1,13,16,29,42,61)\n  <LI> (12) Volt second lower limit (STEADY STATE) (itv 15,1,2,3)\n  <LI> (13) Burn time lower limit (PULSE) (itv 21,1,16,17,29,42,44,61)\n            (itv 19,1,2,3,6)\n  <LI> (14) Neutral beam decay lengths to plasma centre (NBI) (consistency equation)\n  <LI> (15) LH power threshold limit (itv 103)\n  <LI> (16) Net electric power lower limit (itv 25,1,2,3)\n  <LI> (17) Radiation fraction upper limit (itv 28)\n  <LI> (18) Divertor heat load upper limit (itv 27)\n  <LI> (19) MVA upper limit (itv 30)\n  <LI> (20) Neutral beam tangency radius upper limit (NBI) (itv 33,31,3,13)\n  <LI> (21) Plasma minor radius lower limit (itv 32)\n  <LI> (22) Divertor collisionality upper limit (itv 34,43)\n  <LI> (23) Conducting shell to plasma minor radius ratio upper limit\n            (itv 104,1,74)\n  <LI> (24) Beta upper limit (itv 36,1,2,3,4,6,18)\n  <LI> (25) Peak toroidal field upper limit (itv 35,3,13,29)\n  <LI> (26) Central solenoid EOF current density upper limit (ipfres=0)\n            (itv 38,37,41,12)\n  <LI> (27) Central solenoid BOP current density upper limit (ipfres=0)\n            (itv 39,37,41,12)\n  <LI> (28) Fusion gain Q lower limit (itv 45,47,40)\n  <LI> (29) Inboard radial build consistency (itv 3,1,13,16,29,42,61)\n  <LI> (30) Injection power upper limit (itv 46,47,11)\n  <LI> (31) TF coil case stress upper limit (SCTF) (itv 48,56,57,58,59,60,24)\n  <LI> (32) TF coil conduit stress upper limit (SCTF) (itv 49,56,57,58,59,60,24)\n  <LI> (33) I_op / I_critical (TF coil) (SCTF) (itv 50,56,57,58,59,60,24)\n  <LI> (34) Dump voltage upper limit (SCTF) (itv 51,52,56,57,58,59,60,24)\n  <LI> (35) J_winding pack/J_protection upper limit (SCTF) (itv 53,56,57,58,59,60,24)\n  <LI> (36) TF coil temperature margin lower limit (SCTF) (itv 54,55,56,57,58,59,60,24)\n  <LI> (37) Current drive gamma upper limit (itv 40,47)\n  <LI> (38) First wall coolant temperature rise upper limit (itv 62)\n  <LI> (39) First wall peak temperature upper limit (itv 63)\n  <LI> (40) Start-up injection power lower limit (PULSE) (itv 64)\n  <LI> (41) Plasma current ramp-up time lower limit (PULSE) (itv  66,65)\n  <LI> (42) Cycle time lower limit (PULSE) (itv 17,67,65)\n  <LI> (43) Average centrepost temperature\n            (TART) (consistency equation) (itv 13,20,69,70)\n  <LI> (44) Peak centrepost temperature upper limit (TART) (itv 68,69,70)\n  <LI> (45) Edge safety factor lower limit (TART) (itv 71,1,2,3)\n  <LI> (46) Equation for Ip/Irod upper limit (TART) (itv 72,2,60)\n  <LI> (47) NOT USED\n  <LI> (48) Poloidal beta upper limit (itv 79,2,3,18)\n  <LI> (49) NOT USED\n  <LI> (50) IFE repetition rate upper limit (IFE)\n  <LI> (51) Startup volt-seconds consistency (PULSE) (itv 16,29,3,1)\n  <LI> (52) Tritium breeding ratio lower limit (itv 89,90,91)\n  <LI> (53) Neutron fluence on TF coil upper limit (itv 92,93,94)\n  <LI> (54) Peak TF coil nuclear heating upper limit (itv 95,93,94)\n  <LI> (55) Vacuum vessel helium concentration upper limit iblanket =2 (itv 96,93,94)\n  <LI> (56) Pseparatrix/Rmajor upper limit (itv 97,1,3)\n  <LI> (57) NOT USED\n  <LI> (58) NOT USED\n  <LI> (59) Neutral beam shine-through fraction upper limit (NBI) (itv 105,6,19,4 )\n  <LI> (60) Central solenoid temperature margin lower limit (SCTF) (itv 106)\n  <LI> (61) Minimum availability value (itv 107)\n  <LI> (62) f_alpha_energy_confinement the ratio of particle to energy confinement times (itv 110)\n  <LI> (63) The number of ITER-like vacuum pumps niterpump < tfno (itv 111)\n  <LI> (64) Zeff less than or equal to zeffmax (itv 112)\n  <LI> (65) Dump time set by VV loads (itv 56, 113)\n  <LI> (66) Limit on rate of change of energy in poloidal field\n            (Use iteration variable 65(t_current_ramp_up), 115)\n  <LI> (67) Simple Radiation Wall load limit (itv 116, 4,6)\n  <LI> (68) Psep * Bt / qAR upper limit (itv 117)\n  <LI> (69) ensure separatrix power = the value from Kallenbach divertor (itv 118)\n  <LI> (70) ensure that teomp = separatrix temperature in the pedestal profile,\n            (itv 119 (tesep))\n  <LI> (71) ensure that neomp = separatrix density (nesep) x neratio\n  <LI> (72) central solenoid shear stress limit (Tresca yield criterion) (itv 123 foh_stress)\n  <LI> (73) Psep >= Plh + Paux (itv 137 (fplhsep))\n  <LI> (74) TFC quench < tmax_croco (itv 141 (fcqt))\n  <LI> (75) TFC current/copper area < Maximum (itv 143 f_coppera_m2)\n  <LI> (76) Eich critical separatrix density\n  <LI> (77) TF coil current per turn upper limit\n  <LI> (78) Reinke criterion impurity fraction lower limit (itv  147 freinke)\n  <LI> (79) Peak CS field upper limit (itv  149 fbmaxcs)\n  <LI> (80) Divertor power lower limit pdivt (itv  153 fpdivlim)\n  <LI> (81) Ne(0) > ne(ped) constraint (itv  154 fne0)\n  <LI> (82) toroidalgap >  tftort constraint (itv  171 ftoroidalgap)\n  <LI> (83) Radial build consistency for stellarators (itv 172 f_avspace)\n  <LI> (84) Lower limit for beta (itv 173 fbeta_min)\n  <LI> (85) Constraint for CP lifetime\n  <LI> (86) Constraint for TF coil turn dimension\n  <LI> (87) Constraint for cryogenic power\n  <LI> (88) Constraint for TF coil strain absolute value\n  <LI> (89) Constraint for CS coil quench protection\n  <LI> (90) Checking if the design point is ECRH ignitable (itv 164 fecrh_ignition)</UL>\n\n\n\n",
         "lablmm": "lablmm(ipnfoms) : labels describing figures of merit:<UL>\n<br>\n<LI> ( 1) major radius\n  <LI> ( 2) not used\n  <LI> ( 3) neutron wall load\n  <LI> ( 4) P_tf + P_pf\n  <LI> ( 5) fusion gain Q\n  <LI> ( 6) cost of electricity\n  <LI> ( 7) capital cost (direct cost if ireactor=0,\n                          constructed cost otherwise)\n  <LI> ( 8) aspect ratio\n  <LI> ( 9) divertor heat load\n  <LI> (10) toroidal field\n  <LI> (11) total injected power\n  <LI> (12) hydrogen plant capital cost OBSOLETE\n  <LI> (13) hydrogen production rate OBSOLETE\n  <LI> (14) pulse length\n  <LI> (15) plant availability factor (N.B. requires\n            iavail=1 to be set)\n  <LI> (16) linear combination of major radius (minimised) and pulse length (maximised)\n              note: FoM should be minimised only!\n  <LI> (17) net electrical output\n  <LI> (18) Null Figure of Merit\n  <LI> (19) linear combination of big Q and pulse length (maximised)\n              note: FoM should be minimised only!</UL>\n\n\n",
-        "lablxc": "lablxc(ipnvars) : labels describing iteration variables<UL>\n<br>\n<LI> ( 1) aspect\n  <LI> ( 2) bt\n  <LI> ( 3) rmajor\n <LI> ( 4) te\n <LI> ( 5) beta\n <LI> ( 6) dene\n <LI> ( 7) f_nd_beam_electron\n <LI> ( 8) fbeta_poloidal_eps (f-value for equation 6)\n <LI> ( 9) fdene (f-value for equation 5)\n <LI> (10) hfact\n <LI> (11) pheat\n <LI> (12) oacdcp\n <LI> (13) dr_tf_inboard (NOT RECOMMENDED)\n <LI> (14) fwalld (f-value for equation 8)\n <LI> (15) fvs (f-value for equation 12)\n <LI> (16) dr_cs\n <LI> (17) tdwell\n <LI> (18) q\n <LI> (19) beam_energy\n <LI> (20) tcpav\n <LI> (21) ftburn (f-value for equation 13)\n <LI> (22) NOT USED\n <LI> (23) fcoolcp\n <LI> (24) NOT USED\n <LI> (25) fpnetel (f-value for equation 16)\n <LI> (26) ffuspow (f-value for equation 9)\n <LI> (27) fhldiv (f-value for equation 18)\n <LI> (28) fradpwr (f-value for equation 17), total radiation fraction\n <LI> (29) dr_bore\n <LI> (30) fmva (f-value for equation 19)\n <LI> (31) gapomin\n <LI> (32) frminor (f-value for equation 21)\n <LI> (33) fportsz (f-value for equation 20)\n <LI> (34) fdivcol (f-value for equation 22)\n <LI> (35) fpeakb (f-value for equation 25)\n <LI> (36) fbeta_max (f-value for equation 24)\n <LI> (37) coheof\n <LI> (38) fjohc (f-value for equation 26)\n <LI> (39) fjohc0 (f-value for equation 27)\n <LI> (40) fgamcd (f-value for equation 37)\n <LI> (41) fcohbop\n <LI> (42) dr_cs_tf_gap\n <LI> (43) NOT USED\n <LI> (44) fvsbrnni\n <LI> (45) fqval (f-value for equation 28)\n <LI> (46) fpinj (f-value for equation 30)\n <LI> (47) feffcd\n <LI> (48) fstrcase (f-value for equation 31)\n <LI> (49) fstrcond (f-value for equation 32)\n <LI> (50) fiooic (f-value for equation 33)\n <LI> (51) fvdump (f-value for equation 34)\n <LI> (52) vdalw\n <LI> (53) fjprot (f-value for equation 35)\n <LI> (54) ftmargtf (f-value for equation 36)\n <LI> (55) NOT USED\n <LI> (56) tdmptf\n <LI> (57) thkcas\n <LI> (58) thwcndut\n <LI> (59) fcutfsu\n <LI> (60) cpttf\n <LI> (61) dr_shld_vv_gap_inboard\n <LI> (62) fdtmp (f-value for equation 38)\n <LI> (63) ftpeak (f-value for equation 39)\n <LI> (64) fauxmn (f-value for equation 40)\n <LI> (65) tohs\n <LI> (66) ftohs (f-value for equation 41)\n <LI> (67) ftcycl (f-value for equation 42)\n <LI> (68) fptemp (f-value for equation 44)\n <LI> (69) rcool\n <LI> (70) vcool\n <LI> (71) fq (f-value for equation 45)\n <LI> (72) fipir (f-value for equation 46)\n <LI> (73) dr_fw_plasma_gap_inboard\n <LI> (74) dr_fw_plasma_gap_outboard\n <LI> (75) tfootfi\n <LI> (76) NOT USED\n <LI> (77) NOT USED\n <LI> (78) NOT USED\n <LI> (79) fbeta_poloidal (f-value for equation 48)\n <LI> (80) NOT USED\n <LI> (81) edrive\n <LI> (82) drveff\n <LI> (83) tgain\n <LI> (84) chrad\n <LI> (85) pdrive\n <LI> (86) frrmax (f-value for equation 50)\n <LI> (87) NOT USED\n <LI> (88) NOT USED\n <LI> (89) ftbr (f-value for equation 52)\n <LI> (90) blbuith\n <LI> (91) blbuoth\n <LI> (92) fflutf (f-value for equation 53)\n <LI> (93) dr_shld_inboard\n <LI> (94) dr_shld_outboard\n <LI> (95) fptfnuc (f-value for equation 54)\n <LI> (96) fvvhe (f-value for equation 55)\n <LI> (97) fpsepr (f-value for equation 56)\n <LI> (98) li6enrich\n <LI> (99) NOT USED\n <LI> (100) NOT USED\n <LI> (101) NOT USED\n <LI> (102) fimpvar\n <LI> (103) flhthresh (f-value for equation 15)\n <LI> (104)fr_conducting_wall (f-value for equation 23)\n <LI> (105) fnbshinef (f-value for equation 59)\n <LI> (106) ftmargoh (f-value for equation 60)\n <LI> (107) favail (f-value for equation 61)\n <LI> (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)\n <LI> (109) f_nd_alpha_electron: thermal alpha density / electron density\n <LI> (110) ftaulimit: Lower limit on taup/taueff the ratio of alpha\n <LI> (111) fniterpump: f-value for constraint that number\n <LI> (112) fzeffmax: f-value for max Zeff (f-value for equation 64)\n <LI> (113) ftaucq: f-value for minimum quench time (f-value for equation 65)\n <LI> (114) fw_channel_length: Length of a single first wall channel\n <LI> (115) fpoloidalpower: f-value for max rate of change of\n <LI> (116) fradwall: f-value for radiation wall load limit (eq. 67)\n <LI> (117) fpsepbqar: f-value for  Psep*Bt/qar upper limit (eq. 68)\n <LI> (118) fpsep: f-value to ensure separatrix power is less than\n <LI> (119) tesep:  separatrix temperature calculated by the Kallenbach divertor model\n <LI> (120) ttarget: Plasma temperature adjacent to divertor sheath [eV]\n <LI> (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP\n <LI> (122) oh_steel_frac : streel fraction of Central Solenoid\n <LI> (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72)\n <LI> (124) qtargettotal : Power density on target including surface recombination [W/m2]\n <LI> (125) fimp(3) :  Beryllium density fraction relative to electron density\n <LI> (126) fimp(4) :  Carbon density fraction relative to electron density\n <LI> (127) fimp(5) :  Nitrogen fraction relative to electron density\n <LI> (128) fimp(6) :  Oxygen density fraction relative to electron density\n <LI> (129) fimp(7) :  Neon density fraction relative to electron density\n <LI> (130) fimp(8) :  Silicon density fraction relative to electron density\n <LI> (131) fimp(9) :  Argon density fraction relative to electron density\n <LI> (132) fimp(10) :  Iron density fraction relative to electron density\n <LI> (133) fimp(11) :  Nickel density fraction relative to electron density\n <LI> (134) fimp(12) :  Krypton density fraction relative to electron density\n <LI> (135) fimp(13) :  Xenon density fraction relative to electron density\n <LI> (136) fimp(14) :  Tungsten density fraction relative to electron density\n <LI> (137) fplhsep (f-value for equation 73)\n <LI> (138) rebco_thickness : thickness of REBCO layer in tape (m)\n <LI> (139) copper_thick : thickness of copper layer in tape (m)\n <LI> (140) dr_tf_wp : radial thickness of TFC winding pack (m)\n <LI> (141) fcqt : TF coil quench temperature < tmax_croco (f-value for equation 74)\n <LI> (142) nesep : electron density at separatrix [m-3]\n <LI> (143) f_copperA_m2 : TF coil current / copper area < Maximum value\n <LI> (144) fnesep : Eich critical electron density at separatrix\n <LI> (145) fgwped :  fraction of Greenwald density to set as pedestal-top density\n <LI> (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77)\n <LI> (147) freinke : F-value for Reinke detachment criterion (constraint equation 78)\n <LI> (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion\n <LI> (149) fbmaxcs : F-value for max peak CS field (con. 79, itvar 149)\n <LI> (152) fbmaxcs : Ratio of separatrix density to Greenwald density\n <LI> (153) fpdivlim : F-value for minimum pdivt (con. 80)\n <LI> (154) fne0 : F-value for ne(0) > ne(ped) (con. 81)\n <LI> (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only)\n <LI> (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only)\n <LI> (157) fvssu : F-value for available to required start up flux (con. 51)\n <LI> (158) croco_thick : Thickness of CroCo copper tube (m)\n <LI> (159) ftoroidalgap : F-value for toroidalgap >  tftort constraint (con. 82)\n <LI> (160) f_avspace (f-value for equation 83)\n <LI> (161) fbeta_min (f-value for equation 84)\n <LI> (162) r_cp_top : Top outer radius of the centropost (ST only) (m)\n <LI> (163) f_t_turn_tf : f-value for TF coils WP trurn squared dimension constraint\n <LI> (164) f_crypmw : f-value for cryogenic plant power\n <LI> (165) fstr_wp : f-value for TF coil strain absolute value\n <LI> (166) f_copperaoh_m2 : CS coil current /copper area < Maximum value\n <LI> (167) fecrh_ignition: f-value for equation 90\n <LI> (168) EMPTY : Description\n <LI> (169) EMPTY : Description\n <LI> (170) EMPTY : Description\n <LI> (171) EMPTY : Description\n <LI> (172) EMPTY : Description\n <LI> (173) EMPTY : Description\n <LI> (174) EMPTY : Description\n <LI> (175) EMPTY : Description\n\n\n\n",
-        "lablxc": "lablxc(ipnvars) : labels describing iteration variables<UL>\n<br>\n<LI> ( 1) aspect\n  <LI> ( 2) bt\n  <LI> ( 3) rmajor\n <LI> ( 4) te\n <LI> ( 5) beta\n <LI> ( 6) dene\n <LI> ( 7) f_nd_beam_electron\n <LI> ( 8) fbeta_poloidal_eps (f-value for equation 6)\n <LI> ( 9) fdene (f-value for equation 5)\n <LI> (10) hfact\n <LI> (11) pheat\n <LI> (12) oacdcp\n <LI> (13) dr_tf_inboard (NOT RECOMMENDED)\n <LI> (14) fwalld (f-value for equation 8)\n <LI> (15) fvs (f-value for equation 12)\n <LI> (16) dr_cs\n <LI> (17) t_between_pulse\n <LI> (18) q\n <LI> (19) beam_energy\n <LI> (20) tcpav\n <LI> (21) ft_burn (f-value for equation 13)\n <LI> (22) NOT USED\n <LI> (23) fcoolcp\n <LI> (24) NOT USED\n <LI> (25) fpnetel (f-value for equation 16)\n <LI> (26) ffuspow (f-value for equation 9)\n <LI> (27) fhldiv (f-value for equation 18)\n <LI> (28) fradpwr (f-value for equation 17), total radiation fraction\n <LI> (29) dr_bore\n <LI> (30) fmva (f-value for equation 19)\n <LI> (31) gapomin\n <LI> (32) frminor (f-value for equation 21)\n <LI> (33) fportsz (f-value for equation 20)\n <LI> (34) fdivcol (f-value for equation 22)\n <LI> (35) fpeakb (f-value for equation 25)\n <LI> (36) fbeta_max (f-value for equation 24)\n <LI> (37) coheof\n <LI> (38) fjohc (f-value for equation 26)\n <LI> (39) fjohc0 (f-value for equation 27)\n <LI> (40) fgamcd (f-value for equation 37)\n <LI> (41) fcohbop\n <LI> (42) dr_cs_tf_gap\n <LI> (43) NOT USED\n <LI> (44) fvsbrnni\n <LI> (45) fqval (f-value for equation 28)\n <LI> (46) fpinj (f-value for equation 30)\n <LI> (47) feffcd\n <LI> (48) fstrcase (f-value for equation 31)\n <LI> (49) fstrcond (f-value for equation 32)\n <LI> (50) fiooic (f-value for equation 33)\n <LI> (51) fvdump (f-value for equation 34)\n <LI> (52) vdalw\n <LI> (53) fjprot (f-value for equation 35)\n <LI> (54) ftmargtf (f-value for equation 36)\n <LI> (55) NOT USED\n <LI> (56) tdmptf\n <LI> (57) thkcas\n <LI> (58) thwcndut\n <LI> (59) fcutfsu\n <LI> (60) cpttf\n <LI> (61) dr_shld_vv_gap_inboard\n <LI> (62) fdtmp (f-value for equation 38)\n <LI> (63) ftpeak (f-value for equation 39)\n <LI> (64) fauxmn (f-value for equation 40)\n <LI> (65) t_current_ramp_up\n <LI> (66) ft_current_ramp_up (f-value for equation 41)\n <LI> (67) ftcycl (f-value for equation 42)\n <LI> (68) fptemp (f-value for equation 44)\n <LI> (69) rcool\n <LI> (70) vcool\n <LI> (71) fq (f-value for equation 45)\n <LI> (72) fipir (f-value for equation 46)\n <LI> (73) dr_fw_plasma_gap_inboard\n <LI> (74) dr_fw_plasma_gap_outboard\n <LI> (75) tfootfi\n <LI> (76) NOT USED\n <LI> (77) NOT USED\n <LI> (78) NOT USED\n <LI> (79) fbetap (f-value for equation 48)\n <LI> (80) NOT USED\n <LI> (81) edrive\n <LI> (82) drveff\n <LI> (83) tgain\n <LI> (84) chrad\n <LI> (85) pdrive\n <LI> (86) frrmax (f-value for equation 50)\n <LI> (87) NOT USED\n <LI> (88) NOT USED\n <LI> (89) ftbr (f-value for equation 52)\n <LI> (90) blbuith\n <LI> (91) blbuoth\n <LI> (92) fflutf (f-value for equation 53)\n <LI> (93) dr_shld_inboard\n <LI> (94) dr_shld_outboard\n <LI> (95) fptfnuc (f-value for equation 54)\n <LI> (96) fvvhe (f-value for equation 55)\n <LI> (97) fpsepr (f-value for equation 56)\n <LI> (98) li6enrich\n <LI> (99) NOT USED\n <LI> (100) NOT USED\n <LI> (101) NOT USED\n <LI> (102) fimpvar\n <LI> (103) flhthresh (f-value for equation 15)\n <LI> (104)fr_conducting_wall (f-value for equation 23)\n <LI> (105) fnbshinef (f-value for equation 59)\n <LI> (106) ftmargoh (f-value for equation 60)\n <LI> (107) favail (f-value for equation 61)\n <LI> (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)\n <LI> (109) f_nd_alpha_electron: thermal alpha density / electron density\n <LI> (110) ftaulimit: Lower limit on taup/taueff the ratio of alpha\n <LI> (111) fniterpump: f-value for constraint that number\n <LI> (112) fzeffmax: f-value for max Zeff (f-value for equation 64)\n <LI> (113) ftaucq: f-value for minimum quench time (f-value for equation 65)\n <LI> (114) fw_channel_length: Length of a single first wall channel\n <LI> (115) fpoloidalpower: f-value for max rate of change of\n <LI> (116) fradwall: f-value for radiation wall load limit (eq. 67)\n <LI> (117) fpsepbqar: f-value for  Psep*Bt/qar upper limit (eq. 68)\n <LI> (118) fpsep: f-value to ensure separatrix power is less than\n <LI> (119) tesep:  separatrix temperature calculated by the Kallenbach divertor model\n <LI> (120) ttarget: Plasma temperature adjacent to divertor sheath [eV]\n <LI> (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP\n <LI> (122) oh_steel_frac : streel fraction of Central Solenoid\n <LI> (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72)\n <LI> (124) qtargettotal : Power density on target including surface recombination [W/m2]\n <LI> (125) fimp(3) :  Beryllium density fraction relative to electron density\n <LI> (126) fimp(4) :  Carbon density fraction relative to electron density\n <LI> (127) fimp(5) :  Nitrogen fraction relative to electron density\n <LI> (128) fimp(6) :  Oxygen density fraction relative to electron density\n <LI> (129) fimp(7) :  Neon density fraction relative to electron density\n <LI> (130) fimp(8) :  Silicon density fraction relative to electron density\n <LI> (131) fimp(9) :  Argon density fraction relative to electron density\n <LI> (132) fimp(10) :  Iron density fraction relative to electron density\n <LI> (133) fimp(11) :  Nickel density fraction relative to electron density\n <LI> (134) fimp(12) :  Krypton density fraction relative to electron density\n <LI> (135) fimp(13) :  Xenon density fraction relative to electron density\n <LI> (136) fimp(14) :  Tungsten density fraction relative to electron density\n <LI> (137) fplhsep (f-value for equation 73)\n <LI> (138) rebco_thickness : thickness of REBCO layer in tape (m)\n <LI> (139) copper_thick : thickness of copper layer in tape (m)\n <LI> (140) dr_tf_wp : radial thickness of TFC winding pack (m)\n <LI> (141) fcqt : TF coil quench temperature < tmax_croco (f-value for equation 74)\n <LI> (142) nesep : electron density at separatrix [m-3]\n <LI> (143) f_copperA_m2 : TF coil current / copper area < Maximum value\n <LI> (144) fnesep : Eich critical electron density at separatrix\n <LI> (145) fgwped :  fraction of Greenwald density to set as pedestal-top density\n <LI> (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77)\n <LI> (147) freinke : F-value for Reinke detachment criterion (constraint equation 78)\n <LI> (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion\n <LI> (149) fbmaxcs : F-value for max peak CS field (con. 79, itvar 149)\n <LI> (152) fbmaxcs : Ratio of separatrix density to Greenwald density\n <LI> (153) fpdivlim : F-value for minimum pdivt (con. 80)\n <LI> (154) fne0 : F-value for ne(0) > ne(ped) (con. 81)\n <LI> (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only)\n <LI> (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only)\n <LI> (157) fvssu : F-value for available to required start up flux (con. 51)\n <LI> (158) croco_thick : Thickness of CroCo copper tube (m)\n <LI> (159) ftoroidalgap : F-value for toroidalgap >  tftort constraint (con. 82)\n <LI> (160) f_avspace (f-value for equation 83)\n <LI> (161) fbeta_min (f-value for equation 84)\n <LI> (162) r_cp_top : Top outer radius of the centropost (ST only) (m)\n <LI> (163) f_t_turn_tf : f-value for TF coils WP trurn squared dimension constraint\n <LI> (164) f_crypmw : f-value for cryogenic plant power\n <LI> (165) fstr_wp : f-value for TF coil strain absolute value\n <LI> (166) f_copperaoh_m2 : CS coil current /copper area < Maximum value\n <LI> (167) fecrh_ignition: f-value for equation 90\n <LI> (168) EMPTY : Description\n <LI> (169) EMPTY : Description\n <LI> (170) EMPTY : Description\n <LI> (171) EMPTY : Description\n <LI> (172) EMPTY : Description\n <LI> (173) EMPTY : Description\n <LI> (174) EMPTY : Description\n <LI> (175) EMPTY : Description\n\n\n\n",
+        "lablxc": "lablxc(ipnvars) : labels describing iteration variables<UL>\n<br>\n<LI> ( 1) aspect\n  <LI> ( 2) bt\n  <LI> ( 3) rmajor\n <LI> ( 4) te\n <LI> ( 5) beta\n <LI> ( 6) dene\n <LI> ( 7) f_nd_beam_electron\n <LI> ( 8) fbeta_poloidal_eps (f-value for equation 6)\n <LI> ( 9) fdene (f-value for equation 5)\n <LI> (10) hfact\n <LI> (11) pheat\n <LI> (12) oacdcp\n <LI> (13) dr_tf_inboard (NOT RECOMMENDED)\n <LI> (14) fwalld (f-value for equation 8)\n <LI> (15) fvs (f-value for equation 12)\n <LI> (16) dr_cs\n <LI> (17) tdwell\n <LI> (18) q\n <LI> (19) beam_energy\n <LI> (20) tcpav\n <LI> (21) ftburn (f-value for equation 13)\n <LI> (22) NOT USED\n <LI> (23) fcoolcp\n <LI> (24) NOT USED\n <LI> (25) fpnetel (f-value for equation 16)\n <LI> (26) ffuspow (f-value for equation 9)\n <LI> (27) fhldiv (f-value for equation 18)\n <LI> (28) fradpwr (f-value for equation 17), total radiation fraction\n <LI> (29) dr_bore\n <LI> (30) fmva (f-value for equation 19)\n <LI> (31) gapomin\n <LI> (32) frminor (f-value for equation 21)\n <LI> (33) fportsz (f-value for equation 20)\n <LI> (34) fdivcol (f-value for equation 22)\n <LI> (35) fpeakb (f-value for equation 25)\n <LI> (36) fbeta_max (f-value for equation 24)\n <LI> (37) coheof\n <LI> (38) fjohc (f-value for equation 26)\n <LI> (39) fjohc0 (f-value for equation 27)\n <LI> (40) fgamcd (f-value for equation 37)\n <LI> (41) fcohbop\n <LI> (42) dr_cs_tf_gap\n <LI> (43) NOT USED\n <LI> (44) fvsbrnni\n <LI> (45) fqval (f-value for equation 28)\n <LI> (46) fpinj (f-value for equation 30)\n <LI> (47) feffcd\n <LI> (48) fstrcase (f-value for equation 31)\n <LI> (49) fstrcond (f-value for equation 32)\n <LI> (50) fiooic (f-value for equation 33)\n <LI> (51) fvdump (f-value for equation 34)\n <LI> (52) vdalw\n <LI> (53) fjprot (f-value for equation 35)\n <LI> (54) ftmargtf (f-value for equation 36)\n <LI> (55) NOT USED\n <LI> (56) tdmptf\n <LI> (57) thkcas\n <LI> (58) thwcndut\n <LI> (59) fcutfsu\n <LI> (60) cpttf\n <LI> (61) dr_shld_vv_gap_inboard\n <LI> (62) fdtmp (f-value for equation 38)\n <LI> (63) ftpeak (f-value for equation 39)\n <LI> (64) fauxmn (f-value for equation 40)\n <LI> (65) tohs\n <LI> (66) ftohs (f-value for equation 41)\n <LI> (67) ftcycl (f-value for equation 42)\n <LI> (68) fptemp (f-value for equation 44)\n <LI> (69) rcool\n <LI> (70) vcool\n <LI> (71) fq (f-value for equation 45)\n <LI> (72) fipir (f-value for equation 46)\n <LI> (73) dr_fw_plasma_gap_inboard\n <LI> (74) dr_fw_plasma_gap_outboard\n <LI> (75) tfootfi\n <LI> (76) NOT USED\n <LI> (77) NOT USED\n <LI> (78) NOT USED\n <LI> (79) fbeta_poloidal (f-value for equation 48)\n <LI> (80) NOT USED\n <LI> (81) edrive\n <LI> (82) drveff\n <LI> (83) tgain\n <LI> (84) chrad\n <LI> (85) pdrive\n <LI> (86) frrmax (f-value for equation 50)\n <LI> (87) NOT USED\n <LI> (88) NOT USED\n <LI> (89) ftbr (f-value for equation 52)\n <LI> (90) blbuith\n <LI> (91) blbuoth\n <LI> (92) fflutf (f-value for equation 53)\n <LI> (93) dr_shld_inboard\n <LI> (94) dr_shld_outboard\n <LI> (95) fptfnuc (f-value for equation 54)\n <LI> (96) fvvhe (f-value for equation 55)\n <LI> (97) fpsepr (f-value for equation 56)\n <LI> (98) li6enrich\n <LI> (99) NOT USED\n <LI> (100) NOT USED\n <LI> (101) NOT USED\n <LI> (102) fimpvar\n <LI> (103) flhthresh (f-value for equation 15)\n <LI> (104)fr_conducting_wall (f-value for equation 23)\n <LI> (105) fnbshinef (f-value for equation 59)\n <LI> (106) ftmargoh (f-value for equation 60)\n <LI> (107) favail (f-value for equation 61)\n <LI> (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)\n <LI> (109) f_nd_alpha_electron: thermal alpha density / electron density\n <LI> (110) falpha_energy_confinement: Lower limit on f_alpha_energy_confinement the ratio of alpha\n <LI> (111) fniterpump: f-value for constraint that number\n <LI> (112) fzeffmax: f-value for max Zeff (f-value for equation 64)\n <LI> (113) ftaucq: f-value for minimum quench time (f-value for equation 65)\n <LI> (114) fw_channel_length: Length of a single first wall channel\n <LI> (115) fpoloidalpower: f-value for max rate of change of\n <LI> (116) fradwall: f-value for radiation wall load limit (eq. 67)\n <LI> (117) fpsepbqar: f-value for  Psep*Bt/qar upper limit (eq. 68)\n <LI> (118) fpsep: f-value to ensure separatrix power is less than\n <LI> (119) tesep:  separatrix temperature calculated by the Kallenbach divertor model\n <LI> (120) ttarget: Plasma temperature adjacent to divertor sheath [eV]\n <LI> (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP\n <LI> (122) oh_steel_frac : streel fraction of Central Solenoid\n <LI> (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72)\n <LI> (124) qtargettotal : Power density on target including surface recombination [W/m2]\n <LI> (125) fimp(3) :  Beryllium density fraction relative to electron density\n <LI> (126) fimp(4) :  Carbon density fraction relative to electron density\n <LI> (127) fimp(5) :  Nitrogen fraction relative to electron density\n <LI> (128) fimp(6) :  Oxygen density fraction relative to electron density\n <LI> (129) fimp(7) :  Neon density fraction relative to electron density\n <LI> (130) fimp(8) :  Silicon density fraction relative to electron density\n <LI> (131) fimp(9) :  Argon density fraction relative to electron density\n <LI> (132) fimp(10) :  Iron density fraction relative to electron density\n <LI> (133) fimp(11) :  Nickel density fraction relative to electron density\n <LI> (134) fimp(12) :  Krypton density fraction relative to electron density\n <LI> (135) fimp(13) :  Xenon density fraction relative to electron density\n <LI> (136) fimp(14) :  Tungsten density fraction relative to electron density\n <LI> (137) fplhsep (f-value for equation 73)\n <LI> (138) rebco_thickness : thickness of REBCO layer in tape (m)\n <LI> (139) copper_thick : thickness of copper layer in tape (m)\n <LI> (140) dr_tf_wp : radial thickness of TFC winding pack (m)\n <LI> (141) fcqt : TF coil quench temperature < tmax_croco (f-value for equation 74)\n <LI> (142) nesep : electron density at separatrix [m-3]\n <LI> (143) f_copperA_m2 : TF coil current / copper area < Maximum value\n <LI> (144) fnesep : Eich critical electron density at separatrix\n <LI> (145) fgwped :  fraction of Greenwald density to set as pedestal-top density\n <LI> (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77)\n <LI> (147) freinke : F-value for Reinke detachment criterion (constraint equation 78)\n <LI> (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion\n <LI> (149) fbmaxcs : F-value for max peak CS field (con. 79, itvar 149)\n <LI> (152) fbmaxcs : Ratio of separatrix density to Greenwald density\n <LI> (153) fpdivlim : F-value for minimum pdivt (con. 80)\n <LI> (154) fne0 : F-value for ne(0) > ne(ped) (con. 81)\n <LI> (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only)\n <LI> (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only)\n <LI> (157) fvssu : F-value for available to required start up flux (con. 51)\n <LI> (158) croco_thick : Thickness of CroCo copper tube (m)\n <LI> (159) ftoroidalgap : F-value for toroidalgap >  tftort constraint (con. 82)\n <LI> (160) f_avspace (f-value for equation 83)\n <LI> (161) fbeta_min (f-value for equation 84)\n <LI> (162) r_cp_top : Top outer radius of the centropost (ST only) (m)\n <LI> (163) f_t_turn_tf : f-value for TF coils WP trurn squared dimension constraint\n <LI> (164) f_crypmw : f-value for cryogenic plant power\n <LI> (165) fstr_wp : f-value for TF coil strain absolute value\n <LI> (166) f_copperaoh_m2 : CS coil current /copper area < Maximum value\n <LI> (167) fecrh_ignition: f-value for equation 90\n <LI> (168) EMPTY : Description\n <LI> (169) EMPTY : Description\n <LI> (170) EMPTY : Description\n <LI> (171) EMPTY : Description\n <LI> (172) EMPTY : Description\n <LI> (173) EMPTY : Description\n <LI> (174) EMPTY : Description\n <LI> (175) EMPTY : Description\n\n\n\n",
+        "lablxc": "lablxc(ipnvars) : labels describing iteration variables<UL>\n<br>\n<LI> ( 1) aspect\n  <LI> ( 2) bt\n  <LI> ( 3) rmajor\n <LI> ( 4) te\n <LI> ( 5) beta\n <LI> ( 6) dene\n <LI> ( 7) f_nd_beam_electron\n <LI> ( 8) fbeta_poloidal_eps (f-value for equation 6)\n <LI> ( 9) fdene (f-value for equation 5)\n <LI> (10) hfact\n <LI> (11) pheat\n <LI> (12) oacdcp\n <LI> (13) dr_tf_inboard (NOT RECOMMENDED)\n <LI> (14) fwalld (f-value for equation 8)\n <LI> (15) fvs (f-value for equation 12)\n <LI> (16) dr_cs\n <LI> (17) t_between_pulse\n <LI> (18) q\n <LI> (19) beam_energy\n <LI> (20) tcpav\n <LI> (21) ft_burn (f-value for equation 13)\n <LI> (22) NOT USED\n <LI> (23) fcoolcp\n <LI> (24) NOT USED\n <LI> (25) fpnetel (f-value for equation 16)\n <LI> (26) ffuspow (f-value for equation 9)\n <LI> (27) fhldiv (f-value for equation 18)\n <LI> (28) fradpwr (f-value for equation 17), total radiation fraction\n <LI> (29) dr_bore\n <LI> (30) fmva (f-value for equation 19)\n <LI> (31) gapomin\n <LI> (32) frminor (f-value for equation 21)\n <LI> (33) fportsz (f-value for equation 20)\n <LI> (34) fdivcol (f-value for equation 22)\n <LI> (35) fpeakb (f-value for equation 25)\n <LI> (36) fbeta_max (f-value for equation 24)\n <LI> (37) coheof\n <LI> (38) fjohc (f-value for equation 26)\n <LI> (39) fjohc0 (f-value for equation 27)\n <LI> (40) fgamcd (f-value for equation 37)\n <LI> (41) fcohbop\n <LI> (42) dr_cs_tf_gap\n <LI> (43) NOT USED\n <LI> (44) fvsbrnni\n <LI> (45) fqval (f-value for equation 28)\n <LI> (46) fpinj (f-value for equation 30)\n <LI> (47) feffcd\n <LI> (48) fstrcase (f-value for equation 31)\n <LI> (49) fstrcond (f-value for equation 32)\n <LI> (50) fiooic (f-value for equation 33)\n <LI> (51) fvdump (f-value for equation 34)\n <LI> (52) vdalw\n <LI> (53) fjprot (f-value for equation 35)\n <LI> (54) ftmargtf (f-value for equation 36)\n <LI> (55) NOT USED\n <LI> (56) tdmptf\n <LI> (57) thkcas\n <LI> (58) thwcndut\n <LI> (59) fcutfsu\n <LI> (60) cpttf\n <LI> (61) dr_shld_vv_gap_inboard\n <LI> (62) fdtmp (f-value for equation 38)\n <LI> (63) ftpeak (f-value for equation 39)\n <LI> (64) fauxmn (f-value for equation 40)\n <LI> (65) t_current_ramp_up\n <LI> (66) ft_current_ramp_up (f-value for equation 41)\n <LI> (67) ftcycl (f-value for equation 42)\n <LI> (68) fptemp (f-value for equation 44)\n <LI> (69) rcool\n <LI> (70) vcool\n <LI> (71) fq (f-value for equation 45)\n <LI> (72) fipir (f-value for equation 46)\n <LI> (73) dr_fw_plasma_gap_inboard\n <LI> (74) dr_fw_plasma_gap_outboard\n <LI> (75) tfootfi\n <LI> (76) NOT USED\n <LI> (77) NOT USED\n <LI> (78) NOT USED\n <LI> (79) fbetap (f-value for equation 48)\n <LI> (80) NOT USED\n <LI> (81) edrive\n <LI> (82) drveff\n <LI> (83) tgain\n <LI> (84) chrad\n <LI> (85) pdrive\n <LI> (86) frrmax (f-value for equation 50)\n <LI> (87) NOT USED\n <LI> (88) NOT USED\n <LI> (89) ftbr (f-value for equation 52)\n <LI> (90) blbuith\n <LI> (91) blbuoth\n <LI> (92) fflutf (f-value for equation 53)\n <LI> (93) dr_shld_inboard\n <LI> (94) dr_shld_outboard\n <LI> (95) fptfnuc (f-value for equation 54)\n <LI> (96) fvvhe (f-value for equation 55)\n <LI> (97) fpsepr (f-value for equation 56)\n <LI> (98) li6enrich\n <LI> (99) NOT USED\n <LI> (100) NOT USED\n <LI> (101) NOT USED\n <LI> (102) fimpvar\n <LI> (103) flhthresh (f-value for equation 15)\n <LI> (104)fr_conducting_wall (f-value for equation 23)\n <LI> (105) fnbshinef (f-value for equation 59)\n <LI> (106) ftmargoh (f-value for equation 60)\n <LI> (107) favail (f-value for equation 61)\n <LI> (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)\n <LI> (109) f_nd_alpha_electron: thermal alpha density / electron density\n <LI> (110) falpha_energy_confinement: Lower limit on f_alpha_energy_confinement the ratio of alpha\n <LI> (111) fniterpump: f-value for constraint that number\n <LI> (112) fzeffmax: f-value for max Zeff (f-value for equation 64)\n <LI> (113) ftaucq: f-value for minimum quench time (f-value for equation 65)\n <LI> (114) fw_channel_length: Length of a single first wall channel\n <LI> (115) fpoloidalpower: f-value for max rate of change of\n <LI> (116) fradwall: f-value for radiation wall load limit (eq. 67)\n <LI> (117) fpsepbqar: f-value for  Psep*Bt/qar upper limit (eq. 68)\n <LI> (118) fpsep: f-value to ensure separatrix power is less than\n <LI> (119) tesep:  separatrix temperature calculated by the Kallenbach divertor model\n <LI> (120) ttarget: Plasma temperature adjacent to divertor sheath [eV]\n <LI> (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP\n <LI> (122) oh_steel_frac : streel fraction of Central Solenoid\n <LI> (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72)\n <LI> (124) qtargettotal : Power density on target including surface recombination [W/m2]\n <LI> (125) fimp(3) :  Beryllium density fraction relative to electron density\n <LI> (126) fimp(4) :  Carbon density fraction relative to electron density\n <LI> (127) fimp(5) :  Nitrogen fraction relative to electron density\n <LI> (128) fimp(6) :  Oxygen density fraction relative to electron density\n <LI> (129) fimp(7) :  Neon density fraction relative to electron density\n <LI> (130) fimp(8) :  Silicon density fraction relative to electron density\n <LI> (131) fimp(9) :  Argon density fraction relative to electron density\n <LI> (132) fimp(10) :  Iron density fraction relative to electron density\n <LI> (133) fimp(11) :  Nickel density fraction relative to electron density\n <LI> (134) fimp(12) :  Krypton density fraction relative to electron density\n <LI> (135) fimp(13) :  Xenon density fraction relative to electron density\n <LI> (136) fimp(14) :  Tungsten density fraction relative to electron density\n <LI> (137) fplhsep (f-value for equation 73)\n <LI> (138) rebco_thickness : thickness of REBCO layer in tape (m)\n <LI> (139) copper_thick : thickness of copper layer in tape (m)\n <LI> (140) dr_tf_wp : radial thickness of TFC winding pack (m)\n <LI> (141) fcqt : TF coil quench temperature < tmax_croco (f-value for equation 74)\n <LI> (142) nesep : electron density at separatrix [m-3]\n <LI> (143) f_copperA_m2 : TF coil current / copper area < Maximum value\n <LI> (144) fnesep : Eich critical electron density at separatrix\n <LI> (145) fgwped :  fraction of Greenwald density to set as pedestal-top density\n <LI> (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77)\n <LI> (147) freinke : F-value for Reinke detachment criterion (constraint equation 78)\n <LI> (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion\n <LI> (149) fbmaxcs : F-value for max peak CS field (con. 79, itvar 149)\n <LI> (152) fbmaxcs : Ratio of separatrix density to Greenwald density\n <LI> (153) fpdivlim : F-value for minimum pdivt (con. 80)\n <LI> (154) fne0 : F-value for ne(0) > ne(ped) (con. 81)\n <LI> (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only)\n <LI> (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only)\n <LI> (157) fvssu : F-value for available to required start up flux (con. 51)\n <LI> (158) croco_thick : Thickness of CroCo copper tube (m)\n <LI> (159) ftoroidalgap : F-value for toroidalgap >  tftort constraint (con. 82)\n <LI> (160) f_avspace (f-value for equation 83)\n <LI> (161) fbeta_min (f-value for equation 84)\n <LI> (162) r_cp_top : Top outer radius of the centropost (ST only) (m)\n <LI> (163) f_t_turn_tf : f-value for TF coils WP trurn squared dimension constraint\n <LI> (164) f_crypmw : f-value for cryogenic plant power\n <LI> (165) fstr_wp : f-value for TF coil strain absolute value\n <LI> (166) f_copperaoh_m2 : CS coil current /copper area < Maximum value\n <LI> (167) fecrh_ignition: f-value for equation 90\n <LI> (168) EMPTY : Description\n <LI> (169) EMPTY : Description\n <LI> (170) EMPTY : Description\n <LI> (171) EMPTY : Description\n <LI> (172) EMPTY : Description\n <LI> (173) EMPTY : Description\n <LI> (174) EMPTY : Description\n <LI> (175) EMPTY : Description\n\n\n\n",
         "lambda_EU": "Decay length in EUROFER [cm]",
         "lambda_He_VV": "Decay length [cm]",
         "lambda_n_BZ_IB": "Decay length in IB BZ [cm]",
@@ -10198,7 +10194,7 @@
         "nre": "",
         "nsix": "",
         "nsixi": "",
-        "nsweep": "Switch denoting quantity to scan:<UL>\n         <LI> 1  aspect\n         <LI> 2  hldivlim\n         <LI> 3  pnetelin\n         <LI> 4  hfact\n         <LI> 5  oacdcp\n         <LI> 6  walalw\n         <LI> 7  beamfus0\n         <LI> 8  fqval\n         <LI> 9  te\n         <LI> 10 boundu(15: fvs)\n         <LI> 11 beta_norm_max\n         <LI> 12 bootstrap_current_fraction_max (use negative values only)\n         <LI> 13 boundu(10: hfact)\n         <LI> 14 fiooic\n         <LI> 15 fjprot\n         <LI> 16 rmajor\n         <LI> 17 bmxlim\n         <LI> 18 gammax\n         <LI> 19 boundl(16: dr_cs)\n         <LI> 20 t_burn_min\n         <LI> 21 not used\n         <LI> 22 cfactr (N.B. requires iavail=0)\n         <LI> 23 boundu(72: fipir)\n         <LI> 24 powfmax\n         <LI> 25 kappa\n         <LI> 26 triang\n         <LI> 27 tbrmin (for blktmodel > 0 only)\n         <LI> 28 bt\n         <LI> 29 coreradius\n       <LI> 31 taulimit\n         <LI> 32 epsvmc\n         <LI> 33 ttarget\n         <LI> 34 qtargettotal\n         <LI> 35 lambda_q_omp\n         <LI> 36 lambda_target\n         <LI> 37 lcon_factor\n         <LI> 38 Neon upper limit\n         <LI> 39 Argon upper limit\n         <LI> 40 Xenon upper limit\n         <LI> 41 dr_blkt_outboard\n         <LI> 42 Argon fraction fimp(9)\n         <LI> 43 normalised minor radius at which electron cyclotron current drive is maximum\n         <LI> 44 Allowable maximum shear stress (Tresca) in tf coil structural material\n         <LI> 45 Minimum allowable temperature margin ; tf coils\n         <LI> 46 boundu(150) fgwsep\n         <LI> 47 impurity_enrichment(9) Argon impurity enrichment\n         <LI> 48 TF coil - n_pancake (integer turn winding pack)\n         <LI> 49 TF coil - n_layer (integer turn winding pack)\n         <LI> 50 Xenon fraction fimp(13)\n         <LI> 51 Power fraction to lower DN Divertor ftar\n         <LI> 52 SoL radiation fraction\n         <LI> 54 GL_nbti upper critical field at 0 Kelvin\n         <LI> 55 `dr_shld_inboard` : Inboard neutron shield thickness\n         <LI> 56 crypmw_max: Maximum cryogenic power (ixx=164, ixc=87)\n         <LI> 57 `bt` lower boundary\n         <LI> 58 `dr_fw_plasma_gap_inboard` : Inboard plasma-first wall gap\n         <LI> 59 `dr_fw_plasma_gap_outboard` : Outboard plasma-first wall gap\n         <LI> 60 sig_tf_wp_max: Allowable stress in TF Coil conduit (Tresca)\n         <LI> 61 copperaoh_m2_max : CS coil current / copper area\n         <LI> 62 coheof : CS coil current density at EOF\n         <LI> 63 dr_cs : CS thickness (m)\n         <LI> 64 ohhghf : CS height (m) </UL>",
+        "nsweep": "Switch denoting quantity to scan:<UL>\n         <LI> 1  aspect\n         <LI> 2  hldivlim\n         <LI> 3  pnetelin\n         <LI> 4  hfact\n         <LI> 5  oacdcp\n         <LI> 6  walalw\n         <LI> 7  beamfus0\n         <LI> 8  fqval\n         <LI> 9  te\n         <LI> 10 boundu(15: fvs)\n         <LI> 11 beta_norm_max\n         <LI> 12 bootstrap_current_fraction_max (use negative values only)\n         <LI> 13 boundu(10: hfact)\n         <LI> 14 fiooic\n         <LI> 15 fjprot\n         <LI> 16 rmajor\n         <LI> 17 bmxlim\n         <LI> 18 gammax\n         <LI> 19 boundl(16: dr_cs)\n         <LI> 20 t_burn_min\n         <LI> 21 not used\n         <LI> 22 cfactr (N.B. requires iavail=0)\n         <LI> 23 boundu(72: fipir)\n         <LI> 24 powfmax\n         <LI> 25 kappa\n         <LI> 26 triang\n         <LI> 27 tbrmin (for blktmodel > 0 only)\n         <LI> 28 bt\n         <LI> 29 coreradius\n       <LI> 31 f_alpha_energy_confinement_min\n         <LI> 32 epsvmc\n         <LI> 33 ttarget\n         <LI> 34 qtargettotal\n         <LI> 35 lambda_q_omp\n         <LI> 36 lambda_target\n         <LI> 37 lcon_factor\n         <LI> 38 Neon upper limit\n         <LI> 39 Argon upper limit\n         <LI> 40 Xenon upper limit\n         <LI> 41 dr_blkt_outboard\n         <LI> 42 Argon fraction fimp(9)\n         <LI> 43 normalised minor radius at which electron cyclotron current drive is maximum\n         <LI> 44 Allowable maximum shear stress (Tresca) in tf coil structural material\n         <LI> 45 Minimum allowable temperature margin ; tf coils\n         <LI> 46 boundu(150) fgwsep\n         <LI> 47 impurity_enrichment(9) Argon impurity enrichment\n         <LI> 48 TF coil - n_pancake (integer turn winding pack)\n         <LI> 49 TF coil - n_layer (integer turn winding pack)\n         <LI> 50 Xenon fraction fimp(13)\n         <LI> 51 Power fraction to lower DN Divertor ftar\n         <LI> 52 SoL radiation fraction\n         <LI> 54 GL_nbti upper critical field at 0 Kelvin\n         <LI> 55 `dr_shld_inboard` : Inboard neutron shield thickness\n         <LI> 56 crypmw_max: Maximum cryogenic power (ixx=164, ixc=87)\n         <LI> 57 `bt` lower boundary\n         <LI> 58 `dr_fw_plasma_gap_inboard` : Inboard plasma-first wall gap\n         <LI> 59 `dr_fw_plasma_gap_outboard` : Outboard plasma-first wall gap\n         <LI> 60 sig_tf_wp_max: Allowable stress in TF Coil conduit (Tresca)\n         <LI> 61 copperaoh_m2_max : CS coil current / copper area\n         <LI> 62 coheof : CS coil current density at EOF\n         <LI> 63 dr_cs : CS thickness (m)\n         <LI> 64 ohhghf : CS height (m) </UL>",
         "nsweep_2": "nsweep_2 /3/ : switch denoting quantity to scan for 2D scan:",
         "nt": "",
         "ntype": "switch for vacuum pump type:\n<ul>\n<li>=0 - for turbomolecular pump (magnetic bearing) with speed of 2.0 m3/s\n   (1.95 for N2, 1.8 for He, 1.8 for DT)</li>\n<li>=1 - for compound cryopump with nominal speed of 10.0 m3/s\n   (9.0 for N2, 5.0 for He and 25.0 for DT)</li>\n</ul>",
@@ -10353,7 +10349,7 @@
         "poloidalpower": "Poloidal power usage at time t (MW)",
         "porbitlossmw": "neutral beam power lost after ionisation but before thermalisation (orbit loss power) (MW)",
         "p_plasma_outer_rad_mw": "radiation power from outer zone (MW)",
-        "powerht": "heating power (= transport loss power) (MW) used in confinement time calculation",
+        "p_plasma_loss_mw": "heating power (= transport loss power) (MW) used in confinement time calculation",
         "powfmax": "maximum fusion power (MW) (`constraint equation 9`)",
         "fusion_power": "fusion power (MW)",
         "powohres": "central solenoid resistive power during flattop (W)",
@@ -10413,10 +10409,10 @@
         "pthermshld": "",
         "pthrmw": "L-H power threshold for various scalings (MW)\n<ul>\n<li>=1 ITER 1996 scaling: nominal</li>\n<li>=2 ITER 1996 scaling: upper bound</li>\n<li>=3 ITER 1996 scaling: lower bound</li>\n<li>=4 ITER 1997 scaling: excluding elongation</li>\n<li>=5 ITER 1997 scaling: including elongation</li>\n<li>=6 Martin 2008 scaling: nominal</li>\n<li>=7 Martin 2008 scaling: 95% upper bound</li>\n<li>=8 Martin 2008 scaling: 95% lower bound</li>\n<li>=9 Snipes 2000 scaling: nominal</li>\n<li>=10 Snipes 2000 scaling: upper bound</li>\n<li>=11 Snipes 2000 scaling: lower bound</li>\n<li>=12 Snipes 2000 scaling (closed divertor): nominal</li>\n<li>=13 Snipes 2000 scaling (closed divertor): upper bound</li>\n<li>=14 Snipes 2000 scaling (closed divertor): lower bound</li>\n<li>=15 Hubbard et al. 2012 L-I threshold scaling: nominal</li>\n<li>=16 Hubbard et al. 2012 L-I threshold scaling: lower bound</li>\n<li>=17 Hubbard et al. 2012 L-I threshold scaling: upper bound</li>\n<li>=18 Hubbard et al. 2017 L-I threshold scaling</li>\n<li>=19 Martin 2008 aspect ratio corrected scaling: nominal</li>\n<li>=20 Martin 2008 aspect ratio corrected scaling: 95% upper bound</li>\n<li>=21 Martin 2008 aspect ratio corrected scaling: 95% lower bound</li>\n</ul>",
         "ptpdiv": "peak temperature at the plate (eV)",
-        "ptremw": "electron transport power (MW)",
-        "ptrepv": "electron transport power per volume (MW/m3)",
-        "ptrimw": "ion transport power (MW)",
-        "ptripv": "ion transport power per volume (MW/m3)",
+        "p_electron_transport_loss_mw": "electron transport power (MW)",
+        "pden_electron_transport_loss_mw": "electron transport power per volume (MW/m3)",
+        "p_ion_transport_loss_mw": "ion transport power (MW)",
+        "pden_ion_transport_loss_mw": "ion transport power per volume (MW/m3)",
         "pulsetimings": "Switch for pulse timings (if lpulse=1):\n<ul>\n<li>=0, t_current_ramp_up = Ip(MA)/0.1 t_precharge, t_ramp_down = input</li>\n<li>=1, t_current_ramp_up = iteration var or input. t_precharge/t_ramp_down max of input or t_current_ramp_up</li>\n</ul>",
         "pumpareafraction": "area of one pumping port as a fraction of plasma surface area",
         "pumpspeedfactor": "effective pumping speed reduction factor due to duct impedance",
@@ -10731,16 +10727,16 @@
         "tau2": "",
         "taubeam": "neutral beam e-decay lengths to plasma centre",
         "taucq": "allowable TF quench time (s)",
-        "tauee": "electron energy confinement time (sec)",
-        "tauee_in": "Input electron energy confinement time (sec) (`isc=48 only`)",
-        "taueff": "global thermal energy confinement time (sec)",
-        "tauei": "ion energy confinement time (sec)",
+        "t_electron_energy_confinement": "electron energy confinement time (sec)",
+        "tauee_in": "Input electron energy confinement time (sec) (`i_confinement_time=48 only`)",
+        "t_energy_confinement": "global thermal energy confinement time (sec)",
+        "t_ion_energy_confinement": "ion energy confinement time (sec)",
         "taufall": "Lithium Fall Time (s)",
-        "taulimit": "Lower limit on taup/taueff the ratio of alpha particle to energy confinement\n times (`constraint equation 62`)",
+        "f_alpha_energy_confinement_min": "Lower limit on f_alpha_energy_confinement the ratio of alpha particle to energy confinement\n times (`constraint equation 62`)",
         "taumax": "Maximum allowed energy confinement time (s)",
-        "taup": "alpha particle confinement time (sec)",
+        "t_alpha_confinement": "alpha particle confinement time (sec)",
         "tauratio": "tauratio /1.0/ : ratio of He and pellet particle confinement times",
-        "tauscl": "tauscl(ipnlaws) : labels describing energy confinement scaling laws:<UL>\n \n<LI> ( 1)  Neo-Alcator (ohmic)\n <LI> ( 2)  Mirnov (H-mode)\n <LI> ( 3)  Merezkhin-Muhkovatov (L-mode)\n <LI> ( 4)  Shimomura (H-mode)\n <LI> ( 5)  Kaye-Goldston (L-mode)\n <LI> ( 6)  ITER 89-P (L-mode)\n <LI> ( 7)  ITER 89-O (L-mode)\n <LI> ( 8)  Rebut-Lallia (L-mode)\n <LI> ( 9)  Goldston (L-mode)\n <LI> (10)  T10 (L-mode)\n <LI> (11)  JAERI-88 (L-mode)\n <LI> (12)  Kaye-Big Complex (L-mode)\n <LI> (13)  ITER H90-P (H-mode)\n <LI> (14)  ITER Mix (L-mode)\n <LI> (15)  Riedel (L-mode)\n <LI> (16)  Christiansen (L-mode)\n <LI> (17)  Lackner-Gottardi (L-mode)\n <LI> (18)  Neo-Kaye (L-mode)\n <LI> (19)  Riedel (H-mode)\n <LI> (20)  ITER H90-P amended (H-mode)\n <LI> (21)  LHD (stellarator)\n <LI> (22)  Gyro-reduced Bohm (stellarator)\n <LI> (23)  Lackner-Gottardi (stellarator)\n <LI> (24)  ITER-93H (H-mode)\n <LI> (25) OBSOLETE\n <LI> (26)  ITER H-97P ELM-free (H-mode)\n <LI> (27)  ITER H-97P ELMy (H-mode)\n <LI> (28)  ITER-96P (=ITER-97L) (L-mode)\n <LI> (29)  Valovic modified ELMy (H-mode)\n <LI> (30)  Kaye PPPL April 98 (L-mode)\n <LI> (31)  ITERH-PB98P(y) (H-mode)\n <LI> (32)  IPB98(y) (H-mode)\n <LI> (33)  IPB98(y,1) (H-mode)\n <LI> (34)  IPB98(y,2) (H-mode)\n <LI> (35)  IPB98(y,3) (H-mode)\n <LI> (36)  IPB98(y,4) (H-mode)\n <LI> (37)  ISS95 (stellarator)\n <LI> (38)  ISS04 (stellarator)\n <LI> (39)  DS03 (H-mode)\n <LI> (40)  Murari et al non-power law (H-mode)\n <LI> (41)  Petty 2008 (H-mode)\n <LI> (42)  Lang et al. 2012 (H-mode)\n <LI> (43)  Hubbard 2017 (I-mode) - nominal\n <LI> (44)  Hubbard 2017 (I-mode) - lower bound\n <LI> (45)  Hubbard 2017 (I-mode) - upper bound\n <LI> (46)  NSTX (H-mode; Spherical tokamak)\n <LI> (47)  NSTX-Petty08 Hybrid (H-mode)\n <LI> (48)  Use input tauee_in </UL>\n\n\n",
+        "labels_confinement_scalings": "labels_confinement_scalings(n_confinement_scalings) : labels describing energy confinement scaling laws:<UL>\n \n<LI> ( 1)  Neo-Alcator (ohmic)\n <LI> ( 2)  Mirnov (H-mode)\n <LI> ( 3)  Merezkhin-Muhkovatov (L-mode)\n <LI> ( 4)  Shimomura (H-mode)\n <LI> ( 5)  Kaye-Goldston (L-mode)\n <LI> ( 6)  ITER 89-P (L-mode)\n <LI> ( 7)  ITER 89-O (L-mode)\n <LI> ( 8)  Rebut-Lallia (L-mode)\n <LI> ( 9)  Goldston (L-mode)\n <LI> (10)  T10 (L-mode)\n <LI> (11)  JAERI-88 (L-mode)\n <LI> (12)  Kaye-Big Complex (L-mode)\n <LI> (13)  ITER H90-P (H-mode)\n <LI> (14)  ITER Mix (L-mode)\n <LI> (15)  Riedel (L-mode)\n <LI> (16)  Christiansen (L-mode)\n <LI> (17)  Lackner-Gottardi (L-mode)\n <LI> (18)  Neo-Kaye (L-mode)\n <LI> (19)  Riedel (H-mode)\n <LI> (20)  ITER H90-P amended (H-mode)\n <LI> (21)  LHD (stellarator)\n <LI> (22)  Gyro-reduced Bohm (stellarator)\n <LI> (23)  Lackner-Gottardi (stellarator)\n <LI> (24)  ITER-93H (H-mode)\n <LI> (25) OBSOLETE\n <LI> (26)  ITER H-97P ELM-free (H-mode)\n <LI> (27)  ITER H-97P ELMy (H-mode)\n <LI> (28)  ITER-96P (=ITER-97L) (L-mode)\n <LI> (29)  Valovic modified ELMy (H-mode)\n <LI> (30)  Kaye PPPL April 98 (L-mode)\n <LI> (31)  ITERH-PB98P(y) (H-mode)\n <LI> (32)  IPB98(y) (H-mode)\n <LI> (33)  IPB98(y,1) (H-mode)\n <LI> (34)  IPB98(y,2) (H-mode)\n <LI> (35)  IPB98(y,3) (H-mode)\n <LI> (36)  IPB98(y,4) (H-mode)\n <LI> (37)  ISS95 (stellarator)\n <LI> (38)  ISS04 (stellarator)\n <LI> (39)  DS03 (H-mode)\n <LI> (40)  Murari et al non-power law (H-mode)\n <LI> (41)  Petty 2008 (H-mode)\n <LI> (42)  Lang et al. 2012 (H-mode)\n <LI> (43)  Hubbard 2017 (I-mode) - nominal\n <LI> (44)  Hubbard 2017 (I-mode) - lower bound\n <LI> (45)  Hubbard 2017 (I-mode) - upper bound\n <LI> (46)  NSTX (H-mode; Spherical tokamak)\n <LI> (47)  NSTX-Petty08 Hybrid (H-mode)\n <LI> (48)  Use input tauee_in </UL>\n\n\n",
         "tbeamin": "permitted neutral beam e-decay lengths to plasma centre",
         "tbeta": "temperature profile index beta  (`ipedestal=1,2`)",
         "tbktrepl": "time taken to replace blanket (y) (`iavail=1`)",
@@ -10860,7 +10856,7 @@
         "toolow": "Used for reporting error in function pimpden",
         "toroidalgap": "Minimal distance between two toroidal coils. (m)",
         "total_costs": "",
-        "total_energy_conf_time": "",
+        "t_energy_confinement_beta": "",
         "total_loss_power": "",
         "e_plasma_beta": "",
         "totalpowerlost": "Total power lost due to radiation, ionisation and recombination [W]",
@@ -11450,7 +11446,7 @@
             "name": "Minimum availability value"
         },
         "62": {
-            "name": "taup"
+            "name": "t_alpha_confinement"
         },
         "63": {
             "name": "The number of ITER"
@@ -12915,7 +12911,7 @@
             "lb": 0.001,
             "ub": 1.0
         },
-        "ftaulimit": {
+        "falpha_energy_confinement": {
             "lb": 0.001,
             "ub": 1.0
         },
@@ -13387,10 +13383,6 @@
             "lb": 0,
             "ub": 1
         },
-        "iinvqd": {
-            "lb": 0,
-            "ub": 1
-        },
         "ilhthresh": {
             "lb": 1,
             "ub": 21
@@ -13479,7 +13471,7 @@
             "lb": 0,
             "ub": 1
         },
-        "iradloss": {
+        "i_rad_loss": {
             "lb": 0,
             "ub": 2
         },
@@ -14423,7 +14415,7 @@
             "lb": 0.0,
             "ub": 100.0
         },
-        "taulimit": {
+        "f_alpha_energy_confinement_min": {
             "lb": 1.0,
             "ub": 100.0
         },
@@ -15488,7 +15480,7 @@
             "lb": 0.001,
             "ub": 1.0
         },
-        "ftaulimit": {
+        "falpha_energy_confinement": {
             "lb": 0.001,
             "ub": 1.0
         },
@@ -15808,7 +15800,7 @@
         "fstrcase": 1.0,
         "fstrcond": 1.0,
         "ftaucq": 1.0,
-        "ftaulimit": 1.0,
+        "falpha_energy_confinement": 1.0,
         "ftbr": 1.0,
         "ft_burn": 1.0,
         "ftcycl": 1.0,
@@ -15921,7 +15913,7 @@
         },
         "110": {
             "lb": 0.001,
-            "name": "ftaulimit",
+            "name": "falpha_energy_confinement",
             "ub": 1.0
         },
         "111": {
@@ -16676,7 +16668,7 @@
         "108": "breeder_f",
         "109": "f_nd_alpha_electron",
         "11": "pheat",
-        "110": "ftaulimit",
+        "110": "falpha_energy_confinement",
         "111": "fniterpump",
         "112": "fzeffmax",
         "113": "ftaucq",
@@ -16921,7 +16913,7 @@
         "fstrcase": "48",
         "fstrcond": "49",
         "ftaucq": "113",
-        "ftaulimit": "110",
+        "falpha_energy_confinement": "110",
         "ftbr": "89",
         "ft_burn": "21",
         "ftcycl": "67",
@@ -17469,8 +17461,8 @@
             "t_current_ramp_up_min",
             "vvhealw",
             "walalw",
-            "taulimit",
-            "ftaulimit",
+            "f_alpha_energy_confinement_min",
+            "falpha_energy_confinement",
             "fniterpump",
             "zeffmax",
             "fpoloidalpower",
@@ -19040,7 +19032,7 @@
             "rad_fraction_LCFS",
             "e_plasma_beta",
             "total_loss_power",
-            "total_energy_conf_time",
+            "t_energy_confinement_beta",
             "ptarmw",
             "lambdaio",
             "drsep",
@@ -19060,7 +19052,7 @@
             "first_call"
         ],
         "physics_variables": [
-            "ipnlaws",
+            "n_confinement_scalings",
             "m_beam_amu",
             "m_fuel_amu",
             "m_ions_total_amu",
@@ -19101,7 +19093,7 @@
             "nd_ions_total",
             "dnla",
             "nd_protons",
-            "dntau",
+            "ntau",
             "nd_impurities",
             "dndrho_max",
             "dtdrho_max",
@@ -19142,7 +19134,6 @@
             "i_beta_fast_alpha",
             "igeom",
             "ignite",
-            "iinvqd",
             "ipedestal",
             "i_pfirsch_schluter_current",
             "neped",
@@ -19158,9 +19149,9 @@
             "teped",
             "tesep",
             "iprofile",
-            "iradloss",
-            "isc",
-            "tauscl",
+            "i_rad_loss",
+            "i_confinement_time",
+            "labels_confinement_scalings",
             "i_plasma_wall_gap",
             "i_plasma_geometry",
             "itart",
@@ -19168,8 +19159,8 @@
             "iwalld",
             "kappa",
             "kappa95",
-            "kappaa",
-            "kappaa_IPB",
+
+            "kappa_ipb",
             "ne0",
             "ni0",
             "m_s_limit",
@@ -19209,7 +19200,7 @@
             "neutron_power_density_plasma",
             "p_plasma_ohmic_mw",
             "pden_plasma_ohmic_mw",
-            "powerht",
+            "p_plasma_loss_mw",
             "fusion_power",
             "len_plasma_poloidal",
             "p_plasma_rad_mw",
@@ -19221,11 +19212,11 @@
             "ilhthresh",
             "plhthresh",
             "pthrmw",
-            "ptremw",
-            "ptrepv",
-            "ptrimw",
+            "p_electron_transport_loss_mw",
+            "pden_electron_transport_loss_mw",
+            "p_ion_transport_loss_mw",
             "pscalingmw",
-            "ptripv",
+            "pden_ion_transport_loss_mw",
             "q",
             "q0",
             "q95",
@@ -19253,11 +19244,11 @@
             "a_plasma_surface_outboard",
             "i_single_null",
             "f_sync_reflect",
-            "tauee",
+            "t_electron_energy_confinement",
             "tauee_in",
-            "taueff",
-            "tauei",
-            "taup",
+            "t_energy_confinement",
+            "t_ion_energy_confinement",
+            "t_alpha_confinement",
             "te",
             "te0",
             "ten",
@@ -19928,7 +19919,7 @@
         "28": "bt",
         "29": "coreradius",
         "3": "pnetelin",
-        "31": "taulimit",
+        "31": "f_alpha_energy_confinement_min",
         "32": "epsvmc",
         "33": "ttarget",
         "34": "qtargettotal",
@@ -20352,7 +20343,7 @@
         "fstrcond": "real_variable",
         "ftar": "real_variable",
         "ftaucq": "real_variable",
-        "ftaulimit": "real_variable",
+        "falpha_energy_confinement": "real_variable",
         "ftbr": "real_variable",
         "ft_burn": "real_variable",
         "ftcycl": "real_variable",
@@ -20473,7 +20464,6 @@
         "ifueltyp": "int_variable",
         "igeom": "int_variable",
         "ignite": "int_variable",
-        "iinvqd": "int_variable",
         "ilhthresh": "int_variable",
         "ilw_smelter_h": "real_variable",
         "ilw_smelter_l": "real_variable",
@@ -20498,11 +20488,11 @@
         "iprimshld": "int_variable",
         "iprofile": "int_variable",
         "i_pfirsch_schluter_current": "int_variable",
-        "iradloss": "int_variable",
+        "i_rad_loss": "int_variable",
         "ireactor": "int_variable",
         "irefprop": "int_variable",
         "irfcd": "int_variable",
-        "isc": "int_variable",
+        "i_confinement_time": "int_variable",
         "iscenr": "int_variable",
         "i_plasma_wall_gap": "int_variable",
         "i_plasma_geometry": "int_variable",
@@ -20751,7 +20741,7 @@
         "target_spread": "real_variable",
         "targetangle": "real_variable",
         "tauee_in": "real_variable",
-        "taulimit": "real_variable",
+        "f_alpha_energy_confinement_min": "real_variable",
         "taumax": "real_variable",
         "tauratio": "real_variable",
         "tbeamin": "real_variable",
diff --git a/tests/regression/input_files/large_tokamak.IN.DAT b/tests/regression/input_files/large_tokamak.IN.DAT
index 74c517f11c..6a65d375bc 100644
--- a/tests/regression/input_files/large_tokamak.IN.DAT
+++ b/tests/regression/input_files/large_tokamak.IN.DAT
@@ -151,11 +151,11 @@ icc = 60
 ixc = 106 * ftmargoh
 tmargmin_cs = 1.5
 
-* Lower limit on taup/taueff (ratio alpha particle/energy confinement times) *
+* Lower limit on f_alpha_energy_confinement (ratio alpha particle/energy confinement times) *
 *-------------------------------------------------------------------------------*
 icc = 62 
-ixc = 110 * ftaulimit
-taulimit = 5.0
+ixc = 110 * falpha_energy_confinement
+f_alpha_energy_confinement_min = 5.0
 
 * dump time constraint for VV stresses *
 *--------------------------------------*
@@ -386,9 +386,6 @@ i_density_limit = 7
 * Switch for fast alpha pressure calculation
 i_beta_fast_alpha = 1
 
-* Switch for inverse quadrature in l-mode scaling laws 5 and 9
-iinvqd = 1
-
 * Switch for pedestal profiles
 ipedestal = 1
 
@@ -420,7 +417,7 @@ tesep = 0.1
 iprofile = 1
 
 * Switch for energy confinement time scaling law
-isc = 34
+i_confinement_time = 34
 
 * Safety factor on axis
 q0 = 1.0
diff --git a/tests/regression/input_files/large_tokamak_nof.IN.DAT b/tests/regression/input_files/large_tokamak_nof.IN.DAT
index 8c2cd0d8ea..26c75bbcc9 100644
--- a/tests/regression/input_files/large_tokamak_nof.IN.DAT
+++ b/tests/regression/input_files/large_tokamak_nof.IN.DAT
@@ -113,10 +113,10 @@ tmargmin = 1.5
 icc = 60
 tmargmin_cs = 1.5
 
-* Lower limit on taup/taueff (ratio alpha particle/energy confinement times) *
+* Lower limit on f_alpha_energy_confinement (ratio alpha particle/energy confinement times) *
 *-------------------------------------------------------------------------------*
 icc = 62 
-taulimit = 5.0
+f_alpha_energy_confinement_min = 5.0
 
 * dump time constraint for VV stresses *
 *--------------------------------------*
@@ -368,9 +368,6 @@ i_density_limit = 7
 * Switch for fast alpha pressure calculation
 i_beta_fast_alpha = 1
 
-* Switch for inverse quadrature in l-mode scaling laws 5 and 9
-iinvqd = 1
-
 * Switch for pedestal profiles
 ipedestal = 1
 
@@ -402,7 +399,7 @@ tesep = 0.1
 iprofile = 1
 
 * Switch for energy confinement time scaling law
-isc = 34
+i_confinement_time = 34
 
 * Safety factor on axis
 q0 = 1.0
diff --git a/tests/regression/input_files/large_tokamak_once_through.IN.DAT b/tests/regression/input_files/large_tokamak_once_through.IN.DAT
index 174aadcf88..21603dfa0b 100644
--- a/tests/regression/input_files/large_tokamak_once_through.IN.DAT
+++ b/tests/regression/input_files/large_tokamak_once_through.IN.DAT
@@ -28,7 +28,7 @@ icc = 34 * Dump voltage upper limit
 icc = 35 * J_winding pack
 icc = 36 * TF coil temperature margin lower limit
 icc = 60 * Central solenoid temperature margin lower limit
-icc = 62 * taup
+icc = 62 * t_alpha_confinement
 icc = 65 * Dump time set by VV loads
 icc = 72 * central solenoid shear stress limit
 icc = 81 * Ne
@@ -143,7 +143,7 @@ powfmax  = 3000 * maximum fusion power (MW) (`constraint equation 9`)
 psepbqarmax = 10.0 * maximum ratio of Psep*Bt/qAR (MWT/m) (`constraint equation 68`)
 t_burn_min   = 7200.0 * minimum burn time (s) (KE - no longer itv;; see issue #706)
 walalw   = 2.0 * allowable neutron wall-load (MW/m2) (`constraint equation 8`)
-taulimit = 5.0 * Lower limit on taup/taueff the ratio of alpha particle to energy confinement
+f_alpha_energy_confinement_min = 5.0 * Lower limit on f_alpha_energy_confinement the ratio of alpha particle to energy confinement
 
 *-------------------Constraints--------------------*
 
@@ -329,7 +329,6 @@ i_beta_component   = 1 * switch for beta limit scaling (`constraint equation 24`
 i_plasma_current = 4 * switch for plasma current scaling to use
 i_density_limit   = 7 * switch for density limit to enforce (`constraint equation 5`)
 i_beta_fast_alpha = 1 * switch for fast alpha pressure calculation
-iinvqd   = 1 * switch for inverse quadrature in L-mode scaling laws 5 and 9;
 ipedestal = 1 * switch for pedestal profiles;
 neped    = 0.5e20 * electron density of pedestal [m-3] (`ipedestal==1)
 nesep    = 0.2e20 * electron density at separatrix [m-3] (`ipedestal==1)
@@ -340,7 +339,7 @@ tbeta    = 2.0 * temperature profile index beta  (`ipedestal==1)
 teped    = 5.5 * electron temperature of pedestal (keV) (`ipedestal==1')
 tesep    = 0.1 * electron temperature at separatrix (keV) (`ipedestal==1`) calculated if reinke
 iprofile = 1 * switch for current profile consistency;
-isc      = 34 * switch for energy confinement time scaling law (see description in `tauscl`)
+i_confinement_time      = 34 * switch for energy confinement time scaling law (see description in `labels_confinement_scalings`)
 i_plasma_geometry   = 0 * switch for plasma cross-sectional shape calculation;
 kappa    = 1.85 * plasma separatrix elongation (calculated if `i_plasma_geometry = 1-5; 7 or 9-10`)
 q        = 3.7339078193128556 * Safety factor 'near' plasma edge (`iteration variable 18`) equal to q95
diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT
index c45fb0f3ae..6f9b8892d7 100644
--- a/tests/regression/input_files/st_regression.IN.DAT
+++ b/tests/regression/input_files/st_regression.IN.DAT
@@ -79,7 +79,7 @@ icc = 2
 *icc = 4
 * DESCRIPTION:   Global power balance for electrons
 * JUSTIFICATION: Not recommended for use 
-* VARIABLES:     iradloss,ignite,pinjemw, Rest calculated in-situ
+* VARIABLES:     i_rad_loss,ignite,pinjemw, Rest calculated in-situ
 
 *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Performance ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 *‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
@@ -401,7 +401,7 @@ q0 = 2.0
 * DESCRIPTION:   Switch for ignited plasma assumption
 * JUSTIFICATION: Non ignited plasma, default = Not ignited
 
-*isc = 
+*i_confinement_time = 
 * DESCRIPTION:   Switch for confinement scaling law (default=34, IPB98(y,2))
 * JUSTIFICATION: Not set, assuming default value
 
@@ -433,12 +433,8 @@ boundu(21) = 10.0
 * JUSTIFICATION: Not setting a limit on confinement time. 
 
 *tauee_in = 
-* DESCRIPTION:   Input electron energy confinement time (sec) (isc=49 only)'
-* JUSTIFICATION: Not set, not ussing isc = 49.
-
-*iinvqd = 
-* DESCRIPTION:   Switch for inverse quadrature in L-mode scaling laws 5 and 9
-* JUSTIFICATION: Not used, L mode plasma
+* DESCRIPTION:   Input electron energy confinement time (sec) (i_confinement_time=49 only)'
+* JUSTIFICATION: Not set, not ussing i_confinement_time = 49.
 
 *ilhthresh = 
 * DESCRIPTION:   Switch for L-H power threshold to enforce
@@ -451,18 +447,18 @@ boundu(21) = 10.0
 *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 icc = 62
-* DESCRIPTION:   taup/taueff ratio of particle to energy confinement times
+* DESCRIPTION:   f_alpha_energy_confinement ratio of particle to energy confinement times
 * JUSTIFICATION: Used to constrain helium fraction
-* VARIABLES:     taueff,taup calculated in-situ
+* VARIABLES:     t_energy_confinement,t_alpha_confinement calculated in-situ
 
 ixc = 110
-ftaulimit = 1.0
+falpha_energy_confinement = 1.0
 boundl(110) = 0.01
 boundu(110) = 1.0
-* DESCRIPTION:   f-value for lower limit on taup/taueff the ratio of alpha particle to energy confinement times
+* DESCRIPTION:   f-value for lower limit on f_alpha_energy_confinement the ratio of alpha particle to energy confinement times
 * JUSTIFICATION: Calculate He fraction consistent with tau ratio
 
-taulimit = 5.0 
+f_alpha_energy_confinement_min = 5.0 
 * DESCRIPTION:   Ratio of Alpha Particle to Energy Confinement times (icc=62)
 * JUSTIFICATION: Default based on JET
 
@@ -599,7 +595,7 @@ f_sync_reflect = 0.6
 * DESCRIPTION:   Plasma synchrotron radiation wall reflectivity factor
 * JUSTIFICATION: 
 
-*iradloss = 
+*i_rad_loss = 
 * DESCRIPTION:   Switch for radiation loss term inclusion in power balance (default = 1)
 * =0 total power lost is scaling power plus radiation
 * =1 total power lost is scaling power plus core radiation only
diff --git a/tests/regression/input_files/stellarator.IN.DAT b/tests/regression/input_files/stellarator.IN.DAT
index bbeb36f2ad..b5cca40d12 100644
--- a/tests/regression/input_files/stellarator.IN.DAT
+++ b/tests/regression/input_files/stellarator.IN.DAT
@@ -77,7 +77,7 @@ boundl(169) = 4.
 boundu(169) = 35.
 *12
 ixc = 109 * itv_f_nd_alpha_electron
-ftaulimit = 1.
+falpha_energy_confinement = 1.
 boundl(109) = 0.0001
 boundu(109) = 0.4
 
@@ -93,7 +93,7 @@ f_alpha_plasma = 0.95    * fast particle fraction
 f_nd_alpha_electron = 0.144    * thermal alpha density / electron density
 fradpwr = 1      * needed to control radiation power
 epsfcn = 0.0001  * convergence important to start with 10^-4, 10^-3 is NOT sufficient to match the constraint resonably well!!
-taulimit = 6     * tau_He/tau_E
+f_alpha_energy_confinement_min = 6     * tau_He/tau_E
 fhldiv = 0.8     * f value for divertor heat load
 fradwall = 1.0   * f value for radiation wall load
 te0_ecrh_achievable = 15.6203 * keV
@@ -126,10 +126,10 @@ rmajor = 22.16 *Plasma major radius (m)
 aspect = 10.1 *Aspect ratio
 
 ignite = 1     *Switch for ignition assumption (1: Ignited)
-iinvqd = 1     *Switch for inverse quadrature in L-mode scaling laws 5 and 9 (1: Inverse quadrature with Neo-Alcator tau-E used)
+
 ipedestal = 0  *Switch for pedestal profiles (0: Parabolic Profiles)
-iradloss = 1   *Switch for radiation loss term usage in power balance (1: Total power lost is scaling power plus core radiation only)
-isc = 38       *Switch for energy confinement time scaling law (38: ISS04, 49: ISS04-Gyro-Bohm)
+i_rad_loss = 1   *Switch for radiation loss term usage in power balance (1: Total power lost is scaling power plus core radiation only)
+i_confinement_time = 38       *Switch for energy confinement time scaling law (38: ISS04, 49: ISS04-Gyro-Bohm)
 kappa = 1.001  *Plasma separatrix elongation
 f_sync_reflect = 0.6    *Synchrotron wall reflectivity factor
 te = 6.019 *Volume averaged electron temperature (keV)
diff --git a/tests/unit/data/large_tokamak_IN.DAT b/tests/unit/data/large_tokamak_IN.DAT
index ad60bc2746..4a63fddb86 100644
--- a/tests/unit/data/large_tokamak_IN.DAT
+++ b/tests/unit/data/large_tokamak_IN.DAT
@@ -151,11 +151,11 @@ icc = 60
 ixc = 106 * ftmargoh
 tmargmin_cs = 1.5
 
-* Lower limit on taup/taueff (ratio alpha particle/energy confinement times) *
+* Lower limit on f_alpha_energy_confinement (ratio alpha particle/energy confinement times) *
 *-------------------------------------------------------------------------------*
 icc = 62 
-ixc = 110 * ftaulimit
-taulimit = 5.0
+ixc = 110 * falpha_energy_confinement
+f_alpha_energy_confinement_min = 5.0
 
 * dump time constraint for VV stresses *
 *--------------------------------------*
@@ -386,8 +386,6 @@ i_density_limit = 7
 * Switch for fast alpha pressure calculation
 i_beta_fast_alpha = 1
 
-* Switch for inverse quadrature in l-mode scaling laws 5 and 9
-iinvqd = 1
 
 * Switch for pedestal profiles
 ipedestal = 1
@@ -420,7 +418,7 @@ tesep = 0.1
 iprofile = 1
 
 * Switch for energy confinement time scaling law
-isc = 34
+i_confinement_time = 34
 
 * Safety factor on axis
 q0 = 1.0
diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT
index a9cde9b9db..d6407457eb 100644
--- a/tests/unit/data/large_tokamak_MFILE.DAT
+++ b/tests/unit/data/large_tokamak_MFILE.DAT
@@ -173,7 +173,7 @@
  J_winding_pack/J_protection_limit_normalised_residue____________________ (eq_con035)___________________      2.5260E-08    
  TF_coil_temp._margin_lower_limit__normalised_residue____________________ (eq_con036)___________________     -5.6001E-07    
  CS_temperature_margin_lower_limit_normalised_residue____________________ (eq_con060)___________________      2.0134E-08    
- taup/taueff_______________________normalised_residue____________________ (eq_con062)___________________      8.9807E-09    
+ t_alpha_confinement/taueff_______________________normalised_residue____________________ (eq_con062)___________________      8.9807E-09    
  Dump_time_set_by_VV_stress________normalised_residue____________________ (eq_con065)___________________     -2.4337E-07    
  CS_Tresca_yield_criterion_________normalised_residue____________________ (eq_con072)___________________      9.6351E-09    
  ne0_>_neped_______________________normalised_residue____________________ (eq_con081)___________________     -4.2434E-10    
@@ -449,8 +449,8 @@
  Fraction_of_alpha_power_deposited_in_plasma_____________________________ (falpha)______________________      9.5000E-01    
  Fraction_of_alpha_power_to_electrons____________________________________ (falpe)_______________________      7.1742E-01    
  Fraction_of_alpha_power_to_ions_________________________________________ (falpi)_______________________      2.8258E-01    
- Ion_transport_(MW)______________________________________________________ (ptrimw)______________________      1.3990E+02 OP 
- Electron_transport_(MW)_________________________________________________ (ptremw)______________________      1.5739E+02 OP 
+ Ion_transport_(MW)______________________________________________________ (p_ion_transport_loss_mw)______________________      1.3990E+02 OP 
+ Electron_transport_(MW)_________________________________________________ (p_electron_transport_loss_mw)______________________      1.5739E+02 OP 
  Injection_power_to_ions_(MW)____________________________________________ (pinjimw)_____________________      0.0000E+00 OP 
  Injection_power_to_electrons_(MW)_______________________________________ (pinjemw)_____________________      7.9710E+01 OP 
  Ignited_plasma_switch_(0=not_ignited,_1=ignited)________________________ (ignite)______________________              0    
@@ -481,23 +481,23 @@
  L-H_threshold_power_(enforced)_(MW)_____________________________________ (boundl(103)*plhthresh)_______      9.7733E+01 OP 
  L-H_threshold_power_(MW)________________________________________________ (plhthresh)___________________      9.7733E+01 OP 
  Confinement_H_factor____________________________________________________ (hfact)_______________________      1.1976E+00 ITV
- Global_thermal_energy_confinement_time_(s)______________________________ (taueff)______________________      3.2080E+00    
- Ion_energy_confinement_time_(s)_________________________________________ (tauei)_______________________      3.2080E+00    
- Electron_energy_confinement_time_(s)____________________________________ (tauee)_______________________      3.2080E+00    
- n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (dntau)_______________________      2.5706E+20 OP 
- Triple_product__(keV_s/m3)______________________________________________ (dntau*te)____________________      3.2284E+21 OP 
- Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (powerht)_____________________      2.9729E+02 OP 
- Switch_for_radiation_loss_term_usage_in_power_balance___________________ (iradloss)____________________              1    
+ Global_thermal_energy_confinement_time_(s)______________________________ (t_energy_confinement)______________________      3.2080E+00    
+ Ion_energy_confinement_time_(s)_________________________________________ (t_ion_energy_confinement)_______________________      3.2080E+00    
+ Electron_energy_confinement_time_(s)____________________________________ (t_electron_energy_confinement)_______________________      3.2080E+00    
+ n.tau_=_Volume-average_electron_density_x_Energy_confinement_time_(s/m3) (ntau)_______________________      2.5706E+20 OP 
+ Triple_product__(keV_s/m3)______________________________________________ (nTtau)____________________      3.2284E+21 OP 
+ Transport_loss_power_assumed_in_scaling_law_(MW)________________________ (p_plasma_loss_mw)_____________________      2.9729E+02 OP 
+ Switch_for_radiation_loss_term_usage_in_power_balance___________________ (i_rad_loss)____________________              1    
  Radiation_power_subtracted_from_plasma_power_balance_(MW)_______________ ______________________________      9.1277E+01 OP 
  H*_non-radiation_corrected______________________________________________ (hstar)_______________________      1.1022E+00    
- Alpha_particle_confinement_time_(s)_____________________________________ (taup)________________________      2.2016E+01    
- Alpha_particle/energy_confinement_time_ratio____________________________ (taup/taueff)_________________      6.8629E+00    
- Lower_limit_on_taup/taueff______________________________________________ (taulimit)____________________      5.0000E+00    
- Total_energy_confinement_time_including_radiation_loss_(s)______________ (total_energy_conf_time)______      2.8098E+00    
+ Alpha_particle_confinement_time_(s)_____________________________________ (t_alpha_confinement)________________________      2.2016E+01    
+ Alpha_particle/energy_confinement_time_ratio____________________________ (f_alpha_energy_confinement)_________________      6.8629E+00    
+ Lower_limit_on_taup/taueff______________________________________________ (f_alpha_energy_confinement_min)____________________      5.0000E+00    
+ Total_energy_confinement_time_including_radiation_loss_(s)______________ (t_energy_confinement_beta)______      2.8098E+00    
  Normalized_plasma_pressure_beta_as_defined_by_McDonald_et_al____________ (beta_mcdonald)_______________      3.3909E-02 OP 
  Normalized_ion_Larmor_radius____________________________________________ (rho_star)____________________      1.9482E-03 OP 
  Normalized_collisionality_______________________________________________ (nu_star)_____________________      3.7112E-03 OP 
- Volume_measure_of_elongation____________________________________________ (kappaa_IPB)__________________      1.6815E+00 OP 
+ Volume_measure_of_elongation____________________________________________ (kappa_ipb)__________________      1.6815E+00 OP 
  Total_volt-second_requirement_(Wb)______________________________________ (vsstt)_______________________      5.5011E+02 OP 
  Inductive_volt-seconds_(Wb)_____________________________________________ (vsind)_______________________      2.3534E+02 OP 
  Ejima_coefficient_______________________________________________________ (gamma)_______________________      3.0000E-01    
@@ -1342,11 +1342,11 @@ icc = 60
 ixc = 106 * ftmargoh
 tmargmin_cs = 1.5
 
-* Lower limit on taup/taueff (ratio alpha particle/energy confinement times) *
+* Lower limit on f_alpha_energy_confinement (ratio alpha particle/energy confinement times) *
 *-------------------------------------------------------------------------------*
 icc = 62 
-ixc = 110 * ftaulimit
-taulimit = 5.0
+ixc = 110 * falpha_energy_confinement
+f_alpha_energy_confinement_min = 5.0
 
 * dump time constraint for VV stresses *
 *--------------------------------------*
@@ -1577,8 +1577,6 @@ i_density_limit = 7
 * Switch for fast alpha pressure calculation
 i_beta_fast_alpha = 1
 
-* Switch for inverse quadrature in l-mode scaling laws 5 and 9
-iinvqd = 1
 
 * Switch for pedestal profiles
 ipedestal = 1
@@ -1611,7 +1609,7 @@ tesep = 0.1
 iprofile = 1
 
 * Switch for energy confinement time scaling law
-isc = 34
+i_confinement_time = 34
 
 * Safety factor on axis
 q0 = 1.0
diff --git a/tests/unit/test_confinement_time.py b/tests/unit/test_confinement_time.py
new file mode 100644
index 0000000000..825d033c6a
--- /dev/null
+++ b/tests/unit/test_confinement_time.py
@@ -0,0 +1,193 @@
+import pytest
+
+from process import confinement_time as conf
+
+
+@pytest.mark.parametrize(
+    "func, args, expected",
+    [
+        (conf.neo_alcator_confinement_time, (1.0, 1.0, 1.0, 1.0), 0.07),
+        (conf.mirnov_confinement_time, (1.0, 1.0, 1.0), 0.2),
+        (
+            conf.merezhkin_muhkovatov_confinement_time,
+            (1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0),
+            0.011067971810589328,
+        ),
+        (conf.shimomura_confinement_time, (1.0, 1.0, 1.0, 1.0, 1.0), 0.045),
+        (
+            conf.kaye_goldston_confinement_time,
+            (1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0),
+            0.04490731195102493,
+        ),
+        (
+            conf.iter_89p_confinement_time,
+            (1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0),
+            0.048,
+        ),
+        (
+            conf.iter_89_0_confinement_time,
+            (1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0),
+            0.104,
+        ),
+        (
+            conf.rebut_lallia_confinement_time,
+            (1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0),
+            0.18434273785533292,
+        ),
+        (
+            conf.goldston_confinement_time,
+            (1.0, 1.0, 1.0, 1.0, 1.0, 1.0),
+            0.03021037349432586,
+        ),
+        (
+            conf.t10_confinement_time,
+            (1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0),
+            0.07307692307692307,
+        ),
+        (
+            conf.jaeri_confinement_time,
+            (1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0),
+            0.13187536611732242,
+        ),
+        (
+            conf.kaye_big_confinement_time,
+            (1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0),
+            0.105,
+        ),
+        (
+            conf.iter_h90_p_confinement_time,
+            (1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0),
+            0.064,
+        ),
+        (conf.riedel_l_confinement_time, (1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0), 0.044),
+        (
+            conf.christiansen_confinement_time,
+            (1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0),
+            0.24,
+        ),
+        (
+            conf.lackner_gottardi_confinement_time,
+            (1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0),
+            0.13120344887319335,
+        ),
+        (conf.neo_kaye_confinement_time, (1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0), 0.063),
+        (conf.riedel_h_confinement_time, (1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0), 0.1),
+        (
+            conf.iter_h90_p_amended_confinement_time,
+            (1.0, 1.0, 1.0, 1.0, 1.0, 1.0),
+            0.082,
+        ),
+        (conf.sudo_et_al_confinement_time, (1.0, 1.0, 1.0, 1.0, 1.0), 0.17),
+        (conf.gyro_reduced_bohm_confinement_time, (1.0, 1.0, 1.0, 1.0, 1.0), 0.25),
+        (
+            conf.lackner_gottardi_stellarator_confinement_time,
+            (1.0, 1.0, 1.0, 1.0, 1.0, 1.0),
+            0.17,
+        ),
+        (
+            conf.iter_93h_confinement_time,
+            (1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0),
+            0.036,
+        ),
+        (
+            conf.iter_h97p_confinement_time,
+            (1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0),
+            0.031,
+        ),
+        (
+            conf.iter_h97p_elmy_confinement_time,
+            (1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0),
+            0.029,
+        ),
+        (
+            conf.iter_96p_confinement_time,
+            (1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0),
+            0.023,
+        ),
+        (
+            conf.valovic_elmy_confinement_time,
+            (1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0),
+            0.067,
+        ),
+        (conf.kaye_confinement_time, (1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0), 0.021),
+        (
+            conf.iter_pb98py_confinement_time,
+            (1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0),
+            0.0615,
+        ),
+        (
+            conf.iter_ipb98y_confinement_time,
+            (1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0),
+            0.0365,
+        ),
+        (
+            conf.iter_ipb98y1_confinement_time,
+            (1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0),
+            0.0503,
+        ),
+        (
+            conf.iter_ipb98y2_confinement_time,
+            (1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0),
+            0.0562,
+        ),
+        (
+            conf.iter_ipb98y3_confinement_time,
+            (1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0),
+            0.0564,
+        ),
+        (
+            conf.iter_ipb98y4_confinement_time,
+            (1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0),
+            0.0587,
+        ),
+        (
+            conf.iss95_stellarator_confinement_time,
+            (1.0, 1.0, 1.0, 1.0, 1.0, 1.0),
+            0.079,
+        ),
+        (
+            conf.iss04_stellarator_confinement_time,
+            (1.0, 1.0, 1.0, 1.0, 1.0, 1.0),
+            0.134,
+        ),
+        (conf.ds03_confinement_time, (1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0), 0.028),
+        (
+            conf.murari_confinement_time,
+            (1.0, 1.0, 1.0, 1.0, 1.0, 1.0),
+            0.03669697337069055,
+        ),
+        (conf.petty08_confinement_time, (1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0), 0.052),
+        (
+            conf.lang_high_density_confinement_time,
+            (1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0),
+            1.0970434976417428e-103,
+        ),
+        (conf.hubbard_nominal_confinement_time, (1.0, 1.0, 1.0, 1.0), 0.014),
+        (conf.hubbard_lower_confinement_time, (1.0, 1.0, 1.0, 1.0), 0.014),
+        (conf.hubbard_upper_confinement_time, (1.0, 1.0, 1.0, 1.0), 0.014),
+        (
+            conf.menard_nstx_confinement_time,
+            (1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0),
+            0.095,
+        ),
+        (
+            conf.menard_nstx_petty08_hybrid_confinement_time,
+            (1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0),
+            0.095,
+        ),
+        (conf.nstx_gyro_bohm_confinement_time, (1.0, 1.0, 1.0, 1.0, 1.0), 0.21),
+        (
+            conf.itpa20_confinement_time,
+            (1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0),
+            0.06802157257083392,
+        ),
+        (
+            conf.itpa20_il_confinement_time,
+            (1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0),
+            0.09877603755850378,
+        ),
+    ],
+)
+def test_confinement_time(func, args, expected):
+    result = func(*args)
+    assert result == pytest.approx(expected)
diff --git a/tests/unit/test_physics.py b/tests/unit/test_physics.py
index 519e2997d9..1208396b9b 100644
--- a/tests/unit/test_physics.py
+++ b/tests/unit/test_physics.py
@@ -1838,6 +1838,8 @@ class PhyauxParam(NamedTuple):
 
     dene: Any = None
 
+    te: Any = None
+
     nd_fuel_ions: Any = None
 
     nd_alphas: Any = None
@@ -1850,13 +1852,15 @@ class PhyauxParam(NamedTuple):
 
     sbar: Any = None
 
-    taueff: Any = None
+    t_energy_confinement: Any = None
 
     vol_plasma: Any = None
 
     expected_burnup: Any = None
 
-    expected_dntau: Any = None
+    expected_ntau: Any = None
+
+    expected_nTtau: Any = None
 
     expected_figmer: Any = None
 
@@ -1866,7 +1870,7 @@ class PhyauxParam(NamedTuple):
 
     expected_rndfuel: Any = None
 
-    expected_taup: Any = None
+    expected_t_alpha_confinement: Any = None
 
 
 @pytest.mark.parametrize(
@@ -1877,42 +1881,46 @@ class PhyauxParam(NamedTuple):
             burnup_in=0,
             aspect=3,
             dene=7.5e19,
+            te=12.569,
             nd_fuel_ions=5.8589175702454272e19,
             nd_alphas=7.5e18,
             fusion_rate_density_total=1.9852091609123786e17,
             alpha_rate_density_total=1.973996644759543e17,
             plasma_current=18398455.678867526,
             sbar=1,
-            taueff=3.401323521525641,
+            t_energy_confinement=3.401323521525641,
             vol_plasma=1888.1711539956691,
             expected_burnup=0.20383432558954095,
-            expected_dntau=2.5509926411442307e20,
+            expected_ntau=2.5509926411442307e20,
+            expected_nTtau=3.253e21,
             expected_figmer=55.195367036602576,
             expected_fusrat=3.7484146722826997e20,
             expected_qfuel=1.8389516394951276e21,
             expected_rndfuel=3.7484146722826997e20,
-            expected_taup=37.993985551650177,
+            expected_t_alpha_confinement=37.993985551650177,
         ),
         PhyauxParam(
             tauratio=1,
             burnup_in=0,
             aspect=3,
             dene=7.5e19,
+            te=12.569,
             nd_fuel_ions=5.8576156204039725e19,
             nd_alphas=7.5e18,
             fusion_rate_density_total=1.9843269653375773e17,
             alpha_rate_density_total=1.9731194318497056e17,
             plasma_current=18398455.678867526,
             sbar=1,
-            taueff=3.402116961408892,
+            t_energy_confinement=3.402116961408892,
             vol_plasma=1888.1711539956691,
             expected_burnup=0.20387039462081086,
-            expected_dntau=2.5515877210566689e20,
+            expected_ntau=2.5515877210566689e20,
+            expected_nTtau=3.253e21,
             expected_figmer=55.195367036602576,
             expected_fusrat=3.7467489360461772e20,
             expected_qfuel=1.8378092331723546e21,
             expected_rndfuel=3.7467489360461772e20,
-            expected_taup=38.010876984618747,
+            expected_t_alpha_confinement=38.010876984618747,
         ),
     ),
 )
@@ -1933,22 +1941,25 @@ def test_phyaux(phyauxparam, monkeypatch, physics):
 
     monkeypatch.setattr(physics_variables, "burnup_in", phyauxparam.burnup_in)
 
-    burnup, dntau, figmer, fusrat, qfuel, rndfuel, taup = physics.phyaux(
-        aspect=phyauxparam.aspect,
-        dene=phyauxparam.dene,
-        nd_fuel_ions=phyauxparam.nd_fuel_ions,
-        nd_alphas=phyauxparam.nd_alphas,
-        fusion_rate_density_total=phyauxparam.fusion_rate_density_total,
-        alpha_rate_density_total=phyauxparam.alpha_rate_density_total,
-        plasma_current=phyauxparam.plasma_current,
-        sbar=phyauxparam.sbar,
-        taueff=phyauxparam.taueff,
-        vol_plasma=phyauxparam.vol_plasma,
+    burnup, ntau, nTtau, figmer, fusrat, qfuel, rndfuel, t_alpha_confinement, _ = (
+        physics.phyaux(
+            aspect=phyauxparam.aspect,
+            dene=phyauxparam.dene,
+            te=phyauxparam.te,
+            nd_fuel_ions=phyauxparam.nd_fuel_ions,
+            nd_alphas=phyauxparam.nd_alphas,
+            fusion_rate_density_total=phyauxparam.fusion_rate_density_total,
+            alpha_rate_density_total=phyauxparam.alpha_rate_density_total,
+            plasma_current=phyauxparam.plasma_current,
+            sbar=phyauxparam.sbar,
+            t_energy_confinement=phyauxparam.t_energy_confinement,
+            vol_plasma=phyauxparam.vol_plasma,
+        )
     )
 
     assert burnup == pytest.approx(phyauxparam.expected_burnup)
 
-    assert dntau == pytest.approx(phyauxparam.expected_dntau)
+    assert ntau == pytest.approx(phyauxparam.expected_ntau)
 
     assert figmer == pytest.approx(phyauxparam.expected_figmer)
 
@@ -1958,7 +1969,9 @@ def test_phyaux(phyauxparam, monkeypatch, physics):
 
     assert rndfuel == pytest.approx(phyauxparam.expected_rndfuel)
 
-    assert taup == pytest.approx(phyauxparam.expected_taup)
+    assert t_alpha_confinement == pytest.approx(
+        phyauxparam.expected_t_alpha_confinement
+    )
 
 
 def test_rether():
@@ -2157,22 +2170,20 @@ def test_calculate_density_limit(calculatedensitylimitparam, physics):
     assert dlimit == pytest.approx(calculatedensitylimitparam.expected_dlimit)
 
 
-class PcondParam(NamedTuple):
-    iradloss: Any = None
+class ConfinementTimeParam(NamedTuple):
+    i_rad_loss: Any = None
 
     tauee_in: Any = None
 
     pden_plasma_rad_mw: Any = None
 
-    kappaa_ipb: Any = None
+    kappa_ipb: Any = None
 
     p_plasma_ohmic_mw: Any = None
 
     f_alpha_plasma: Any = None
 
-    iinvqd: Any = None
-
-    isc: Any = None
+    i_confinement_time: Any = None
 
     ignite: Any = None
 
@@ -2226,35 +2237,34 @@ class PcondParam(NamedTuple):
 
     zeff: Any = None
 
-    expected_kappaa_ipb: Any = None
+    expected_kappa_ipb: Any = None
 
     expected_kappaa: Any = None
 
-    expected_powerht: Any = None
+    expected_p_plasma_loss_mw: Any = None
 
-    expected_ptrepv: Any = None
+    expected_pden_electron_transport_loss_mw: Any = None
 
-    expected_ptripv: Any = None
+    expected_pden_ion_transport_loss_mw: Any = None
 
     expected_tauee: Any = None
 
-    expected_taueff: Any = None
+    expected_t_energy_confinement: Any = None
 
-    expected_tauei: Any = None
+    expected_t_ion_energy_confinement: Any = None
 
 
 @pytest.mark.parametrize(
-    "pcondparam",
+    "confinementtimeparam",
     (
-        PcondParam(
-            iradloss=1,
+        ConfinementTimeParam(
+            i_rad_loss=1,
             tauee_in=0,
             pden_plasma_rad_mw=0.11824275660100725,
-            kappaa_ipb=1.68145080681586,
+            kappa_ipb=1.68145080681586,
             p_plasma_ohmic_mw=0.63634001890069991,
             f_alpha_plasma=0.94999999999999996,
-            iinvqd=1,
-            isc=32,
+            i_confinement_time=32,
             ignite=0,
             m_fuel_amu=2.5,
             alpha_power_total=319.03020327154269,
@@ -2281,24 +2291,22 @@ class PcondParam(NamedTuple):
             vol_plasma=1888.1711539956691,
             a_plasma_poloidal=38.39822223637151,
             zeff=2.4987360098030775,
-            expected_kappaa_ipb=1.68145080681586,
-            expected_kappaa=1.7187938085542791,
-            expected_ptrepv=0.012570664670798823,
-            expected_ptripv=0.011156836223364355,
+            expected_kappa_ipb=1.68145080681586,
+            expected_pden_electron_transport_loss_mw=0.012572050692511346,
+            expected_pden_ion_transport_loss_mw=0.011158066358576262,
             expected_tauee=21.17616899712392,
-            expected_tauei=21.17616899712392,
-            expected_taueff=21.17616899712392,
-            expected_powerht=290.18368660937881,
+            expected_t_ion_energy_confinement=21.17616899712392,
+            expected_t_energy_confinement=21.17616899712392,
+            expected_p_plasma_loss_mw=290.18368660937881,
         ),
-        PcondParam(
-            iradloss=1,
+        ConfinementTimeParam(
+            i_rad_loss=1,
             tauee_in=0,
             pden_plasma_rad_mw=0.11824275660100725,
-            kappaa_ipb=1.68145080681586,
+            kappa_ipb=1.68145080681586,
             p_plasma_ohmic_mw=0.63634001890069991,
             f_alpha_plasma=0.94999999999999996,
-            iinvqd=1,
-            isc=33,
+            i_confinement_time=33,
             ignite=0,
             m_fuel_amu=2.5,
             alpha_power_total=319.03020327154269,
@@ -2325,24 +2333,22 @@ class PcondParam(NamedTuple):
             vol_plasma=1888.1711539956691,
             a_plasma_poloidal=38.39822223637151,
             zeff=2.4987360098030775,
-            expected_kappaa_ipb=1.68145080681586,
-            expected_kappaa=1.7187938085542791,
-            expected_ptrepv=0.081458458765440875,
-            expected_ptripv=0.072296788376262536,
+            expected_kappa_ipb=1.68145080681586,
+            expected_pden_electron_transport_loss_mw=0.08146744024696746,
+            expected_pden_ion_transport_loss_mw=0.07230475970642361,
             expected_tauee=3.2679051814806361,
-            expected_tauei=3.2679051814806361,
-            expected_taueff=3.2679051814806366,
-            expected_powerht=290.18368660937881,
+            expected_t_ion_energy_confinement=3.2679051814806361,
+            expected_t_energy_confinement=3.2679051814806366,
+            expected_p_plasma_loss_mw=290.18368660937881,
         ),
-        PcondParam(
-            iradloss=1,
+        ConfinementTimeParam(
+            i_rad_loss=1,
             tauee_in=0,
             pden_plasma_rad_mw=0.11824275660100725,
-            kappaa_ipb=1.68145080681586,
+            kappa_ipb=1.68145080681586,
             p_plasma_ohmic_mw=0.63634001890069991,
             f_alpha_plasma=0.94999999999999996,
-            iinvqd=1,
-            isc=34,
+            i_confinement_time=34,
             ignite=0,
             m_fuel_amu=2.5,
             alpha_power_total=319.03020327154269,
@@ -2369,24 +2375,22 @@ class PcondParam(NamedTuple):
             vol_plasma=1888.1711539956691,
             a_plasma_poloidal=38.39822223637151,
             zeff=2.4987360098030775,
-            expected_kappaa_ipb=1.68145080681586,
-            expected_kappaa=1.7187938085542791,
-            expected_ptrepv=0.081327750398391824,
-            expected_ptripv=0.072180780839479111,
+            expected_kappa_ipb=1.68145080681586,
+            expected_pden_electron_transport_loss_mw=0.0813367174682195,
+            expected_pden_ion_transport_loss_mw=0.07218873937883169,
             expected_tauee=3.2731572946627923,
-            expected_tauei=3.2731572946627923,
-            expected_taueff=3.2731572946627923,
-            expected_powerht=290.18368660937881,
+            expected_t_ion_energy_confinement=3.2731572946627923,
+            expected_t_energy_confinement=3.2731572946627923,
+            expected_p_plasma_loss_mw=290.18368660937881,
         ),
-        PcondParam(
-            iradloss=1,
+        ConfinementTimeParam(
+            i_rad_loss=1,
             tauee_in=0,
             pden_plasma_rad_mw=0.11824275660100725,
-            kappaa_ipb=1.68145080681586,
+            kappa_ipb=1.68145080681586,
             p_plasma_ohmic_mw=0.63634001890069991,
             f_alpha_plasma=0.94999999999999996,
-            iinvqd=1,
-            isc=35,
+            i_confinement_time=35,
             ignite=0,
             m_fuel_amu=2.5,
             alpha_power_total=319.03020327154269,
@@ -2413,24 +2417,22 @@ class PcondParam(NamedTuple):
             vol_plasma=1888.1711539956691,
             a_plasma_poloidal=38.39822223637151,
             zeff=2.4987360098030775,
-            expected_kappaa_ipb=1.68145080681586,
-            expected_kappaa=1.7187938085542791,
-            expected_ptrepv=0.12077931279593926,
-            expected_ptripv=0.10719520783694242,
+            expected_kappa_ipb=1.68145080681586,
+            expected_pden_electron_transport_loss_mw=0.12079262973297819,
+            expected_pden_ion_transport_loss_mw=0.10720702701193681,
             expected_tauee=2.2040075681235445,
-            expected_tauei=2.2040075681235445,
-            expected_taueff=2.2040075681235445,
-            expected_powerht=290.18368660937881,
+            expected_t_ion_energy_confinement=2.2040075681235445,
+            expected_t_energy_confinement=2.2040075681235445,
+            expected_p_plasma_loss_mw=290.18368660937881,
         ),
-        PcondParam(
-            iradloss=1,
+        ConfinementTimeParam(
+            i_rad_loss=1,
             tauee_in=0,
             pden_plasma_rad_mw=0.11824275660100725,
-            kappaa_ipb=1.68145080681586,
+            kappa_ipb=1.68145080681586,
             p_plasma_ohmic_mw=0.63634001890069991,
             f_alpha_plasma=0.94999999999999996,
-            iinvqd=1,
-            isc=36,
+            i_confinement_time=36,
             ignite=0,
             m_fuel_amu=2.5,
             alpha_power_total=319.03020327154269,
@@ -2457,24 +2459,22 @@ class PcondParam(NamedTuple):
             vol_plasma=1888.1711539956691,
             a_plasma_poloidal=38.39822223637151,
             zeff=2.4987360098030775,
-            expected_kappaa_ipb=1.68145080681586,
-            expected_kappaa=1.7187938085542791,
-            expected_ptrepv=0.081309182573405442,
-            expected_ptripv=0.072164301346324039,
+            expected_kappa_ipb=1.68145080681586,
+            expected_pden_electron_transport_loss_mw=0.08131814759597392,
+            expected_pden_ion_transport_loss_mw=0.07217225806867361,
             expected_tauee=3.2739047552801135,
-            expected_tauei=3.2739047552801135,
-            expected_taueff=3.2739047552801135,
-            expected_powerht=290.18368660937881,
+            expected_t_ion_energy_confinement=3.2739047552801135,
+            expected_t_energy_confinement=3.2739047552801135,
+            expected_p_plasma_loss_mw=290.18368660937881,
         ),
-        PcondParam(
-            iradloss=1,
+        ConfinementTimeParam(
+            i_rad_loss=1,
             tauee_in=0,
             pden_plasma_rad_mw=0.11824275660100725,
-            kappaa_ipb=1.68145080681586,
+            kappa_ipb=1.68145080681586,
             p_plasma_ohmic_mw=0.63634001890069991,
             f_alpha_plasma=0.94999999999999996,
-            iinvqd=1,
-            isc=37,
+            i_confinement_time=37,
             ignite=0,
             m_fuel_amu=2.5,
             alpha_power_total=319.03020327154269,
@@ -2501,24 +2501,22 @@ class PcondParam(NamedTuple):
             vol_plasma=1888.1711539956691,
             a_plasma_poloidal=38.39822223637151,
             zeff=2.4987360098030775,
-            expected_kappaa_ipb=1.68145080681586,
-            expected_kappaa=1.7187938085542791,
-            expected_ptrepv=0.08142612910014517,
-            expected_ptripv=0.072268094843318462,
+            expected_kappa_ipb=1.68145080681586,
+            expected_pden_electron_transport_loss_mw=0.08143510701705373,
+            expected_pden_ion_transport_loss_mw=0.07227606300977574,
             expected_tauee=3.269202679985145,
-            expected_tauei=3.269202679985145,
-            expected_taueff=3.2692026799851455,
-            expected_powerht=290.18368660937881,
+            expected_t_ion_energy_confinement=3.269202679985145,
+            expected_t_energy_confinement=3.2692026799851455,
+            expected_p_plasma_loss_mw=290.18368660937881,
         ),
-        PcondParam(
-            iradloss=1,
+        ConfinementTimeParam(
+            i_rad_loss=1,
             tauee_in=0,
             pden_plasma_rad_mw=0.11824275660100725,
-            kappaa_ipb=1.68145080681586,
+            kappa_ipb=1.68145080681586,
             p_plasma_ohmic_mw=0.63634001890069991,
             f_alpha_plasma=0.94999999999999996,
-            iinvqd=1,
-            isc=38,
+            i_confinement_time=38,
             ignite=0,
             m_fuel_amu=2.5,
             alpha_power_total=319.03020327154269,
@@ -2545,24 +2543,22 @@ class PcondParam(NamedTuple):
             vol_plasma=1888.1711539956691,
             a_plasma_poloidal=38.39822223637151,
             zeff=2.4987360098030775,
-            expected_kappaa_ipb=1.68145080681586,
-            expected_kappaa=1.7187938085542791,
-            expected_ptrepv=0.072709146314778414,
-            expected_ptripv=0.064531515128155068,
+            expected_kappa_ipb=1.68145080681586,
+            expected_pden_electron_transport_loss_mw=0.07271716311087716,
+            expected_pden_ion_transport_loss_mw=0.06453863027150285,
             expected_tauee=3.6611421391548524,
-            expected_tauei=3.6611421391548524,
-            expected_taueff=3.6611421391548529,
-            expected_powerht=290.18368660937881,
+            expected_t_ion_energy_confinement=3.6611421391548524,
+            expected_t_energy_confinement=3.6611421391548529,
+            expected_p_plasma_loss_mw=290.18368660937881,
         ),
-        PcondParam(
-            iradloss=1,
+        ConfinementTimeParam(
+            i_rad_loss=1,
             tauee_in=0,
             pden_plasma_rad_mw=0.11824275660100725,
-            kappaa_ipb=1.68145080681586,
+            kappa_ipb=1.68145080681586,
             p_plasma_ohmic_mw=0.63634001890069991,
             f_alpha_plasma=0.94999999999999996,
-            iinvqd=1,
-            isc=39,
+            i_confinement_time=39,
             ignite=0,
             m_fuel_amu=2.5,
             alpha_power_total=319.03020327154269,
@@ -2589,24 +2585,22 @@ class PcondParam(NamedTuple):
             vol_plasma=1888.1711539956691,
             a_plasma_poloidal=38.39822223637151,
             zeff=2.4987360098030775,
-            expected_kappaa_ipb=1.68145080681586,
-            expected_kappaa=1.7187938085542791,
-            expected_ptrepv=0.078529089520063822,
-            expected_ptripv=0.069696886639614319,
+            expected_kappa_ipb=1.68145080681586,
+            expected_pden_electron_transport_loss_mw=0.07853774801394538,
+            expected_pden_ion_transport_loss_mw=0.06970457130869961,
             expected_tauee=3.3898077909969717,
-            expected_tauei=3.3898077909969717,
-            expected_taueff=3.3898077909969717,
-            expected_powerht=290.18368660937881,
+            expected_t_ion_energy_confinement=3.3898077909969717,
+            expected_t_energy_confinement=3.3898077909969717,
+            expected_p_plasma_loss_mw=290.18368660937881,
         ),
-        PcondParam(
-            iradloss=1,
+        ConfinementTimeParam(
+            i_rad_loss=1,
             tauee_in=0,
             pden_plasma_rad_mw=0.11824275660100725,
-            kappaa_ipb=1.68145080681586,
+            kappa_ipb=1.68145080681586,
             p_plasma_ohmic_mw=0.63634001890069991,
             f_alpha_plasma=0.94999999999999996,
-            iinvqd=1,
-            isc=40,
+            i_confinement_time=40,
             ignite=0,
             m_fuel_amu=2.5,
             alpha_power_total=319.03020327154269,
@@ -2633,24 +2627,22 @@ class PcondParam(NamedTuple):
             vol_plasma=1888.1711539956691,
             a_plasma_poloidal=38.39822223637151,
             zeff=2.4987360098030775,
-            expected_kappaa_ipb=1.68145080681586,
-            expected_kappaa=1.7187938085542791,
-            expected_ptrepv=0.081359821043062386,
-            expected_ptripv=0.072209244483967094,
-            expected_tauee=3.2718670722507683,
-            expected_tauei=3.2718670722507683,
-            expected_taueff=3.2718670722507692,
-            expected_powerht=290.18368660937881,
+            expected_kappa_ipb=1.68145080681586,
+            expected_pden_electron_transport_loss_mw=0.0840021318362596,
+            expected_pden_ion_transport_loss_mw=0.07455437336481374,
+            expected_tauee=3.169298972363837,
+            expected_t_ion_energy_confinement=3.169298972363837,
+            expected_t_energy_confinement=3.169298972363837,
+            expected_p_plasma_loss_mw=290.18368660937881,
         ),
-        PcondParam(
-            iradloss=1,
+        ConfinementTimeParam(
+            i_rad_loss=1,
             tauee_in=0,
             pden_plasma_rad_mw=0.11824275660100725,
-            kappaa_ipb=1.68145080681586,
+            kappa_ipb=1.68145080681586,
             p_plasma_ohmic_mw=0.63634001890069991,
             f_alpha_plasma=0.94999999999999996,
-            iinvqd=1,
-            isc=41,
+            i_confinement_time=41,
             ignite=0,
             m_fuel_amu=2.5,
             alpha_power_total=319.03020327154269,
@@ -2677,24 +2669,22 @@ class PcondParam(NamedTuple):
             vol_plasma=1888.1711539956691,
             a_plasma_poloidal=38.39822223637151,
             zeff=2.4987360098030775,
-            expected_kappaa_ipb=1.68145080681586,
-            expected_kappaa=1.7187938085542791,
-            expected_ptrepv=0.081513009259203975,
-            expected_ptripv=0.072345203550858064,
-            expected_tauee=3.2657182196344126,
-            expected_tauei=3.2657182196344126,
-            expected_taueff=3.2657182196344126,
-            expected_powerht=290.18368660937881,
+            expected_kappa_ipb=1.68145080681586,
+            expected_pden_electron_transport_loss_mw=0.08311313602000579,
+            expected_pden_ion_transport_loss_mw=0.07376536331761714,
+            expected_tauee=3.203198469625145,
+            expected_t_ion_energy_confinement=3.203198469625145,
+            expected_t_energy_confinement=3.203198469625145,
+            expected_p_plasma_loss_mw=290.18368660937881,
         ),
-        PcondParam(
-            iradloss=1,
+        ConfinementTimeParam(
+            i_rad_loss=1,
             tauee_in=0,
             pden_plasma_rad_mw=0.11824275660100725,
-            kappaa_ipb=1.68145080681586,
+            kappa_ipb=1.68145080681586,
             p_plasma_ohmic_mw=0.63634001890069991,
             f_alpha_plasma=0.94999999999999996,
-            iinvqd=1,
-            isc=42,
+            i_confinement_time=42,
             ignite=0,
             m_fuel_amu=2.5,
             alpha_power_total=319.03020327154269,
@@ -2721,24 +2711,22 @@ class PcondParam(NamedTuple):
             vol_plasma=1888.1711539956691,
             a_plasma_poloidal=38.39822223637151,
             zeff=2.4987360098030775,
-            expected_kappaa_ipb=1.68145080681586,
-            expected_kappaa=1.7187938085542791,
-            expected_ptrepv=0.073097992274882811,
-            expected_ptripv=0.064876627403966491,
+            expected_kappa_ipb=1.68145080681586,
+            expected_pden_electron_transport_loss_mw=0.07310605194452542,
+            expected_pden_ion_transport_loss_mw=0.0648837805988509,
             expected_tauee=3.6416666339340682,
-            expected_tauei=3.6416666339340682,
-            expected_taueff=3.6416666339340686,
-            expected_powerht=290.18368660937881,
+            expected_t_ion_energy_confinement=3.6416666339340682,
+            expected_t_energy_confinement=3.6416666339340686,
+            expected_p_plasma_loss_mw=290.18368660937881,
         ),
-        PcondParam(
-            iradloss=1,
+        ConfinementTimeParam(
+            i_rad_loss=1,
             tauee_in=0,
             pden_plasma_rad_mw=0.11824275660100725,
-            kappaa_ipb=1.68145080681586,
+            kappa_ipb=1.68145080681586,
             p_plasma_ohmic_mw=0.63634001890069991,
             f_alpha_plasma=0.94999999999999996,
-            iinvqd=1,
-            isc=43,
+            i_confinement_time=43,
             ignite=0,
             m_fuel_amu=2.5,
             alpha_power_total=319.03020327154269,
@@ -2765,24 +2753,22 @@ class PcondParam(NamedTuple):
             vol_plasma=1888.1711539956691,
             a_plasma_poloidal=38.39822223637151,
             zeff=2.4987360098030775,
-            expected_kappaa_ipb=1.68145080681586,
-            expected_kappaa=1.7187938085542791,
-            expected_ptrepv=0.081423406537449478,
-            expected_ptripv=0.072265678488503571,
+            expected_kappa_ipb=1.68145080681586,
+            expected_pden_electron_transport_loss_mw=0.08143238415417252,
+            expected_pden_ion_transport_loss_mw=0.07227364638853734,
             expected_tauee=3.2693119926464509,
-            expected_tauei=3.2693119926464509,
-            expected_taueff=3.2693119926464513,
-            expected_powerht=290.18368660937881,
+            expected_t_ion_energy_confinement=3.2693119926464509,
+            expected_t_energy_confinement=3.2693119926464513,
+            expected_p_plasma_loss_mw=290.18368660937881,
         ),
-        PcondParam(
-            iradloss=1,
+        ConfinementTimeParam(
+            i_rad_loss=1,
             tauee_in=0,
             pden_plasma_rad_mw=0.11824275660100725,
-            kappaa_ipb=1.68145080681586,
+            kappa_ipb=1.68145080681586,
             p_plasma_ohmic_mw=0.63634001890069991,
             f_alpha_plasma=0.94999999999999996,
-            iinvqd=1,
-            isc=44,
+            i_confinement_time=44,
             ignite=0,
             m_fuel_amu=2.5,
             alpha_power_total=319.03020327154269,
@@ -2809,24 +2795,22 @@ class PcondParam(NamedTuple):
             vol_plasma=1888.1711539956691,
             a_plasma_poloidal=38.39822223637151,
             zeff=2.4987360098030775,
-            expected_kappaa_ipb=1.68145080681586,
-            expected_kappaa=1.7187938085542791,
-            expected_ptrepv=0.081419881443596701,
-            expected_ptripv=0.072262549863580605,
+            expected_kappa_ipb=1.68145080681586,
+            expected_pden_electron_transport_loss_mw=0.08142885867164847,
+            expected_pden_ion_transport_loss_mw=0.07227051741865713,
             expected_tauee=3.2694535383156871,
-            expected_tauei=3.2694535383156871,
-            expected_taueff=3.2694535383156871,
-            expected_powerht=290.18368660937881,
+            expected_t_ion_energy_confinement=3.2694535383156871,
+            expected_t_energy_confinement=3.2694535383156871,
+            expected_p_plasma_loss_mw=290.18368660937881,
         ),
-        PcondParam(
-            iradloss=1,
+        ConfinementTimeParam(
+            i_rad_loss=1,
             tauee_in=0,
             pden_plasma_rad_mw=0.11824275660100725,
-            kappaa_ipb=1.68145080681586,
+            kappa_ipb=1.68145080681586,
             p_plasma_ohmic_mw=0.63634001890069991,
             f_alpha_plasma=0.94999999999999996,
-            iinvqd=1,
-            isc=45,
+            i_confinement_time=45,
             ignite=0,
             m_fuel_amu=2.5,
             alpha_power_total=319.03020327154269,
@@ -2853,24 +2837,22 @@ class PcondParam(NamedTuple):
             vol_plasma=1888.1711539956691,
             a_plasma_poloidal=38.39822223637151,
             zeff=2.4987360098030775,
-            expected_kappaa_ipb=1.68145080681586,
-            expected_kappaa=1.7187938085542791,
-            expected_ptrepv=0.081421142032658531,
-            expected_ptripv=0.072263668673609824,
+            expected_kappa_ipb=1.68145080681586,
+            expected_pden_electron_transport_loss_mw=0.08143011939694184,
+            expected_pden_ion_transport_loss_mw=0.07227163634959588,
             expected_tauee=3.2694029195542003,
-            expected_tauei=3.2694029195542003,
-            expected_taueff=3.2694029195542003,
-            expected_powerht=290.18368660937881,
+            expected_t_ion_energy_confinement=3.2694029195542003,
+            expected_t_energy_confinement=3.2694029195542003,
+            expected_p_plasma_loss_mw=290.18368660937881,
         ),
-        PcondParam(
-            iradloss=1,
+        ConfinementTimeParam(
+            i_rad_loss=1,
             tauee_in=0,
             pden_plasma_rad_mw=0.11824275660100725,
-            kappaa_ipb=1.68145080681586,
+            kappa_ipb=1.68145080681586,
             p_plasma_ohmic_mw=0.63634001890069991,
             f_alpha_plasma=0.94999999999999996,
-            iinvqd=1,
-            isc=46,
+            i_confinement_time=46,
             ignite=0,
             m_fuel_amu=2.5,
             alpha_power_total=319.03020327154269,
@@ -2897,24 +2879,22 @@ class PcondParam(NamedTuple):
             vol_plasma=1888.1711539956691,
             a_plasma_poloidal=38.39822223637151,
             zeff=2.4987360098030775,
-            expected_kappaa_ipb=1.68145080681586,
-            expected_kappaa=1.7187938085542791,
-            expected_ptrepv=0.079599509500323962,
-            expected_ptripv=0.070646915991500636,
+            expected_kappa_ipb=1.68145080681586,
+            expected_pden_electron_transport_loss_mw=0.07960828601702878,
+            expected_pden_ion_transport_loss_mw=0.07065470540932789,
             expected_tauee=3.3442231132583498,
-            expected_tauei=3.3442231132583498,
-            expected_taueff=3.3442231132583502,
-            expected_powerht=290.18368660937881,
+            expected_t_ion_energy_confinement=3.3442231132583498,
+            expected_t_energy_confinement=3.3442231132583502,
+            expected_p_plasma_loss_mw=290.18368660937881,
         ),
-        PcondParam(
-            iradloss=1,
+        ConfinementTimeParam(
+            i_rad_loss=1,
             tauee_in=0,
             pden_plasma_rad_mw=0.11824275660100725,
-            kappaa_ipb=1.68145080681586,
+            kappa_ipb=1.68145080681586,
             p_plasma_ohmic_mw=0.63634001890069991,
             f_alpha_plasma=0.94999999999999996,
-            iinvqd=1,
-            isc=47,
+            i_confinement_time=47,
             ignite=0,
             m_fuel_amu=2.5,
             alpha_power_total=319.03020327154269,
@@ -2941,89 +2921,108 @@ class PcondParam(NamedTuple):
             vol_plasma=1888.1711539956691,
             a_plasma_poloidal=38.39822223637151,
             zeff=2.4987360098030775,
-            expected_kappaa_ipb=1.68145080681586,
-            expected_kappaa=1.7187938085542791,
-            expected_ptrepv=0.070108167457759038,
-            expected_ptripv=0.062223069561580698,
-            expected_tauee=3.7969687288631331,
-            expected_tauei=3.7969687288631331,
-            expected_taueff=3.7969687288631335,
-            expected_powerht=290.18368660937881,
+            expected_kappa_ipb=1.68145080681586,
+            expected_pden_electron_transport_loss_mw=0.07148441348179191,
+            expected_pden_ion_transport_loss_mw=0.06344452856118785,
+            expected_tauee=3.7242785823911264,
+            expected_t_ion_energy_confinement=3.7242785823911264,
+            expected_t_energy_confinement=3.7242785823911264,
+            expected_p_plasma_loss_mw=290.18368660937881,
         ),
     ),
 )
-def test_pcond(pcondparam, monkeypatch, physics):
+def test_calculate_confinement_time(confinementtimeparam, monkeypatch, physics):
     """
-    Automatically generated Regression Unit Test for pcond.
+    Automatically generated Regression Unit Test for calculate_confinement_time().
 
     This test was generated using data from tests/regression/scenarios/large-tokamak/IN.DAT.
 
-    :param pcondparam: the data used to mock and assert in this test.
-    :type pcondparam: pcondparam
+    :param confinementtimeparam: the data used to mock and assert in this test.
+    :type confinementtimeparam: confinementtimeparam
 
     :param monkeypatch: pytest fixture used to mock module/class variables
     :type monkeypatch: _pytest.monkeypatch.monkeypatch
     """
 
-    monkeypatch.setattr(physics_variables, "iradloss", pcondparam.iradloss)
+    monkeypatch.setattr(
+        physics_variables, "i_rad_loss", confinementtimeparam.i_rad_loss
+    )
 
-    monkeypatch.setattr(physics_variables, "tauee_in", pcondparam.tauee_in)
+    monkeypatch.setattr(physics_variables, "tauee_in", confinementtimeparam.tauee_in)
 
     monkeypatch.setattr(
-        physics_variables, "pden_plasma_rad_mw", pcondparam.pden_plasma_rad_mw
+        physics_variables, "pden_plasma_rad_mw", confinementtimeparam.pden_plasma_rad_mw
     )
 
-    monkeypatch.setattr(physics_variables, "kappaa_ipb", pcondparam.kappaa_ipb)
+    monkeypatch.setattr(physics_variables, "kappa_ipb", confinementtimeparam.kappa_ipb)
 
     monkeypatch.setattr(
-        physics_variables, "p_plasma_ohmic_mw", pcondparam.p_plasma_ohmic_mw
+        physics_variables, "p_plasma_ohmic_mw", confinementtimeparam.p_plasma_ohmic_mw
     )
 
-    monkeypatch.setattr(physics_variables, "f_alpha_plasma", pcondparam.f_alpha_plasma)
-
-    kappaa, ptrepv, ptripv, tauee, tauei, taueff, powerht = physics.pcond(
-        iinvqd=pcondparam.iinvqd,
-        isc=pcondparam.isc,
-        ignite=pcondparam.ignite,
-        m_fuel_amu=pcondparam.m_fuel_amu,
-        alpha_power_total=pcondparam.alpha_power_total,
-        aspect=pcondparam.aspect,
-        bt=pcondparam.bt,
-        dene=pcondparam.dene,
-        nd_ions_total=pcondparam.nd_ions_total,
-        dnla=pcondparam.dnla,
-        eps=pcondparam.eps,
-        hfact=pcondparam.hfact,
-        kappa=pcondparam.kappa,
-        kappa95=pcondparam.kappa95,
-        non_alpha_charged_power=pcondparam.non_alpha_charged_power,
-        pinjmw=pcondparam.pinjmw,
-        plasma_current=pcondparam.plasma_current,
-        pcoreradpv=pcondparam.pcoreradpv,
-        q=pcondparam.q,
-        qstar=pcondparam.qstar,
-        rmajor=pcondparam.rmajor,
-        rminor=pcondparam.rminor,
-        _te=pcondparam.te,
-        ten=pcondparam.ten,
-        tin=pcondparam.tin,
-        vol_plasma=pcondparam.vol_plasma,
-        a_plasma_poloidal=pcondparam.a_plasma_poloidal,
-        zeff=pcondparam.zeff,
+    monkeypatch.setattr(
+        physics_variables, "f_alpha_plasma", confinementtimeparam.f_alpha_plasma
     )
 
-    assert physics_variables.kappaa_ipb == pytest.approx(pcondparam.expected_kappaa_ipb)
+    (
+        pden_electron_transport_loss_mw,
+        pden_ion_transport_loss_mw,
+        t_electron_energy_confinement,
+        t_ion_energy_confinement,
+        t_energy_confinement,
+        p_plasma_loss_mw,
+    ) = physics.calculate_confinement_time(
+        i_confinement_time=confinementtimeparam.i_confinement_time,
+        ignite=confinementtimeparam.ignite,
+        m_fuel_amu=confinementtimeparam.m_fuel_amu,
+        alpha_power_total=confinementtimeparam.alpha_power_total,
+        aspect=confinementtimeparam.aspect,
+        bt=confinementtimeparam.bt,
+        dene=confinementtimeparam.dene,
+        nd_ions_total=confinementtimeparam.nd_ions_total,
+        dnla=confinementtimeparam.dnla,
+        eps=confinementtimeparam.eps,
+        hfact=confinementtimeparam.hfact,
+        kappa=confinementtimeparam.kappa,
+        kappa95=confinementtimeparam.kappa95,
+        non_alpha_charged_power=confinementtimeparam.non_alpha_charged_power,
+        pinjmw=confinementtimeparam.pinjmw,
+        plasma_current=confinementtimeparam.plasma_current,
+        pcoreradpv=confinementtimeparam.pcoreradpv,
+        q=confinementtimeparam.q,
+        qstar=confinementtimeparam.qstar,
+        rmajor=confinementtimeparam.rmajor,
+        rminor=confinementtimeparam.rminor,
+        ten=confinementtimeparam.ten,
+        tin=confinementtimeparam.tin,
+        vol_plasma=confinementtimeparam.vol_plasma,
+        zeff=confinementtimeparam.zeff,
+    )
 
-    assert kappaa == pytest.approx(pcondparam.expected_kappaa)
+    assert physics_variables.kappa_ipb == pytest.approx(
+        confinementtimeparam.expected_kappa_ipb
+    )
 
-    assert powerht == pytest.approx(pcondparam.expected_powerht)
+    assert p_plasma_loss_mw == pytest.approx(
+        confinementtimeparam.expected_p_plasma_loss_mw
+    )
 
-    assert ptrepv == pytest.approx(pcondparam.expected_ptrepv)
+    assert pden_electron_transport_loss_mw == pytest.approx(
+        confinementtimeparam.expected_pden_electron_transport_loss_mw
+    )
 
-    assert ptripv == pytest.approx(pcondparam.expected_ptripv)
+    assert pden_ion_transport_loss_mw == pytest.approx(
+        confinementtimeparam.expected_pden_ion_transport_loss_mw
+    )
 
-    assert tauee == pytest.approx(pcondparam.expected_tauee)
+    assert t_electron_energy_confinement == pytest.approx(
+        confinementtimeparam.expected_tauee
+    )
 
-    assert taueff == pytest.approx(pcondparam.expected_taueff)
+    assert t_energy_confinement == pytest.approx(
+        confinementtimeparam.expected_t_energy_confinement
+    )
 
-    assert tauei == pytest.approx(pcondparam.expected_tauei)
+    assert t_ion_energy_confinement == pytest.approx(
+        confinementtimeparam.expected_t_ion_energy_confinement
+    )
diff --git a/tests/unit/test_power.py b/tests/unit/test_power.py
index 9fbad780d7..8c0380e58d 100644
--- a/tests/unit/test_power.py
+++ b/tests/unit/test_power.py
@@ -2137,7 +2137,7 @@ class Power2Param(NamedTuple):
 
     p_plasma_ohmic_mw: Any = None
 
-    iradloss: Any = None
+    i_rad_loss: Any = None
 
     fusion_power: Any = None
 
@@ -2277,7 +2277,7 @@ class Power2Param(NamedTuple):
             palpfwmw=19.833077403424262,
             idivrt=1,
             p_plasma_ohmic_mw=0.61391840981850698,
-            iradloss=1,
+            i_rad_loss=1,
             fusion_power=1985.785106643267,
             non_alpha_charged_power=1.6064693283140403,
             pscalingmw=325.08626176539281,
@@ -2379,7 +2379,7 @@ class Power2Param(NamedTuple):
             palpfwmw=19.826887164528632,
             idivrt=1,
             p_plasma_ohmic_mw=0.61391840981850698,
-            iradloss=1,
+            i_rad_loss=1,
             fusion_power=1985.1653095257811,
             non_alpha_charged_power=1.6059679220663614,
             pscalingmw=325.00280675287695,
@@ -2570,7 +2570,7 @@ def test_power2(power2param, monkeypatch, power):
         physics_variables, "p_plasma_ohmic_mw", power2param.p_plasma_ohmic_mw
     )
 
-    monkeypatch.setattr(physics_variables, "iradloss", power2param.iradloss)
+    monkeypatch.setattr(physics_variables, "i_rad_loss", power2param.i_rad_loss)
 
     monkeypatch.setattr(physics_variables, "fusion_power", power2param.fusion_power)
 
diff --git a/tracking/tracking_data.py b/tracking/tracking_data.py
index dbc1026fb8..c5cf8bd48d 100644
--- a/tracking/tracking_data.py
+++ b/tracking/tracking_data.py
@@ -133,7 +133,7 @@ class ProcessTracker:
         "kappa",
         "fusion_power",
         "teped",
-        "powerht",
+        "p_plasma_loss_mw",
         "kappa95",
         "neped",
         "dene",
@@ -141,7 +141,7 @@ class ProcessTracker:
         "ne0",
         "aux_current_fraction",
         "nd_impurities",
-        "taueff",
+        "t_energy_confinement",
         "te0",
         "pdivt",
         "nesep",