[yt-svn] commit/yt: ngoldbaum: Merged in bwkeller/yt (pull request #2380)

[commits-noreply at bitbucket.org]

1 new commit in yt:

https://bitbucket.org/yt_analysis/yt/commits/2f108ac62226/
Changeset:   2f108ac62226
Branch:      yt
User:        ngoldbaum
Date:        2016-10-05 15:01:10+00:00
Summary:     Merged in bwkeller/yt (pull request #2380)

Fixed two small issues that prevents succesful build and nosetests on i386
Affected #:  2 files

diff -r aae37ab0285f6f641eb0b435c83f29bb74fc2f66 -r 2f108ac62226387c8a4133f189a241d53dba05d4 yt/geometry/particle_smooth.pyx
--- a/yt/geometry/particle_smooth.pyx
+++ b/yt/geometry/particle_smooth.pyx
@@ -185,8 +185,7 @@
         # Note that what we will be providing to our processing functions will
         # actually be indirectly-sorted fields.  This preserves memory at the
         # expense of additional pointer lookups.
-        pind = np.argsort(pdoms)
-        pind = np.asarray(pind, dtype='int64', order='C')
+        pind = np.asarray(np.argsort(pdoms), dtype='int64', order='C')
         # So what this means is that we now have all the oct-0 particle indices
         # in order, then the oct-1, etc etc.
         # This now gives us the indices to the particles for each domain.

diff -r aae37ab0285f6f641eb0b435c83f29bb74fc2f66 -r 2f108ac62226387c8a4133f189a241d53dba05d4 yt/utilities/tests/test_interpolators.py
--- a/yt/utilities/tests/test_interpolators.py
+++ b/yt/utilities/tests/test_interpolators.py
@@ -55,7 +55,7 @@
                np.mgrid[0.0:1.0:64j, 0.0:1.0:64j, 0.0:1.0:64j]))
     tfi = lin.TrilinearFieldInterpolator(random_data,
             (0.0, 1.0, 0.0, 1.0, 0.0, 1.0), "xyz", True)
-    yield assert_array_equal, tfi(fv), random_data
+    yield assert_array_almost_equal, tfi(fv), random_data
 
     # randomly spaced bins
     size = 64

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.