[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/f7317e3cdd3d/
Changeset:   f7317e3cdd3d
Branch:      yt-3.0
User:        samskillman
Date:        2013-06-03 23:13:12
Summary:     Sometimes FLASH datasets can have 0 grids on a level, but still have grids on higher levels. Also put the mask back in now that the get_vcd function is a bit smarter, and don't rely onthe data source having left and right edges.
Affected #:  1 file

diff -r f2995289fe1af1a07a7d2d12802410e374f2a873 -r f7317e3cdd3dc3dbbaece1d394c99bba3eae4c4b yt/utilities/amr_kdtree/amr_kdtree.py
--- a/yt/utilities/amr_kdtree/amr_kdtree.py
+++ b/yt/utilities/amr_kdtree/amr_kdtree.py
@@ -91,8 +91,8 @@
         self.max_level = max_level
         self.comm_rank = comm_rank
         self.comm_size = comm_size
-        left_edge = self.data_source.left_edge
-        right_edge= self.data_source.right_edge
+        left_edge = np.array([-np.inf]*3)
+        right_edge = np.array([np.inf]*3)
         self.trunk = Node(None, None, None,
                 left_edge, right_edge, None, 1)
         self.build()
@@ -109,7 +109,7 @@
         for lvl in lvl_range:
             #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
+            if len(grids) == 0: continue 
             self.add_grids(grids)
 
     def check_tree(self):
@@ -274,12 +274,12 @@
             dds = self.current_vcds[self.current_saved_grids.index(grid)]
         else:
             dds = []
-            #mask = make_vcd(grid.child_mask)
-            #mask = np.clip(mask, 0.0, 1.0)
-            #mask[mask<1.0] = np.inf
+            mask = make_vcd(grid.child_mask)
+            mask = np.clip(mask, 0.0, 1.0)
+            mask[mask<0.5] = np.inf
             for i,field in enumerate(self.fields):
                 vcd = make_vcd(grid[field], log=self.log_fields[i])
-                #vcd *= mask
+                vcd *= mask
                 if self.log_fields[i]: vcd = np.log10(vcd)
                 dds.append(vcd)
                 self.current_saved_grids.append(grid)


https://bitbucket.org/yt_analysis/yt-3.0/commits/c28cee1987ea/
Changeset:   c28cee1987ea
Branch:      yt-3.0
User:        MatthewTurk
Date:        2013-06-04 22:21:14
Summary:     Merged in samskillman/yt-3.0 (pull request #42)

Bring back data_source renders, bugfix for FLASH renders.
Affected #:  1 file

diff -r 479b20ef010f5f444c2b35754a30576736cd8b75 -r c28cee1987ea6649290a1261f9ad0f471d5bcc00 yt/utilities/amr_kdtree/amr_kdtree.py
--- a/yt/utilities/amr_kdtree/amr_kdtree.py
+++ b/yt/utilities/amr_kdtree/amr_kdtree.py
@@ -91,8 +91,8 @@
         self.max_level = max_level
         self.comm_rank = comm_rank
         self.comm_size = comm_size
-        left_edge = self.data_source.left_edge
-        right_edge= self.data_source.right_edge
+        left_edge = np.array([-np.inf]*3)
+        right_edge = np.array([np.inf]*3)
         self.trunk = Node(None, None, None,
                 left_edge, right_edge, None, 1)
         self.build()
@@ -109,7 +109,7 @@
         for lvl in lvl_range:
             #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
+            if len(grids) == 0: continue 
             self.add_grids(grids)
 
     def check_tree(self):
@@ -274,12 +274,12 @@
             dds = self.current_vcds[self.current_saved_grids.index(grid)]
         else:
             dds = []
-            #mask = make_vcd(grid.child_mask)
-            #mask = np.clip(mask, 0.0, 1.0)
-            #mask[mask<1.0] = np.inf
+            mask = make_vcd(grid.child_mask)
+            mask = np.clip(mask, 0.0, 1.0)
+            mask[mask<0.5] = np.inf
             for i,field in enumerate(self.fields):
                 vcd = make_vcd(grid[field], log=self.log_fields[i])
-                #vcd *= mask
+                vcd *= mask
                 if self.log_fields[i]: vcd = np.log10(vcd)
                 dds.append(vcd)
                 self.current_saved_grids.append(grid)

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.