Skip to content

Commit f14e3ba

Browse files
committed
using nanmin/nanmax instead of minmax + test
1 parent d5ce99d commit f14e3ba

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

parcels/grid.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def __init__(self, lon, lat, time, time_origin, mesh):
5252
self.meridional_halo = 0
5353
self.lat_flipped = False
5454
self.defer_load = False
55-
self.lonlat_minmax = np.array([np.min(lon), np.max(lon), np.min(lat), np.max(lat)], dtype=np.float32)
55+
self.lonlat_minmax = np.array([np.nanmin(lon), np.nanmax(lon), np.nanmin(lat), np.nanmax(lat)], dtype=np.float32)
5656

5757
@property
5858
def ctypes_struct(self):
@@ -203,7 +203,7 @@ def add_periodic_halo(self, zonal, meridional, halosize=5):
203203
self.lat, self.lat[0:halosize] + latshift))
204204
self.ydim = self.lat.size
205205
self.meridional_halo = halosize
206-
self.lonlat_minmax = np.array([np.min(self.lon), np.max(self.lon), np.min(self.lat), np.max(self.lat)], dtype=np.float32)
206+
self.lonlat_minmax = np.array([np.nanmin(self.lon), np.nanmax(self.lon), np.nanmin(self.lat), np.nanmax(self.lat)], dtype=np.float32)
207207

208208

209209
class RectilinearZGrid(RectilinearGrid):

tests/test_grids.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ def sampleSpeed(particle, fieldset, time, dt):
327327
class MyParticle(ptype[mode]):
328328
speed = Variable('speed', dtype=np.float32, initial=0.)
329329

330-
pset = ParticleSet.from_list(field_set, MyParticle, lon=[400], lat=[600])
330+
pset = ParticleSet.from_list(field_set, MyParticle, lon=[400, -200], lat=[600, 600])
331331
pset.execute(pset.Kernel(sampleSpeed), runtime=0, dt=0)
332332
assert(np.allclose(pset[0].speed, 1000))
333333

0 commit comments

Comments
 (0)