[yt-svn] commit/yt: chummels: Merged in MatthewTurk/yt/yt-3.0 (pull request #1038)

[commits-noreply at bitbucket.org]

1 new commit in yt:

https://bitbucket.org/yt_analysis/yt/commits/603f8fbde5e9/
Changeset:   603f8fbde5e9
Branch:      yt-3.0
User:        chummels
Date:        2014-07-21 22:39:21
Summary:     Merged in MatthewTurk/yt/yt-3.0 (pull request #1038)

Fix particle chunks and amrkdtree_downsampling recipe
Affected #:  2 files

diff -r c97c0f6168fd2c6f1e35b6f63cbcaec18cced1f5 -r 603f8fbde5e92daf218f282bd4498e228aaab437 doc/source/cookbook/amrkdtree_downsampling.py
--- a/doc/source/cookbook/amrkdtree_downsampling.py
+++ b/doc/source/cookbook/amrkdtree_downsampling.py
@@ -31,9 +31,9 @@
 # This rendering is okay, but lets say I'd like to improve it, and I don't want
 # to spend the time rendering the high resolution data.  What we can do is
 # generate a low resolution version of the AMRKDTree and pass that in to the
-# camera.  We do this by specifying a maximum refinement level of 3.
+# camera.  We do this by specifying a maximum refinement level of 6.
 
-kd_low_res = AMRKDTree(ds, max_level=3)
+kd_low_res = AMRKDTree(ds, max_level=6)
 print kd_low_res.count_volume()
 print kd_low_res.count_cells()
 

diff -r c97c0f6168fd2c6f1e35b6f63cbcaec18cced1f5 -r 603f8fbde5e92daf218f282bd4498e228aaab437 yt/frontends/stream/io.py
--- a/yt/frontends/stream/io.py
+++ b/yt/frontends/stream/io.py
@@ -119,7 +119,17 @@
                               f[ptype, "particle_position_y"],
                               f[ptype, "particle_position_z"])
             
-    def _count_particles_chunks(self, chunks, ptf, selector):
+    def __count_particles_chunks(self, chunks, ptf, selector):
+        # DISABLED
+        # I have left this in here, but disabled, because of two competing
+        # problems:
+        #   * The IndexedOctreeSubsetSelector currently selects *all* particles
+        #   * Slicing a deposited field thus throws an error, since the octree
+        #     estimate fails.
+        #   * BUT, it provides considerable speedup in some situations for
+        #     stream datasets.
+        # So, pending its re-enabling, we'll leave it here.
+        # 
         # This is allowed to over-estimate.  We probably *will*, too, because
         # we're going to count *all* of the particles, not just individual
         # types.

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.