Update pfcoil_variables.f90 variables for clarity

documentation/proc-pages/eng-models/central-solenoid.md

@@ -9,11 +9,11 @@ amount actually available. The code measures the magnetic flux in units of Volt.
 Switch `iohcl` controls whether a central solenoid is present. A value of 1 denotes that this coil 
 is present, and should be assigned a non-zero thickness `dr_cs`. A value of `iohcl` = 0 denotes 
 that no central solenoid is present, in which case the thickness `dr_cs` should be zero. No PF 
-coils should be located at positions defined by `ipfloc(j)` = 1 if no central solenoid is present.
+coils should be located at positions defined by `i_pf_location(j)` = 1 if no central solenoid is present.
 
-The central solenoid can be either resistive or superconducting (controlled via switch `ipfres` as 
-for the other PF coils), and if superconducting, switch `isumatpf` determines the superconducting 
-material to use -  its value is used like `isumattf` and `isumatpf`. The copper fraction (by volume) 
+The central solenoid can be either resistive or superconducting (controlled via switch `i_pf_conductor` as 
+for the other PF coils), and if superconducting, switch `i_pf_superconductor` determines the superconducting 
+material to use -  its value is used like `isumattf` and `i_pf_superconductor`. The copper fraction (by volume) 
 of the superconducting strands is `fcuohsu`.
 
 The hoop stress is calculated using equations 4.10 and 4.11 from "Superconducting magnets", Martin N. 
@@ -96,7 +96,7 @@ An example output follows.  Note that in this example the cycle life is *not* su
  Minimum burn time (s)                                                    (t_burn_min)                  7.200E+03     
  Initial vertical crack size (m)                                          (t_crack_vertical)        8.900E-04     
  Initial radial crack size (m)                                            (t_crack_radial)          2.670E-03     
- CS turn area (m)                                                         (a_oh_turn)               1.904E-03     
+ CS turn area (m)                                                         (a_cs_turn)               1.904E-03     
  CS turn length (m)                                                       (l_cond_cst)              7.557E-02     
  CS turn internal cable space radius (m)                                  (r_in_cst)                6.732E-03     
  CS turn width (m)                                                        (d_cond_cst)              2.519E-02     
@@ -146,10 +146,10 @@ The central solenoid pre-compression structure is included in the model if and o
 
 ## Current density inputs and limits
 
-The absolute value of the central solenoid current density at the end-of-flat-top ('EOF'), `coheof`, 
+The absolute value of the central solenoid current density at the end-of-flat-top ('EOF'), `j_cs_flat_top_end`, 
 is specified by the user, and can be used as an iteration variable (no. 37). The current density at 
-the beginning-of-pulse ('BOP' - See Figure 1) is specified as a (positive) fraction of `coheof` 
-using `fcohbop` (iteration variable no. 41). The current density in the CS at all other times is 
+the beginning-of-pulse ('BOP' - See Figure 1) is specified as a (positive) fraction of `j_cs_flat_top_end` 
+using `f_j_cs_start_pulse_end_flat_top` (iteration variable no. 41). The current density in the CS at all other times is 
 calculated by taking into account the flux swing necessary to initiate and maintain plasma current.
 
 The current density in the central solenoid can be limited at BOP and at EOF. To limit the current 

documentation/proc-pages/eng-models/pf-coil.md

@@ -9,11 +9,11 @@ position and shape during the flat-top period.
 The positions and sizes of te PF coils are partly input, and partly calculated after consideration 
 of the required currents and allowable current density.
 
-The PF coil locations are controlled using a set of switched stored in array `ipfloc` (see 
+The PF coil locations are controlled using a set of switched stored in array `i_pf_location` (see 
 Figure 1), and are calculated in routine `PFCOIL`. The coils are (usually) organised into groups 
 containing two PF coils placed symmetrically above and below the midplane, and each group `j` has 
-an element `ipfloc(j)` assigned to it. Input parameter `ngrp` should be set to the number of groups, 
-and `ncls(j)` should be assigned the number of coils in each group - which should be 2 in each case.
+an element `i_pf_location(j)` assigned to it. Input parameter `n_pf_coil_groups` should be set to the number of groups, 
+and `n_pf_coils_in_group(j)` should be assigned the number of coils in each group - which should be 2 in each case.
 
 <figure markdown>
 ![Machine build](../images/vertical-build.png){ width="100%"}
@@ -24,26 +24,26 @@ In the following, all variables are defined in the variable descriptor file `var
 values for `rpf1`, `rpf2`, `zref(j)` and `routr` should be adjusted by the user to locate the PF 
 coils accurately.
 
-The three possible values of `ipfloc(j)` correspond to the following PF coil positions: (Redo taking 
+The three possible values of `i_pf_location(j)` correspond to the following PF coil positions: (Redo taking 
 into account `i_single_null` and other recent changes e.g. rclsnorm)
 
-`ipfloc(j)` = 1: PF coils are placed above the central solenoid (one group only);
-*R* = `rohc` + `rpf1`<br>
-*Z* = $\pm$(`hmax` * `ohhghf` + 0.1 + 0.5 * (`hmax` * (1 - `ohhghf`) + `dr_tf_inboard` + 0.1))
+`i_pf_location(j)` = 1: PF coils are placed above the central solenoid (one group only);
+*R* = `r_cs_middle` + `rpf1`<br>
+*Z* = $\pm$(`hmax` * `f_z_cs_tf_internal` + 0.1 + 0.5 * (`hmax` * (1 - `f_z_cs_tf_internal`) + `dr_tf_inboard` + 0.1))
 
-`ipfloc(j)` = 2: PF coils are placed above the TF coils (one group only);<br>
+`i_pf_location(j)` = 2: PF coils are placed above the TF coils (one group only);<br>
 *R* = `rmajor` + `rpf2`<br>
 *Z* = $\pm$(`hmax` * `dr_tf_inboard` + 0.86)
 
-`ipfloc(j)` = 3: PF coils are placed radially outside the TF coils (any number of groups);<br>
+`i_pf_location(j)` = 3: PF coils are placed radially outside the TF coils (any number of groups);<br>
 *R* = `rtot` + `dr_tf_outboard`/2 + `routr`<br>
 *Z* = $\pm$(`rminor` * `zref(j)`
 
-The void fraction (for coolant) in each coil `i`'s winding pack is given by `vf(i)`.
+The void fraction (for coolant) in each coil `i`'s winding pack is given by `f_a_pf_coil_void(i)`.
 
 ## Coil currents
 
-The peak current per turn, `cptdin(i)`, and the winding pack peak current density `rjconpf(i)` in 
+The peak current per turn, `c_pf_coil_turn_peak_input(i)`, and the winding pack peak current density `j_pf_coil_wp_peak(i)` in 
 each PF coil `i` are inputs. The PF coil currents vary as a function of time during the tokamak 
 operation as indicated in Figure 2. They contribute part of the flux swing necessary to maintain the plasma current.
 
@@ -58,11 +58,11 @@ ramp-up period, although it will pass through zero during the burn phase.</figca
 ## Materials
 
 The PF coils can be either resistive or superconducting. This is determined from the value of 
-`ipfres`. If `ipfres` = 0, the PF coils and the central solenoid are assumed to be superconducting. 
-If `ipfres` = 1, they are assumed to be resistive, with their resistivity given by the value of variable `pfclres`.
+`i_pf_conductor`. If `i_pf_conductor` = 0, the PF coils and the central solenoid are assumed to be superconducting. 
+If `i_pf_conductor` = 1, they are assumed to be resistive, with their resistivity given by the value of variable `rho_pf_coil`.
 
-If `ipfres` = 0, switch `isumatpf` specifies which superconducting material is to be used for the 
-PF coils. The values of `isumatpf` are used in the same way as switch `isumattf` is for the TF coils.
+If `i_pf_conductor` = 0, switch `i_pf_superconductor` specifies which superconducting material is to be used for the 
+PF coils. The values of `i_pf_superconductor` are used in the same way as switch `isumattf` is for the TF coils.
 
 The fraction of copper present in the superconducting filaments if given by the value of 
 variable `fcupfsu`.

documentation/proc-pages/io/python-lib-guide.md

@@ -26,7 +26,7 @@ To get values of input file entries from the object
     i.number_of_constraints
     i.number_of_itvars
     i.data["fimp"].value
-    i.data["ipfloc"].value
+    i.data["i_pf_location"].value
 ```
 
 To add/remove constraints, iteration variables