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

[Bitbucket]

2 new commits in yt:


https://bitbucket.org/yt_analysis/yt/changeset/34145571fc0b/
changeset:   34145571fc0b
branch:      yt
user:        MatthewTurk
date:        2012-10-17 22:30:36
summary:     Fixing some includes in the manifest
affected #:  1 file

diff -r ff017cd2c1a8a85e5894d78b8bbf5745a84dc959 -r 34145571fc0b06761f18e71db1ea48046609ff17 MANIFEST.in
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,3 @@
-include distribute_setup.py
+include distribute_setup.py README* CREDITS FUNDING LICENSE.txt
 recursive-include yt/gui/reason/html *.html *.png *.ico *.js
-recursive-include yt *.pyx *.pxd *.hh *.h README* CREDITS FUNDING LICENSE
+recursive-include yt *.pyx *.pxd *.hh *.h README*



https://bitbucket.org/yt_analysis/yt/changeset/883eb7631b46/
changeset:   883eb7631b46
branch:      yt
user:        MatthewTurk
date:        2012-10-17 22:51:46
summary:     Merge
affected #:  3 files

diff -r 34145571fc0b06761f18e71db1ea48046609ff17 -r 883eb7631b460d62733b6ffe9996a17dbf5c03cd yt/analysis_modules/halo_profiler/multi_halo_profiler.py
--- a/yt/analysis_modules/halo_profiler/multi_halo_profiler.py
+++ b/yt/analysis_modules/halo_profiler/multi_halo_profiler.py
@@ -718,7 +718,9 @@
             Default=True.
         njobs : int
             The number of jobs over which to split the projections.  Set
-            to -1 so that each halo is done by a single processor.
+            to -1 so that each halo is done by a single processor.  Halo 
+            projections do not currently work in parallel, so this must 
+            be set to -1.
             Default: -1.
         dynamic : bool
             If True, distribute halos using a task queue.  If False,
@@ -732,6 +734,12 @@
 
         """
 
+        # Halo projections cannot run in parallel because they are done by 
+        # giving a data source to the projection object.
+        if njobs > 0:
+            mylog.warn("Halo projections cannot use more than one processor per halo, setting njobs to -1.")
+            njobs = -1
+        
         # Get list of halos for projecting.
         if halo_list == 'filtered':
             halo_projection_list = self.filtered_halos


diff -r 34145571fc0b06761f18e71db1ea48046609ff17 -r 883eb7631b460d62733b6ffe9996a17dbf5c03cd yt/data_objects/data_containers.py
--- a/yt/data_objects/data_containers.py
+++ b/yt/data_objects/data_containers.py
@@ -237,6 +237,7 @@
     def __set_default_field_parameters(self):
         self.set_field_parameter("center",np.zeros(3,dtype='float64'))
         self.set_field_parameter("bulk_velocity",np.zeros(3,dtype='float64'))
+        self.set_field_parameter("normal",np.array([0,0,1],dtype='float64'))
 
     def _set_center(self, center):
         if center is None:


diff -r 34145571fc0b06761f18e71db1ea48046609ff17 -r 883eb7631b460d62733b6ffe9996a17dbf5c03cd yt/data_objects/universal_fields.py
--- a/yt/data_objects/universal_fields.py
+++ b/yt/data_objects/universal_fields.py
@@ -876,8 +876,6 @@
 
 def _RadialVelocity(field, data):
     normal = data.get_field_parameter("normal")
-    if normal == None:
-        normal = [0,0,1]
     velocities = obtain_rv_vec(data).transpose()    
     theta = np.tile(data['sph_theta'], (3, 1)).transpose()
     phi   = np.tile(data['sph_phi'], (3, 1)).transpose()

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.