🚚 Move to new eqdsk package (Fusion-Power-Plant-Framework#3416)

* 🚚 Move to new eqdsk package * 🐛 17 -> 3 * 🎨 From_cocos_index -> from_cocos etc * 🎨 Add full coil specification flag * ✅ Fix tests based on eqdsk changes * 🎨 Small changes * 👽️ Fix based of eqdsk changes * 📝 Qpsi docs * Update eudemo/eudemo_tests/test_tf_coils.py * 🐛 Fix fixed_boundary writer * 🎨 Set default bluemira cocos as constant * ✅ Fix tests * ⬆️ Update eqdsk package version
geograham · Jul 30, 2024 · 43f85bd · 43f85bd
1 parent a01a038
commit 43f85bd
Show file tree

Hide file tree

Showing 37 changed files with 384 additions and 965 deletions.
diff --git a/bluemira/equilibria/coils/_grouping.py b/bluemira/equilibria/coils/_grouping.py
@@ -36,10 +36,9 @@
 
 if TYPE_CHECKING:
     import numpy.typing as npt
+    from eqdsk import EQDSKInterface
     from matplotlib.axes import Axes
 
-    from bluemira.equilibria.file import EQDSKInterface
-
 
 def symmetrise_coilset(coilset: CoilSet) -> CoilSet:
     """

diff --git a/bluemira/equilibria/coils/_tools.py b/bluemira/equilibria/coils/_tools.py
@@ -12,13 +12,13 @@
 
 from typing import TYPE_CHECKING
 
-if TYPE_CHECKING:
-    from bluemira.equilibria.coils import CoilSet
-
 import numpy as np
 
 from bluemira.magnetostatics.greens import circular_coil_inductance_elliptic, greens_psi
 
+if TYPE_CHECKING:
+    from bluemira.equilibria.coils import CoilSet
+
 
 def make_mutual_inductance_matrix(coilset: CoilSet) -> np.ndarray:
     """

diff --git a/bluemira/equilibria/constants.py b/bluemira/equilibria/constants.py
@@ -77,3 +77,6 @@
 # Minimum discretisation of a coil [m], limit imposed to avoid massive memory
 # usage
 COIL_DISCR = 0.05
+
+# bluemira default cocos
+BLUEMIRA_DEFAULT_COCOS = 3