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

[Bitbucket]

2 new commits in yt:


https://bitbucket.org/yt_analysis/yt/changeset/bb552fbe9d83/
changeset:   bb552fbe9d83
branch:      yt
user:        MatthewTurk
date:        2012-02-25 02:25:51
summary:     Fixing argument list in generate_levels_octree.
affected #:  1 file

diff -r 73fa0ace10e3fedb119b7d1556a678a995771132 -r bb552fbe9d83808c776e19005dd36d09b0824904 yt/analysis_modules/sunrise_export/sunrise_exporter.py
--- a/yt/analysis_modules/sunrise_export/sunrise_exporter.py
+++ b/yt/analysis_modules/sunrise_export/sunrise_exporter.py
@@ -290,7 +290,7 @@
 
 def generate_levels_octree(pf, fields):
     fields = ensure_list(fields) + ["Ones", "Ones"]
-    ogl, levels_finest, levels_all = initialize_octree_list(fields)
+    ogl, levels_finest, levels_all = initialize_octree_list(pf, fields)
     o_length = na.sum(levels_finest.values())
     r_length = na.sum(levels_all.values())
     output = na.zeros((r_length,len(fields)), dtype='float64')



https://bitbucket.org/yt_analysis/yt/changeset/3cd955043884/
changeset:   3cd955043884
branch:      yt
user:        MatthewTurk
date:        2012-02-25 02:33:21
summary:     Fixing undefined local in the levels-octree calculation.
affected #:  1 file

diff -r bb552fbe9d83808c776e19005dd36d09b0824904 -r 3cd9550438843786e965a2d7dcc6747b42b5021b yt/utilities/_amr_utils/DepthFirstOctree.pyx
--- a/yt/utilities/_amr_utils/DepthFirstOctree.pyx
+++ b/yt/utilities/_amr_utils/DepthFirstOctree.pyx
@@ -130,10 +130,10 @@
     cdef np.ndarray[np.float64_t, ndim=1] child_leftedges
     cdef np.float64_t cx, cy, cz
     cdef int cp
+    cdef int s = 0
     for i_off in range(i_f):
         i = i_off + i_i
         cx = (leftedges[0] + i*dx)
-        if i_f > 2: print k, cz
         for j_off in range(j_f):
             j = j_off + j_i
             cy = (leftedges[1] + j*dx)
@@ -160,9 +160,8 @@
                     genealogy[cp, 0] = curpos[level+1] 
                     # set next parent id to id of current cell
                     genealogy[curpos[level+1]:curpos[level+1]+8, 1] = cp
-                    s = RecurseOctreeByLevels(child_i, child_j, child_k, 2, 2, 2,
+                    RecurseOctreeByLevels(child_i, child_j, child_k, 2, 2, 2,
                                               curpos, ci, output, genealogy,
                                               corners, grids)
                 curpos[level] += 1
-    return s
-
+    return

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.