Skip to content

Commit dbc79ed

Browse files
committed
Switch to freeqdsk for reading/writing geqdsk files
Closes #179
1 parent d8e6be6 commit dbc79ed

10 files changed

+7
-511
lines changed

hypnotoad/cases/tokamak.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1719,7 +1719,7 @@ def read_geqdsk(
17191719
if settings is None:
17201720
settings = {}
17211721

1722-
from ..geqdsk._geqdsk import read as geq_read
1722+
from freeqdsk.geqdsk import read as geq_read
17231723

17241724
data = geq_read(filehandle)
17251725

hypnotoad/cases/torpex.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
from collections import OrderedDict
2121
import warnings
2222

23+
from freeqdsk.geqdsk import read as geq_read
2324
import numpy
2425
from optionsfactory import WithMeta
2526
from optionsfactory.checks import is_positive
@@ -31,7 +32,6 @@
3132
EquilibriumRegion,
3233
SolutionError,
3334
)
34-
from ..geqdsk._geqdsk import read as geq_read
3535
from ..utils.utils import with_default
3636

3737
# type for manipulating information about magnetic field coils
@@ -688,7 +688,7 @@ def createMesh(filename):
688688

689689

690690
def createEqdsk(equilib, *, nR, Rmin, Rmax, nZ, Zmin, Zmax, filename="torpex_test.g"):
691-
from ..geqdsk._geqdsk import write as geq_write
691+
from freeqdsk.geqdsk import write as geq_write
692692

693693
R = numpy.linspace(Rmin, Rmax, nR)[numpy.newaxis, :]
694694
Z = numpy.linspace(Zmin, Zmax, nZ)[:, numpy.newaxis]

hypnotoad/geqdsk/__init__.py

Whitespace-only changes.

hypnotoad/geqdsk/_fileutils.py

-126
This file was deleted.

0 commit comments

Comments
 (0)