📖 Add guidelines for impedance naming conventions in style guide

Author: chris-ashe

documentation/development/standards.md

@@ -278,6 +278,12 @@ This should be used for units of $\text{kg} \cdot \text{m}^{-2}\text{s}^{-1}$
 
 ---------------------
 
+##### Impedances
+
+- Impedances should start with the `imp_` prefix
+
+---------------------
+
 ##### Resistivity
 
 - Resistivity variables should start with the `rho_` prefix

documentation/eng-models/power-requirements.md

@@ -5,10 +5,10 @@ The main power flow is controlled by `power.py`. The main class `Power` controls
 
 ### TF Coils
 
-Generall the newt power consumption of one magnet in $\text{VA}$ is given by:
+Generall the net power consumption of one magnet in $\text{VA}$ is given by:
 
 $$
-P_{\text{TF,electric}} = \left(R_{\text{TF,coil}}+R_{\text{joints}}+R_{\text{feeder}}\right) \times I_{\text{TF,coil}}^2 
+P_{\text{TF,electric}} = \left(\Omega_{\text{TF,coil}}+\Omega_{\text{joints}}+\Omega_{\text{feeder}}\right) \times I_{\text{TF,coil}}^2 
 \\ +\left(L_{\text{TF,coil-self}}+L_{\text{feeder}}\right)\frac{dI}{dt}
 $$
 

process/power.py

@@ -1781,7 +1781,7 @@ def tfpwr(self, output: bool):
                 v_tf_coil_dump_quench_kv=tfcoil_variables.v_tf_coil_dump_quench_kv,
                 e_tf_magnetic_stored_total_mj=superconducting_tf_coil_variables.e_tf_magnetic_stored_total
                 / 1e6,
-                ind_tf_total=superconducting_tf_coil_variables.ind_tf_total,
+                ind_tf_total=tfcoil_variables.ind_tf_total,
                 ind_tf_coil=superconducting_tf_coil_variables.ind_tf_coil,
                 t_tf_charge=tfcoil_variables.t_tf_charge,
             )
@@ -1961,34 +1961,34 @@ def superconducting_tf_power_iter_1988(
         v_tf_bus = 1000.0e0 * c_tf_turn_ka * res_tf_bus
 
         #  Total resistance of the TF coils, ohms
-        rcoils = 0.0
+        res_tf_coils = 0.0
 
         #  Total impedance, ohms
-        ztotal = res_tf_bus + rcoils + ind_tf_total / t_tf_charge
+        imp_tf_total = res_tf_bus + res_tf_coils + ind_tf_total / t_tf_charge
 
         #  Charging voltage for the TF coils, volts
-        tfcv = 1000.0e0 * c_tf_turn_ka * ztotal
+        v_tf_charge = 1000.0e0 * c_tf_turn_ka * imp_tf_total
 
         #  Number of TF power modules
-        ntfpm = (c_tf_turn_ka * (1.0e0 + nsptfc)) / 5.0e0
+        n_tf_power_modules = (c_tf_turn_ka * (1.0e0 + nsptfc)) / 5.0e0
 
         #  TF coil power module voltage, volts
-        tfpmv = rtfps * tfcv / (1.0e0 + nsptfc)
+        v_tf_power_module = rtfps * v_tf_charge / (1.0e0 + nsptfc)
 
         #  TF coil power supply voltage, volts
-        tfpsv = rtfps * tfcv
+        tfpsv = rtfps * v_tf_charge
 
         #  Power supply current, kA
         tfpska = rtfps * c_tf_turn_ka
 
         #  TF power module current, kA
-        tfpmka = rtfps * c_tf_turn_ka / (ntfpm / (1.0e0 + nsptfc))
+        tfpmka = rtfps * c_tf_turn_ka / (n_tf_power_modules / (1.0e0 + nsptfc))
 
         #  TF power module power, kW
-        tfpmkw = tfpmv * tfpmka
+        tfpmkw = v_tf_power_module * tfpmka
 
         #  Available DC power for charging the TF coils, kW
-        tfckw = tfpmkw * ntfpm
+        tfckw = tfpmkw * n_tf_power_modules
 
         #  Peak AC power needed to charge coils, kW
         tfackw = tfckw / 0.9e0
@@ -2022,7 +2022,7 @@ def superconducting_tf_power_iter_1988(
 
         #  Building space:
         #  Power modules floor space, m2
-        part1 = fspc1 * ntfpm * tfpmkw**0.667e0
+        part1 = fspc1 * n_tf_power_modules * tfpmkw**0.667e0
 
         #  Circuit breakers floor space, m2
         part2 = (
@@ -2091,14 +2091,14 @@ def superconducting_tf_power_iter_1988(
             po.ovarre(
                 self.outfile,
                 "Total resistance of TF coils (ohm)",
-                "(rcoils)",
-                rcoils,
+                "(res_tf_coils)",
+                res_tf_coils,
                 "OP ",
             )
             # MDK Remove this as it leads to confusion between (a) total inductance/n_tf_coils, or (b)
             #     self-inductance of one single coil
             # po.ovarre(outfile,'Inductance per TF coil (H)','(ind_tf_coil)',ind_tf_coil, 'OP ')
-            po.ovarre(self.outfile, "TF coil charging voltage (V)", "(tfcv)", tfcv)
+            po.ovarre(self.outfile, "TF coil charging voltage (V)", "(v_tf_charge)", v_tf_charge)
             po.ovarre(
                 self.outfile,
                 "Number of DC circuit breakers",

tests/unit/test_tfcoil.py

@@ -714,7 +714,6 @@ class TfcindParam(NamedTuple):
             z_tf_arc=np.zeros(3),
             r_tf_arc=np.zeros(3),
             ind_tf_coil=0.0,
-            expected_ind_tf_coil=6.26806810007207e-06,
         ),
     ),
 )