Skip to content

WIP:Expose cocos setting in read_geqdsk #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mikekryjak wants to merge 1 commit into
base: master
Choose a base branch
from
Open

WIP:Expose cocos setting in read_geqdsk #133

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions hypnotoad/cases/tokamak.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1653,12 +1653,16 @@ def Bt_axis(self):


def read_geqdsk(
filehandle, settings=None, nonorthogonal_settings=None, make_regions=True
filehandle, settings=None, nonorthogonal_settings=None, make_regions=True, cocos = 1
):
"""
Read geqdsk formatted data from a file object, returning
a TokamakEquilibrium object

cocos - COordinate COnventions. Not fully handled yet,
only whether psi is divided by 2pi or not.
if < 10 then psi is divided by 2pi, otherwise not.

Inputs
------
filehandle A file handle to read
Expand All @@ -1676,7 +1680,7 @@ def read_geqdsk(

from ..geqdsk._geqdsk import read as geq_read

data = geq_read(filehandle)
data = geq_read(filehandle, cocos)

# Range of psi normalises psi derivatives
psi_bdry_gfile = data["sibdry"]
Expand Down