[yt-svn] commit/yt: 2 new changesets

[commits-noreply at bitbucket.org]

2 new commits in yt:

https://bitbucket.org/yt_analysis/yt/commits/2b00cf20ca0e/
Changeset:   2b00cf20ca0e
Branch:      yt-3.0
User:        MatthewTurk
Date:        2014-01-07 22:23:45
Summary:     Clean up FLASH IO and make all FLASH fluids =f8.
Affected #:  1 file

diff -r b14aeeb32c24da11e8183514af80f14e8c5b5a55 -r 2b00cf20ca0ee8d35af3845c9eb36a6ad8493333 yt/frontends/flash/io.py
--- a/yt/frontends/flash/io.py
+++ b/yt/frontends/flash/io.py
@@ -100,26 +100,6 @@
                     data = p_fields[start:end, fi]
                     yield (ptype, field), data[mask]
 
-    def _read_data_set(self, grid, field):
-        f = self._handle
-        f_part = self._particle_handle
-        if field in self._particle_fields:
-            if grid.NumberOfParticles == 0: return np.array([], dtype='float64')
-            start = self.pf.h._particle_indices[grid.id - grid._id_offset]
-            end = self.pf.h._particle_indices[grid.id - grid._id_offset + 1]
-            fi = self._particle_fields[field]
-            tr = f_part["/tracer particles"][start:end, fi]
-        else:
-            tr = f["/%s" % field][grid.id - grid._id_offset,:,:,:].transpose()
-        return tr.astype("float64")
-
-    def _read_data_slice(self, grid, field, axis, coord):
-        sl = [slice(None), slice(None), slice(None)]
-        sl[axis] = slice(coord, coord + 1)
-        f = self._handle
-        tr = f["/%s" % field][grid.id - grid._id_offset].transpose()[sl]
-        return tr.astype("float64")
-
     def _read_fluid_selection(self, chunks, selector, fields, size):
         chunks = list(chunks)
         if any((ftype != "gas" for ftype, fname in fields)):
@@ -129,8 +109,8 @@
         for field in fields:
             ftype, fname = field
             dt = f["/%s" % fname].dtype
-            if dt == "float32": dt = "float64"
-            rv[field] = np.empty(size, dtype=dt)
+            # Always use *native* 64-bit float.
+            rv[field] = np.empty(size, dtype="=f8")
         ng = sum(len(c.objs) for c in chunks)
         mylog.debug("Reading %s cells of %s fields in %s blocks",
                     size, [f2 for f1, f2 in fields], ng)
@@ -161,6 +141,6 @@
                 end = gs[-1].id - gs[-1]._id_offset + 1
                 data = ds[start:end,:,:,:].transpose()
                 for i, g in enumerate(gs):
-                    rv[g.id][field] = data[...,i]
+                    rv[g.id][field] = np.asarray(data[...,i], "=f8")
         return rv
 


https://bitbucket.org/yt_analysis/yt/commits/4547da83703b/
Changeset:   4547da83703b
Branch:      yt-3.0
User:        jzuhone
Date:        2014-01-10 15:37:58
Summary:     Merged in MatthewTurk/yt/yt-3.0 (pull request #685)

Clean up FLASH IO and make all FLASH fluids =f8.
Affected #:  1 file

diff -r a7c959d7d3cd9cfb8bb02a2becb01657e49b0d58 -r 4547da83703b0fa9d84b2b51ae0fd03bf5ce537f yt/frontends/flash/io.py
--- a/yt/frontends/flash/io.py
+++ b/yt/frontends/flash/io.py
@@ -100,26 +100,6 @@
                     data = p_fields[start:end, fi]
                     yield (ptype, field), data[mask]
 
-    def _read_data_set(self, grid, field):
-        f = self._handle
-        f_part = self._particle_handle
-        if field in self._particle_fields:
-            if grid.NumberOfParticles == 0: return np.array([], dtype='float64')
-            start = self.pf.h._particle_indices[grid.id - grid._id_offset]
-            end = self.pf.h._particle_indices[grid.id - grid._id_offset + 1]
-            fi = self._particle_fields[field]
-            tr = f_part["/tracer particles"][start:end, fi]
-        else:
-            tr = f["/%s" % field][grid.id - grid._id_offset,:,:,:].transpose()
-        return tr.astype("float64")
-
-    def _read_data_slice(self, grid, field, axis, coord):
-        sl = [slice(None), slice(None), slice(None)]
-        sl[axis] = slice(coord, coord + 1)
-        f = self._handle
-        tr = f["/%s" % field][grid.id - grid._id_offset].transpose()[sl]
-        return tr.astype("float64")
-
     def _read_fluid_selection(self, chunks, selector, fields, size):
         chunks = list(chunks)
         if any((ftype != "gas" for ftype, fname in fields)):
@@ -129,8 +109,8 @@
         for field in fields:
             ftype, fname = field
             dt = f["/%s" % fname].dtype
-            if dt == "float32": dt = "float64"
-            rv[field] = np.empty(size, dtype=dt)
+            # Always use *native* 64-bit float.
+            rv[field] = np.empty(size, dtype="=f8")
         ng = sum(len(c.objs) for c in chunks)
         mylog.debug("Reading %s cells of %s fields in %s blocks",
                     size, [f2 for f1, f2 in fields], ng)
@@ -161,6 +141,6 @@
                 end = gs[-1].id - gs[-1]._id_offset + 1
                 data = ds[start:end,:,:,:].transpose()
                 for i, g in enumerate(gs):
-                    rv[g.id][field] = data[...,i]
+                    rv[g.id][field] = np.asarray(data[...,i], "=f8")
         return rv

Repository URL: https://bitbucket.org/yt_analysis/yt/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.