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

[Bitbucket]

2 new changesets in yt:

http://bitbucket.org/yt_analysis/yt/changeset/3becbdffbc30/
changeset:   3becbdffbc30
branch:      yt
user:        MatthewTurk
date:        2011-08-15 14:57:38
summary:     Fixing problem with unit conversions not being applied in projections.
affected #:  1 file (241 bytes)

--- a/yt/data_objects/data_containers.py	Thu Aug 04 16:43:31 2011 -0400
+++ b/yt/data_objects/data_containers.py	Mon Aug 15 08:57:38 2011 -0400
@@ -1613,6 +1613,10 @@
             dxs.append(na.ones(nvals.shape[0], dtype='float64') * ds)
         coord_data = na.concatenate(coord_data, axis=0).transpose()
         field_data = na.concatenate(field_data, axis=0).transpose()
+        if self._weight is not None:
+            dls, convs = self._get_dls(self._grids[0], fields)
+            # We always get one extra for the weighting field
+            field_data *= convs[:-1]
         weight_data = na.concatenate(weight_data, axis=0).transpose()
         dxs = na.concatenate(dxs, axis=0).transpose()
         # We now convert to half-widths and center-points
@@ -1684,17 +1688,7 @@
             pbar.update(pi)
             grid.clear_data()
         pbar.finish()
-        lt = tree.get_all_from_level(level, False)
         return
-        if self._weight is not None:
-            field_data = field_data / coord_data[3,:].reshape((1,coord_data.shape[1]))
-        else:
-            field_data *= convs[...,na.newaxis]
-        mylog.info("Level %s done: %s final", \
-                   level, coord_data.shape[1])
-        dx = grids_to_project[0].dds[self.axis] # this is our dl
-        return coord_data, dx, field_data
-
 
     def _get_points_in_region(self, grid):
         pointI = self.source._get_point_indices(grid, use_child_mask=False)


http://bitbucket.org/yt_analysis/yt/changeset/b83810515c59/
changeset:   b83810515c59
branch:      yt
user:        MatthewTurk
date:        2011-08-15 14:58:37
summary:     Merging
affected #:  1 file (14 bytes)

--- a/yt/data_objects/data_containers.py	Mon Aug 15 08:57:38 2011 -0400
+++ b/yt/data_objects/data_containers.py	Mon Aug 15 08:58:37 2011 -0400
@@ -32,6 +32,7 @@
 import weakref
 import exceptions
 import itertools
+import shelve
 
 from yt.funcs import *

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.