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

[Bitbucket]

3 new changesets in yt:

http://bitbucket.org/yt_analysis/yt/changeset/55b0dd467945/
changeset:   55b0dd467945
branch:      stable
user:        samskillman
date:        2011-10-04 02:15:20
summary:     == should be used instead of is for comparing values.  This led to a bug when using >256 processors to render.  Now fixed.
affected #:  1 file (-1 bytes)

--- a/yt/utilities/amr_kdtree/amr_kdtree.py	Sat Sep 24 09:40:53 2011 -0600
+++ b/yt/utilities/amr_kdtree/amr_kdtree.py	Mon Oct 03 18:15:20 2011 -0600
@@ -604,7 +604,7 @@
         for i in range(2**nprocs):
             if ((i + 1)>>par_tree_depth) == 1:
                 # There are nprocs nodes that meet this criteria
-                if (i+1-nprocs) is not my_rank:
+                if (i+1-nprocs) != my_rank:
                     self.tree_dict.pop(i)
                     continue
         for node in self.tree_dict.itervalues():
@@ -833,7 +833,7 @@
             # This is where all the domain decomposition occurs.  
             if ((current_node.id + 1)>>par_tree_depth) == 1:
                 # There are anprocs nodes that meet this criteria
-                if (current_node.id+1-anprocs) is my_rank:
+                if (current_node.id+1-anprocs) == my_rank:
                     # I own this shared node
                     self.my_l_corner = current_node.l_corner
                     self.my_r_corner = current_node.r_corner
@@ -843,7 +843,7 @@
                     continue
                 
             # If we are down to one grid, we are either in it or the parent grid
-            if len(current_node.grids) is 1:
+            if len(current_node.grids) == 1:
                 thisgrid = current_node.grids[0]
                 # If we are completely contained by that grid
                 if (thisgrid.LeftEdge[0] <= current_node.l_corner[0]) and (thisgrid.RightEdge[0] >= current_node.r_corner[0]) and \
@@ -871,7 +871,7 @@
                     continue
 
             # If we don't have any grids, this volume belongs to the parent        
-            if len(current_node.grids) is 0:
+            if len(current_node.grids) == 0:
                 set_leaf(current_node, current_node.parent_grid, current_node.l_corner, current_node.r_corner)
                 # print 'This volume does not have a child grid, so it belongs to my parent!'
                 current_node, previous_node = self.step_depth(current_node, previous_node)


http://bitbucket.org/yt_analysis/yt/changeset/510d1815e9af/
changeset:   510d1815e9af
branch:      yt
user:        samskillman
date:        2011-10-21 16:38:51
summary:     Adding ParallelAnalysisInterface.__init__(self) to other Camera classes that overwrite __init__() and therefore were not initializing all the parallell goodness.
affected #:  1 file (-1 bytes)

--- a/yt/visualization/volume_rendering/camera.py	Thu Oct 20 14:49:34 2011 -0400
+++ b/yt/visualization/volume_rendering/camera.py	Fri Oct 21 08:38:51 2011 -0600
@@ -582,7 +582,8 @@
                  transfer_function = None, fields = None,
                  sub_samples = 5, log_fields = None, volume = None,
                  pf = None, use_kd=True, no_ghost=False):
-        if pf is not None: self.pf = pf
+	ParallelAnalysisInterface.__init__(self)
+	if pf is not None: self.pf = pf
         self.center = na.array(center, dtype='float64')
         self.radius = radius
         self.nside = nside
@@ -651,7 +652,8 @@
                  sub_samples = 5, log_fields = None, volume = None,
                  pf = None, use_kd=True, no_ghost=False,
                  rays_per_cell = 0.1, max_nside = 8192):
-        if pf is not None: self.pf = pf
+	ParallelAnalysisInterface.__init__(self)
+	if pf is not None: self.pf = pf
         self.center = na.array(center, dtype='float64')
         self.radius = radius
         self.use_kd = use_kd
@@ -703,7 +705,8 @@
 
 class StereoPairCamera(Camera):
     def __init__(self, original_camera, relative_separation = 0.005):
-        self.original_camera = original_camera
+	ParallelAnalysisInterface.__init__(self)
+	self.original_camera = original_camera
         self.relative_separation = relative_separation
 
     def split(self):


http://bitbucket.org/yt_analysis/yt/changeset/48ea712394c8/
changeset:   48ea712394c8
branch:      stable
user:        samskillman
date:        2011-10-21 16:42:30
summary:     Merging stable heads.
affected #:  1 file (-1 bytes)

--- a/yt/utilities/amr_kdtree/amr_kdtree.py	Wed Oct 05 17:01:08 2011 -0400
+++ b/yt/utilities/amr_kdtree/amr_kdtree.py	Fri Oct 21 08:42:30 2011 -0600
@@ -604,7 +604,7 @@
         for i in range(2**nprocs):
             if ((i + 1)>>par_tree_depth) == 1:
                 # There are nprocs nodes that meet this criteria
-                if (i+1-nprocs) is not my_rank:
+                if (i+1-nprocs) != my_rank:
                     self.tree_dict.pop(i)
                     continue
         for node in self.tree_dict.itervalues():
@@ -833,7 +833,7 @@
             # This is where all the domain decomposition occurs.  
             if ((current_node.id + 1)>>par_tree_depth) == 1:
                 # There are anprocs nodes that meet this criteria
-                if (current_node.id+1-anprocs) is my_rank:
+                if (current_node.id+1-anprocs) == my_rank:
                     # I own this shared node
                     self.my_l_corner = current_node.l_corner
                     self.my_r_corner = current_node.r_corner
@@ -843,7 +843,7 @@
                     continue
                 
             # If we are down to one grid, we are either in it or the parent grid
-            if len(current_node.grids) is 1:
+            if len(current_node.grids) == 1:
                 thisgrid = current_node.grids[0]
                 # If we are completely contained by that grid
                 if (thisgrid.LeftEdge[0] <= current_node.l_corner[0]) and (thisgrid.RightEdge[0] >= current_node.r_corner[0]) and \
@@ -871,7 +871,7 @@
                     continue
 
             # If we don't have any grids, this volume belongs to the parent        
-            if len(current_node.grids) is 0:
+            if len(current_node.grids) == 0:
                 set_leaf(current_node, current_node.parent_grid, current_node.l_corner, current_node.r_corner)
                 # print 'This volume does not have a child grid, so it belongs to my parent!'
                 current_node, previous_node = self.step_depth(current_node, previous_node)

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.