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

[commits-noreply at bitbucket.org]

2 new commits in yt-3.0:

https://bitbucket.org/yt_analysis/yt-3.0/commits/9024c7fa22dc/
Changeset:   9024c7fa22dc
Branch:      yt-3.0
User:        MatthewTurk
Date:        2013-10-24 21:41:29
Summary:     Removing NotImplementedError for partial_coverage = 1.
Affected #:  1 file

diff -r a068074be818374213c9a209eb681d84e2bd778a -r 9024c7fa22dc05a28c3973faef2474a9567623f4 yt/geometry/oct_container.pyx
--- a/yt/geometry/oct_container.pyx
+++ b/yt/geometry/oct_container.pyx
@@ -500,8 +500,6 @@
                       left_edge = (self.DLE[0], self.DLE[1], self.DLE[2]),
                       right_edge = (self.DRE[0], self.DRE[1], self.DRE[2]),
                       over_refine = self.oref)
-        if self.partial_coverage == 1:
-            raise NotImplementedError
         cdef SelectorObject selector = selection_routines.AlwaysSelector(None)
         # domain_id = -1 here, because we want *every* oct
         cdef OctVisitorData data


https://bitbucket.org/yt_analysis/yt-3.0/commits/9cd06e423304/
Changeset:   9cd06e423304
Branch:      yt-3.0
User:        MatthewTurk
Date:        2013-10-24 21:42:47
Summary:     Merging
Affected #:  3 files

diff -r 9024c7fa22dc05a28c3973faef2474a9567623f4 -r 9cd06e4233044a84bc4f8c880a4e45417816f316 yt/data_objects/grid_patch.py
--- a/yt/data_objects/grid_patch.py
+++ b/yt/data_objects/grid_patch.py
@@ -259,7 +259,8 @@
             new_field[1:,1:,:-1] += of
             new_field[1:,1:,1:] += of
             np.multiply(new_field, 0.125, new_field)
-            if self.pf.field_info[field].take_log:
+            finfo = self.pf._get_field_info(field)
+            if finfo.take_log:
                 new_field = np.log10(new_field)
 
             new_field[:,:, -1] = 2.0*new_field[:,:,-2] - new_field[:,:,-3]
@@ -269,7 +270,7 @@
             new_field[-1,:,:] = 2.0*new_field[-2,:,:] - new_field[-3,:,:]
             new_field[0,:,:]  = 2.0*new_field[1,:,:] - new_field[2,:,:]
 
-            if self.pf.field_info[field].take_log:
+            if finfo.take_log:
                 np.power(10.0, new_field, new_field)
         else:
             cg = self.retrieve_ghost_zones(1, field, smoothed=smoothed)

diff -r 9024c7fa22dc05a28c3973faef2474a9567623f4 -r 9cd06e4233044a84bc4f8c880a4e45417816f316 yt/data_objects/static_output.py
--- a/yt/data_objects/static_output.py
+++ b/yt/data_objects/static_output.py
@@ -291,7 +291,9 @@
 
     _last_freq = (None, None)
     _last_finfo = None
-    def _get_field_info(self, ftype, fname):
+    def _get_field_info(self, ftype, fname = None):
+        if fname is None:
+            ftype, fname = "unknown", ftype
         guessing_type = False
         if ftype == "unknown" and self._last_freq[0] != None:
             ftype = self._last_freq[0]

diff -r 9024c7fa22dc05a28c3973faef2474a9567623f4 -r 9cd06e4233044a84bc4f8c880a4e45417816f316 yt/utilities/amr_kdtree/amr_kdtree.py
--- a/yt/utilities/amr_kdtree/amr_kdtree.py
+++ b/yt/utilities/amr_kdtree/amr_kdtree.py
@@ -83,6 +83,7 @@
             grids = np.array([b for b, mask in self.data_source.blocks if b.Level == lvl])
             gids = np.array([g.id for g in grids if g.Level == lvl],
                             dtype="int64")
+            if len(grids) == 0: continue
             self.add_grids(grids)
 
     def check_tree(self):

Repository URL: https://bitbucket.org/yt_analysis/yt-3.0/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.