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

[commits-noreply at bitbucket.org]

2 new commits in yt:

https://bitbucket.org/yt_analysis/yt/commits/66732456fe07/
changeset:   66732456fe07
branch:      yt
user:        samskillman
date:        2013-03-01 20:28:58
summary:     Fix for 1-indexed grid neighbor finding.
affected #:  1 file

diff -r 99f54b08b497e432785acf362e594ba087007cf9 -r 66732456fe075ddb11ddd842e239c5fc5627ebe6 yt/utilities/amr_kdtree/amr_kdtree.py
--- a/yt/utilities/amr_kdtree/amr_kdtree.py
+++ b/yt/utilities/amr_kdtree/amr_kdtree.py
@@ -353,7 +353,8 @@
 
         if (in_grid != True).sum()>0:
             grids[in_grid != True] = \
-                [self.pf.h.grids[self.locate_brick(new_positions[i]).grid] 
+                [self.pf.h.grids[self.locate_brick(new_positions[i]).grid -
+                                 self._id_offset]
                  for i in get_them]
             cis[in_grid != True] = \
                 [(new_positions[i]-grids[i].LeftEdge)/
@@ -390,7 +391,8 @@
         
         """
         position = np.array(position)
-        grid = self.pf.h.grids[self.locate_brick(position).grid]
+        grid = self.pf.h.grids[self.locate_brick(position).grid -
+                               self._id_offset]
         ci = ((position-grid.LeftEdge)/grid.dds).astype('int64')
         return self.locate_neighbors(grid,ci)
 


https://bitbucket.org/yt_analysis/yt/commits/78980a0f4149/
changeset:   78980a0f4149
branch:      yt
user:        ngoldbaum
date:        2013-03-01 21:46:27
summary:     Merging.
affected #:  37 files

diff -r 66732456fe075ddb11ddd842e239c5fc5627ebe6 -r 78980a0f41490764b541bb0bcb6a69a32f135139 .hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -5156,3 +5156,10 @@
 0000000000000000000000000000000000000000 mpi-opaque
 f15825659f5af3ce64aaad30062aff3603cbfb66 hop callback
 0000000000000000000000000000000000000000 hop callback
+ca6e536c15a60070e6988fd472dc771a1897e170 yt-2.0
+882c41eed5dd4a3cdcbb567bcb79b833e46b1f42 yt-2.0.1
+a2b3521b1590c25029ca0bc602ad6cb7ae7b8ba2 yt-2.1
+41bd8aacfbc81fa66d7a3f2cd2880f10c3e237a4 yt-2.2
+3836676ee6307f9caf5ccdb0f0dd373676a68535 yt-2.3
+076cec2c57d2e4b508babbfd661f5daa1e34ec80 yt-2.4
+bd285a9a8a643ebb7b47b543e9343da84cd294c5 yt-2.5

diff -r 66732456fe075ddb11ddd842e239c5fc5627ebe6 -r 78980a0f41490764b541bb0bcb6a69a32f135139 MANIFEST.in
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,10 @@
 include distribute_setup.py README* CREDITS FUNDING LICENSE.txt
+include yt/utilities/kdtree/LICENSE
+include yt/utilities/kdtree/Makefile
+include yt/utilities/kdtree/api.py
+include yt/utilities/kdtree/fKD.f90
+include yt/utilities/kdtree/fKD.v
+include yt/utilities/kdtree/fKD_source.f90
+include yt/utilities/kdtree/kdtree2-README
 recursive-include yt/gui/reason/html *.html *.png *.ico *.js
 recursive-include yt *.pyx *.pxd *.hh *.h README*

diff -r 66732456fe075ddb11ddd842e239c5fc5627ebe6 -r 78980a0f41490764b541bb0bcb6a69a32f135139 doc/install_script.sh
--- a/doc/install_script.sh
+++ b/doc/install_script.sh
@@ -15,7 +15,7 @@
 
 DEST_SUFFIX="yt-`uname -m`"
 DEST_DIR="`pwd`/${DEST_SUFFIX/ /}"   # Installation location
-BRANCH="yt" # This is the branch to which we will forcibly update.
+BRANCH="stable" # This is the branch to which we will forcibly update.
 
 if [ ${REINST_YT} -eq 1 ] && [ -n ${YT_DEST} ]
 then

diff -r 66732456fe075ddb11ddd842e239c5fc5627ebe6 -r 78980a0f41490764b541bb0bcb6a69a32f135139 setup.py
--- a/setup.py
+++ b/setup.py
@@ -154,7 +154,7 @@
 
 import setuptools
 
-VERSION = "2.5dev"
+VERSION = "2.5"
 
 if os.path.exists('MANIFEST'):
     os.remove('MANIFEST')

diff -r 66732456fe075ddb11ddd842e239c5fc5627ebe6 -r 78980a0f41490764b541bb0bcb6a69a32f135139 yt/data_objects/field_info_container.py
--- a/yt/data_objects/field_info_container.py
+++ b/yt/data_objects/field_info_container.py
@@ -505,3 +505,4 @@
         if isinstance(data, FieldDetector): return True
         if getattr(data, "_type_name", None) == 'grid': return True
         raise NeedsOriginalGrid()
+

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.