From 131a7f75255c3db64d8464b8ba220df480a2c22d Mon Sep 17 00:00:00 2001 From: antsimi <36040805+AntSimi@users.noreply.github.com> Date: Wed, 6 Apr 2022 09:16:26 +0200 Subject: [PATCH 1/3] Add display method for unregulargrid --- CHANGELOG.rst | 2 ++ requirements.txt | 2 +- src/py_eddy_tracker/dataset/grid.py | 15 +++++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 57fd7551..558442e5 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -19,6 +19,8 @@ Fixed Added ^^^^^ +- Add display grid for unregular grid + [3.6.0] - 2022-01-12 -------------------- diff --git a/requirements.txt b/requirements.txt index 477cf32d..55aaca56 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ matplotlib netCDF4 numba>=0.53 -numpy<1.21 +numpy<1.22 opencv-python pint polygon3 diff --git a/src/py_eddy_tracker/dataset/grid.py b/src/py_eddy_tracker/dataset/grid.py index 797e0482..88605a8d 100644 --- a/src/py_eddy_tracker/dataset/grid.py +++ b/src/py_eddy_tracker/dataset/grid.py @@ -1074,6 +1074,21 @@ def load(self): self.init_pos_interpolator() + def display(self, ax, name, factor=1, **kwargs): + """ + :param matplotlib.axes.Axes ax: matplotlib axes used to draw + :param str,array name: variable to display, could be an array + :param float factor: multiply grid by + :param dict kwargs: look at :py:meth:`matplotlib.axes.Axes.pcolormesh` + + .. minigallery:: py_eddy_tracker.UnRegularGridDataset.display + """ + if "cmap" not in kwargs: + kwargs["cmap"] = "coolwarm" + data = self.grid(name) if isinstance(name, str) else name + print(self.x_c.shape, self.y_c.shape, data.shape) + return ax.pcolor(self.x_c, self.y_c, data * factor, **kwargs) + @property def bounds(self): """Give bounds""" From a00e21d0ab65597389430f00363797dfb2d1697c Mon Sep 17 00:00:00 2001 From: antsimi <36040805+AntSimi@users.noreply.github.com> Date: Wed, 6 Apr 2022 09:19:54 +0200 Subject: [PATCH 2/3] Remove print ... --- src/py_eddy_tracker/dataset/grid.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/py_eddy_tracker/dataset/grid.py b/src/py_eddy_tracker/dataset/grid.py index 88605a8d..e627db7e 100644 --- a/src/py_eddy_tracker/dataset/grid.py +++ b/src/py_eddy_tracker/dataset/grid.py @@ -1086,7 +1086,6 @@ def display(self, ax, name, factor=1, **kwargs): if "cmap" not in kwargs: kwargs["cmap"] = "coolwarm" data = self.grid(name) if isinstance(name, str) else name - print(self.x_c.shape, self.y_c.shape, data.shape) return ax.pcolor(self.x_c, self.y_c, data * factor, **kwargs) @property From 37985468f87494568456109ab9bcd79cbf14f7a1 Mon Sep 17 00:00:00 2001 From: antsimi <36040805+AntSimi@users.noreply.github.com> Date: Fri, 15 Apr 2022 10:07:20 +0200 Subject: [PATCH 3/3] Doc correction --- src/py_eddy_tracker/dataset/grid.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/py_eddy_tracker/dataset/grid.py b/src/py_eddy_tracker/dataset/grid.py index e627db7e..e0ce903e 100644 --- a/src/py_eddy_tracker/dataset/grid.py +++ b/src/py_eddy_tracker/dataset/grid.py @@ -1079,7 +1079,7 @@ def display(self, ax, name, factor=1, **kwargs): :param matplotlib.axes.Axes ax: matplotlib axes used to draw :param str,array name: variable to display, could be an array :param float factor: multiply grid by - :param dict kwargs: look at :py:meth:`matplotlib.axes.Axes.pcolormesh` + :param dict kwargs: look at :py:meth:`matplotlib.axes.Axes.pcolor` .. minigallery:: py_eddy_tracker.UnRegularGridDataset.display """