Skip to content

Minor fixes #79

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

Closed
totork wants to merge 5 commits into from
Closed

Minor fixes #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
31605ac
Fix GEQDSK psi error
Jun 16, 2026
b1b0b44
Use full field for area calculation
Jun 16, 2026
e509c51
Add dagp to default mapwriter
Jun 16, 2026
d30b26c
Ruff formatting
Jun 16, 2026
d2bf947
Revert "Ruff formatting"
Jun 16, 2026
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
3 changes: 2 additions & 1 deletion zoidberg/field.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1237,7 +1237,8 @@ def __init__(self, gfile):
print("Height: {0} -> {1} m".format(self.zmin, self.zmax))

# Poloidal flux
self.psi = np.transpose(data["psi"])
#self.psi = np.transpose(data["psi"])
self.psi = data["psi"]
nr, nz = self.psi.shape

# Normalising factors: psi on axis and boundary
Expand Down
3 changes: 2 additions & 1 deletion zoidberg/zoidberg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ def make_maps(
y_all = y_all[refine_parallel_integral:-refine_parallel_integral]

Bs = [
magnetic_field.Byfunc(coord[..., 0], coord[..., 1], y)
magnetic_field.Bmag(coord[..., 0], coord[..., 1], y)
for coord, y in zip(coords, y_all)
]

Expand Down Expand Up @@ -700,6 +700,7 @@ def write_maps(
with MapWriter(gridfile, new_names=new_names, metric2d=metric2d, quiet=quiet) as mw:
mw.add_grid_field(grid, magnetic_field)
mw.add_maps(maps)
mw.add_dagp()


def write_Bfield_to_vtk(
Expand Down
Loading