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

Bitbucket commits-noreply at bitbucket.org
Tue Nov 22 13:08:21 PST 2011


2 new commits in yt:


https://bitbucket.org/yt_analysis/yt/changeset/9610c81a1f3e/
changeset:   9610c81a1f3e
branch:      yt
user:        MatthewTurk
date:        2011-11-22 22:07:33
summary:     Switching default of no_ghost in off_axis_projection to match that of camera.
affected #:  1 file

diff -r eff898582e9538166e31ae224eda89020d07b096 -r 9610c81a1f3ef27fd150fd1163f8c8752c04db25 yt/visualization/volume_rendering/camera.py
--- a/yt/visualization/volume_rendering/camera.py
+++ b/yt/visualization/volume_rendering/camera.py
@@ -794,7 +794,7 @@
         return (left_camera, right_camera)
 
 def off_axis_projection(pf, center, normal_vector, width, resolution,
-                        field, weight = None, volume = None, no_ghost = False):
+                        field, weight = None, volume = None, no_ghost = True):
     r"""Project through a parameter file, off-axis, and return the image plane.
 
     This function will accept the necessary items to integrate through a volume
@@ -833,7 +833,7 @@
         lead to large speed improvements, but at a loss of
         accuracy/smoothness in resulting image.  The effects are
         less notable when the transfer function is smooth and
-        broad. Default: False
+        broad. Default: True
 
     Returns
     -------



https://bitbucket.org/yt_analysis/yt/changeset/4ec73cabefb6/
changeset:   4ec73cabefb6
branch:      yt
user:        MatthewTurk
date:        2011-11-22 22:07:54
summary:     Merge
affected #:  2 files

diff -r 9610c81a1f3ef27fd150fd1163f8c8752c04db25 -r 4ec73cabefb6bbf87f117ec671ecc21fa9eb7233 yt/analysis_modules/halo_finding/halo_objects.py
--- a/yt/analysis_modules/halo_finding/halo_objects.py
+++ b/yt/analysis_modules/halo_finding/halo_objects.py
@@ -1323,6 +1323,7 @@
     _name = "Loaded"
     
     def __init__(self, pf, basename):
+        ParallelAnalysisInterface.__init__(self)
         self.pf = pf
         self._groups = []
         self.basename = basename


diff -r 9610c81a1f3ef27fd150fd1163f8c8752c04db25 -r 4ec73cabefb6bbf87f117ec671ecc21fa9eb7233 yt/analysis_modules/halo_merger_tree/merger_tree.py
--- a/yt/analysis_modules/halo_merger_tree/merger_tree.py
+++ b/yt/analysis_modules/halo_merger_tree/merger_tree.py
@@ -464,6 +464,7 @@
                         parent_masses = na.concatenate((parent_masses, thisMasses))
                         parent_halos = na.concatenate((parent_halos, 
                             na.ones(thisIDs.size, dtype='int32') * gID))
+                        del thisIDs, thisMasses
                     h5fp.close()
             
             # Sort the arrays by particle index in ascending order.
@@ -495,6 +496,7 @@
                     child_masses = na.concatenate((child_masses, thisMasses))
                     child_halos = na.concatenate((child_halos, 
                         na.ones(thisIDs.size, dtype='int32') * gID))
+                    del thisIDs, thisMasses
                 h5fp.close()
         
         # Sort the arrays by particle index.
@@ -548,6 +550,7 @@
         parent_halos_tosend = parent_halos[parent_send]
         child_IDs_tosend = child_IDs[child_send]
         child_halos_tosend = child_halos[child_send]
+        del parent_send, child_send
         
         parent_IDs_tosend = self.comm.par_combine_object(parent_IDs_tosend,
                 datatype="array", op="cat")
@@ -651,6 +654,11 @@
             #values = tuple(values)
             self.write_values.append(values)
             self.write_values_dict[parent_currt][parent_halo] = values
+
+        # Clean up.
+        del parent_IDs, parent_masses, parent_halos
+        del parent_IDs_tosend, parent_masses_tosend
+        del parent_halos_tosend, child_IDs_tosend, child_halos_tosend
         
         return (child_IDs, child_masses, child_halos)

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.



More information about the yt-svn mailing list