Skip to content

Commit 81dfe9d

Browse files
Remove n_face property method; reference grid.n_face directly in ravel/unravel
1 parent 760cf13 commit 81dfe9d

1 file changed

Lines changed: 3 additions & 10 deletions

File tree

parcels/field.py

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -285,13 +285,6 @@ def zdim(self):
285285
else:
286286
return 0
287287

288-
@property
289-
def n_face(self):
290-
if type(self.data) is ux.uxDataArray:
291-
return self.grid.n_face
292-
else:
293-
return 0 # TODO : Discuss what we want to return as n_face for dataarray obj
294-
295288
@property
296289
def interp_method(self):
297290
return self._interp_method
@@ -452,7 +445,7 @@ def ravel_index(self, zi, yi, xi):
452445
if type(self.data) is xr.DataArray:
453446
return xi + self.xdim * (yi + self.ydim * zi)
454447
else:
455-
return xi + self.n_face * zi
448+
return xi + self.grid.n_face * zi
456449

457450
def unravel_index(self, ei):
458451
"""Return the zi, yi, xi indices for a given flat index.
@@ -481,8 +474,8 @@ def unravel_index(self, ei):
481474
return zi, yi, xi
482475
else:
483476
_ei = ei[self.igrid]
484-
zi = _ei // self.n_face
485-
fi = _ei % self.n_face
477+
zi = _ei // self.grid.n_face
478+
fi = _ei % self.grid.n_face
486479
return zi, fi
487480

488481
def __getattr__(self, key: str):

0 commit comments

Comments
 (0)