diff --git a/zoidberg/field.py b/zoidberg/field.py index af68411..7b2f5d1 100644 --- a/zoidberg/field.py +++ b/zoidberg/field.py @@ -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 diff --git a/zoidberg/zoidberg.py b/zoidberg/zoidberg.py index b99963a..fbe2888 100644 --- a/zoidberg/zoidberg.py +++ b/zoidberg/zoidberg.py @@ -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) ] @@ -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(