♻️ Refactor tf coil structure

process/caller.py

@@ -260,12 +260,16 @@ def _call_models_once(self, xc: np.ndarray) -> None:
 
         # Toroidal field coil model
 
-        self.models.tfcoil.run()
+        # Toroidal field coil resistive model
+        if ft.tfcoil_variables.i_tf_sup != 1:
+            self.models.resistive_tf_coil.run(output=False)
 
         # Toroidal field coil superconductor model
         if ft.tfcoil_variables.i_tf_sup == 1:
             self.models.sctfcoil.run(output=False)
 
+        self.models.build.portsz()
+
         # Poloidal field and central solenoid model
         self.models.pfcoil.run()
 

process/io/plot_proc.py

@@ -52,7 +52,7 @@
 )
 from process.impurity_radiation import read_impurity_file
 from process.objectives import OBJECTIVE_NAMES
-from process.tfcoil import TF_TYPES
+from process.superconducting_tf_coil import SUPERCONDUCTING_TF_TYPES
 
 if os.name == "posix" and "DISPLAY" not in os.environ:
     mpl.use("Agg")
@@ -2849,7 +2849,9 @@ def plot_magnetics_info(axis, mfile_data, scan):
         i_tf_sc_mat = 0
 
     if i_tf_sc_mat > 0:
-        tftype = TF_TYPES[int(mfile_data.data["i_tf_sc_mat"].get_scan(scan))]
+        tftype = SUPERCONDUCTING_TF_TYPES[
+            int(mfile_data.data["i_tf_sc_mat"].get_scan(scan))
+        ]
     else:
         tftype = "Resistive Copper"
 

process/main.py

@@ -86,11 +86,12 @@
 from process.plasma_profiles import PlasmaProfile
 from process.power import Power
 from process.pulse import Pulse
+from process.resistive_tf_coil import ResistiveTFCoil
 from process.scan import Scan
-from process.sctfcoil import Sctfcoil
 from process.stellarator import Neoclassics, Stellarator
 from process.structure import Structure
-from process.tfcoil import TFcoil
+from process.superconducting_tf_coil import SuperconductingTFCoil
+from process.tf_coil import TFCoil
 from process.utilities.f2py_string_patch import string_to_f2py_compatible
 from process.vacuum import Vacuum
 from process.water_use import WaterUse
@@ -657,8 +658,9 @@ def __init__(self):
         self.power = Power()
         self.cryostat = Cryostat()
         self.build = Build()
-        self.sctfcoil = Sctfcoil()
-        self.tfcoil = TFcoil(build=self.build, sctfcoil=self.sctfcoil)
+        self.sctfcoil = SuperconductingTFCoil()
+        self.tfcoil = TFCoil(build=self.build)
+        self.resistive_tf_coil = ResistiveTFCoil()
         self.divertor = Divertor()
         self.structure = Structure()
         self.plasma_geom = PlasmaGeom()

process/output.py

@@ -61,8 +61,9 @@ def write(models, _outfile):
     # Cryostat build
     models.cryostat.cryostat_output()
 
-    # Toroidal field coil model
-    models.tfcoil.output()
+    # Toroidal field coil resistive model
+    if ft.tfcoil_variables.i_tf_sup != 1:
+        models.resistive_tf_coil.run(output=True)
 
     # Toroidal field coil superconductor model
     if ft.tfcoil_variables.i_tf_sup == 1: