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

[Bitbucket]

2 new commits in yt:


https://bitbucket.org/yt_analysis/yt/changeset/7152e1776e98/
changeset:   7152e1776e98
branch:      yt
user:        ngoldbaum
date:        2012-09-17 22:03:57
summary:     Fixing the way 2D data is handled so that grid edges (for FLASH) and dx/dy/dz are correct for non-enzo data.
affected #:  3 files

diff -r af06f14fcd9eab09d59a8f065a42c64731fb3f5d -r 7152e1776e984b39e4b96aec129e654e9f4ba247 yt/data_objects/grid_patch.py
--- a/yt/data_objects/grid_patch.py
+++ b/yt/data_objects/grid_patch.py
@@ -210,8 +210,6 @@
             LE, RE = self.hierarchy.grid_left_edge[id,:], \
                      self.hierarchy.grid_right_edge[id,:]
             self.dds = np.array((RE - LE) / self.ActiveDimensions)
-        if self.pf.dimensionality < 2: self.dds[1] = 1.0
-        if self.pf.dimensionality < 3: self.dds[2] = 1.0
         self.field_data['dx'], self.field_data['dy'], self.field_data['dz'] = self.dds
 
     @property


diff -r af06f14fcd9eab09d59a8f065a42c64731fb3f5d -r 7152e1776e984b39e4b96aec129e654e9f4ba247 yt/frontends/flash/data_structures.py
--- a/yt/frontends/flash/data_structures.py
+++ b/yt/frontends/flash/data_structures.py
@@ -143,6 +143,9 @@
         for i in range(nlevels+1):
             dxs[i,:ND] = rdx[:ND]/self.parameter_file.refine_by**i
        
+        if ND < 3:
+            dxs[:,ND:] = rdx[ND:]
+
         for i in xrange(self.num_grids):
             dx = dxs[self.grid_levels[i],:]
             self.grid_left_edge[i] = np.rint(self.grid_left_edge[i]/dx)*dx


diff -r af06f14fcd9eab09d59a8f065a42c64731fb3f5d -r 7152e1776e984b39e4b96aec129e654e9f4ba247 yt/visualization/plot_window.py
--- a/yt/visualization/plot_window.py
+++ b/yt/visualization/plot_window.py
@@ -1255,8 +1255,7 @@
     def __init__(self, field, size):
         self._plot_valid = True
         fsize, axrect, caxrect = self._get_best_layout(size)
-        # Hardcoding the axis dimensions for now
-        
+                
         self.figure = matplotlib.figure.Figure(figsize = fsize, 
                                                frameon = True)
         self.axes = self.figure.add_axes(axrect)



https://bitbucket.org/yt_analysis/yt/changeset/27378d5fc23d/
changeset:   27378d5fc23d
branch:      yt
user:        ngoldbaum
date:        2012-09-17 22:33:58
summary:     A kludgy way of avoiding crashes when trying to make a plot with a very compressed axis ratio.  Printing a warning that this might be a bad idea.
affected #:  1 file

diff -r 7152e1776e984b39e4b96aec129e654e9f4ba247 -r 27378d5fc23db4ebee055507307b77d29e25165b yt/visualization/plot_window.py
--- a/yt/visualization/plot_window.py
+++ b/yt/visualization/plot_window.py
@@ -809,7 +809,7 @@
                 raise RuntimeError("Colormap '%s' does not exist!" % str(cmap))
             self.plots[field].image.set_cmap(cmap)
 
-    def save(self,name=None):
+    def save(self,name=None,mpl_kwargs=None):
         """saves the plot to disk.
 
         Parameters
@@ -817,6 +817,10 @@
         name : string
            the base of the filename.  If not set the filename of 
            the parameter file is used
+        mpl_kwargs : dict
+           A dict of keyword arguments to be passed to matplotlib.
+           
+        >>> slc.save(mpl_kwargs={'bbox_inches':'tight'})
 
         """
         if name == None:
@@ -841,7 +845,7 @@
                 n = "%s_%s_%s" % (name, type, k)
             if weight:
                 n += "_%s" % (weight)
-            names.append(v.save(n))
+            names.append(v.save(n,mpl_kwargs))
         return names
 
     def _send_zmq(self):
@@ -1255,13 +1259,23 @@
     def __init__(self, field, size):
         self._plot_valid = True
         fsize, axrect, caxrect = self._get_best_layout(size)
-                
-        self.figure = matplotlib.figure.Figure(figsize = fsize, 
-                                               frameon = True)
-        self.axes = self.figure.add_axes(axrect)
-        self.cax = self.figure.add_axes(caxrect)
-
-    def save(self, name, canvas = None):
+        
+        if np.any(np.array(axrect) < 0):
+            self.figure = matplotlib.figure.Figure(figsize = size, 
+                                                   frameon = True)
+            self.axes = self.figure.add_axes((.07,.10,.8,.8))
+            self.cax = self.figure.add_axes((.87,.10,.04,.8))
+            mylog.warning('The axis ratio of the requested plot is very narrow.  '
+                          'There is a good chance the plot will not look very good, '
+                          'consider making the plot manually using FixedResolutionBuffer '
+                          'and matplotlib.')
+        else:
+            self.figure = matplotlib.figure.Figure(figsize = fsize, 
+                                                   frameon = True)
+            self.axes = self.figure.add_axes(axrect)
+            self.cax = self.figure.add_axes(caxrect)
+            
+    def save(self, name, mpl_kwargs, canvas = None):
         if name[-4:] == '.png':
             suffix = ''
         else:
@@ -1278,7 +1292,7 @@
             else:
                 mylog.warning("Unknown suffix %s, defaulting to Agg", suffix)
                 canvas = FigureCanvasAgg(self.figure)
-        canvas.print_figure(fn)
+        canvas.print_figure(fn,mpl_kwargs)
         return fn
 
     def _get_best_layout(self, size):

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.