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

[commits-noreply at bitbucket.org]

2 new commits in yt:

https://bitbucket.org/yt_analysis/yt/commits/0631ba18afb5/
Changeset:   0631ba18afb5
Branch:      yt
User:        chummels
Date:        2014-08-07 21:39:00
Summary:     Fixing a bug that occurs when you use the halo finder.
Affected #:  1 file

diff -r c4b7a1412c51c49d504c9eb6825fa82540a0b06e -r 0631ba18afb579056cd1c37610bd7ed49d78cfca 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
@@ -27,7 +27,7 @@
 from yt.extern.six import add_metaclass
 
 from yt.config import ytcfg
-from yt.funcs import mylog
+from yt.funcs import mylog, ensure_dir_exists
 from yt.utilities.performance_counters import \
     time_function, \
     yt_counters


https://bitbucket.org/yt_analysis/yt/commits/d0ec6bb3dbf2/
Changeset:   d0ec6bb3dbf2
Branch:      yt
User:        chummels
Date:        2014-08-07 21:39:36
Summary:     Merging.
Affected #:  2 files

diff -r 0631ba18afb579056cd1c37610bd7ed49d78cfca -r d0ec6bb3dbf2455e05e565f1d862a2942810e6ef yt/analysis_modules/halo_analysis/halo_callbacks.py
--- a/yt/analysis_modules/halo_analysis/halo_callbacks.py
+++ b/yt/analysis_modules/halo_analysis/halo_callbacks.py
@@ -225,13 +225,13 @@
 
     # accumulate, if necessary
     if accumulation:
-        used = my_profile.used        
+        used = my_profile.used
         for field in my_profile.field_data:
             if weight_field is None:
                 my_profile.field_data[field][used] = \
                     np.cumsum(my_profile.field_data[field][used])
             else:
-                my_weight = my_profile.weight[:, 0]
+                my_weight = my_profile.weight
                 my_profile.field_data[field][used] = \
                   np.cumsum(my_profile.field_data[field][used] * my_weight[used]) / \
                   np.cumsum(my_weight[used])

diff -r 0631ba18afb579056cd1c37610bd7ed49d78cfca -r d0ec6bb3dbf2455e05e565f1d862a2942810e6ef yt/analysis_modules/halo_finding/rockstar/rockstar_interface.pyx
--- a/yt/analysis_modules/halo_finding/rockstar/rockstar_interface.pyx
+++ b/yt/analysis_modules/halo_finding/rockstar/rockstar_interface.pyx
@@ -233,7 +233,6 @@
             fi += 1
         pi += npart
     num_p[0] = local_parts
-    del ds._instantiated_hierarchy
     del ds
 
 cdef class RockstarInterface:

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.