Switch to freeqdsk for reading/writing geqdsk files

Closes #179
boutproject · Sep 20, 2024 · 53c48f4 · 53c48f4
1 parent d8e6be6
commit 53c48f4
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 511 deletions.
diff --git a/hypnotoad/cases/tokamak.py b/hypnotoad/cases/tokamak.py
@@ -1719,7 +1719,7 @@ def read_geqdsk(
     if settings is None:
         settings = {}
 
-    from ..geqdsk._geqdsk import read as geq_read
+    from freeqdsk.geqdsk import read as geq_read
 
     data = geq_read(filehandle)
 

diff --git a/hypnotoad/cases/torpex.py b/hypnotoad/cases/torpex.py
@@ -20,6 +20,7 @@
 from collections import OrderedDict
 import warnings
 
+from freeqdsk.geqdsk import read as geq_read
 import numpy
 from optionsfactory import WithMeta
 from optionsfactory.checks import is_positive
@@ -31,7 +32,6 @@
     EquilibriumRegion,
     SolutionError,
 )
-from ..geqdsk._geqdsk import read as geq_read
 from ..utils.utils import with_default
 
 # type for manipulating information about magnetic field coils
@@ -688,7 +688,7 @@ def createMesh(filename):
 
 
 def createEqdsk(equilib, *, nR, Rmin, Rmax, nZ, Zmin, Zmax, filename="torpex_test.g"):
-    from ..geqdsk._geqdsk import write as geq_write
+    from freeqdsk.geqdsk import write as geq_write
 
     R = numpy.linspace(Rmin, Rmax, nR)[numpy.newaxis, :]
     Z = numpy.linspace(Zmin, Zmax, nZ)[:, numpy.newaxis]

diff --git a/hypnotoad/geqdsk/__init__.py b/hypnotoad/geqdsk/__init__.py
diff --git a/hypnotoad/geqdsk/_fileutils.py b/hypnotoad/geqdsk/_fileutils.py