[Yt-svn] yt: More fixes to the fixed resolution projection

[hg at spacepope.org]

hg Repository: yt
details:   yt/rev/433a3cae29aa
changeset: 1590:433a3cae29aa
user:      Matthew Turk <matthewturk at gmail.com>
date:
Fri Apr 23 14:05:58 2010 -0700
description:
More fixes to the fixed resolution projection

diffstat:

 yt/lagos/BaseDataTypes.py |  18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diffs (41 lines):

diff -r b814d145a841 -r 433a3cae29aa yt/lagos/BaseDataTypes.py
--- a/yt/lagos/BaseDataTypes.py	Thu Apr 22 15:43:19 2010 -0700
+++ b/yt/lagos/BaseDataTypes.py	Fri Apr 23 14:05:58 2010 -0700
@@ -1505,17 +1505,16 @@
         self._grids = self.pf.hierarchy.grids[ind][level_ind][(sort_ind,)][::-1]
 
     def _generate_coords(self):
-        xi, yi, zi = self.left_edge + self.dds*0.5
-        xf, yf, zf = self.left_edge + self.dds*(self.ActiveDimensions-0.5)
-        coords = na.ogrid[xi:xf:self.ActiveDimensions[0]*1j,
-                          yi:yf:self.ActiveDimensions[1]*1j,
-                          zi:zf:self.ActiveDimensions[2]*1j]
         xax = x_dict[self.axis]
         yax = y_dict[self.axis]
+        ci = self.left_edge + self.dds*0.5
+        cf = self.left_edge + self.dds*(self.ActiveDimensions-0.5)
+        cx = na.mgrid[ci[xax]:cf[xax]:self.ActiveDimensions[xax]*1j]
+        cy = na.mgrid[ci[yax]:cf[yax]:self.ActiveDimensions[yax]*1j]
         blank = na.ones( (self.ActiveDimensions[xax],
                           self.ActiveDimensions[yax]), dtype='float64')
-        self['px'] = coords[xax] * blank
-        self['py'] = coords[yax] * blank
+        self['px'] = cx[None,:] * blank
+        self['py'] = cx[:,None] * blank
         self['pdx'] = self.dds[xax]
         self['pdy'] = self.dds[yax]
 
@@ -1535,10 +1534,11 @@
         for field in fields_to_get:
             self[field] = na.zeros(self.dims, dtype='float64')
         dls = self.__setup_dls(fields_to_get)
-        for grid in self._get_grids():
+        for i,grid in enumerate(self._get_grids()):
+            mylog.debug("Getting fields from %s", i)
             self._get_data_from_grid(grid, fields_to_get, dls)
         for field in fields_to_get:
-            self[field] = self._mpi_allsum(self[field])
+            self[field] = self._mpi_Allsum_double(self[field])
             conv = self.pf.units[self.pf.field_info[field].projection_conversion]
             self[field] *= conv