Add coil names and types (#16)

* Add coil names and types

* fix tests with Jon's magic fortran string

.pre-commit-config.yaml

@@ -15,7 +15,7 @@ repos:
     rev: v0.5.0
     hooks:
       - id: ruff
-        args: [--fix, --exit-non-zero-on-fix]
+        args: [--fix]
       - id: ruff-format
 
   - repo: https://github.com/pre-commit/mirrors-prettier

eqdsk/cocos.py

@@ -352,7 +352,7 @@ def identify_cocos(
         raise ValueError(
             "The sign of qpsi is not consistent across the flux surfaces.",
         )
-    sign_q = Sign(sign_q.max())
+    sign_q = Sign(int(sign_q.max()) or 1)
 
     sign_Bp = sign_Ip * sign_psi_inc_towards_boundary
     sign_rho_theta_phi = sign_Ip * sign_B0 * sign_q

eqdsk/file.py

@@ -122,6 +122,10 @@ class EQDSKInterface:
     """Safety factor values on the 1-D flux grid [dimensionless]."""
     file_name: str | None = None
     """The EQDSK file the data originates from."""
+    coil_names: list[str] | None = None
+    """Name of the coils"""
+    coil_types: list[str] | None = None
+    """Type of the coils"""
 
     def __post_init__(self):
         """Calculate derived parameters if they're not given."""
@@ -332,7 +336,7 @@ def _read_json(file_path: Path) -> dict[str, Any]:
         data = json.load(file)
 
     for k, value in data.items():
-        if isinstance(value, list):
+        if isinstance(value, list) and k not in {"coil_type", "coil_names"}:
             data[k] = np.asarray(value)
 
     # For backward compatibility where 'psinorm' was sometimes 'pnorm'
@@ -618,7 +622,7 @@ def write_array(fortran_format: ff.FortranRecordWriter, array: np.ndarray):
         # Create FortranRecordWriter objects with the Fortran format
         # edit descriptors to be used in the G-EQDSK output.
         f2000 = ff.FortranRecordWriter("a48,3i4")
-        f2020 = ff.FortranRecordWriter("5e16.9")
+        f2020 = ff.FortranRecordWriter("5ES23.16e2")
         f2022 = ff.FortranRecordWriter("2i5")
         fCSTM = ff.FortranRecordWriter("i5")
 

tests/_helpers.py

@@ -41,7 +41,7 @@ def read_strict_geqdsk(file_path):
     # Create FortranRecordReader objects with the Fortran format
     # edit descriptors to be used to parse the G-EQDSK input.
     f2000 = ff.FortranRecordReader("a48,3i4")
-    f2020 = ff.FortranRecordReader("5e16.9")
+    f2020 = ff.FortranRecordReader("5ES23.16e2")
     f2022 = ff.FortranRecordReader("2i5")
     fCSTM = ff.FortranRecordReader("i5")