[yt-svn] commit/yt: MatthewTurk: Merged in MatthewTurk/yt/yt-3.0 (pull request #886)

[commits-noreply at bitbucket.org]

1 new commit in yt:

https://bitbucket.org/yt_analysis/yt/commits/49bd5c1c9d59/
Changeset:   49bd5c1c9d59
Branch:      yt-3.0
User:        MatthewTurk
Date:        2014-05-09 01:56:29
Summary:     Merged in MatthewTurk/yt/yt-3.0 (pull request #886)

Minor FOF fix.
Affected #:  2 files

diff -r 91fafe9161705f1bfc26276508b19cdfcbb2d476 -r 49bd5c1c9d59d9dcf42e26b9b88c9c831018c002 yt/analysis_modules/halo_finding/rockstar/rockstar_groupies.pyx
--- a/yt/analysis_modules/halo_finding/rockstar/rockstar_groupies.pyx
+++ b/yt/analysis_modules/halo_finding/rockstar/rockstar_groupies.pyx
@@ -6,6 +6,10 @@
 from libc.stdlib cimport malloc, free
 import sys
 
+ctypedef fused anyfloat:
+    np.float32_t
+    np.float64_t
+
 # Importing relevant rockstar data types particle, fof halo, halo
 
 cdef import from "particle.h":
@@ -235,8 +239,8 @@
     @cython.wraparound(False)
     def make_rockstar_fof(self, np.ndarray[np.int64_t, ndim=1] pind,
                                 np.ndarray[np.int64_t, ndim=1] fof_tags,
-                                np.ndarray[np.float64_t, ndim=2] pos,
-                                np.ndarray[np.float64_t, ndim=2] vel):
+                                np.ndarray[anyfloat, ndim=2] pos,
+                                np.ndarray[anyfloat, ndim=2] vel):
 
         # Define fof object
 

diff -r 91fafe9161705f1bfc26276508b19cdfcbb2d476 -r 49bd5c1c9d59d9dcf42e26b9b88c9c831018c002 yt/utilities/lib/ContourFinding.pyx
--- a/yt/utilities/lib/ContourFinding.pyx
+++ b/yt/utilities/lib/ContourFinding.pyx
@@ -751,7 +751,6 @@
                 c1 = container[offset]
                 if c1 == NULL: continue
                 c0 = contour_find(c1)
-                offset = pind[offset]
                 if c0.count < minimum_count:
                     contour_ids[offset] = -1
         free(container)

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.