Post rebase changes

Author: chris-ashe

process/data_structure/superconducting_tf_coil_variables.py

@@ -288,74 +288,76 @@
 
 
 def init_superconducting_tf_coil_variables():
-    global is_leg_cp_temp_same
-    global tf_fit_t
-    global tf_fit_z
-    global f_b_tf_inboard_peak_ripple_symmetric
-    global c_tf_coil
-    global a_tf_wp_with_insulation
-    global a_tf_wp_no_insulation
-    global a_tf_coil_inboard_steel
-    global a_tf_coil_inboard_insulation
-    global f_a_tf_coil_inboard_steel
-    global f_a_tf_coil_inboard_insulation
-    global z_cp_top
-    global r_tf_outboard_in
-    global r_tf_outboard_out
-    global r_tf_wp_inboard_inner
-    global r_tf_wp_inboard_outer
-    global r_tf_wp_inboard_centre
-    global dr_tf_wp_top
-    global vol_ins_cp
-    global vol_gr_ins_cp
-    global vol_case_cp
-    global dx_tf_wp_toroidal_min
-    global dx_tf_wp_toroidal_average
-    global dx_tf_side_case_average
-    global a_tf_plasma_case
-    global a_tf_coil_nose_case
-    global a_tf_wp_ground_insulation
-    global a_leg_ins
-    global a_leg_gr_ins
-    global a_leg_cond
-    global rad_tf_coil_inboard_toroidal_half
-    global tan_theta_coil
-    global t_conductor_radial
-    global t_conductor_toroidal
-    global dr_tf_turn_cable_space
-    global dx_tf_turn_cable_space
-    global dr_tf_turn
-    global dx_tf_turn
-    global dx_tf_turn_cable_space_average
-    global vforce_inboard_tot
-    global t1
-    global time2
-    global tau2
-    global e_tf_magnetic_stored_total
-    global radius_tf_turn_cable_space_corners
-    global a_tf_turn_cable_space_effective
-    global dr_tf_wp_no_insulation
-    global dia_tf_turn_superconducting_cable
-    global n_tf_turn_superconducting_cables
-    global len_tf_coil_superconductor
-    global len_tf_superconductor_total
-    global j_tf_superconductor_critical
-    global f_c_tf_turn_operating_critical
-    global j_tf_coil_turn
-    global b_tf_superconductor_critical_zero_temp_strain
-    global temp_tf_superconductor_critical_zero_field_strain
-    global f_a_tf_turn_cable_space_cooling
-    global c_tf_turn_cables_critical
-    global j_tf_superconductor
-    global i_tf_turn_type
-    global dx_tf_turn_tape_stack
-    global dr_tf_turn_tape_stack
-    global a_tf_turn_tape_stack
-    global n_tf_turn_superconducting_strands
-    global x_tf_turn_coolant_channel_centre
-    global dr_tf_turn_stabiliser
-    global dx_tf_turn_stabiliser
-    global a_tf_turn_stabiliser
+    global \
+        is_leg_cp_temp_same, \
+        tf_fit_t, \
+        tf_fit_z, \
+        f_b_tf_inboard_peak_ripple_symmetric, \
+        c_tf_coil, \
+        a_tf_wp_with_insulation, \
+        a_tf_wp_no_insulation, \
+        a_tf_coil_inboard_steel, \
+        a_tf_coil_inboard_insulation, \
+        f_a_tf_coil_inboard_steel, \
+        f_a_tf_coil_inboard_insulation, \
+        z_cp_top, \
+        r_tf_outboard_in, \
+        r_tf_outboard_out, \
+        r_tf_wp_inboard_inner, \
+        r_tf_wp_inboard_outer, \
+        r_tf_wp_inboard_centre, \
+        dr_tf_wp_top, \
+        vol_ins_cp, \
+        vol_gr_ins_cp, \
+        vol_case_cp, \
+        dx_tf_wp_toroidal_min, \
+        dx_tf_wp_toroidal_average, \
+        dx_tf_side_case_average, \
+        a_tf_plasma_case, \
+        a_tf_coil_nose_case, \
+        a_tf_wp_ground_insulation, \
+        a_leg_ins, \
+        a_leg_gr_ins, \
+        a_leg_cond, \
+        rad_tf_coil_inboard_toroidal_half, \
+        tan_theta_coil, \
+        t_conductor_radial, \
+        t_conductor_toroidal, \
+        dr_tf_turn_cable_space, \
+        dx_tf_turn_cable_space, \
+        dr_tf_turn, \
+        dx_tf_turn, \
+        dx_tf_turn_cable_space_average, \
+        vforce_inboard_tot, \
+        t1, \
+        time2, \
+        tau2, \
+        e_tf_magnetic_stored_total, \
+        radius_tf_turn_cable_space_corners, \
+        a_tf_turn_cable_space_effective, \
+        dr_tf_wp_no_insulation, \
+        dia_tf_turn_superconducting_cable, \
+        n_tf_turn_superconducting_cables, \
+        len_tf_coil_superconductor, \
+        len_tf_superconductor_total, \
+        j_tf_superconductor_critical, \
+        f_c_tf_turn_operating_critical, \
+        j_tf_coil_turn, \
+        b_tf_superconductor_critical_zero_temp_strain, \
+        temp_tf_superconductor_critical_zero_field_strain, \
+        f_a_tf_turn_cable_space_cooling, \
+        c_tf_turn_cables_critical, \
+        j_tf_superconductor, \
+        vv_stress_quench, \
+        i_tf_turn_type, \
+        dx_tf_turn_tape_stack, \
+        dr_tf_turn_tape_stack, \
+        a_tf_turn_tape_stack, \
+        n_tf_turn_superconducting_strands, \
+        x_tf_turn_coolant_channel_centre, \
+        dr_tf_turn_stabiliser, \
+        dx_tf_turn_stabiliser, \
+        a_tf_turn_stabiliser
 
     is_leg_cp_temp_same = 0
     tf_fit_t = 0.0
@@ -416,6 +418,7 @@ def init_superconducting_tf_coil_variables():
     f_a_tf_turn_cable_space_cooling = 0.0
     c_tf_turn_cables_critical = 0.0
     j_tf_superconductor = 0.0
+    vv_stress_quench = 0.0
     i_tf_turn_type = 0
     dx_tf_turn_tape_stack = 0.0
     dr_tf_turn_tape_stack = 0.0