Update blanket variables to new style

documentation/proc-pages/development/standards.md

@@ -312,7 +312,7 @@ This should be used for units of $\text{kg} \cdot \text{m}^{-2}\text{s}^{-1}$
 
 ##### Magnetic field strengths
 
-- Magnetic field strengths should start with the `b_`
+- Magnetic field strengths should start with the `b_` prefix
 
 ---------------------
 
@@ -337,9 +337,17 @@ This should be used for units of $\text{kg} \cdot \text{m}^{-2}\text{s}^{-1}$
 
 ---------------------
 
+##### Solid Angles
+
+- Solid angles should start with the `ster_` prefix. Short for steradians.
+
+---------------------
+
 ##### Lifetimes
 
-- Lifetimes of componenets should start with the `life_` prefix.
+- Lifetimes of components should start with the `life_` prefix.
+
+The default units for lifetimes is in years.
 
 The unit declaration `_fpy` can be used to specify that it is the full-power year lifetime.
 

documentation/proc-pages/eng-models/fw-blanket.md

@@ -60,15 +60,15 @@ electricity have been revised extensively.
     - `MEDIUM` -- 1.261
     - `THICK` -- 1.264.
 
-`secondary_cycle` -- This switch controls how the coolant pumping power in the 
+`i_thermal_electric_conversion` -- This switch controls how the coolant pumping power in the 
 first wall and blanket is determined, and also how the calculation of the plant's 
 thermal to electric conversion efficiency (the secondary cycle thermal 
 efficiency) proceeds.
 
 ## Thermo-hydraulic model for first wall and blanket
 
 !!! Note "Note" 
-    This is called for primary_pumping = 2 and 3
+    This is called for i_coolant_pumping = 2 and 3
 
 Summary of key variables and switches:  
 
@@ -82,13 +82,13 @@ Summary of key variables and switches:
 |    roughness epsilon     |       `roughness`       | ---                      | ---                                  |
 |     peak FW temp (K)     |         `temp_fw_peak`         | ---                      | ---                                  |
 |     maximum temp (K)     |       `temp_fw_max`       | ---                      | ---                                  |
-|        FCI switch        |           ---           | ---                      | `ifci`                               |
+|        FCI switch        |           ---           | ---                      | `i_blkt_liquid_breeder_channel_type`                               |
 |         Coolant          |      :-----------:      | ------------------------ | --------------------------           |
-|  primary coolant switch  |       `i_fw_coolant_type`       | `coolwh`                 | ---                                  |
-| secondary coolant switch |           ---           | ---                      | `i_bb_liq`                           |
-|      inlet temp (K)      |        `temp_fw_coolant_in`        | `inlet_temp`             | `inlet_temp_liq`                     |
-|     outlet temp (K)      |       `temp_fw_coolant_out`        | `outlet_temp`            | `outlet_temp_liq`                    |
-|      pressure (Pa)       |      `pres_fw_coolant`       | `blpressure`             | `blpressure_liq`                     |
+|  primary coolant switch  |       `i_fw_coolant_type`       | `i_blkt_coolant_type`                 | ---                                  |
+| secondary coolant switch |           ---           | ---                      | `i_blkt_liquid_breeder_type`                           |
+|      inlet temp (K)      |        `temp_fw_coolant_in`        | `temp_blkt_coolant_in`             | `inlet_temp_liq`                     |
+|     outlet temp (K)      |       `temp_fw_coolant_out`        | `temp_blkt_coolant_out`            | `outlet_temp_liq`                    |
+|      pressure (Pa)       |      `pres_fw_coolant`       | `pres_blkt_coolant`             | `blpressure_liq`                     |
 
 The default thermo-hydraulic model assumes that a solid breeder is in use, with both the first wall and the breeding blanket using helium as a coolant.
 This can be changed using the switches detailed in the following subsection. 
@@ -143,11 +143,11 @@ where $\texttt{tkfw}$ is the thermal conductivity of the first wall material and
 The temperature difference between the channel inner wall (film temperature) and the bulk coolant is calculated using the heat transfer coefficient, which is derived using the [Gnielinski correlation](https://en.wikipedia.org/wiki/Nusselt_number#Gnielinski_correlation).  The pressure drop is based on the Darcy fraction factor, using the [Haaland equation](https://en.wikipedia.org/wiki/Darcy_friction_factor_formulae#Haaland_equation), an approximation to the implicit Colebrook–White equation.  The thermal conductivity of Eurofer is used, from "Fusion Demo Interim Structural Design Criteria - Appendix A Material Design Limit Data", F. Tavassoli, TW4-TTMS-005-D01, 2004"
 
 !!! Note "Note" 
-    The pressure drop calculation is only performed for primary_pumping = 2, as for 3 it is used as an input, as explained in the heat transport section.
+    The pressure drop calculation is only performed for i_coolant_pumping = 2, as for 3 it is used as an input, as explained in the heat transport section.
 
 ### Model Switches
 
-There are three blanket model options, chosen by the user to match their selected blanket design using the switch 'icooldual' (default=0):
+There are three blanket model options, chosen by the user to match their selected blanket design using the switch 'i_blkt_dual_coolant' (default=0):
     0.   Solid breeder - nuclear heating in the blanket is exctrated by the primary coolant.
     1.   Liquid metal breeder, single-coolant 
         - nuclear heating in the blanket is exctrated by the primary coolant.
@@ -158,27 +158,27 @@ There are three blanket model options, chosen by the user to match their selecte
 
 The default assuption for all blanket models is that the first wall and breeding blanket have the same coolant (flow = FW inlet -> FW outlet -> BB inlet-> BB outlet). 
 It is possible to choose a different coolant for the FW and breeding blanket, in which case the mechanical pumping powers for the FW and BB are calculated seperately. 
-The model has three mechanical pumping power options, chosen by the user to match their selected blanket design using the switch 'ipump' (default=0): 
-    0.   Same coolant for FW and BB ('i_fw_coolant_type`=`coolwh`)
-    1.   Different coolant for FW and BB ('i_fw_coolant_type`/=`coolwh`) 
+The model has three mechanical pumping power options, chosen by the user to match their selected blanket design using the switch 'i_fw_blkt_shared_coolant' (default=0): 
+    0.   Same coolant for FW and BB ('i_fw_coolant_type`=`i_blkt_coolant_type`)
+    1.   Different coolant for FW and BB ('i_fw_coolant_type`/=`i_blkt_coolant_type`) 
 
 !!! Note "Note" 
-    For the dual-coolant blanket the 'ipump' switch is relavent for the blanket structure coolant and not the liquid metal breeder/coolant choice.  
+    For the dual-coolant blanket the 'i_fw_blkt_shared_coolant' switch is relavent for the blanket structure coolant and not the liquid metal breeder/coolant choice.  
 
 The user can select the number poloidal and toroidal modules for the IB and OB BB. The 'ims' switch can be set to 1 for a single-module-segment blanket (default=0):
     0. Multi-module segment 
     1. Single-module-segment
 
 |   Variable   | Units | Itvar. | Default | Description                                              |
 | :----------: | :---: | ------ | ------- | -------------------------------------------------------- |
-| `nblktmodpi` |  ---  |        | 7       | Number of inboard blanket modules in poloidal direction  |
-| `nblktmodpo` |  ---  |        | 8       | Number of outboard blanket modules in poloidal direction |
-| `nblktmodti` |  ---  |        | 32      | Number of inboard blanket modules in toroidal direction  |
-| `nblktmodto` |  ---  |        | 48      | Number of outboard blanket modules in toroidal direction |
+| `n_blkt_inboard_modules_poloidal` |  ---  |        | 7       | Number of inboard blanket modules in poloidal direction  |
+| `n_blkt_outboard_modules_poloidal` |  ---  |        | 8       | Number of outboard blanket modules in poloidal direction |
+| `n_blkt_inboard_modules_toroidal` |  ---  |        | 32      | Number of inboard blanket modules in toroidal direction  |
+| `n_blkt_outboard_modules_toroidal` |  ---  |        | 48      | Number of outboard blanket modules in toroidal direction |
 
 #### Liquid Breeder or Dual Coolant
 
-There are two material options for the liquid breeder/coolant, chosen by the user to match their selected blanket design using the switch 'i_bb_liq' (default=0):
+There are two material options for the liquid breeder/coolant, chosen by the user to match their selected blanket design using the switch 'i_blkt_liquid_breeder_type' (default=0):
     0.  Lead-Lithium 
     1.  Lithium (needs testing)    
 Both options use the mid-temperature of the metal to find the following properties: density, specific heat, thermal conductivity, dynamic viscosity and electrical conductivity. 
@@ -195,11 +195,11 @@ The Hartmann number is also calculated (using the magnetic feild strength in the
 
 #### Flow Channel Inserts for Liquid Metal Breeder
 
-There are three model options, chosen by the user to match their selected blanket design using the switch 'ifci' (default=0):
+There are three model options, chosen by the user to match their selected blanket design using the switch 'i_blkt_liquid_breeder_channel_type' (default=0):
     0.   No FCIs used. Conductivity of Eurofer steel is assumed for MHD pressure drop calculations in the liquid metal breeder.
     1.   FCIs used, assumed to be perfectly electrically insulating.  
     2.   FCIs used, with conductivity chosen by the user (`bz_channel_conduct_liq`).
 
 |         Variable         |   Units   | Itvar. | Usage       | Default | Description                                                         |
 | :----------------------: | :-------: | ------ | ----------- | ------- | ------------------------------------------------------------------- |
-| `bz_channel_conduct_liq` | A V-1 m-1 | 72     | ifci = 0, 2 | 8.33D5  | Liquid metal coolant/breeder thin conductor or FCI wall conductance |
+| `bz_channel_conduct_liq` | A V-1 m-1 | 72     | i_blkt_liquid_breeder_channel_type = 0, 2 | 8.33D5  | Liquid metal coolant/breeder thin conductor or FCI wall conductance |

documentation/proc-pages/eng-models/machine-build.md

@@ -92,7 +92,7 @@ The vertical build is shown schematically below (click to zoom).
 Since PROCESS is essentially a 0-D code, the shape of each component is used to estimate its mass
 and cost, but is not used otherwise.  The first wall, blanket, shield and vacuum vessel may be
 either D-shaped in cross-section, or each may be defined by two half-ellipses. The choice between
-these two possibilities is set using input parameter `fwbsshape`, which should be
+these two possibilities is set using input parameter `i_fw_blkt_vv_shape`, which should be
 
 - 1 for D-shaped,
 - 2 for ellipses.

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

@@ -13,7 +13,7 @@ turbines. Figure 1 shows the power flow.
 
 All of the charged particle transport power leaving the plasma (excluding the `1-f_alpha_plasma` 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.
+along with a proportion `f_ster_div_single` of the radiation power and the neutron power.
 
 Switch `iprimdiv` may be used to specify whether the thermal power deposited in the divertor becomes 
 high-grade thermal power (`iprimdiv` = 1) or low-grade waste heat (see Figure 1).
@@ -39,12 +39,12 @@ The primary coolant (less any thermal power required to produce hydrogen in a hy
 plant) is used to heat the secondary coolant to turn the turbines, which power the generator. The 
 remainder is dumped to the environment. All of the low-grade heat is dumped to the environment.
 
-`primary_pumping` : This switch controls the calculation of the mechanical pumping power required 
+`i_coolant_pumping` : This switch controls the calculation of the mechanical pumping power required 
 for the primary coolant.
 
-  - If `primary_pumping` = 0, the user sets mechanical pumping directly
-  - If `primary_pumping` = 1, the user sets mechanical pumping power as a fraction of thermal power removed by coolant.
-  - If `primary_pumping` = 2, the mechanical pumping power is calculated, as follows:
+  - If `i_coolant_pumping` = 0, the user sets mechanical pumping directly
+  - If `i_coolant_pumping` = 1, the user sets mechanical pumping power as a fraction of thermal power removed by coolant.
+  - If `i_coolant_pumping` = 2, the mechanical pumping power is calculated, as follows:
     - User inputs for the coolant outlets temperature (which may be used as an iteration variable), 
       the coolant channel diameter, and the segmentation of the blanket are used. The peak temperature 
       in the first wall material (underneath the armour) is derived. The user can apply an upper limit 
@@ -62,7 +62,7 @@ for the primary coolant.
       mechanical power used) is specified by the parameter `etaiso`. Note that the mechanical pumping 
       power for the shield and divertor are still calculated using the simplified method (a fixed 
       fraction of the heat transported).
-  - If `primary_pumping` = 3, the mechanical pumping power is calculated using specified pressure drop. 
+  - If `i_coolant_pumping` = 3, the mechanical pumping power is calculated using specified pressure drop. 
     The pressures and temperatures are set by the user.
       - When used with the DCLL model a different set of pressure drop variables are used, which are outlined below:
 
@@ -75,19 +75,19 @@ for the primary coolant.
 
      - The defaults for these variables are geared towards a WCLL concept, so different values should be used with Helium cooling.
 
-`secondary_cycle` : This switch controls the calculation of the thermal to electric conversion 
+`i_thermal_electric_conversion` : This switch controls the calculation of the thermal to electric conversion 
 efficiency in the secondary cycle.
 
-  - If `secondary_cycle` = 0, the efficiency of the power generation cycle is set to a single value 
+  - If `i_thermal_electric_conversion` = 0, the efficiency of the power generation cycle is set to a single value 
     obtained from previous cycle modelling studies. The heat deposited in the Toroidal Field coils 
     divertor coolant is assumed to be at such low temperature that it cannot be used for power 
     generation and is dumped to the environment.
-  - In the remaining options (`secondary_cycle` = 1, 2 or 3), the heat deposited in the divertor 
+  - In the remaining options (`i_thermal_electric_conversion` = 1, 2 or 3), the heat deposited in the divertor 
     coolant is used for power generation
   - If `secondary cycle` = 1, the efficiency of the power generation cycle is set as above, but the 
     divertor heat is used for electricity generation.
-  - If `secondary_cycle` = 2, the efficiency of the power generation cycle is input by the user.
-  - If `secondary_cycle` = 3, a steam Rankine cycle is assumed. The secondary cycle thermal 
+  - If `i_thermal_electric_conversion` = 2, the efficiency of the power generation cycle is input by the user.
+  - If `i_thermal_electric_conversion` = 3, a steam Rankine cycle is assumed. The secondary cycle thermal 
     efficiency (`etath`) is calculated from the coolant outlet temperature using simple relations 
     between temperature and efficiency[^1]:
 
@@ -96,7 +96,7 @@ efficiency in the secondary cycle.
     \eta & = & -0.8002 + 0.1802 \, \mathrm{ln}(T) \,\, \mathrm{(helium \, coolant; superheated \, steam \, Rankine \, cycle)}
     \end{eqnarray*}$
 
-  - If `secondary_cycle` = 4, a supercritical CO$_2$ Brayton cycle is assumed. The secondary cycle 
+  - If `i_thermal_electric_conversion` = 4, a supercritical CO$_2$ Brayton cycle is assumed. The secondary cycle 
     efficiency (`etath`) is calculated from the coolant outlet temperature using simple relations 
     between temperature and efficiency from [^1]:
 

documentation/proc-pages/fusion-devices/spherical-tokamak.md

@@ -10,7 +10,7 @@
         title="Schematic diagram of the Power Core radial build" 
         width="650" height="100" />
         <br><br>
-        <figcaption><i>Figure 1: Schematic diagram of the fusion power core of a typical tokamak power plant modelled by `PROCESS`, showing the relative positions of the components. A double null plasma is assumed (`i_single_null=0`) - compare Figure 2, and the first wall, blanket, shield and vacuum vessel are D-shaped in cross-section (chosen by setting switch `fwbsshape=1`) - compare Figure 3. Also shown are the code variables used to define the thicknesses of the components. The arrowed labels adjacent to the axes are the total 'builds' to that point. The precise locations and sizes of the PF coils are calculated within the code.
+        <figcaption><i>Figure 1: Schematic diagram of the fusion power core of a typical tokamak power plant modelled by `PROCESS`, showing the relative positions of the components. A double null plasma is assumed (`i_single_null=0`) - compare Figure 2, and the first wall, blanket, shield and vacuum vessel are D-shaped in cross-section (chosen by setting switch `i_fw_blkt_vv_shape=1`) - compare Figure 3. Also shown are the code variables used to define the thicknesses of the components. The arrowed labels adjacent to the axes are the total 'builds' to that point. The precise locations and sizes of the PF coils are calculated within the code.
         </i></figcaption>
         <br>
         </center>
@@ -67,7 +67,7 @@ Switch `itart` provides overall control of the ST switches within the code, and
     title="Schematic diagram of the Power Core radial build" 
     width="650" height="100" />
     <br><br>
-    <figcaption><i>Figure 3: Schematic diagram of the fusion power core of a typical tokamak power plant modelled by `PROCESS`. The first wall, blanket, shield and vacuum vessel cross-sectional shapes are each assumed to be defined by two ellipses (chosen by setting switch `fwbsshape=2`) - compare Figure 2.
+    <figcaption><i>Figure 3: Schematic diagram of the fusion power core of a typical tokamak power plant modelled by `PROCESS`. The first wall, blanket, shield and vacuum vessel cross-sectional shapes are each assumed to be defined by two ellipses (chosen by setting switch `i_fw_blkt_vv_shape=2`) - compare Figure 2.
     </i></figcaption>
     <br>
     </center>

documentation/proc-pages/fusion-devices/stellarator.md

@@ -263,13 +263,13 @@ fblli2o = 0.07 *Lithium oxide fraction of blanket by volume (only relevant for m
 fbllipb = 0. *Lithium lead fraction of blanket by volume (only relevant for mass calculations)
 fblss = 0.13 *Stainless steel fraction of blanket by volume (only relevant for mass calculations)
 fblvd = 0. *Vanadium fraction of blanket by volume (only relevant for mass calculations)
-fhole = 0. *Area fraction taken up by other holes (in addition to fdiv and fhcd when ipowerflow=1)
+fhole = 0. *Area fraction taken up by other holes (in addition to f_ster_div_single and f_a_fw_hcd when ipowerflow=1)
 fwclfr = 0.1 *First wall coolant fraction (only relevant for mass calculations)
-primary_pumping = 1 *Switch for pumping power (0: User sets pump power directly)
+i_coolant_pumping = 1 *Switch for pumping power (0: User sets pump power directly)
 htpmw_blkt = 120. *Blanket coolant mechanical pumping power (MW)
 htpmw_fw = 56. *First wall coolant mechanical pumping power (MW)
 htpmw_div = 24. *Divertor coolant mechanical pumping power (MW)
-secondary_cycle = 2 *Switch for power conversion cycle (2: user input thermal-electric efficiency)
+i_thermal_electric_conversion = 2 *Switch for power conversion cycle (2: user input thermal-electric efficiency)
 vfblkt = 0.1 *Coolant void fraction in blanket (blktmodel=0) (only relevant for mass calculations)
 vfshld = 0.6 *Coolant void fraction in shield
 declblkt = 0.075 *Neutron decay length in blanket area (m)