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

[commits-noreply at bitbucket.org]

2 new commits in yt-3.0:

https://bitbucket.org/yt_analysis/yt-3.0/commits/c7d14681b421/
Changeset:   c7d14681b421
Branch:      yt-3.0
User:        drudd
Date:        2013-04-16 16:30:47
Summary:     Merged yt_analysis/yt-3.0 into yt-3.0
Affected #:  3 files

diff -r 3a1a2a95457855b229396b14b67aeba15d2a3f27 -r c7d14681b421ad536caf21b5c7e5201a666f7aaa yt/frontends/enzo/io.py
--- a/yt/frontends/enzo/io.py
+++ b/yt/frontends/enzo/io.py
@@ -55,7 +55,7 @@
         ptypes = list(set([ftype for ftype, fname in fields]))
         fields = list(set(fields))
         if len(ptypes) > 1: raise NotImplementedError
-        pfields = [(ptypes[0], "position_%s" % ax) for ax in 'xyz']
+        pfields = [(ptypes[0], "particle_position_%s" % ax) for ax in 'xyz']
         size = 0
         for chunk in chunks:
             data = self._read_chunk_data(chunk, pfields, 'active', 

diff -r 3a1a2a95457855b229396b14b67aeba15d2a3f27 -r c7d14681b421ad536caf21b5c7e5201a666f7aaa yt/frontends/ramses/data_structures.py
--- a/yt/frontends/ramses/data_structures.py
+++ b/yt/frontends/ramses/data_structures.py
@@ -116,6 +116,9 @@
             self.particle_field_offsets = {}
             return
         f = open(self.part_fn, "rb")
+        f.seek(0, os.SEEK_END)
+        flen = f.tell()
+        f.seek(0)
         hvals = {}
         attrs = ( ('ncpu', 1, 'I'),
                   ('ndim', 1, 'I'),
@@ -143,12 +146,15 @@
         if hvals["nstar_tot"] > 0:
             particle_fields += [("particle_age", "d"),
                                 ("particle_metallicity", "d")]
-        field_offsets = {particle_fields[0][0]: f.tell()}
-        for field, vtype in particle_fields[1:]:
+        field_offsets = {}
+        _pfields = {}
+        for field, vtype in particle_fields:
+            if f.tell() >= flen: break
+            field_offsets[field] = f.tell()
+            _pfields[field] = vtype
             fpu.skip(f, 1)
-            field_offsets[field] = f.tell()
         self.particle_field_offsets = field_offsets
-        self.particle_field_types = dict(particle_fields)
+        self.particle_field_types = _pfields
 
     def _read_amr_header(self):
         hvals = {}

diff -r 3a1a2a95457855b229396b14b67aeba15d2a3f27 -r c7d14681b421ad536caf21b5c7e5201a666f7aaa yt/frontends/ramses/fields.py
--- a/yt/frontends/ramses/fields.py
+++ b/yt/frontends/ramses/fields.py
@@ -91,6 +91,8 @@
     "particle_mass",
     "particle_identifier",
     "particle_refinement_level",
+    "particle_age",
+    "particle_metallicity",
 ]
 
 for f in known_ramses_particle_fields:


https://bitbucket.org/yt_analysis/yt-3.0/commits/294e62e00fa8/
Changeset:   294e62e00fa8
Branch:      yt-3.0
User:        MatthewTurk
Date:        2013-07-01 23:44:02
Summary:     Merging from Doug
Affected #:  0 files

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.