Merge branch 'master' into cmacmackin/hermes_collisions

Author: mikekryjak

src/boutdata/data.py

@@ -780,8 +780,8 @@ def recalculate_xyz(self, *, nx=None, ny=None, nz=None):
                     "don't know which parameters to choose"
                 )
             with DataFile(self.gridfilename) as gridfile:
-                self.nx = float(gridfile["nx"])
-                self.ny = float(gridfile["ny"])
+                self.nx = int(gridfile["nx"])
+                self.ny = int(gridfile["ny"])
                 try:
                     nzfromfile = gridfile["MZ"]
                 except KeyError:
@@ -817,10 +817,10 @@ def recalculate_xyz(self, *, nx=None, ny=None, nz=None):
                     except KeyError:
                         gridfilename = self["grid"]
                     with DataFile(gridfilename) as gridfile:
-                        self.nx = float(gridfile["nx"])
-                        self.ny = float(gridfile["ny"])
+                        self.nx = int(gridfile["nx"])
+                        self.ny = int(gridfile["ny"])
                         try:
-                            nzfromfile = float(gridfile["MZ"])
+                            nzfromfile = int(gridfile["MZ"])
                         except KeyError:
                             pass
         if nz is not None:
@@ -834,6 +834,9 @@ def recalculate_xyz(self, *, nx=None, ny=None, nz=None):
                 except KeyError:
                     if nzfromfile is not None:
                         self.nz = nzfromfile
+                    else:
+                        self.nz = 1
+
         mxg = self._keys.get("MXG", 2)
         myg = self._keys.get("MYG", 2)
 

src/boututils/View3D.py

@@ -322,8 +322,6 @@ def magnetic_field(g, X, Y, Z, rmin, rmax, zmin, zmax, Br, Bz, Btrz):
     bz = np.zeros(np.shape(X))
     bt = np.zeros(np.shape(X))
 
-    nx, ny, nz = np.shape(X)
-
     mask = (rho >= rmin) & (rho <= rmax) & (Z >= zmin) & (Z <= zmax)
     k = np.argwhere(mask is True)
 
@@ -361,8 +359,6 @@ def psi_field(g, X, Y, Z, rmin, rmax, zmin, zmax):
 
     psi = np.zeros(np.shape(X))
 
-    nx, ny, nz = np.shape(X)
-
     mask = (rho >= rmin) & (rho <= rmax) & (Z >= zmin) & (Z <= zmax)
     k = np.argwhere(mask is True)
 

src/boututils/datafile.py

@@ -523,7 +523,7 @@ def _bout_dimensions_from_var(self, data):
             return defdims_list[len(np.shape(data))]
 
         if bout_type == "string_t":
-            nt, string_length = data.shape
+            _, string_length = data.shape
             return ("t", f"char{string_length}")
         elif bout_type == "string":
             return (f"char{len(data)}",)