[Yt-svn] yt: More fixing of backouts. I'm at a loss for why these were b...

[hg at spacepope.org]

hg Repository: yt
details:   yt/rev/58b0b141e079
changeset: 3527:58b0b141e079
user:      Matthew Turk <matthewturk at gmail.com>
date:
Wed Nov 10 14:25:28 2010 -0800
description:
More fixing of backouts.  I'm at a loss for why these were backed out.

diffstat:

 yt/utilities/_amr_utils/fortran_reader.pyx |  5 ++++-
 yt/utilities/amr_kdtree/amr_kdtree.py      |  8 ++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diffs (49 lines):

diff -r 8c97e0a35093 -r 58b0b141e079 yt/utilities/_amr_utils/fortran_reader.pyx
--- a/yt/utilities/_amr_utils/fortran_reader.pyx	Wed Nov 10 14:02:22 2010 -0800
+++ b/yt/utilities/_amr_utils/fortran_reader.pyx	Wed Nov 10 14:25:28 2010 -0800
@@ -234,6 +234,9 @@
         fread(&new_padding, sizeof(int), 1, f); FIX_LONG(new_padding)
         assert(padding[0] == new_padding)
 
+ at cython.cdivision(True)
+ at cython.boundscheck(False)
+ at cython.wraparound(False)
 def read_art_grid(int varindex, 
               np.ndarray[np.int64_t, ndim=1] start_index,
               np.ndarray[np.int32_t, ndim=1] grid_dims,
@@ -250,8 +253,8 @@
     cdef np.ndarray[np.int64_t, ndim=1] og_start_index
     cdef np.float64_t temp_data
     cdef np.int64_t end_index[3]
+    cdef int kr_offset, jr_offset, ir_offset
     cdef int to_fill = 0
-    cdef ir_offset, jr_offset, kr_offset
     # Note that indexing into a cell is:
     #   (k*2 + j)*2 + i
     for i in range(3):
diff -r 8c97e0a35093 -r 58b0b141e079 yt/utilities/amr_kdtree/amr_kdtree.py
--- a/yt/utilities/amr_kdtree/amr_kdtree.py	Wed Nov 10 14:02:22 2010 -0800
+++ b/yt/utilities/amr_kdtree/amr_kdtree.py	Wed Nov 10 14:25:28 2010 -0800
@@ -26,18 +26,18 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 import numpy as na
-from mpi4py import MPI
 from yt.funcs import *
 from yt.visualization.volume_rendering.grid_partitioner import HomogenizedVolume
 from yt.utilities.amr_utils import PartitionedGrid
 from yt.utilities.performance_counters import yt_counters, time_function
 import yt.utilities.parallel_tools.parallel_analysis_interface as PT
 
+from yt.config import ytcfg
+
 from time import time
 import h5py
-comm = MPI.COMM_WORLD
-my_rank = comm.rank
-nprocs = comm.size
+my_rank = ytcfg.getint("yt", "__parallel_rank")
+nprocs = ytcfg.getint("yt", "__parallel_size")
 
 def corner_bounds(split_dim, split, current_left = None, current_right = None):
     r"""