#3959 revert to iterative solver for interpolator and relax test tole…

…rances
pybamm-team · May 20, 2024 · fc3aa8e · fc3aa8e
1 parent 3abc482
commit fc3aa8e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/pybamm/expression_tree/interpolant.py b/pybamm/expression_tree/interpolant.py
@@ -151,17 +151,12 @@ def __init__(
                     fill_value = None
                 else:
                     fill_value = np.nan
-                if interpolator == "cubic":
-                    solver = spsolve
-                else:
-                    solver = None
                 interpolating_function = interpolate.RegularGridInterpolator(
                     (x1, x2),
                     y,
                     method=interpolator,
                     bounds_error=False,
                     fill_value=fill_value,
-                    solver=solver,
                 )
 
         elif len(x) == 3:
@@ -179,17 +174,12 @@ def __init__(
                     for 3D interpolation"""
                 )
             else:
-                if interpolator == "cubic":
-                    solver = spsolve
-                else:
-                    solver = None
                 interpolating_function = interpolate.RegularGridInterpolator(
                     (x1, x2, x3),
                     y,
                     method=interpolator,
                     bounds_error=False,
                     fill_value=fill_value,
-                    solver=solver,
                 )
         else:
             raise ValueError(f"Invalid dimension of x: {len(x)}")

diff --git a/tests/unit/test_expression_tree/test_interpolant.py b/tests/unit/test_expression_tree/test_interpolant.py
@@ -133,7 +133,8 @@ def f(x, y):
         # check also works for cubic
         interp = pybamm.Interpolant(x_in, data, (var1, var2), interpolator="cubic")
         value = interp.evaluate(y=np.array([1, 5]))
-        np.testing.assert_equal(value, f(1, 5))
+        # relaxed tolerance as from Scipy 1.13 it uses iterative solver
+        np.testing.assert_almost_equal(value, f(1, 5), decimal=3)
 
         # Test raising error if data is not 2D
         data_3d = np.zeros((11, 22, 33))
@@ -231,7 +232,8 @@ def f(x, y, z):
             x_in, data, (var1, var2, var3), interpolator="cubic"
         )
         value = interp.evaluate(y=np.array([1, 5, 8]))
-        np.testing.assert_equal(value, f(1, 5, 8))
+        # relaxed tolerance as from Scipy 1.13 it uses iterative solver
+        np.testing.assert_almost_equal(value, f(1, 5, 8), decimal=3)
 
         # Test raising error if data is not 3D
         data_4d = np.zeros((11, 22, 33, 5))