[yt-svn] commit/yt: 3 new changesets
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Thu May 8 16:56:34 PDT 2014
3 new commits in yt:
https://bitbucket.org/yt_analysis/yt/commits/a6cfa471db17/
Changeset: a6cfa471db17
Branch: yt-3.0
User: MatthewTurk
Date: 2014-05-07 23:15:45
Summary: We do not want to reset the offset value.
Affected #: 1 file
diff -r 2c9549b58b9f0b8d7789813474093b62f59d49c0 -r a6cfa471db17a0b9a6087e7d0b633d9b27c73289 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)
https://bitbucket.org/yt_analysis/yt/commits/3acbe5189aaa/
Changeset: 3acbe5189aaa
Branch: yt-3.0
User: MatthewTurk
Date: 2014-05-08 00:23:45
Summary: Allowing "anyfloat" for make_rockstar_fof.
Affected #: 1 file
diff -r a6cfa471db17a0b9a6087e7d0b633d9b27c73289 -r 3acbe5189aaa234050e1126e5ced703fe2878b92 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
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.
More information about the yt-svn
mailing list