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

[Bitbucket]

2 new changesets in yt:

http://bitbucket.org/yt_analysis/yt/changeset/9cd66e26aa6d/
changeset:   9cd66e26aa6d
branch:      yt
user:        MatthewTurk
date:        2011-10-15 15:17:29
summary:     Enzo frontend: Explicitly find ParticleFileName if NumberOfBaryonFields == 0
and NumberOfParticles > 0.
affected #:  1 file (-1 bytes)

--- a/yt/frontends/enzo/data_structures.py	Thu Oct 13 08:46:35 2011 -0400
+++ b/yt/frontends/enzo/data_structures.py	Sat Oct 15 09:17:29 2011 -0400
@@ -245,7 +245,7 @@
             fn.append(["-1"])
             if nb > 0: fn[-1] = _next_token_line("BaryonFileName", f)
             np.append(int(_next_token_line("NumberOfParticles", f)[0]))
-            if nb == 0 and np[-1] > 0: fn[-1] = _next_token_line("FileName", f)
+            if nb == 0 and np[-1] > 0: fn[-1] = _next_token_line("ParticleFileName", f)
             for line in f:
                 if len(line) < 2: break
                 if line.startswith("Pointer:"):


http://bitbucket.org/yt_analysis/yt/changeset/2dfda1e2e7c2/
changeset:   2dfda1e2e7c2
branch:      yt
user:        MatthewTurk
date:        2011-10-15 15:17:59
summary:     Merging
affected #:  1 file (-1 bytes)

--- a/yt/data_objects/hierarchy.py	Sat Oct 15 09:17:29 2011 -0400
+++ b/yt/data_objects/hierarchy.py	Sat Oct 15 09:17:59 2011 -0400
@@ -125,6 +125,11 @@
             cname = cls.__name__
             if cname.endswith("Base"): cname = cname[:-4]
             self._add_object_class(name, cname, cls, dd)
+        if self.pf.refine_by != 2 and hasattr(self, 'proj') and \
+            hasattr(self, 'overlap_proj'):
+            mylog.warning("Refine by something other than two: reverting to"
+                        + " overlap_proj")
+            self.proj = self.overlap_proj
         self.object_types.sort()
 
     # Now all the object related stuff

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.