Merge pull request #36 from boutproject/numpy2

Support NumPy 2

Author: dschwoerer

pyproject.toml

@@ -28,7 +28,7 @@ keywords = [
 requires-python = ">=3.10"
 dependencies = [
     "boututils ~= 0.1.10",
-    "numpy ~= 1.24",
+    "numpy >= 1.24",
     "sympy ~= 1.7",
     "scipy ~= 1.10",
     "matplotlib ~= 3.7",

zoidberg/fieldtracer.py

@@ -351,7 +351,7 @@ def trace_poincare(
         raise ValueError("nplot and y_slices cannot both be None")
 
     if y_slices is not None:
-        y_slices = np.asfarray(y_slices)
+        y_slices = np.asarray(y_slices)
 
         if np.amin(y_slices) < 0.0 or np.amax(y_slices) > yperiod:
             raise ValueError(
@@ -384,8 +384,8 @@ def trace_poincare(
         ) * y_values[:-1]
 
     # Starting location
-    xpos = np.asfarray(xpos)
-    zpos = np.asfarray(zpos)
+    xpos = np.asarray(xpos)
+    zpos = np.asarray(zpos)
 
     field_tracer = FieldTracer(magnetic_field)
     result = field_tracer.follow_field_lines(xpos, zpos, y_values_over)

zoidberg/grid.py

@@ -54,7 +54,7 @@ def __init__(self, poloidal_grids, ycoords, Ly, yperiodic=False, name="fci_grid"
 
         self.poloidal_grids = poloidal_grids
         self._ngrids = ngrids  # This is an implementation detail, whether we have one or multiple separate grids
-        self.ycoords = np.asfarray(ycoords)
+        self.ycoords = np.asarray(ycoords)
         self.Ly = Ly
         self.yperiodic = yperiodic
 

zoidberg/plot.py

@@ -172,8 +172,8 @@ def plot_3d_field_line(magnetic_field, xpos, zpos, yperiod, cycles=20, y_res=50)
     # Go round toroidally cycles times
     phivals_hires = np.linspace(0, cycles * yperiod, num=y_res * cycles, endpoint=False)
 
-    xpos = np.asfarray(xpos)
-    zpos = np.asfarray(zpos)
+    xpos = np.asarray(xpos)
+    zpos = np.asarray(zpos)
 
     field_tracer = fieldtracer.FieldTracer(magnetic_field)
     result_hires = field_tracer.follow_field_lines(xpos, zpos, phivals_hires)

zoidberg/poloidal_grid.py

@@ -172,8 +172,8 @@ def getCoordinate(self, xind, zind, dx=0, dz=0):
         """
 
         # Convert to NumPy arrays if not already
-        xind = np.asfarray(xind)
-        zind = np.asfarray(zind)
+        xind = np.asarray(xind)
+        zind = np.asarray(zind)
         # Make sure dx and dz are integers
         dx = int(dx)
         dz = int(dz)
@@ -213,8 +213,8 @@ def findIndex(self, R, Z):
         """
 
         # Make sure inputs are NumPy arrays
-        R = np.asfarray(R)
-        Z = np.asfarray(Z)
+        R = np.asarray(R)
+        Z = np.asarray(Z)
 
         # Check that they have the same shape
         assert R.shape == Z.shape
@@ -353,8 +353,8 @@ def findIndex(self, R, Z, tol=1e-10, show=False):
         """
 
         # Make sure inputs are NumPy arrays
-        R = np.asfarray(R)
-        Z = np.asfarray(Z)
+        R = np.asarray(R)
+        Z = np.asarray(Z)
 
         # Check that they have the same shape
         assert R.shape == Z.shape
@@ -378,8 +378,8 @@ def findIndex(self, R, Z, tol=1e-10, show=False):
         zind = ind - xind * nz
 
         # Convert indices to float
-        xind = np.asfarray(xind)
-        zind = np.asfarray(zind)
+        xind = np.asarray(xind, dtype=float)
+        zind = np.asarray(zind, dtype=float)
 
         # Create a mask for the positions
         mask = np.ones(xind.shape)

zoidberg/rzline.py

@@ -57,8 +57,8 @@ class RZline:
     """
 
     def __init__(self, r, z, anticlockwise=True, spline_order=None, smooth=False):
-        r = np.asfarray(r)
-        z = np.asfarray(z)
+        r = np.asarray(r)
+        z = np.asarray(z)
 
         # Check the sizes of the variables
         n = len(r)
@@ -421,8 +421,8 @@ def line_from_points_poly(rarray, zarray, show=False, spline_order=None):
 
     """
 
-    rarray = np.asfarray(rarray)
-    zarray = np.asfarray(zarray)
+    rarray = np.asarray(rarray)
+    zarray = np.asarray(zarray)
 
     assert rarray.size >= 3
     assert rarray.shape == zarray.shape
@@ -610,8 +610,8 @@ def line_from_points(
     """
 
     # Make sure we have Numpy arrays
-    rarray = np.asfarray(rarray)
-    zarray = np.asfarray(zarray)
+    rarray = np.asarray(rarray)
+    zarray = np.asarray(zarray)
 
     assert rarray.size == zarray.size