Fixes zoidberg

.ci_fedora.sh

@@ -59,7 +59,11 @@ else
     export OMPI_MCA_rmaps_base_oversubscribe=yes
     export PRTE_MCA_rmaps_default_mapping_policy=:oversubscribe
     export TRAVIS=true
+    # Try limiting openmp threads
     export FLEXIBLAS=NETLIB
+    export MKL_NUM_THREADS=1
+    export NUMEXPR_NUM_THREADS=1
+    export OMP_NUM_THREADS=1
     cd
     cd BOUT-dev
     echo "starting configure"

requirements.txt

@@ -1,8 +1,9 @@
-Jinja2~=3.1.4
-numpy~=2.0.0
-scipy>=1.11.0
-netcdf4~=1.7.1
+Jinja2>=3.1.4
+numpy>=2.0.0
+scipy>=1.14.1
+netcdf4>=1.7.1
 matplotlib>=3.7.0
-Cython~=3.0.0
-boututils~=0.2.1
-boutdata~=0.2.1
+Cython>=3.0.0
+boututils>=0.2.1
+boutdata>=0.2.1
+zoidberg>=0.2.2

tests/MMS/spatial/fci/runtest

@@ -6,9 +6,6 @@
 # Cores: 2
 # requires: zoidberg
 
-from __future__ import division
-from __future__ import print_function
-
 from boututils.run_wrapper import build_and_log, launch_safe
 from boutdata.collect import collect
 import boutconfig as conf
@@ -61,7 +58,7 @@ for nslice in nslices:
         # Note that the Bz and Bzprime parameters here must be the same as in mms.py
         field = zb.field.Slab(Bz=0.05, Bzprime=0.1)
         # Create rectangular poloidal grids
-        poloidal_grid = zb.poloidal_grid.RectangularPoloidalGrid(nx, n, 0.1, 1.0)
+        poloidal_grid = zb.poloidal_grid.RectangularPoloidalGrid(nx, n, 0.1, 1.0, MXG=1)
         # Set the ylength and y locations
         ylength = 10.0
 
@@ -74,7 +71,16 @@ for nslice in nslices:
         # Create the grid
         grid = zb.grid.Grid(poloidal_grid, ycoords, ylength, yperiodic=yperiodic)
         # Make and write maps
-        maps = zb.make_maps(grid, field, nslice=nslice, quiet=True)
+        from scipy.interpolate import RectBivariateSpline as RBS
+
+        def myRBS(a, b, c):
+            mx, my = c.shape
+            kx = max(mx - 1, 1)
+            kx = min(kx, 3)
+            return RBS(a, b, c, kx=kx)
+
+        zb.poloidal_grid.RectBivariateSpline = myRBS
+        maps = zb.make_maps(grid, field, nslice=nslice, quiet=True, MXG=1)
         zb.write_maps(
             grid, field, maps, new_names=False, metric2d=conf.isMetric2D(), quiet=True
         )

tests/integrated/test-fci-boundary/runtest

@@ -29,16 +29,17 @@ mthread = 2
 directory = "data"
 
 with DataFile("grid.fci.nc") as grid:
-    xfwd = grid.read("forward_xt_prime")[1:-1]
-    xbwd = grid.read("backward_xt_prime")[1:-1]
+    MXG = grid.get("MXG", default=1)
+    xfwd = grid.read("forward_xt_prime")[MXG:-MXG]
+    xbwd = grid.read("backward_xt_prime")[MXG:-MXG]
 
 nx = xfwd.shape[0]
 
 regions = {
-    "xin_fwd": xfwd < 1,
-    "xout_fwd": xfwd > nx,
-    "xin_bwd": xbwd < 1,
-    "xout_bwd": xbwd > nx,
+    "xin_fwd": xfwd < MXG,
+    "xout_fwd": xfwd > nx + MXG - 1,
+    "xin_bwd": xbwd < MXG,
+    "xout_bwd": xbwd > nx + MXG - 1,
 }
 regions = {k: v.astype(int) for k, v in regions.items()}