[yt-svn] commit/yt-3.0: samskillman: Fixing insertion of blocks based on levels. Will not work for things that do not have b.Level, but at least this does not Nlvl insert each grid. Also changing source to data_source

[commits-noreply at bitbucket.org]

1 new commit in yt-3.0:

https://bitbucket.org/yt_analysis/yt-3.0/commits/49f1241d1fd8/
Changeset:   49f1241d1fd8
Branch:      yt-3.0
User:        samskillman
Date:        2013-06-03 21:01:37
Summary:     Fixing insertion of blocks based on levels. Will not work for things that do not have b.Level, but at least this does not Nlvl insert each grid. Also changing source to data_source
Affected #:  2 files

diff -r ada7c2c608f1bb724bfa274539a0321b76df503c -r 49f1241d1fd80b4294a520be53e790d1db72fe54 yt/utilities/amr_kdtree/amr_kdtree.py
--- a/yt/utilities/amr_kdtree/amr_kdtree.py
+++ b/yt/utilities/amr_kdtree/amr_kdtree.py
@@ -73,12 +73,12 @@
 
 class Tree(object):
     def __init__(self, pf, comm_rank=0, comm_size=1,
-            min_level=None, max_level=None, source=None):
+            min_level=None, max_level=None, data_source=None):
         
         self.pf = pf
-        if source is None:
-            source = pf.h.all_data()
-        self.source = source
+        if data_source is None:
+            data_source = pf.h.all_data()
+        self.data_source = data_source
         self._id_offset = self.pf.h.grids[0]._id_offset
         if min_level is None: min_level = 0
         if max_level is None: max_level = pf.h.max_level
@@ -86,8 +86,8 @@
         self.max_level = max_level
         self.comm_rank = comm_rank
         self.comm_size = comm_size
-        left_edge = self.source.left_edge
-        right_edge= self.source.right_edge
+        left_edge = self.data_source.left_edge
+        right_edge= self.data_source.right_edge
         self.trunk = Node(None, None, None,
                 left_edge, right_edge, None, 1)
         self.build()
@@ -102,8 +102,8 @@
     def build(self):
         lvl_range = range(self.min_level, self.max_level+1)
         for lvl in lvl_range:
-            #grids = self.source.select_grids(lvl)
-            grids = np.array([b for b, mask in self.source.blocks])
+            #grids = self.data_source.select_grids(lvl)
+            grids = np.array([b for b, mask in self.data_source.blocks if b.Level == lvl])
             if len(grids) == 0: break
             self.add_grids(grids)
 
@@ -148,7 +148,7 @@
     fields = None
     log_fields = None
     no_ghost = True
-    def __init__(self, pf, min_level=None, max_level=None, source=None):
+    def __init__(self, pf, min_level=None, max_level=None, data_source=None):
 
         ParallelAnalysisInterface.__init__(self)
 
@@ -159,17 +159,20 @@
         self.brick_dimensions = []
         self.sdx = pf.h.get_smallest_dx()
         self._initialized = False
-        self._id_offset = pf.h.grids[0]._id_offset
+        try: 
+            self._id_offset = pf.h.grids[0]._id_offset
+        except:
+            self._id_offset = 0
 
         #self.add_mask_field()
-        if source is None:
-            source = pf.h.all_data()
-        self.source = source
+        if data_source is None:
+            data_source = pf.h.all_data()
+        self.data_source = data_source
     
         mylog.debug('Building AMRKDTree')
         self.tree = Tree(pf, self.comm.rank, self.comm.size,
                          min_level=min_level,
-                         max_level=max_level, source=source)
+                         max_level=max_level, data_source=data_source)
 
     def set_fields(self, fields, log_fields, no_ghost):
         self.fields = fields

diff -r ada7c2c608f1bb724bfa274539a0321b76df503c -r 49f1241d1fd80b4294a520be53e790d1db72fe54 yt/visualization/volume_rendering/camera.py
--- a/yt/visualization/volume_rendering/camera.py
+++ b/yt/visualization/volume_rendering/camera.py
@@ -164,7 +164,7 @@
                  log_fields = None,
                  sub_samples = 5, pf = None,
                  min_level=None, max_level=None, no_ghost=True,
-                 source=None,
+                 data_source=None,
                  use_light=False):
         ParallelAnalysisInterface.__init__(self)
         if pf is not None: self.pf = pf
@@ -196,13 +196,13 @@
         if self.no_ghost:
             mylog.info('Warning: no_ghost is currently True (default). This may lead to artifacts at grid boundaries.')
 
-        if source is None:
-            source = self.pf.h.all_data()
-        self.source = source
+        if data_source is None:
+            data_source = self.pf.h.all_data()
+        self.data_source = data_source
 
         if volume is None:
             volume = AMRKDTree(self.pf, min_level=min_level, 
-                               max_level=max_level, source=self.source)
+                               max_level=max_level, data_source=self.data_source)
         self.volume = volume        
 
     def _setup_box_properties(self, width, center, unit_vectors):

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.