From 9451cab86cea77e361a531c537252a24b97d1edf Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 15 Aug 2022 19:06:01 +0200 Subject: datafile: do not rely on timestep being present in all datasets --- datafile.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/datafile.py b/datafile.py index f9f758f..7b7b6e3 100644 --- a/datafile.py +++ b/datafile.py @@ -41,12 +41,12 @@ class _DataSlice(object): it = None time = None - def __init__(self, data, layout): + def __init__(self, data, layout, it, time): self.layout = layout self.data = data - self.it = data.attrs['timestep'] - self.time = data.attrs['time'] + self.it = it + self.time = time def __getitem__(self, key): return self.data[key] @@ -129,7 +129,7 @@ class _DataSet(object): data = self._df._f[querystr] layout = _SliceLayout(data.attrs['origin'], data.attrs['delta'], data.shape[::-1]) - return _DataSlice(data, layout) + return _DataSlice(data, layout, it, data.attrs['time']) def _slice_merge_components(self, it, rl): data = [] @@ -177,7 +177,7 @@ class _DataSet(object): res[sl] = d.data[:] layout = _SliceLayout(coord_min, step, res.shape[::-1]) - return _DataSlice(res, layout) + return _DataSlice(res, layout, it, data[0].time) def slice(self, it = None, time = None, rl = None, component = None): if it is None and time is not None: -- cgit v1.2.3