[yt-svn] commit/yt-3.0: 3 new changesets
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Fri Jul 26 09:59:31 PDT 2013
3 new commits in yt-3.0:
https://bitbucket.org/yt_analysis/yt-3.0/commits/29f1916e80f0/
Changeset: 29f1916e80f0
Branch: yt-3.0
User: samskillman
Date: 2013-07-18 22:16:26
Summary: Fixing 1D, 2D hierarchies by adding extra nap arg.
Affected #: 1 file
diff -r 6793ff95963ec411086d25ef94c7aff7985a8984 -r 29f1916e80f07b3ec18ab4dc627726b5e3038911 yt/frontends/enzo/data_structures.py
--- a/yt/frontends/enzo/data_structures.py
+++ b/yt/frontends/enzo/data_structures.py
@@ -675,7 +675,7 @@
class EnzoHierarchy1D(EnzoHierarchy):
- def _fill_arrays(self, ei, si, LE, RE, npart):
+ def _fill_arrays(self, ei, si, LE, RE, npart, nap):
self.grid_dimensions[:,:1] = ei
self.grid_dimensions[:,:1] -= np.array(si, self.float_type)
self.grid_dimensions += 1
@@ -685,10 +685,12 @@
self.grid_left_edge[:,1:] = 0.0
self.grid_right_edge[:,1:] = 1.0
self.grid_dimensions[:,1:] = 1
+ if nap is not None:
+ raise NotImplementedError
class EnzoHierarchy2D(EnzoHierarchy):
- def _fill_arrays(self, ei, si, LE, RE, npart):
+ def _fill_arrays(self, ei, si, LE, RE, npart, nap):
self.grid_dimensions[:,:2] = ei
self.grid_dimensions[:,:2] -= np.array(si, self.float_type)
self.grid_dimensions += 1
@@ -698,6 +700,8 @@
self.grid_left_edge[:,2] = 0.0
self.grid_right_edge[:,2] = 1.0
self.grid_dimensions[:,2] = 1
+ if nap is not None:
+ raise NotImplementedError
class EnzoStaticOutput(StaticOutput):
"""
https://bitbucket.org/yt_analysis/yt-3.0/commits/e7e295d8cf68/
Changeset: e7e295d8cf68
Branch: yt-3.0
User: samskillman
Date: 2013-07-18 22:44:25
Summary: A possible fix for 2D data reading in enzo. I don't know how this should be
handled ideally.
Affected #: 1 file
diff -r 29f1916e80f07b3ec18ab4dc627726b5e3038911 -r e7e295d8cf680112b7141b2c42c3e6b198d5b4f1 yt/frontends/enzo/io.py
--- a/yt/frontends/enzo/io.py
+++ b/yt/frontends/enzo/io.py
@@ -277,6 +277,33 @@
(grid.id, field)).transpose()
return t
+ def _read_fluid_selection(self, chunks, selector, fields, size):
+ rv = {}
+ # Now we have to do something unpleasant
+ chunks = list(chunks)
+ if selector.__class__.__name__ == "GridSelector":
+ return self._read_grid_chunk(chunks, fields)
+ if any((ftype != "gas" for ftype, fname in fields)):
+ raise NotImplementedError
+ for field in fields:
+ ftype, fname = field
+ fsize = size
+ rv[field] = np.empty(fsize, dtype="float64")
+ ng = sum(len(c.objs) for c in chunks)
+ mylog.debug("Reading %s cells of %s fields in %s grids",
+ size, [f2 for f1, f2 in fields], ng)
+ ind = 0
+ for chunk in chunks:
+ data = self._read_chunk_data(chunk, fields)
+ for g in chunk.objs:
+ for field in fields:
+ ftype, fname = field
+ ds = np.atleast_3d(data[g.id].pop(fname))
+ nd = g.select(selector, ds, rv[field], ind) # caches
+ ind += nd
+ data.pop(g.id)
+ return rv
+
class IOHandlerPacked1D(IOHandlerPackedHDF5):
https://bitbucket.org/yt_analysis/yt-3.0/commits/1129fc0779d1/
Changeset: 1129fc0779d1
Branch: yt-3.0
User: MatthewTurk
Date: 2013-07-26 18:59:27
Summary: Merged in samskillman/yt-3.0 (pull request #69)
Fixing 1D, 2D hierarchies by adding extra nap arg.
Affected #: 2 files
diff -r 7ffc40eb23159d00fa634703480757d0fed7088a -r 1129fc0779d1c70eb8393017bf70acd97afff0a4 yt/frontends/enzo/data_structures.py
--- a/yt/frontends/enzo/data_structures.py
+++ b/yt/frontends/enzo/data_structures.py
@@ -675,7 +675,7 @@
class EnzoHierarchy1D(EnzoHierarchy):
- def _fill_arrays(self, ei, si, LE, RE, npart):
+ def _fill_arrays(self, ei, si, LE, RE, npart, nap):
self.grid_dimensions[:,:1] = ei
self.grid_dimensions[:,:1] -= np.array(si, self.float_type)
self.grid_dimensions += 1
@@ -685,10 +685,12 @@
self.grid_left_edge[:,1:] = 0.0
self.grid_right_edge[:,1:] = 1.0
self.grid_dimensions[:,1:] = 1
+ if nap is not None:
+ raise NotImplementedError
class EnzoHierarchy2D(EnzoHierarchy):
- def _fill_arrays(self, ei, si, LE, RE, npart):
+ def _fill_arrays(self, ei, si, LE, RE, npart, nap):
self.grid_dimensions[:,:2] = ei
self.grid_dimensions[:,:2] -= np.array(si, self.float_type)
self.grid_dimensions += 1
@@ -698,6 +700,8 @@
self.grid_left_edge[:,2] = 0.0
self.grid_right_edge[:,2] = 1.0
self.grid_dimensions[:,2] = 1
+ if nap is not None:
+ raise NotImplementedError
class EnzoStaticOutput(StaticOutput):
"""
diff -r 7ffc40eb23159d00fa634703480757d0fed7088a -r 1129fc0779d1c70eb8393017bf70acd97afff0a4 yt/frontends/enzo/io.py
--- a/yt/frontends/enzo/io.py
+++ b/yt/frontends/enzo/io.py
@@ -277,6 +277,33 @@
(grid.id, field)).transpose()
return t
+ def _read_fluid_selection(self, chunks, selector, fields, size):
+ rv = {}
+ # Now we have to do something unpleasant
+ chunks = list(chunks)
+ if selector.__class__.__name__ == "GridSelector":
+ return self._read_grid_chunk(chunks, fields)
+ if any((ftype != "gas" for ftype, fname in fields)):
+ raise NotImplementedError
+ for field in fields:
+ ftype, fname = field
+ fsize = size
+ rv[field] = np.empty(fsize, dtype="float64")
+ ng = sum(len(c.objs) for c in chunks)
+ mylog.debug("Reading %s cells of %s fields in %s grids",
+ size, [f2 for f1, f2 in fields], ng)
+ ind = 0
+ for chunk in chunks:
+ data = self._read_chunk_data(chunk, fields)
+ for g in chunk.objs:
+ for field in fields:
+ ftype, fname = field
+ ds = np.atleast_3d(data[g.id].pop(fname))
+ nd = g.select(selector, ds, rv[field], ind) # caches
+ ind += nd
+ data.pop(g.id)
+ return rv
+
class IOHandlerPacked1D(IOHandlerPackedHDF5):
Repository URL: https://bitbucket.org/yt_analysis/yt-3.0/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
More information about the yt-svn
mailing list