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

[commits-noreply at bitbucket.org]

3 new commits in yt:

https://bitbucket.org/yt_analysis/yt/commits/1d1aa9c6218b/
Changeset:   1d1aa9c6218b
User:        ngoldbaum
Date:        2017-05-18 16:27:41+00:00
Summary:     attempt to fix type errors in alt_ray_tracers.pyx
Affected #:  1 file

diff -r 4b22085ba0b75e00f4176024e555d459c8f0451d -r 1d1aa9c6218bba28ae0ae40dfcc4f81354331ab1 yt/utilities/lib/alt_ray_tracers.pyx
--- a/yt/utilities/lib/alt_ray_tracers.pyx
+++ b/yt/utilities/lib/alt_ray_tracers.pyx
@@ -200,11 +200,13 @@
     # find intersections and compute return values
     tsect, dsect = _cart_intersect(p1cart, p2cart, _cyl2cart(b1), _cyl2cart(b2))
     tmask = np.logical_and(0.0<=tsect, tsect<=1.0)
-    tsect, tinds = np.unique(tsect[tmask], return_index=True)
+    ret = np.unique(tsect[tmask], return_index=True)
+    tsect, tinds = ret[0], ret[1].astype('int64')
     inds = inds[tmask][tinds]
     xyz = dsect[tmask][tinds]
     s = np.sqrt(((xyz - p1cart) * (xyz - p1cart)).sum(axis=1))
-    s, sinds = np.unique(s, return_index=True)
+    ret = np.unique(s, return_index=True)
+    s, sinds = ret[0], ret[1].astype('int64')
     inds = inds[sinds]
     xyz = xyz[sinds]
     t = s/np.sqrt((dpcart*dpcart).sum())


https://bitbucket.org/yt_analysis/yt/commits/518c4573b503/
Changeset:   518c4573b503
User:        ngoldbaum
Date:        2017-05-31 15:51:31+00:00
Summary:     fix root cause of test failures
Affected #:  1 file

diff -r 1d1aa9c6218bba28ae0ae40dfcc4f81354331ab1 -r 518c4573b5032ddcde862f1d0639baf234445621 yt/utilities/lib/alt_ray_tracers.pyx
--- a/yt/utilities/lib/alt_ray_tracers.pyx
+++ b/yt/utilities/lib/alt_ray_tracers.pyx
@@ -155,7 +155,7 @@
         thetaleft = np.empty(I)
         thetaleft.fill(p1[2])
         thetaright = np.empty(I)
-        thetaleft.fill(p2[2])
+        thetaright.fill(p2[2])
     else:
         rleft = rleft[inds]
         rright = rright[inds]


https://bitbucket.org/yt_analysis/yt/commits/2e4db0abbbb3/
Changeset:   2e4db0abbbb3
User:        xarthisius
Date:        2017-05-31 21:11:03+00:00
Summary:     Merge pull request #1404 from ngoldbaum/alt-ray-tracers-fix

attempt to fix type errors in alt_ray_tracers.pyx
Affected #:  1 file

diff -r 4b22085ba0b75e00f4176024e555d459c8f0451d -r 2e4db0abbbb3b069fcafcb703650b9336bcca3aa yt/utilities/lib/alt_ray_tracers.pyx
--- a/yt/utilities/lib/alt_ray_tracers.pyx
+++ b/yt/utilities/lib/alt_ray_tracers.pyx
@@ -155,7 +155,7 @@
         thetaleft = np.empty(I)
         thetaleft.fill(p1[2])
         thetaright = np.empty(I)
-        thetaleft.fill(p2[2])
+        thetaright.fill(p2[2])
     else:
         rleft = rleft[inds]
         rright = rright[inds]
@@ -200,11 +200,13 @@
     # find intersections and compute return values
     tsect, dsect = _cart_intersect(p1cart, p2cart, _cyl2cart(b1), _cyl2cart(b2))
     tmask = np.logical_and(0.0<=tsect, tsect<=1.0)
-    tsect, tinds = np.unique(tsect[tmask], return_index=True)
+    ret = np.unique(tsect[tmask], return_index=True)
+    tsect, tinds = ret[0], ret[1].astype('int64')
     inds = inds[tmask][tinds]
     xyz = dsect[tmask][tinds]
     s = np.sqrt(((xyz - p1cart) * (xyz - p1cart)).sum(axis=1))
-    s, sinds = np.unique(s, return_index=True)
+    ret = np.unique(s, return_index=True)
+    s, sinds = ret[0], ret[1].astype('int64')
     inds = inds[sinds]
     xyz = xyz[sinds]
     t = s/np.sqrt((dpcart*dpcart).sum())

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.