rebase

documentation/proc-pages/development/add-vars.md

@@ -247,15 +247,15 @@ Constraint equations are added to *PROCESS* in the following way:
       !! Logic change during pre-factoring: err, symbol, units will be assigned only if present.
       !! ffuspow : input real : f-value for maximum fusion power
       !! powfmax : input real : maximum fusion power (MW)
-      !! fusion_power : input real : fusion power (MW)
+      !! powfmw : input real : fusion power (MW)
       use constraint_variables, only: ffuspow, powfmax
-      use physics_variables, only: fusion_power
+      use physics_variables, only: powfmw
       implicit none
       type (constraint_args_type), intent(out) :: args
 
-      args%cc =  1.0D0 - ffuspow * powfmax/fusion_power
+      args%cc =  1.0D0 - ffuspow * powfmax/powfmw
       args%con = powfmax * (1.0D0 - args%cc)
-      args%err = fusion_power * args%cc
+      args%err = powfmw * args%cc
       args%symbol = '<'
       args%units = 'MW'
 

documentation/proc-pages/development/standards.md

@@ -259,7 +259,7 @@ real(kind(1.0D0)) :: alphan = 0.25D0
 real(kind(1.0D0)) :: alphap = 0.0D0
 !! Pressure profile index
 
-real(kind(1.0D0)) :: alpha_rate_density = 0.0D0
+real(kind(1.0D0)) :: alpharate = 0.0D0
 !! Alpha particle production rate (particles/m3/sec)
 ```
 
@@ -306,16 +306,16 @@ subroutine constraint_eqn_001(args)
   !! - \( T_i \) -- density weighted average ion temperature [keV]
   !! - \( B_{tot} \) -- total toroidal + poloidal field [T]
 
-  use physics_variables, only: betaft, beta_beam, dene, ten, dnitot, tin, btot, beta
-  use constants, only: electron_charge,rmu0
+  use physics_variables, only: betaft, betanb, dene, ten, dnitot, tin, btot, beta
+  use constants, only: echarge,rmu0
 
   implicit none
 
   type(constraint_args_type), intent(out) :: args
   !! constraint derived type
 
-    args%cc = 1.0D0 - (betaft + beta_beam + &
-      2.0D3*rmu0*electron_charge * (dene*ten + dnitot*tin)/btot**2 )/beta
+    args%cc = 1.0D0 - (betaft + betanb + &
+      2.0D3*rmu0*echarge * (dene*ten + dnitot*tin)/btot**2 )/beta
     args%con = beta * (1.0D0 - args%cc)
     args%err = beta * args%cc
     args%symbol = '='

documentation/proc-pages/eng-models/heating_and_current_drive/NBI/culham_nb.md

@@ -49,11 +49,11 @@ $$
 Deuterium and tritium beam densities
 
 $$
-\mathtt{dend} = n_{\text{ion}} \times (1-\mathtt{f_tritium_beam})
+\mathtt{dend} = n_{\text{ion}} \times (1-\mathtt{ftritbm})
 $$
 
 $$
-\mathtt{dent} = n_{\text{ion}} \times \mathtt{f_tritium_beam}
+\mathtt{dent} = n_{\text{ion}} \times \mathtt{ftritbm}
 $$
 
 Power split to the ions and electrons is clauclated with the $\mathtt{cfnbi()}$ method found [here](../NBI/nbi_overview.md/#ion-coupled-power-cfnbi) and outputs $\mathtt{fpion}$
@@ -72,7 +72,7 @@ plus correction terms outlined in Culham Report AEA FUS 172.
 |  $\mathtt{aspect}$, $A$      |   aspect ratio                            |
 |  $\mathtt{dene}$, $n_{\text{e}}$     |    volume averaged electron density $(\text{m}^{-3})$                           |
 |  $\mathtt{dnla}$, $n_{\text{e,0}}$      |    line averaged electron density $(\text{m}^{-3})$                           |
-|  $\mathtt{beam_energy}$      |  neutral beam energy $(\text{keV})$                             |
+|  $\mathtt{enbeam}$      |  neutral beam energy $(\text{keV})$                             |
 |  $\mathtt{frbeam}$      |   R_tangent / R_major for neutral beam injection                            |
 |  $\mathtt{fshine}$      |  shine-through fraction of beam                             |
 |  $\mathtt{rmajor}$, $R$      |  plasma major radius $(\text{m})$                              |
@@ -114,7 +114,7 @@ $$
 Beam energy in MeV
 
 $$
-\mathtt{ebmev} = \frac{\mathtt{beam_energy}}{10^3}
+\mathtt{ebmev} = \frac{\mathtt{enbeam}}{10^3}
 $$
 
 x and y coefficients of function J0(x,y) (IPDG89)

documentation/proc-pages/eng-models/heating_and_current_drive/NBI/iter_nb.md

@@ -39,11 +39,11 @@ $$
 
 Deuterium and tritium beam densities:
 $$
-n_D = n_i * (1.0 - \mathtt{f_tritium_beam}) 
+n_D = n_i * (1.0 - \mathtt{ftritbm}) 
 $$
 
 $$
-n_T = n_i * \mathtt{f_tritium_beam}
+n_T = n_i * \mathtt{ftritbm}
 $$
 
 Power split to ions / electrons is calculated via the the `cfnbi` method described [here](nbi_overview.md)

documentation/proc-pages/eng-models/heating_and_current_drive/RF/ec_overview.md

@@ -33,7 +33,7 @@ The answer ECGAM is the normalised efficiency $n_{\text{e}}IR/P$ with $n_{\text{
 
 
 $$
-\mathtt{mcsq} = m_{\text{e}} \frac{c^2}{1  \text{keV}}
+\mathtt{mcsq} = 9.1095\times10^{-31} \frac{c^2}{1  \text{keV}}
 $$
 
 $$

documentation/proc-pages/eng-models/power-conversion-and-heat-dissipation-systems.md

@@ -11,7 +11,7 @@ turbines. Figure 1 shows the power flow.
 
 ## Divertor
 
-All of the charged particle transport power leaving the plasma (excluding the `1-f_alpha_plasma` portion of 
+All of the charged particle transport power leaving the plasma (excluding the `1-falpha` portion of 
 the alpha power that escapes directly to the first wall) is assumed to be absorbed in the divertor, 
 along with a proportion `fdiv` of the radiation power and the neutron power.
 

documentation/proc-pages/index.md

@@ -65,6 +65,20 @@ itself to ensure that the documentation remains consistent with the latest versi
 It is to be hoped that it will be of assistance not only to users of PROCESS, but 
 to anyone using PROCESS outputs or models based on them.
 
+## Developer Group
+
+- [James Morris](mailto:james.morris2@ukaea.uk)
+- [Michael Kovari](mailto:michael.kovari@ukaea.uk)
+- [Stuart Muldrew](mailto:stuart.muldrew@ukaea.uk)
+- [Alex Pearce](mailto:alexander.pearce@ukaea.uk)
+- [Jonathan Maddock](mailto:jonathan.maddock@ukaea.uk)
+- [Timothy Nunn](mailto:timothy.nunn@ukaea.uk)
+- [Christopher Ashe](mailto:christopher.ashe@ukaea.uk)
+- [Georgina Graham](mailto:georgina.graham@ukaea.uk)
+- [Jack Foster](mailto:jack.foster@ukaea.uk)
+- [Graeme Turkington](mailto:graeme.turkington@ukaea.uk)
+- [Jonathan Matthews](mailto:jonathan.matthews@ukaea.uk)
+
 ## References
 
 Below is a list of PROCESS publications describing the models:

documentation/proc-pages/physics-models/error.txt

@@ -207,7 +207,7 @@ deuterium-tritium reaction:
 \]
 
 20\% of the energy produced is given to the alpha particles (\(^4\)He),
-a fraction of which remain (c.f. \texttt{f_alpha_plasma}) within the plasma and
+a fraction of which remain (c.f. \texttt{falpha}) within the plasma and
 thermalise (slow down) due to collisions, thus heating the plasma. The
 remaining 80\% is carried away by the neutrons, which deposit their
 energy within the blanket and shield.
@@ -254,17 +254,17 @@ integrated over the plasma profiles (correctly, with or without
 pedestals).
 
 The fractional composition of the `fuel' ions (D, T and \(^3\)He) is
-controlled using the three variables \texttt{f_deuterium}, \texttt{f_tritium} and
-\texttt{f_helium3}, respectively:
+controlled using the three variables \texttt{fdeut}, \texttt{ftrit} and
+\texttt{fhe3}, respectively:
 
 \[\begin{aligned}
 n_{\mbox{fuel}}  & = n_D + n_T + n_{\mathrm{^{3}He}}  \;\;\; \mbox{particles/m$^3$} \\
-n_D  & = \mathtt{f_deuterium} \, n_{\mbox{fuel}} \\
-n_T  & = \mathtt{f_tritium} \, n_{\mbox{fuel}} \\
-n_{\mathrm{^{3}He}} & = \mathtt{f_helium3} \, n_{\mbox{fuel}}
+n_D  & = \mathtt{fdeut} \, n_{\mbox{fuel}} \\
+n_T  & = \mathtt{ftrit} \, n_{\mbox{fuel}} \\
+n_{\mathrm{^{3}He}} & = \mathtt{fhe3} \, n_{\mbox{fuel}}
 \end{aligned}\]
 
-PROCESS checks that \(f_deuterium + f_tritium + f_helium3 = 1.0\), and stops with an
+PROCESS checks that \(fdeut + ftrit + fhe3 = 1.0\), and stops with an
 error message otherwise.
 
 \subsection{Plasma Profiles}\label{plasma-profiles}
@@ -499,8 +499,8 @@ model. The available impurities are as follows:
 As stated above, the number density fractions for hydrogen (all
 isotopes) and helium need not be set, as they are calculated by the code
 to ensure that plasma quasi-neutrality is maintained, and taking into
-account the fuel ratios \texttt{f_deuterium}, \texttt{f_tritium} and
-\texttt{f_helium3}, and the alpha particle fraction \texttt{ralpne} which may
+account the fuel ratios \texttt{fdeut}, \texttt{ftrit} and
+\texttt{fhe3}, and the alpha particle fraction \texttt{ralpne} which may
 be input by the user.
 
 The impurity fraction of one of the elements listed in array
@@ -994,18 +994,18 @@ is derived directly from the energy confinement scaling law.
 \texttt{iradloss\ =\ 0} -- Total power lost is scaling power plus
 radiation
 
-\texttt{pscaling\ +\ pradpv\ =\ f_alpha_plasma*alpha_power_density\ +\ charged_power_density\ +\ pohmpv\ +\ pinjmw/plasma_volume}
+\texttt{pscaling\ +\ pradpv\ =\ falpha*palppv\ +\ pchargepv\ +\ pohmpv\ +\ pinjmw/vol}
 
 \texttt{iradloss\ =\ 1} -- Total power lost is scaling power plus core
 radiation only
 
-\texttt{pscaling\ +\ pcoreradpv\ =\ f_alpha_plasma*alpha_power_density\ +\ charged_power_density\ +\ pohmpv\ +\ pinjmw/plasma_volume}
+\texttt{pscaling\ +\ pcoreradpv\ =\ falpha*palppv\ +\ pchargepv\ +\ pohmpv\ +\ pinjmw/vol}
 
 \texttt{iradloss\ =\ 2} -- Total power lost is scaling power only, with
 no additional allowance for radiation. This is not recommended for power
 plant models.
 
-\texttt{pscaling\ =\ f_alpha_plasma*alpha_power_density\ +\ charged_power_density\ +\ pohmpv\ +\ pinjmw/plasma_volume}
+\texttt{pscaling\ =\ falpha*palppv\ +\ pchargepv\ +\ pohmpv\ +\ pinjmw/vol}
 
 \subsection{Plasma Core Power Balance}\label{plasma-core-power-balance}
 
@@ -1027,7 +1027,7 @@ The primary sources of power are the fusion reactions themselves, ohmic
 power due to resistive heating within the plasma, and any auxiliary
 power provided for heating and current drive. The power carried by the
 fusion-generated neutrons is lost from the plasma, but is deposited in
-the surrounding material. A fraction \texttt{f_alpha_plasma} of the alpha
+the surrounding material. A fraction \texttt{falpha} of the alpha
 particle power is assumed to stay within the plasma core to contribute
 to the plasma power balance. The sum of this core alpha power, any power
 carried by non-alpha charged particles, the ohmic power and any injected