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

[Bitbucket]

2 new commits in yt:


https://bitbucket.org/yt_analysis/yt/changeset/38156b81fa92/
changeset:   38156b81fa92
branch:      yt
user:        jzuhone
date:        2012-12-03 20:24:40
summary:     Cosmetic fixes
affected #:  2 files

diff -r 7eef966e21e6618b3224325096c1f2cacdafbf83 -r 38156b81fa92a49cf2faa861aae472118f798101 yt/frontends/stream/data_structures.py
--- a/yt/frontends/stream/data_structures.py
+++ b/yt/frontends/stream/data_structures.py
@@ -281,12 +281,11 @@
             if data[i].has_key("number_of_particles") :
                 grid.NumberOfParticles = data[i].pop("number_of_particles")
             for key in data[i].keys() :
-                if key in grid.keys() : del grid[key]
+                if key in grid.keys() : grid.field_data.pop(key, None)
                 self.stream_handler.fields[grid.id][key] = data[i][key]
             
         self._detect_fields()
-        
-        
+                
 class StreamStaticOutput(StaticOutput):
     _hierarchy_class = StreamHierarchy
     _fieldinfo_fallback = StreamFieldInfo


diff -r 7eef966e21e6618b3224325096c1f2cacdafbf83 -r 38156b81fa92a49cf2faa861aae472118f798101 yt/utilities/particle_generator.py
--- a/yt/utilities/particle_generator.py
+++ b/yt/utilities/particle_generator.py
@@ -73,7 +73,7 @@
         """
         return self.num_particles
 
-    def get_from_grid(self, grid) :
+    def get_for_grid(self, grid) :
         """
         Return a dict containing all of the particle fields in the specified grid.
         """
@@ -160,7 +160,7 @@
             else :
                 data["number_of_particles"] = self.NumberOfParticles[i] + \
                                               g.NumberOfParticles
-            grid_particles = self.get_from_grid(g)
+            grid_particles = self.get_for_grid(g)
             for field in self.field_list :
                 if data["number_of_particles"] > 0 :
                     # We have particles in this grid
@@ -168,7 +168,6 @@
                         # Particles already exist
                         if field in self.pf.h.field_list :
                             # This field already exists
-                            #prev_particles = self.pf.h.io._read_data_set(g,field)
                             prev_particles = g[field]
                         else :
                             # This one doesn't, set the previous particles' field



https://bitbucket.org/yt_analysis/yt/changeset/fa360d6c81c3/
changeset:   fa360d6c81c3
branch:      yt
user:        jzuhone
date:        2012-12-03 20:25:52
summary:     Merging
affected #:  2 files

diff -r 38156b81fa92a49cf2faa861aae472118f798101 -r fa360d6c81c39378a925cc88cb67ac2b44248ba7 doc/install_script.sh
--- a/doc/install_script.sh
+++ b/doc/install_script.sh
@@ -747,7 +747,7 @@
 then
     echo "Cloning a copy of Enzo."
     cd ${DEST_DIR}/src/
-    ${HG_EXEC} clone https://enzo.googlecode.com/hg/ ./enzo-hg-stable
+    ${HG_EXEC} clone https://bitbucket.org/enzo/enzo-stable ./enzo-hg-stable
     cd $MY_PWD
 fi
 


diff -r 38156b81fa92a49cf2faa861aae472118f798101 -r fa360d6c81c39378a925cc88cb67ac2b44248ba7 yt/utilities/answer_testing/framework.py
--- a/yt/utilities/answer_testing/framework.py
+++ b/yt/utilities/answer_testing/framework.py
@@ -420,6 +420,8 @@
         for k in new_result:
             err_msg = "%s values of %s (%s weighted) projection (axis %s) not equal." % \
               (k, self.field, self.weight_field, self.axis)
+            if k == 'weight_field' and self.weight_field is None:
+                continue
             if self.decimals is None:
                 assert_equal(new_result[k], old_result[k],
                              err_msg=err_msg)

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.