Skip to content

Commit

Permalink
[Issue pybamm-team#2670]: Replaced interp2d into RegularGridInterpola…
Browse files Browse the repository at this point in the history
…tor in ProcessedVariable
  • Loading branch information
jaskiratsingh2000 committed Feb 20, 2023
1 parent 6ab6c15 commit 6232ae2
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions pybamm/solvers/processed_variable.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import numpy as np
import pybamm
import scipy.interpolate as interp
from scipy.interpolate import RegularGridInterpolator
from scipy.integrate import cumulative_trapezoid


Expand Down Expand Up @@ -627,11 +628,10 @@ class Interpolant2D:
def __init__(
self, first_dim_pts_for_interp, second_dim_pts_for_interp, entries_for_interp
):
self.interpolant = interp.interp2d(
second_dim_pts_for_interp,
first_dim_pts_for_interp,
self.interpolant = interp.RegularGridInterpolator(
(first_dim_pts_for_interp, second_dim_pts_for_interp),
entries_for_interp[:, :, 0],
kind="linear",
method="linear",
fill_value=np.nan,
bounds_error=False,
)
Expand All @@ -645,15 +645,15 @@ def __call__(self, input):
if isinstance(first_dim, np.ndarray) and isinstance(second_dim, np.ndarray):
first_dim = first_dim[:, 0, 0]
second_dim = second_dim[:, 0]
return self.interpolant(second_dim, first_dim)
return self.interpolant((first_dim, second_dim))
elif isinstance(first_dim, np.ndarray):
first_dim = first_dim[:, 0]
return self.interpolant(second_dim, first_dim)[:, 0]
return self.interpolant((first_dim, second_dim))[:, 0]
elif isinstance(second_dim, np.ndarray):
second_dim = second_dim[:, 0]
return self.interpolant(second_dim, first_dim)
return self.interpolant((first_dim, second_dim))
else:
return self.interpolant(second_dim, first_dim)[0]
return self.interpolant((first_dim, second_dim))


def eval_dimension_name(name, x, r, y, z, R):
Expand Down

0 comments on commit 6232ae2

Please sign in to comment.