♻️ Refactor tf averaged turn geometry

documentation/eng-models/tf-coil-superconducting.md

@@ -133,24 +133,24 @@ turns. The number of turns can be parametrized in three different ways :
     `c_tf_turn`. There is no guarantee that a realistic turn configuration (with all
     the turn geometrically fitting in the allocated space) or even have an
     integer number of turn is used with this parametrization. If the turn
-    thickness `t_turn_tf` or the cable thickness `t_cable_tf` is defined by
+    thickness `dx_tf_turn_general` or the cable space thickness `dx_tf_turn_cable_space_general` is defined by
     the user, this parametrization is not selected.
   </p>   
 - <p style='text-align: justify;'>
-    **Turn size parametrization:** the dimension of the turn `t_turn_tf` can be
+    **Turn size parametrization:** the dimension of the turn `dx_tf_turn_general` can be
     set by the user. To do so, the user just have to select the following option:
-    `i_tf_turns_integer = 0` and to set a value to the variable `t_turn_tf`. The
+    `i_tf_turns_integer = 0` and to set a value to the variable `dx_tf_turn_general`. The
     area of the corresponding squared turn and the number of turns necessary to
     fill the WP area is deduced. There is no guarantee that a realistic turn
     configuration (with all the turn geometrically fitting in the allocated
     space) or even have an integer number of turns is used with this parametrization.
     The current per turn `c_tf_turn` will be overwitten.
   </p>
 - <p style='text-align: justify;'>
-    **Cable size parametrization:** the dimension of the SC cable `t_cable_tf`
+    **Cable size parametrization:** the dimension of the SC cable `dx_tf_turn_cable_space_general`
     can be set by the user. To do so, the user just have to select the following
     option: `i_tf_turns_integer = 0` and to set a value to the variable
-    `t_cable_tf`. The area of the corresponding squared turn is deduced adding
+    `dx_tf_turn_cable_space_general`. The area of the corresponding squared turn is deduced adding
     the steel conduit structure and the turn insulation. The number of turns
     necessary to fill the WP area is then deduced. There is no guarantee that a
     realistic turn configuration (with all the turn geometrically fitting in the

documentation/eng-models/tf-coil.md

@@ -968,11 +968,11 @@ considered/implemented in <em>PROCESS</em>.
 | `i_tf_turns_integer` | Switch activating the integer turn parametrization <br> - 0 : Integer number of turns <br> - 1 : non integer number of turn | -                  | 0             | -    |
 | `n_tf_wp_layers`            | Number of turns in the radial direction (`i_tf_turns_integer = 1` only)                                                     | -                  | 20            | -    |
 | `n_tf_wp_pancakes`          | Number of turns in the toroidal direction (`i_tf_turns_integer = 1` only)                                                   | -                  | 10            | -    |
-| `t_turn_tf`          | TF turn squared size                                                                                                        | -                  | No default    | m    |
-| `t_cable_tf`         | TF cable diameter size                                                                                                      | -                  | No default    | m    |
+| `dx_tf_turn_general`          | TF turn squared size                                                                                                        | -                  | No default    | m    |
+| `dx_tf_turn_cable_space_general`         | TF cable diameter size                                                                                                      | -                  | No default    | m    |
 | `f_t_turn_tf`        | f-value for TF turn squared size constraint (icc = 86)                                                                      | 175                | 1.            | m    |
 | `t_turn_tf_max`      | Maximum turn squared size for constraint (icc = 86)                                                                         | -                  | 0.05          | m    |
-| `c_tf_turn`              | Current per turn <br> Overwitten if `t_turn_tf` is set by the user                                                          | ixc = 60           | $70.10^3$     | A    |
+| `c_tf_turn`              | Current per turn <br> Overwitten if `dx_tf_turn_general` is set by the user                                                          | ixc = 60           | $70.10^3$     | A    |
 | `dx_tf_turn_insulation`           | Turn insulation layer thickness                                                                                             | -                  | $0.8.10^{-3}$ | m    |
 | `dx_tf_turn_steel`           | Steekl jacket/conduit thickness                                                                                             | 58                 | $8.10^{-3}$   | m    |
 | `dia_tf_turn_coolant_channel`            | Helium cooling channel diameter                                                                                             | -                  | $5.10^{-3}$   | m    |

documentation/fusion-devices/stellarator.md

@@ -210,7 +210,7 @@ The fully three-dimensional shape of the coils is assumed to be fixed, but the s
 The stellarator coils are assumed to be superconducting - no resistive coil calculations are performed. The critical field at the superconductor is calculated using circular approximations for the coils in the inductance and field calculations, and the limit is enforced automatically. All superconductor materials that are available for tokamaks are also available for stellarators.
 
 The winding pack cross-section is rectangular for the stellarator coils, rather than the two-step cross-section assumed for tokamaks. The coil thicknesses and most of the dimensions of the materials within the coil cross-section are outputs from the model, instead of being inputs as is the case for tokamaks; see the variable descriptor file for details. In addition, certain iteration variables (`dr_tf_inboard`, no. 13; `dr_tf_nose_case`, no. 57; `c_tf_turn`, no. 60 and `dx_tf_inboard_out_toroidal`, no. 77) should not be turned on in the input file as they are calculated self-consistently (`dr_tf_nose_case` is required as input); the code will stop with an error message of this is attempted.
-The conduit insulation thickness (`dx_tf_turn_insulation`), as well as the steel thickness around each conductor (`dx_tf_turn_steel`) should be given as input parameters together with the dimension of the conductor area (`t_turn_tf`).
+The conduit insulation thickness (`dx_tf_turn_insulation`), as well as the steel thickness around each conductor (`dx_tf_turn_steel`) should be given as input parameters together with the dimension of the conductor area (`dx_tf_turn_general`).
 
 
 stellarator-PROCESS returns a set of parameters for the coil force densities, which are scaled from the reference calculation.
@@ -230,7 +230,7 @@ fiooic = 0.78 *Fraction TF coil critical current to operation current (should be
 v_tf_coil_dump_quench_max_kv = 12.64 * Max voltage across tf coil during quench (kV)
 t_tf_superconductor_quench = 20 * Dump time (should be iteration variable)
 dr_tf_nose_case = 0.1 * Thickness TF Coil case (for stellarators: Also for toroidal direction)
-t_turn_tf = 0.048 * Dimension conductor area including steel and insulation. Important parameter.
+dx_tf_turn_general = 0.048 * Dimension conductor area including steel and insulation. Important parameter.
 dx_tf_turn_insulation = 0.0015 * Conduit insulation thickness (one side) (m)
 dx_tf_turn_steel = 0.006 * thickness of steel around each conductor (one side) (m)
 dx_tf_wp_insulation = 0.1 * insulation on top of winding pack (one side) (m)

examples/data/csv_output_large_tokamak_MFILE.DAT

@@ -711,7 +711,7 @@
  Cable_WP_fraction_______________________________________________________ ((a_tf_wp_with_insulation-a_tf_wp_steel-a_tf_coil_wp_turn_insulation)/a_tf_wp_with_insulation)_______      5.2482E-01    
  Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________              0    
  Number_of_turns_per_TF_coil_____________________________________________ (n_tf_coil_turns)___________________      1.5709E+02 OP 
- Width_of_turn_including_inter-turn_insulation_(m)_______________________ (t_turn_tf)___________________      5.7439E-02 OP 
+ Width_of_turn_including_inter-turn_insulation_(m)_______________________ (dx_tf_turn_general)___________________      5.7439E-02 OP 
  Width_of_conductor_(square)_(m)_________________________________________ (t_conductor)_________________      5.5839E-02 OP 
  Width_of_space_inside_conductor_(m)_____________________________________ (dx_tf_turn_cable_space_average)_____________________      3.9839E-02 OP 
  Steel_conduit_thickness_(m)_____________________________________________ (dx_tf_turn_steel)____________________      8.0000E-03 ITV

examples/data/large_tokamak_1_MFILE.DAT

@@ -708,7 +708,7 @@
  Cable_WP_fraction_______________________________________________________ ((a_tf_wp_with_insulation-a_tf_wp_steel-a_tf_coil_wp_turn_insulation)/a_tf_wp_with_insulation)_______      5.3656E-01    
  Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________              0    
  Number_of_turns_per_TF_coil_____________________________________________ (n_tf_coil_turns)___________________      1.4739E+02 OP 
- Width_of_turn_including_inter-turn_insulation_(m)_______________________ (t_turn_tf)___________________      5.9223E-02 OP 
+ Width_of_turn_including_inter-turn_insulation_(m)_______________________ (dx_tf_turn_general)___________________      5.9223E-02 OP 
  Width_of_conductor_(square)_(m)_________________________________________ (t_conductor)_________________      5.7623E-02 OP 
  Width_of_space_inside_conductor_(m)_____________________________________ (dx_tf_turn_cable_space_average)_____________________      4.1604E-02 OP 
  Steel_conduit_thickness_(m)_____________________________________________ (dx_tf_turn_steel)____________________      8.0099E-03 ITV

examples/data/large_tokamak_2_MFILE.DAT

@@ -708,7 +708,7 @@
  Cable_WP_fraction_______________________________________________________ ((a_tf_wp_with_insulation-a_tf_wp_steel-a_tf_coil_wp_turn_insulation)/a_tf_wp_with_insulation)_______      5.3656E-01    
  Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________              0    
  Number_of_turns_per_TF_coil_____________________________________________ (n_tf_coil_turns)___________________      1.4739E+02 OP 
- Width_of_turn_including_inter-turn_insulation_(m)_______________________ (t_turn_tf)___________________      5.9223E-02 OP 
+ Width_of_turn_including_inter-turn_insulation_(m)_______________________ (dx_tf_turn_general)___________________      5.9223E-02 OP 
  Width_of_conductor_(square)_(m)_________________________________________ (t_conductor)_________________      5.7623E-02 OP 
  Width_of_space_inside_conductor_(m)_____________________________________ (dx_tf_turn_cable_space_average)_____________________      4.1604E-02 OP 
  Steel_conduit_thickness_(m)_____________________________________________ (dx_tf_turn_steel)____________________      8.0099E-03 ITV

examples/data/large_tokamak_3_MFILE.DAT

@@ -708,7 +708,7 @@
  Cable_WP_fraction_______________________________________________________ ((a_tf_wp_with_insulation-a_tf_wp_steel-a_tf_coil_wp_turn_insulation)/a_tf_wp_with_insulation)_______      5.3656E-01    
  Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________              0    
  Number_of_turns_per_TF_coil_____________________________________________ (n_tf_coil_turns)___________________      1.4739E+02 OP 
- Width_of_turn_including_inter-turn_insulation_(m)_______________________ (t_turn_tf)___________________      5.9223E-02 OP 
+ Width_of_turn_including_inter-turn_insulation_(m)_______________________ (dx_tf_turn_general)___________________      5.9223E-02 OP 
  Width_of_conductor_(square)_(m)_________________________________________ (t_conductor)_________________      5.7623E-02 OP 
  Width_of_space_inside_conductor_(m)_____________________________________ (dx_tf_turn_cable_space_average)_____________________      4.1604E-02 OP 
  Steel_conduit_thickness_(m)_____________________________________________ (dx_tf_turn_steel)____________________      8.0099E-03 ITV

examples/data/large_tokamak_4_MFILE.DAT

@@ -708,7 +708,7 @@
  Cable_WP_fraction_______________________________________________________ ((a_tf_wp_with_insulation-a_tf_wp_steel-a_tf_coil_wp_turn_insulation)/a_tf_wp_with_insulation)_______      5.3656E-01    
  Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________              0    
  Number_of_turns_per_TF_coil_____________________________________________ (n_tf_coil_turns)___________________      1.4739E+02 OP 
- Width_of_turn_including_inter-turn_insulation_(m)_______________________ (t_turn_tf)___________________      5.9223E-02 OP 
+ Width_of_turn_including_inter-turn_insulation_(m)_______________________ (dx_tf_turn_general)___________________      5.9223E-02 OP 
  Width_of_conductor_(square)_(m)_________________________________________ (t_conductor)_________________      5.7623E-02 OP 
  Width_of_space_inside_conductor_(m)_____________________________________ (dx_tf_turn_cable_space_average)_____________________      4.1604E-02 OP 
  Steel_conduit_thickness_(m)_____________________________________________ (dx_tf_turn_steel)____________________      8.0099E-03 ITV

examples/data/large_tokamak_nof_2_MFILE.DAT

@@ -670,7 +670,7 @@
  Cable_WP_fraction________________________________________________________ ((a_tf_wp_with_insulation-a_tf_wp_steel-aiwp)/a_tf_wp_with_insulation)________ 5.29144615941500196e-01
  Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________              0    
  Number_of_turns_per_TF_coil______________________________________________ (n_tf_coil_turns)____________________ 1.55574412294225624e+02 OP
- Width_of_turn_including_inter-turn_insulation_(m)________________________ (t_turn_tf)____________________ 5.82428732675677810e-02 OP
+ Width_of_turn_including_inter-turn_insulation_(m)________________________ (dx_tf_turn_general)____________________ 5.82428732675677810e-02 OP
  Width_of_conductor_(square)_(m)__________________________________________ (t_conductor)__________________ 5.66428732675677837e-02 OP
  Width_of_space_inside_conductor_(m)______________________________________ (dx_tf_turn_cable_space_average)______________________ 4.06186532016039326e-02 OP
  Steel_conduit_thickness_(m)______________________________________________ (dx_tf_turn_steel)_____________________ 8.01211003298192385e-03

examples/data/large_tokamak_nof_MFILE.DAT

@@ -744,7 +744,7 @@
  Cable_WP_fraction________________________________________________________ ((a_tf_wp_with_insulation-a_tf_wp_steel-aiwp)/a_tf_wp_with_insulation)________ 5.08389576488017192e-01
  Turn_parametrisation____________________________________________________ (i_tf_turns_integer)__________              0    
  Number_of_turns_per_TF_coil______________________________________________ (n_tf_coil_turns)____________________ 1.54382962574717794e+02 OP
- Width_of_turn_including_inter-turn_insulation_(m)________________________ (t_turn_tf)____________________ 5.64999376912919751e-02 OP
+ Width_of_turn_including_inter-turn_insulation_(m)________________________ (dx_tf_turn_general)____________________ 5.64999376912919751e-02 OP
  Width_of_conductor_(square)_(m)__________________________________________ (t_conductor)__________________ 5.48999376912919779e-02 OP
  Width_of_space_inside_conductor_(m)______________________________________ (dx_tf_turn_cable_space_average)______________________ 3.83854185774860357e-02 OP
  Steel_conduit_thickness_(m)______________________________________________ (dx_tf_turn_steel)_____________________ 8.25725955690296935e-03

process/constraints.py

@@ -2220,12 +2220,12 @@ def constraint_equation_86():
     """Upper limit on the turn edge length in the TF winding pack
     Author : S Kahn
 
-    t_turn_tf: TF coil turn edge length including turn insulation [m]
+    dx_tf_turn_general: TF coil turn edge length including turn insulation [m]
     f_t_turn_tf: f-value for TF turn edge length constraint
     t_turn_tf_max: TF turn edge length including turn insulation upper limit [m]
     """
     cc = (
-        data_structure.tfcoil_variables.t_turn_tf
+        data_structure.tfcoil_variables.dx_tf_turn_general
         / data_structure.tfcoil_variables.t_turn_tf_max
         - 1.0 * data_structure.tfcoil_variables.f_t_turn_tf
     )

process/data_structure/tfcoil_variables.py

@@ -118,15 +118,15 @@
 """Conductor (cable + steel conduit) area averaged dimension [m]"""
 
 
-t_turn_tf: float = None
+dx_tf_turn_general: float = None
 """TF coil turn edge length including turn insulation [m]
 If the turn is not a square (i_tf_turns_integer = 1) a squared turn of
 equivelent size is use to calculated this quantity
-If the t_turn_tf is non zero, c_tf_turn is calculated
+If the dx_tf_turn_general is non zero, c_tf_turn is calculated
 """
 
 
-t_turn_tf_is_input: bool = None
+i_dx_tf_turn_general_input: bool = None
 """Boolean switch to activated when the user set the TF coil turn dimensions
 Not an input
 """
@@ -149,15 +149,15 @@
 """
 
 
-t_cable_tf: float = None
+dx_tf_turn_cable_space_general: float = None
 """TF coil superconducting cable squared/rounded dimensions [m]
 If the turn is not a square (i_tf_turns_integer = 1) a squared cable of
 equivelent size is use to calculated this quantity
-If the t_cable_tf is non zero, c_tf_turn is calculated
+If the dx_tf_turn_cable_space_general is non zero, c_tf_turn is calculated
 """
 
 
-t_cable_tf_is_input: bool = None
+i_dx_tf_turn_cable_space_general_input: bool = None
 """Boolean switch to activated when the user set the TF coil cable dimensions
 Not an input
 """
@@ -1109,12 +1109,12 @@ def init_tfcoil_variables():
     global casths_fraction
     global tfc_sidewall_is_fraction
     global t_conductor
-    global t_turn_tf
-    global t_turn_tf_is_input
+    global dx_tf_turn_general
+    global i_dx_tf_turn_general_input
     global f_t_turn_tf
     global t_turn_tf_max
-    global t_cable_tf
-    global t_cable_tf_is_input
+    global dx_tf_turn_cable_space_general
+    global i_dx_tf_turn_cable_space_general_input
     global acs
     global cdtfleg
     global cforce
@@ -1324,10 +1324,10 @@ def init_tfcoil_variables():
     dx_tf_side_case_min = 0.0
     casths_fraction = 0.06
     t_conductor = 0.0
-    t_cable_tf = 0.0
-    t_cable_tf_is_input = False
-    t_turn_tf = 0.0
-    t_turn_tf_is_input = False
+    dx_tf_turn_cable_space_general = 0.0
+    i_dx_tf_turn_cable_space_general_input = False
+    dx_tf_turn_general = 0.0
+    i_dx_tf_turn_general_input = False
     f_t_turn_tf = 1.0
     t_turn_tf_max = 0.05
     acs = 0.0