Skip to content

Commit cb3c47a

Browse files
committed
change how to control if grid is circular
add use of filter
1 parent 08f937c commit cb3c47a

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

src/py_eddy_tracker/generic.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ def interp2d_geo(x_g, y_g, z_g, m_g, x, y, nearest=False):
198198
y_step = y_g[1] - y_ref
199199
nb_x = x_g.shape[0]
200200
nb_y = y_g.shape[0]
201-
is_circular = (x_g[-1] + x_step) % 360 == x_g[0] % 360
201+
is_circular = abs(x_g[-1] % 360 - (x_g[0] - x_step) % 360) < 1e-5
202202
z = empty(x.shape, dtype=z_g.dtype)
203203
for i in prange(x.size):
204204
x_ = (x[i] - x_ref) / x_step

src/py_eddy_tracker/observations/observation.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1750,6 +1750,8 @@ def merge_filters(self, *filters):
17501750
:return: Return applicable object to numpy.array
17511751
:rtype: slice, index, mask
17521752
"""
1753+
if len(filters) == 1 and isinstance(filters[0], list):
1754+
filters = filters[0]
17531755
filters_ = list()
17541756
# Remove all filter which select all obs
17551757
for filter in filters:
@@ -1894,6 +1896,7 @@ def grid_count(self, bins, intern=False, center=False, filter=slice(None)):
18941896
18951897
.. minigallery:: py_eddy_tracker.EddiesObservations.grid_count
18961898
"""
1899+
filter = self.merge_filters(filter)
18971900
x_name, y_name = self.intern(intern)
18981901
x_bins, y_bins = arange(*bins[0]), arange(*bins[1])
18991902
x0 = bins[0][0]

0 commit comments

Comments
 (0)