🚚 Rearrange3

Author: je-cook

bluemira/magnets/tfcoil_designer.py

@@ -336,42 +336,26 @@ def _derived_values(self, op_config):
             strain=self.params.strain.value,
         )
 
-    def _make_conductor(self, optimisation_params, derived_params, n_WPs, WP_i=0):
-        # current functionality requires conductors are the same for both WPs
-        # in future allow for different conductor objects so can vary cable and strands
-        # between the sets of the winding pack?
-        stab_strand_config = self.build_config.get("stabilising_strand")
-        sc_strand_config = self.build_config.get("superconducting_strand")
-        cable_config = self.build_config.get("cable")
-        conductor_config = self.build_config.get("conductor")
-
-        stab_strand_params = self._check_arrays_match(
-            n_WPs, stab_strand_config.get("params")
-        )
-        sc_strand_params = self._check_arrays_match(
-            n_WPs, sc_strand_config.get("params")
-        )
-        conductor_params = self._check_arrays_match(
-            n_WPs, conductor_config.get("params")
-        )
-
-        cable_params = self._check_arrays_match(n_WPs, cable_config.get("params"))
+    def B_TF_r(self, tf_current, r):
+        """
+        Compute the magnetic field generated by the TF coils,
+        including ripple correction.
 
-        stab_strand = self._make_strand(WP_i, stab_strand_config, stab_strand_params)
-        sc_strand = self._make_strand(WP_i, sc_strand_config, sc_strand_params)
-        cable = self._make_cable(WP_i, n_WPs)
-        # param frame optimisation stuff?
-        result = cable.optimise_n_stab_ths(
-            t0=optimisation_params["t0"],
-            tf=optimisation_params["Tau_discharge"],
-            initial_temperature=derived_params.T_op,
-            target_temperature=optimisation_params["hotspot_target_temperature"],
-            B_fun=derived_params.B_fun,
-            I_fun=derived_params.I_fun,
-            bounds=[1, 10000],
-        )
+        Parameters
+        ----------
+        tf_current : float
+            Toroidal field coil current [A].
+        n_TF : int
+            Number of toroidal field coils.
+        r : float
+            Radial position from the tokamak center [m].
 
-        return self._make_conductor_cls(cable, WP_i, conductor_config, conductor_params)
+        Returns
+        -------
+        float
+            Magnetic field intensity [T].
+        """
+        return 1.08 * (MU_0_2PI * self.params.n_TF.value * tf_current / r)
 
     def run(self):
         """
@@ -436,27 +420,6 @@ def _check_arrays_match(self, n_WPs, param_list):
             "Value should be an integer >= 1."
         )
 
-    def B_TF_r(self, tf_current, r):
-        """
-        Compute the magnetic field generated by the TF coils,
-        including ripple correction.
-
-        Parameters
-        ----------
-        tf_current : float
-            Toroidal field coil current [A].
-        n_TF : int
-            Number of toroidal field coils.
-        r : float
-            Radial position from the tokamak center [m].
-
-        Returns
-        -------
-        float
-            Magnetic field intensity [T].
-        """
-        return 1.08 * (MU_0_2PI * self.params.n_TF.value * tf_current / r)
-
     def _make_strand(self, i_WP, config, params):
         cls_name = config["class"]
         stab_strand_cls = get_class_from_module(
@@ -545,6 +508,43 @@ def _make_conductor_cls(self, cable, i_WP, config, params):
             ),
         )
 
+    def _make_conductor(self, optimisation_params, derived_params, n_WPs, WP_i=0):
+        # current functionality requires conductors are the same for both WPs
+        # in future allow for different conductor objects so can vary cable and strands
+        # between the sets of the winding pack?
+        stab_strand_config = self.build_config.get("stabilising_strand")
+        sc_strand_config = self.build_config.get("superconducting_strand")
+        cable_config = self.build_config.get("cable")
+        conductor_config = self.build_config.get("conductor")
+
+        stab_strand_params = self._check_arrays_match(
+            n_WPs, stab_strand_config.get("params")
+        )
+        sc_strand_params = self._check_arrays_match(
+            n_WPs, sc_strand_config.get("params")
+        )
+        conductor_params = self._check_arrays_match(
+            n_WPs, conductor_config.get("params")
+        )
+
+        cable_params = self._check_arrays_match(n_WPs, cable_config.get("params"))
+
+        stab_strand = self._make_strand(WP_i, stab_strand_config, stab_strand_params)
+        sc_strand = self._make_strand(WP_i, sc_strand_config, sc_strand_params)
+        cable = self._make_cable(WP_i, n_WPs)
+        # param frame optimisation stuff?
+        result = cable.optimise_n_stab_ths(
+            t0=optimisation_params["t0"],
+            tf=optimisation_params["Tau_discharge"],
+            initial_temperature=derived_params.T_op,
+            target_temperature=optimisation_params["hotspot_target_temperature"],
+            B_fun=derived_params.B_fun,
+            I_fun=derived_params.I_fun,
+            bounds=[1, 10000],
+        )
+
+        return self._make_conductor_cls(cable, WP_i, conductor_config, conductor_params)
+
     def _make_winding_pack(self, conductor, i_WP, config, params):
         cls_name = config["class"]
         winding_pack_cls = get_class_from_module(