[Yt-svn] yt-commit r1586 - branches/yt-1.6/yt trunk/yt
mturk at wrangler.dreamhost.com
mturk at wrangler.dreamhost.com
Thu Jan 21 20:35:50 PST 2010
Author: mturk
Date: Thu Jan 21 20:35:50 2010
New Revision: 1586
URL: http://yt.enzotools.org/changeset/1586
Log:
re-generated Cython code from r1585 changes.
Modified:
branches/yt-1.6/yt/amr_utils.c
trunk/yt/amr_utils.c
Modified: branches/yt-1.6/yt/amr_utils.c
==============================================================================
--- branches/yt-1.6/yt/amr_utils.c (original)
+++ branches/yt-1.6/yt/amr_utils.c Thu Jan 21 20:35:50 2010
@@ -1,4 +1,4 @@
-/* Generated by Cython 0.11.3 on Thu Jan 21 14:00:51 2010 */
+/* Generated by Cython 0.11.3 on Thu Jan 21 20:35:22 2010 */
#define PY_SSIZE_T_CLEAN
#include "Python.h"
@@ -815,7 +815,7 @@
typedef npy_cdouble __pyx_t_5numpy_complex_t;
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":74
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":74
* cdef class VectorPlane
*
* cdef class TransferFunctionProxy: # <<<<<<<<<<<<<<
@@ -836,7 +836,7 @@
PyObject *tf_obj;
};
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":36
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":36
* self.refined_pos = 0
*
* cdef class OctreeGrid: # <<<<<<<<<<<<<<
@@ -854,7 +854,7 @@
int level;
};
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":53
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":53
* self.level = level
*
* cdef class OctreeGridList: # <<<<<<<<<<<<<<
@@ -867,7 +867,7 @@
PyObject *grids;
};
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":442
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":442
* return 1
*
* cdef class ProtoPrism: # <<<<<<<<<<<<<<
@@ -885,7 +885,7 @@
PyObject *subgrid_faces;
};
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":30
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":30
* cimport cython
*
* cdef class position: # <<<<<<<<<<<<<<
@@ -899,7 +899,7 @@
int refined_pos;
};
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":410
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":410
* tf.eval_transfer(dt, dv, rgba, grad)
*
* cdef class GridFace: # <<<<<<<<<<<<<<
@@ -916,7 +916,7 @@
__pyx_t_5numpy_float64_t right_edge[3];
};
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":72
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":72
* np.float64_t *data, np.float64_t *grad)
*
* cdef class VectorPlane # <<<<<<<<<<<<<<
@@ -945,7 +945,7 @@
__pyx_t_5numpy_float64_t *y_vec;
};
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":209
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":209
* tv[(((k*self.nv)+j)*self.nv+i)] = fv[k]
*
* cdef class PartitionedGrid: # <<<<<<<<<<<<<<
@@ -969,7 +969,7 @@
};
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":442
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":442
* return 1
*
* cdef class ProtoPrism: # <<<<<<<<<<<<<<
@@ -983,7 +983,7 @@
static struct __pyx_vtabstruct_2yt_9amr_utils_ProtoPrism *__pyx_vtabptr_2yt_9amr_utils_ProtoPrism;
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":149
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":149
* # dst.a = dst.a + (1 - dst.a) * src.a
*
* cdef class VectorPlane: # <<<<<<<<<<<<<<
@@ -999,7 +999,7 @@
static struct __pyx_vtabstruct_2yt_9amr_utils_VectorPlane *__pyx_vtabptr_2yt_9amr_utils_VectorPlane;
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":209
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":209
* tv[(((k*self.nv)+j)*self.nv+i)] = fv[k]
*
* cdef class PartitionedGrid: # <<<<<<<<<<<<<<
@@ -1015,7 +1015,7 @@
static struct __pyx_vtabstruct_2yt_9amr_utils_PartitionedGrid *__pyx_vtabptr_2yt_9amr_utils_PartitionedGrid;
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":410
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":410
* tf.eval_transfer(dt, dv, rgba, grad)
*
* cdef class GridFace: # <<<<<<<<<<<<<<
@@ -1029,7 +1029,7 @@
static struct __pyx_vtabstruct_2yt_9amr_utils_GridFace *__pyx_vtabptr_2yt_9amr_utils_GridFace;
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":74
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":74
* cdef class VectorPlane
*
* cdef class TransferFunctionProxy: # <<<<<<<<<<<<<<
@@ -1394,7 +1394,7 @@
static char __pyx_k_29[] = "Format string allocated too short.";
static char __pyx_k_30[] = "unknown dtype code in numpy.pxd (%d)";
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":32
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":32
* cdef class position:
* cdef public int output_pos, refined_pos
* def __cinit__(self): # <<<<<<<<<<<<<<
@@ -1410,7 +1410,7 @@
__Pyx_RaiseArgtupleInvalid("__cinit__", 1, 0, 0, PyTuple_GET_SIZE(__pyx_args)); return -1;}
if (unlikely(__pyx_kwds) && unlikely(PyDict_Size(__pyx_kwds) > 0) && unlikely(!__Pyx_CheckKeywordStrings(__pyx_kwds, "__cinit__", 0))) return -1;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":33
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":33
* cdef public int output_pos, refined_pos
* def __cinit__(self):
* self.output_pos = 0 # <<<<<<<<<<<<<<
@@ -1419,7 +1419,7 @@
*/
((struct __pyx_obj_2yt_9amr_utils_position *)__pyx_v_self)->output_pos = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":34
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":34
* def __cinit__(self):
* self.output_pos = 0
* self.refined_pos = 0 # <<<<<<<<<<<<<<
@@ -1433,7 +1433,7 @@
return __pyx_r;
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":39
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":39
* cdef public object child_indices, fields, left_edges, dimensions, dx
* cdef public int level
* def __cinit__(self, # <<<<<<<<<<<<<<
@@ -1593,7 +1593,7 @@
__pyx_bstride_0_dx = __pyx_bstruct_dx.strides[0];
__pyx_bshape_0_dx = __pyx_bstruct_dx.shape[0];
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":46
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":46
* np.ndarray[np.float64_t, ndim=1] dx,
* int level):
* self.child_indices = child_indices # <<<<<<<<<<<<<<
@@ -1606,7 +1606,7 @@
__Pyx_DECREF(((struct __pyx_obj_2yt_9amr_utils_OctreeGrid *)__pyx_v_self)->child_indices);
((struct __pyx_obj_2yt_9amr_utils_OctreeGrid *)__pyx_v_self)->child_indices = ((PyObject *)__pyx_v_child_indices);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":47
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":47
* int level):
* self.child_indices = child_indices
* self.fields = fields # <<<<<<<<<<<<<<
@@ -1619,7 +1619,7 @@
__Pyx_DECREF(((struct __pyx_obj_2yt_9amr_utils_OctreeGrid *)__pyx_v_self)->fields);
((struct __pyx_obj_2yt_9amr_utils_OctreeGrid *)__pyx_v_self)->fields = ((PyObject *)__pyx_v_fields);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":48
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":48
* self.child_indices = child_indices
* self.fields = fields
* self.left_edges = left_edges # <<<<<<<<<<<<<<
@@ -1632,7 +1632,7 @@
__Pyx_DECREF(((struct __pyx_obj_2yt_9amr_utils_OctreeGrid *)__pyx_v_self)->left_edges);
((struct __pyx_obj_2yt_9amr_utils_OctreeGrid *)__pyx_v_self)->left_edges = ((PyObject *)__pyx_v_left_edges);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":49
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":49
* self.fields = fields
* self.left_edges = left_edges
* self.dimensions = dimensions # <<<<<<<<<<<<<<
@@ -1645,7 +1645,7 @@
__Pyx_DECREF(((struct __pyx_obj_2yt_9amr_utils_OctreeGrid *)__pyx_v_self)->dimensions);
((struct __pyx_obj_2yt_9amr_utils_OctreeGrid *)__pyx_v_self)->dimensions = ((PyObject *)__pyx_v_dimensions);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":50
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":50
* self.left_edges = left_edges
* self.dimensions = dimensions
* self.dx = dx # <<<<<<<<<<<<<<
@@ -1658,7 +1658,7 @@
__Pyx_DECREF(((struct __pyx_obj_2yt_9amr_utils_OctreeGrid *)__pyx_v_self)->dx);
((struct __pyx_obj_2yt_9amr_utils_OctreeGrid *)__pyx_v_self)->dx = ((PyObject *)__pyx_v_dx);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":51
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":51
* self.dimensions = dimensions
* self.dx = dx
* self.level = level # <<<<<<<<<<<<<<
@@ -1692,7 +1692,7 @@
return __pyx_r;
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":55
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":55
* cdef class OctreeGridList:
* cdef public object grids
* def __cinit__(self, grids): # <<<<<<<<<<<<<<
@@ -1737,7 +1737,7 @@
return -1;
__pyx_L4_argument_unpacking_done:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":56
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":56
* cdef public object grids
* def __cinit__(self, grids):
* self.grids = grids # <<<<<<<<<<<<<<
@@ -1755,7 +1755,7 @@
return __pyx_r;
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":58
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":58
* self.grids = grids
*
* def __getitem__(self, int item): # <<<<<<<<<<<<<<
@@ -1778,7 +1778,7 @@
return NULL;
__pyx_L4_argument_unpacking_done:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":59
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":59
*
* def __getitem__(self, int item):
* return self.grids[item] # <<<<<<<<<<<<<<
@@ -1804,7 +1804,7 @@
return __pyx_r;
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":62
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":62
*
* @cython.boundscheck(False)
* def RecurseOctreeDepthFirst(int i_i, int j_i, int k_i, # <<<<<<<<<<<<<<
@@ -2067,7 +2067,7 @@
__pyx_bstride_0_refined = __pyx_bstruct_refined.strides[0];
__pyx_bshape_0_refined = __pyx_bstruct_refined.shape[0];
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":71
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":71
* cdef int child_i, child_j, child_k
* cdef OctreeGrid child_grid
* cdef OctreeGrid grid = grids[gi-1] # <<<<<<<<<<<<<<
@@ -2081,7 +2081,7 @@
__pyx_v_grid = ((struct __pyx_obj_2yt_9amr_utils_OctreeGrid *)__pyx_1);
__pyx_1 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":72
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":72
* cdef OctreeGrid child_grid
* cdef OctreeGrid grid = grids[gi-1]
* cdef np.ndarray[np.int32_t, ndim=3] child_indices = grid.child_indices # <<<<<<<<<<<<<<
@@ -2103,7 +2103,7 @@
__Pyx_INCREF(__pyx_v_grid->child_indices);
__pyx_v_child_indices = ((PyArrayObject *)__pyx_v_grid->child_indices);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":73
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":73
* cdef OctreeGrid grid = grids[gi-1]
* cdef np.ndarray[np.int32_t, ndim=3] child_indices = grid.child_indices
* cdef np.ndarray[np.int32_t, ndim=1] dimensions = grid.dimensions # <<<<<<<<<<<<<<
@@ -2125,7 +2125,7 @@
__Pyx_INCREF(__pyx_v_grid->dimensions);
__pyx_v_dimensions = ((PyArrayObject *)__pyx_v_grid->dimensions);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":74
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":74
* cdef np.ndarray[np.int32_t, ndim=3] child_indices = grid.child_indices
* cdef np.ndarray[np.int32_t, ndim=1] dimensions = grid.dimensions
* cdef np.ndarray[np.float64_t, ndim=4] fields = grid.fields # <<<<<<<<<<<<<<
@@ -2147,7 +2147,7 @@
__Pyx_INCREF(__pyx_v_grid->fields);
__pyx_v_fields = ((PyArrayObject *)__pyx_v_grid->fields);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":75
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":75
* cdef np.ndarray[np.int32_t, ndim=1] dimensions = grid.dimensions
* cdef np.ndarray[np.float64_t, ndim=4] fields = grid.fields
* cdef np.ndarray[np.float64_t, ndim=1] leftedges = grid.left_edges # <<<<<<<<<<<<<<
@@ -2169,7 +2169,7 @@
__Pyx_INCREF(__pyx_v_grid->left_edges);
__pyx_v_leftedges = ((PyArrayObject *)__pyx_v_grid->left_edges);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":76
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":76
* cdef np.ndarray[np.float64_t, ndim=4] fields = grid.fields
* cdef np.ndarray[np.float64_t, ndim=1] leftedges = grid.left_edges
* cdef np.float64_t dx = grid.dx[0] # <<<<<<<<<<<<<<
@@ -2182,7 +2182,7 @@
__Pyx_DECREF(__pyx_1); __pyx_1 = 0;
__pyx_v_dx = __pyx_t_6;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":80
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":80
* cdef np.ndarray[np.float64_t, ndim=1] child_leftedges
* cdef np.float64_t cx, cy, cz
* for k_off in range(k_f): # <<<<<<<<<<<<<<
@@ -2192,7 +2192,7 @@
for (__pyx_t_7 = 0; __pyx_t_7 < __pyx_v_k_f; __pyx_t_7+=1) {
__pyx_v_k_off = __pyx_t_7;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":81
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":81
* cdef np.float64_t cx, cy, cz
* for k_off in range(k_f):
* k = k_off + k_i # <<<<<<<<<<<<<<
@@ -2201,7 +2201,7 @@
*/
__pyx_v_k = (__pyx_v_k_off + __pyx_v_k_i);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":82
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":82
* for k_off in range(k_f):
* k = k_off + k_i
* cz = (leftedges[2] + k*dx) # <<<<<<<<<<<<<<
@@ -2212,7 +2212,7 @@
if (__pyx_t_1 < 0) __pyx_t_1 += __pyx_bshape_0_leftedges;
__pyx_v_cz = ((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_leftedges.buf, __pyx_t_1, __pyx_bstride_0_leftedges)) + (__pyx_v_k * __pyx_v_dx));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":83
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":83
* k = k_off + k_i
* cz = (leftedges[2] + k*dx)
* for j_off in range(j_f): # <<<<<<<<<<<<<<
@@ -2222,7 +2222,7 @@
for (__pyx_t_8 = 0; __pyx_t_8 < __pyx_v_j_f; __pyx_t_8+=1) {
__pyx_v_j_off = __pyx_t_8;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":84
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":84
* cz = (leftedges[2] + k*dx)
* for j_off in range(j_f):
* j = j_off + j_i # <<<<<<<<<<<<<<
@@ -2231,7 +2231,7 @@
*/
__pyx_v_j = (__pyx_v_j_off + __pyx_v_j_i);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":85
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":85
* for j_off in range(j_f):
* j = j_off + j_i
* cy = (leftedges[1] + j*dx) # <<<<<<<<<<<<<<
@@ -2242,7 +2242,7 @@
if (__pyx_t_9 < 0) __pyx_t_9 += __pyx_bshape_0_leftedges;
__pyx_v_cy = ((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_leftedges.buf, __pyx_t_9, __pyx_bstride_0_leftedges)) + (__pyx_v_j * __pyx_v_dx));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":86
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":86
* j = j_off + j_i
* cy = (leftedges[1] + j*dx)
* for i_off in range(i_f): # <<<<<<<<<<<<<<
@@ -2252,7 +2252,7 @@
for (__pyx_t_10 = 0; __pyx_t_10 < __pyx_v_i_f; __pyx_t_10+=1) {
__pyx_v_i_off = __pyx_t_10;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":87
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":87
* cy = (leftedges[1] + j*dx)
* for i_off in range(i_f):
* i = i_off + i_i # <<<<<<<<<<<<<<
@@ -2261,7 +2261,7 @@
*/
__pyx_v_i = (__pyx_v_i_off + __pyx_v_i_i);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":88
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":88
* for i_off in range(i_f):
* i = i_off + i_i
* cx = (leftedges[0] + i*dx) # <<<<<<<<<<<<<<
@@ -2272,7 +2272,7 @@
if (__pyx_t_11 < 0) __pyx_t_11 += __pyx_bshape_0_leftedges;
__pyx_v_cx = ((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_leftedges.buf, __pyx_t_11, __pyx_bstride_0_leftedges)) + (__pyx_v_i * __pyx_v_dx));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":89
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":89
* i = i_off + i_i
* cx = (leftedges[0] + i*dx)
* ci = grid.child_indices[i,j,k] # <<<<<<<<<<<<<<
@@ -2303,7 +2303,7 @@
__Pyx_DECREF(__pyx_1); __pyx_1 = 0;
__pyx_v_ci = __pyx_t_16;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":90
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":90
* cx = (leftedges[0] + i*dx)
* ci = grid.child_indices[i,j,k]
* if ci == -1: # <<<<<<<<<<<<<<
@@ -2313,7 +2313,7 @@
__pyx_t_17 = (__pyx_v_ci == -1);
if (__pyx_t_17) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":91
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":91
* ci = grid.child_indices[i,j,k]
* if ci == -1:
* for fi in range(fields.shape[0]): # <<<<<<<<<<<<<<
@@ -2323,7 +2323,7 @@
for (__pyx_t_16 = 0; __pyx_t_16 < (__pyx_v_fields->dimensions[0]); __pyx_t_16+=1) {
__pyx_v_fi = __pyx_t_16;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":92
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":92
* if ci == -1:
* for fi in range(fields.shape[0]):
* output[curpos.output_pos,fi] = fields[fi,i,j,k] # <<<<<<<<<<<<<<
@@ -2345,7 +2345,7 @@
*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_output.buf, __pyx_t_22, __pyx_bstride_0_output, __pyx_t_23, __pyx_bstride_1_output) = (*__Pyx_BufPtrStrided4d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_fields.buf, __pyx_t_18, __pyx_bstride_0_fields, __pyx_t_19, __pyx_bstride_1_fields, __pyx_t_20, __pyx_bstride_2_fields, __pyx_t_21, __pyx_bstride_3_fields));
}
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":93
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":93
* for fi in range(fields.shape[0]):
* output[curpos.output_pos,fi] = fields[fi,i,j,k]
* refined[curpos.refined_pos] = 0 # <<<<<<<<<<<<<<
@@ -2356,7 +2356,7 @@
if (__pyx_t_16 < 0) __pyx_t_16 += __pyx_bshape_0_refined;
*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int32_t *, __pyx_bstruct_refined.buf, __pyx_t_16, __pyx_bstride_0_refined) = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":94
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":94
* output[curpos.output_pos,fi] = fields[fi,i,j,k]
* refined[curpos.refined_pos] = 0
* curpos.output_pos += 1 # <<<<<<<<<<<<<<
@@ -2365,7 +2365,7 @@
*/
__pyx_v_curpos->output_pos += 1;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":95
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":95
* refined[curpos.refined_pos] = 0
* curpos.output_pos += 1
* curpos.refined_pos += 1 # <<<<<<<<<<<<<<
@@ -2377,7 +2377,7 @@
}
/*else*/ {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":97
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":97
* curpos.refined_pos += 1
* else:
* refined[curpos.refined_pos] = 1 # <<<<<<<<<<<<<<
@@ -2388,7 +2388,7 @@
if (__pyx_t_24 < 0) __pyx_t_24 += __pyx_bshape_0_refined;
*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int32_t *, __pyx_bstruct_refined.buf, __pyx_t_24, __pyx_bstride_0_refined) = 1;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":98
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":98
* else:
* refined[curpos.refined_pos] = 1
* curpos.refined_pos += 1 # <<<<<<<<<<<<<<
@@ -2397,7 +2397,7 @@
*/
__pyx_v_curpos->refined_pos += 1;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":99
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":99
* refined[curpos.refined_pos] = 1
* curpos.refined_pos += 1
* child_grid = grids[ci-1] # <<<<<<<<<<<<<<
@@ -2412,7 +2412,7 @@
__pyx_v_child_grid = ((struct __pyx_obj_2yt_9amr_utils_OctreeGrid *)__pyx_1);
__pyx_1 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":100
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":100
* curpos.refined_pos += 1
* child_grid = grids[ci-1]
* child_dx = child_grid.dx[0] # <<<<<<<<<<<<<<
@@ -2425,7 +2425,7 @@
__Pyx_DECREF(__pyx_1); __pyx_1 = 0;
__pyx_v_child_dx = __pyx_t_6;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":101
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":101
* child_grid = grids[ci-1]
* child_dx = child_grid.dx[0]
* child_leftedges = child_grid.left_edges # <<<<<<<<<<<<<<
@@ -2456,7 +2456,7 @@
__Pyx_DECREF(((PyObject *)__pyx_v_child_leftedges));
__pyx_v_child_leftedges = ((PyArrayObject *)__pyx_v_child_grid->left_edges);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":102
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":102
* child_dx = child_grid.dx[0]
* child_leftedges = child_grid.left_edges
* child_i = int((cx - child_leftedges[0])/child_dx) # <<<<<<<<<<<<<<
@@ -2479,7 +2479,7 @@
__Pyx_DECREF(__pyx_t_15); __pyx_t_15 = 0;
__pyx_v_child_i = __pyx_t_27;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":103
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":103
* child_leftedges = child_grid.left_edges
* child_i = int((cx - child_leftedges[0])/child_dx)
* child_j = int((cy - child_leftedges[1])/child_dx) # <<<<<<<<<<<<<<
@@ -2502,7 +2502,7 @@
__Pyx_DECREF(__pyx_t_15); __pyx_t_15 = 0;
__pyx_v_child_j = __pyx_t_27;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":104
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":104
* child_i = int((cx - child_leftedges[0])/child_dx)
* child_j = int((cy - child_leftedges[1])/child_dx)
* child_k = int((cz - child_leftedges[2])/child_dx) # <<<<<<<<<<<<<<
@@ -2525,7 +2525,7 @@
__Pyx_DECREF(__pyx_t_15); __pyx_t_15 = 0;
__pyx_v_child_k = __pyx_t_27;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":105
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":105
* child_j = int((cy - child_leftedges[1])/child_dx)
* child_k = int((cz - child_leftedges[2])/child_dx)
* s = RecurseOctreeDepthFirst(child_i, child_j, child_k, 2, 2, 2, # <<<<<<<<<<<<<<
@@ -2541,7 +2541,7 @@
__pyx_t_13 = PyInt_FromLong(__pyx_v_child_k); if (unlikely(!__pyx_t_13)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 105; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_t_13);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":106
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":106
* child_k = int((cz - child_leftedges[2])/child_dx)
* s = RecurseOctreeDepthFirst(child_i, child_j, child_k, 2, 2, 2,
* curpos, ci, output, refined, grids) # <<<<<<<<<<<<<<
@@ -2598,7 +2598,7 @@
}
}
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":107
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":107
* s = RecurseOctreeDepthFirst(child_i, child_j, child_k, 2, 2, 2,
* curpos, ci, output, refined, grids)
* return s # <<<<<<<<<<<<<<
@@ -2654,7 +2654,7 @@
return __pyx_r;
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":110
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":110
*
* @cython.boundscheck(False)
* def RecurseOctreeByLevels(int i_i, int j_i, int k_i, # <<<<<<<<<<<<<<
@@ -2970,7 +2970,7 @@
__pyx_bstride_0_corners = __pyx_bstruct_corners.strides[0]; __pyx_bstride_1_corners = __pyx_bstruct_corners.strides[1];
__pyx_bshape_0_corners = __pyx_bstruct_corners.shape[0]; __pyx_bshape_1_corners = __pyx_bstruct_corners.shape[1];
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":121
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":121
* cdef int child_i, child_j, child_k
* cdef OctreeGrid child_grid
* cdef OctreeGrid grid = grids[gi-1] # <<<<<<<<<<<<<<
@@ -2984,7 +2984,7 @@
__pyx_v_grid = ((struct __pyx_obj_2yt_9amr_utils_OctreeGrid *)__pyx_1);
__pyx_1 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":122
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":122
* cdef OctreeGrid child_grid
* cdef OctreeGrid grid = grids[gi-1]
* cdef int level = grid.level # <<<<<<<<<<<<<<
@@ -2993,7 +2993,7 @@
*/
__pyx_v_level = __pyx_v_grid->level;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":123
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":123
* cdef OctreeGrid grid = grids[gi-1]
* cdef int level = grid.level
* cdef np.ndarray[np.int32_t, ndim=3] child_indices = grid.child_indices # <<<<<<<<<<<<<<
@@ -3015,7 +3015,7 @@
__Pyx_INCREF(__pyx_v_grid->child_indices);
__pyx_v_child_indices = ((PyArrayObject *)__pyx_v_grid->child_indices);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":124
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":124
* cdef int level = grid.level
* cdef np.ndarray[np.int32_t, ndim=3] child_indices = grid.child_indices
* cdef np.ndarray[np.int32_t, ndim=1] dimensions = grid.dimensions # <<<<<<<<<<<<<<
@@ -3037,7 +3037,7 @@
__Pyx_INCREF(__pyx_v_grid->dimensions);
__pyx_v_dimensions = ((PyArrayObject *)__pyx_v_grid->dimensions);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":125
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":125
* cdef np.ndarray[np.int32_t, ndim=3] child_indices = grid.child_indices
* cdef np.ndarray[np.int32_t, ndim=1] dimensions = grid.dimensions
* cdef np.ndarray[np.float64_t, ndim=4] fields = grid.fields # <<<<<<<<<<<<<<
@@ -3059,7 +3059,7 @@
__Pyx_INCREF(__pyx_v_grid->fields);
__pyx_v_fields = ((PyArrayObject *)__pyx_v_grid->fields);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":126
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":126
* cdef np.ndarray[np.int32_t, ndim=1] dimensions = grid.dimensions
* cdef np.ndarray[np.float64_t, ndim=4] fields = grid.fields
* cdef np.ndarray[np.float64_t, ndim=1] leftedges = grid.left_edges # <<<<<<<<<<<<<<
@@ -3081,7 +3081,7 @@
__Pyx_INCREF(__pyx_v_grid->left_edges);
__pyx_v_leftedges = ((PyArrayObject *)__pyx_v_grid->left_edges);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":127
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":127
* cdef np.ndarray[np.float64_t, ndim=4] fields = grid.fields
* cdef np.ndarray[np.float64_t, ndim=1] leftedges = grid.left_edges
* cdef np.float64_t dx = grid.dx[0] # <<<<<<<<<<<<<<
@@ -3094,7 +3094,7 @@
__Pyx_DECREF(__pyx_1); __pyx_1 = 0;
__pyx_v_dx = __pyx_t_6;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":132
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":132
* cdef np.float64_t cx, cy, cz
* cdef int cp
* for i_off in range(i_f): # <<<<<<<<<<<<<<
@@ -3104,7 +3104,7 @@
for (__pyx_t_7 = 0; __pyx_t_7 < __pyx_v_i_f; __pyx_t_7+=1) {
__pyx_v_i_off = __pyx_t_7;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":133
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":133
* cdef int cp
* for i_off in range(i_f):
* i = i_off + i_i # <<<<<<<<<<<<<<
@@ -3113,7 +3113,7 @@
*/
__pyx_v_i = (__pyx_v_i_off + __pyx_v_i_i);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":134
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":134
* for i_off in range(i_f):
* i = i_off + i_i
* cx = (leftedges[0] + i*dx) # <<<<<<<<<<<<<<
@@ -3124,7 +3124,7 @@
if (__pyx_t_1 < 0) __pyx_t_1 += __pyx_bshape_0_leftedges;
__pyx_v_cx = ((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_leftedges.buf, __pyx_t_1, __pyx_bstride_0_leftedges)) + (__pyx_v_i * __pyx_v_dx));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":135
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":135
* i = i_off + i_i
* cx = (leftedges[0] + i*dx)
* if i_f > 2: print k, cz # <<<<<<<<<<<<<<
@@ -3151,7 +3151,7 @@
}
__pyx_L8:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":136
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":136
* cx = (leftedges[0] + i*dx)
* if i_f > 2: print k, cz
* for j_off in range(j_f): # <<<<<<<<<<<<<<
@@ -3161,7 +3161,7 @@
for (__pyx_t_12 = 0; __pyx_t_12 < __pyx_v_j_f; __pyx_t_12+=1) {
__pyx_v_j_off = __pyx_t_12;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":137
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":137
* if i_f > 2: print k, cz
* for j_off in range(j_f):
* j = j_off + j_i # <<<<<<<<<<<<<<
@@ -3170,7 +3170,7 @@
*/
__pyx_v_j = (__pyx_v_j_off + __pyx_v_j_i);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":138
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":138
* for j_off in range(j_f):
* j = j_off + j_i
* cy = (leftedges[1] + j*dx) # <<<<<<<<<<<<<<
@@ -3181,7 +3181,7 @@
if (__pyx_t_13 < 0) __pyx_t_13 += __pyx_bshape_0_leftedges;
__pyx_v_cy = ((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_leftedges.buf, __pyx_t_13, __pyx_bstride_0_leftedges)) + (__pyx_v_j * __pyx_v_dx));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":139
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":139
* j = j_off + j_i
* cy = (leftedges[1] + j*dx)
* for k_off in range(k_f): # <<<<<<<<<<<<<<
@@ -3191,7 +3191,7 @@
for (__pyx_t_14 = 0; __pyx_t_14 < __pyx_v_k_f; __pyx_t_14+=1) {
__pyx_v_k_off = __pyx_t_14;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":140
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":140
* cy = (leftedges[1] + j*dx)
* for k_off in range(k_f):
* k = k_off + k_i # <<<<<<<<<<<<<<
@@ -3200,7 +3200,7 @@
*/
__pyx_v_k = (__pyx_v_k_off + __pyx_v_k_i);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":141
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":141
* for k_off in range(k_f):
* k = k_off + k_i
* cz = (leftedges[2] + k*dx) # <<<<<<<<<<<<<<
@@ -3211,7 +3211,7 @@
if (__pyx_t_15 < 0) __pyx_t_15 += __pyx_bshape_0_leftedges;
__pyx_v_cz = ((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_leftedges.buf, __pyx_t_15, __pyx_bstride_0_leftedges)) + (__pyx_v_k * __pyx_v_dx));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":142
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":142
* k = k_off + k_i
* cz = (leftedges[2] + k*dx)
* cp = curpos[level] # <<<<<<<<<<<<<<
@@ -3222,7 +3222,7 @@
if (__pyx_t_16 < 0) __pyx_t_16 += __pyx_bshape_0_curpos;
__pyx_v_cp = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int32_t *, __pyx_bstruct_curpos.buf, __pyx_t_16, __pyx_bstride_0_curpos));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":143
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":143
* cz = (leftedges[2] + k*dx)
* cp = curpos[level]
* corners[cp, 0] = cx # <<<<<<<<<<<<<<
@@ -3235,7 +3235,7 @@
if (__pyx_t_18 < 0) __pyx_t_18 += __pyx_bshape_1_corners;
*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_corners.buf, __pyx_t_17, __pyx_bstride_0_corners, __pyx_t_18, __pyx_bstride_1_corners) = __pyx_v_cx;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":144
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":144
* cp = curpos[level]
* corners[cp, 0] = cx
* corners[cp, 1] = cy # <<<<<<<<<<<<<<
@@ -3248,7 +3248,7 @@
if (__pyx_t_20 < 0) __pyx_t_20 += __pyx_bshape_1_corners;
*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_corners.buf, __pyx_t_19, __pyx_bstride_0_corners, __pyx_t_20, __pyx_bstride_1_corners) = __pyx_v_cy;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":145
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":145
* corners[cp, 0] = cx
* corners[cp, 1] = cy
* corners[cp, 2] = cz # <<<<<<<<<<<<<<
@@ -3261,7 +3261,7 @@
if (__pyx_t_22 < 0) __pyx_t_22 += __pyx_bshape_1_corners;
*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_corners.buf, __pyx_t_21, __pyx_bstride_0_corners, __pyx_t_22, __pyx_bstride_1_corners) = __pyx_v_cz;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":146
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":146
* corners[cp, 1] = cy
* corners[cp, 2] = cz
* genealogy[curpos[level], 2] = level # <<<<<<<<<<<<<<
@@ -3276,7 +3276,7 @@
if (__pyx_t_25 < 0) __pyx_t_25 += __pyx_bshape_1_genealogy;
*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_int32_t *, __pyx_bstruct_genealogy.buf, __pyx_t_24, __pyx_bstride_0_genealogy, __pyx_t_25, __pyx_bstride_1_genealogy) = __pyx_v_level;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":148
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":148
* genealogy[curpos[level], 2] = level
* # always output data
* for fi in range(fields.shape[0]): # <<<<<<<<<<<<<<
@@ -3286,7 +3286,7 @@
for (__pyx_t_26 = 0; __pyx_t_26 < (__pyx_v_fields->dimensions[0]); __pyx_t_26+=1) {
__pyx_v_fi = __pyx_t_26;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":149
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":149
* # always output data
* for fi in range(fields.shape[0]):
* output[cp,fi] = fields[fi,i,j,k] # <<<<<<<<<<<<<<
@@ -3308,7 +3308,7 @@
*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_output.buf, __pyx_t_31, __pyx_bstride_0_output, __pyx_t_32, __pyx_bstride_1_output) = (*__Pyx_BufPtrStrided4d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_fields.buf, __pyx_t_27, __pyx_bstride_0_fields, __pyx_t_28, __pyx_bstride_1_fields, __pyx_t_29, __pyx_bstride_2_fields, __pyx_t_30, __pyx_bstride_3_fields));
}
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":150
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":150
* for fi in range(fields.shape[0]):
* output[cp,fi] = fields[fi,i,j,k]
* ci = child_indices[i,j,k] # <<<<<<<<<<<<<<
@@ -3323,7 +3323,7 @@
if (__pyx_t_34 < 0) __pyx_t_34 += __pyx_bshape_2_child_indices;
__pyx_v_ci = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int32_t *, __pyx_bstruct_child_indices.buf, __pyx_t_26, __pyx_bstride_0_child_indices, __pyx_t_33, __pyx_bstride_1_child_indices, __pyx_t_34, __pyx_bstride_2_child_indices));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":151
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":151
* output[cp,fi] = fields[fi,i,j,k]
* ci = child_indices[i,j,k]
* if ci > -1: # <<<<<<<<<<<<<<
@@ -3333,7 +3333,7 @@
__pyx_t_8 = (__pyx_v_ci > -1);
if (__pyx_t_8) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":152
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":152
* ci = child_indices[i,j,k]
* if ci > -1:
* child_grid = grids[ci-1] # <<<<<<<<<<<<<<
@@ -3348,7 +3348,7 @@
__pyx_v_child_grid = ((struct __pyx_obj_2yt_9amr_utils_OctreeGrid *)__pyx_1);
__pyx_1 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":153
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":153
* if ci > -1:
* child_grid = grids[ci-1]
* child_dx = child_grid.dx[0] # <<<<<<<<<<<<<<
@@ -3361,7 +3361,7 @@
__Pyx_DECREF(__pyx_1); __pyx_1 = 0;
__pyx_v_child_dx = __pyx_t_6;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":154
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":154
* child_grid = grids[ci-1]
* child_dx = child_grid.dx[0]
* child_leftedges = child_grid.left_edges # <<<<<<<<<<<<<<
@@ -3392,7 +3392,7 @@
__Pyx_DECREF(((PyObject *)__pyx_v_child_leftedges));
__pyx_v_child_leftedges = ((PyArrayObject *)__pyx_v_child_grid->left_edges);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":155
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":155
* child_dx = child_grid.dx[0]
* child_leftedges = child_grid.left_edges
* child_i = int((cx-child_leftedges[0])/child_dx) # <<<<<<<<<<<<<<
@@ -3415,7 +3415,7 @@
__Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
__pyx_v_child_i = __pyx_t_37;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":156
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":156
* child_leftedges = child_grid.left_edges
* child_i = int((cx-child_leftedges[0])/child_dx)
* child_j = int((cy-child_leftedges[1])/child_dx) # <<<<<<<<<<<<<<
@@ -3438,7 +3438,7 @@
__Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
__pyx_v_child_j = __pyx_t_37;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":157
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":157
* child_i = int((cx-child_leftedges[0])/child_dx)
* child_j = int((cy-child_leftedges[1])/child_dx)
* child_k = int((cz-child_leftedges[2])/child_dx) # <<<<<<<<<<<<<<
@@ -3461,7 +3461,7 @@
__Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
__pyx_v_child_k = __pyx_t_37;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":159
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":159
* child_k = int((cz-child_leftedges[2])/child_dx)
* # set current child id to id of next cell to examine
* genealogy[cp, 0] = curpos[level+1] # <<<<<<<<<<<<<<
@@ -3476,7 +3476,7 @@
if (__pyx_t_44 < 0) __pyx_t_44 += __pyx_bshape_1_genealogy;
*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_int32_t *, __pyx_bstruct_genealogy.buf, __pyx_t_37, __pyx_bstride_0_genealogy, __pyx_t_44, __pyx_bstride_1_genealogy) = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int32_t *, __pyx_bstruct_curpos.buf, __pyx_t_43, __pyx_bstride_0_curpos));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":161
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":161
* genealogy[cp, 0] = curpos[level+1]
* # set next parent id to id of current cell
* genealogy[curpos[level+1]:curpos[level+1]+8, 1] = cp # <<<<<<<<<<<<<<
@@ -3509,7 +3509,7 @@
__Pyx_DECREF(((PyObject *)__pyx_t_9)); __pyx_t_9 = 0;
__Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":162
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":162
* # set next parent id to id of current cell
* genealogy[curpos[level+1]:curpos[level+1]+8, 1] = cp
* s = RecurseOctreeByLevels(child_i, child_j, child_k, 2, 2, 2, # <<<<<<<<<<<<<<
@@ -3525,7 +3525,7 @@
__pyx_t_10 = PyInt_FromLong(__pyx_v_child_k); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 162; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_t_10);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":163
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":163
* genealogy[curpos[level+1]:curpos[level+1]+8, 1] = cp
* s = RecurseOctreeByLevels(child_i, child_j, child_k, 2, 2, 2,
* curpos, ci, output, genealogy, # <<<<<<<<<<<<<<
@@ -3535,7 +3535,7 @@
__pyx_t_47 = __Pyx_PyInt_to_py_npy_int32(__pyx_v_ci); if (unlikely(!__pyx_t_47)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 163; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_t_47);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":164
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":164
* s = RecurseOctreeByLevels(child_i, child_j, child_k, 2, 2, 2,
* curpos, ci, output, genealogy,
* corners, grids) # <<<<<<<<<<<<<<
@@ -3591,7 +3591,7 @@
}
__pyx_L15:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":165
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":165
* curpos, ci, output, genealogy,
* corners, grids)
* curpos[level] += 1 # <<<<<<<<<<<<<<
@@ -3605,7 +3605,7 @@
}
}
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":166
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":166
* corners, grids)
* curpos[level] += 1
* return s # <<<<<<<<<<<<<<
@@ -3664,7 +3664,7 @@
return __pyx_r;
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":31
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":31
*
* @cython.boundscheck(False)
* def UnilinearlyInterpolate(np.ndarray[np.float64_t, ndim=1] table, # <<<<<<<<<<<<<<
@@ -3825,7 +3825,7 @@
__pyx_bstride_0_output = __pyx_bstruct_output.strides[0];
__pyx_bshape_0_output = __pyx_bstruct_output.shape[0];
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":38
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":38
* cdef double x, xp, xm
* cdef int i, x_i, y_i
* for i in range(x_vals.shape[0]): # <<<<<<<<<<<<<<
@@ -3835,7 +3835,7 @@
for (__pyx_t_1 = 0; __pyx_t_1 < (__pyx_v_x_vals->dimensions[0]); __pyx_t_1+=1) {
__pyx_v_i = __pyx_t_1;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":39
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":39
* cdef int i, x_i, y_i
* for i in range(x_vals.shape[0]):
* x_i = x_is[i] # <<<<<<<<<<<<<<
@@ -3846,7 +3846,7 @@
if (__pyx_t_2 < 0) __pyx_t_2 += __pyx_bshape_0_x_is;
__pyx_v_x_i = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int32_t *, __pyx_bstruct_x_is.buf, __pyx_t_2, __pyx_bstride_0_x_is));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":40
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":40
* for i in range(x_vals.shape[0]):
* x_i = x_is[i]
* x = x_vals[i] # <<<<<<<<<<<<<<
@@ -3857,7 +3857,7 @@
if (__pyx_t_3 < 0) __pyx_t_3 += __pyx_bshape_0_x_vals;
__pyx_v_x = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_x_vals.buf, __pyx_t_3, __pyx_bstride_0_x_vals));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":41
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":41
* x_i = x_is[i]
* x = x_vals[i]
* dx_inv = 1.0 / (x_bins[x_i+1] - x_bins[x_i]) # <<<<<<<<<<<<<<
@@ -3874,7 +3874,7 @@
__pyx_v_dx_inv = __pyx_t_6;
__pyx_t_6 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":42
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":42
* x = x_vals[i]
* dx_inv = 1.0 / (x_bins[x_i+1] - x_bins[x_i])
* xp = (x - x_bins[x_i]) * dx_inv # <<<<<<<<<<<<<<
@@ -3892,7 +3892,7 @@
__Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
__pyx_v_xp = __pyx_t_9;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":43
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":43
* dx_inv = 1.0 / (x_bins[x_i+1] - x_bins[x_i])
* xp = (x - x_bins[x_i]) * dx_inv
* xm = (x_bins[x_i+1] - x) * dx_inv # <<<<<<<<<<<<<<
@@ -3910,7 +3910,7 @@
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
__pyx_v_xm = __pyx_t_9;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":44
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":44
* xp = (x - x_bins[x_i]) * dx_inv
* xm = (x_bins[x_i+1] - x) * dx_inv
* output[i] = table[x_i ] * (xm) \ # <<<<<<<<<<<<<<
@@ -3920,7 +3920,7 @@
__pyx_t_11 = __pyx_v_x_i;
if (__pyx_t_11 < 0) __pyx_t_11 += __pyx_bshape_0_table;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":45
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":45
* xm = (x_bins[x_i+1] - x) * dx_inv
* output[i] = table[x_i ] * (xm) \
* + table[x_i+1] * (xp) # <<<<<<<<<<<<<<
@@ -3930,7 +3930,7 @@
__pyx_t_12 = (__pyx_v_x_i + 1);
if (__pyx_t_12 < 0) __pyx_t_12 += __pyx_bshape_0_table;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":44
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":44
* xp = (x - x_bins[x_i]) * dx_inv
* xm = (x_bins[x_i+1] - x) * dx_inv
* output[i] = table[x_i ] * (xm) \ # <<<<<<<<<<<<<<
@@ -3971,7 +3971,7 @@
return __pyx_r;
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":48
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":48
*
* @cython.boundscheck(False)
* def BilinearlyInterpolate(np.ndarray[np.float64_t, ndim=2] table, # <<<<<<<<<<<<<<
@@ -4210,7 +4210,7 @@
__pyx_bstride_0_output = __pyx_bstruct_output.strides[0];
__pyx_bshape_0_output = __pyx_bstruct_output.shape[0];
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":60
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":60
* cdef double dx_inv, dy_inv
* cdef int i, x_i, y_i
* for i in range(x_vals.shape[0]): # <<<<<<<<<<<<<<
@@ -4220,7 +4220,7 @@
for (__pyx_t_1 = 0; __pyx_t_1 < (__pyx_v_x_vals->dimensions[0]); __pyx_t_1+=1) {
__pyx_v_i = __pyx_t_1;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":61
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":61
* cdef int i, x_i, y_i
* for i in range(x_vals.shape[0]):
* x_i = x_is[i] # <<<<<<<<<<<<<<
@@ -4231,7 +4231,7 @@
if (__pyx_t_2 < 0) __pyx_t_2 += __pyx_bshape_0_x_is;
__pyx_v_x_i = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int32_t *, __pyx_bstruct_x_is.buf, __pyx_t_2, __pyx_bstride_0_x_is));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":62
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":62
* for i in range(x_vals.shape[0]):
* x_i = x_is[i]
* y_i = y_is[i] # <<<<<<<<<<<<<<
@@ -4242,7 +4242,7 @@
if (__pyx_t_3 < 0) __pyx_t_3 += __pyx_bshape_0_y_is;
__pyx_v_y_i = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int32_t *, __pyx_bstruct_y_is.buf, __pyx_t_3, __pyx_bstride_0_y_is));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":63
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":63
* x_i = x_is[i]
* y_i = y_is[i]
* x = x_vals[i] # <<<<<<<<<<<<<<
@@ -4253,7 +4253,7 @@
if (__pyx_t_4 < 0) __pyx_t_4 += __pyx_bshape_0_x_vals;
__pyx_v_x = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_x_vals.buf, __pyx_t_4, __pyx_bstride_0_x_vals));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":64
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":64
* y_i = y_is[i]
* x = x_vals[i]
* y = y_vals[i] # <<<<<<<<<<<<<<
@@ -4264,7 +4264,7 @@
if (__pyx_t_5 < 0) __pyx_t_5 += __pyx_bshape_0_y_vals;
__pyx_v_y = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_y_vals.buf, __pyx_t_5, __pyx_bstride_0_y_vals));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":65
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":65
* x = x_vals[i]
* y = y_vals[i]
* dx_inv = 1.0 / (x_bins[x_i+1] - x_bins[x_i]) # <<<<<<<<<<<<<<
@@ -4277,7 +4277,7 @@
if (__pyx_t_7 < 0) __pyx_t_7 += __pyx_bshape_0_x_bins;
__pyx_v_dx_inv = (1.0 / ((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_x_bins.buf, __pyx_t_6, __pyx_bstride_0_x_bins)) - (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_x_bins.buf, __pyx_t_7, __pyx_bstride_0_x_bins))));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":66
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":66
* y = y_vals[i]
* dx_inv = 1.0 / (x_bins[x_i+1] - x_bins[x_i])
* dy_inv = 1.0 / (y_bins[y_i+1] - y_bins[y_i]) # <<<<<<<<<<<<<<
@@ -4290,7 +4290,7 @@
if (__pyx_t_9 < 0) __pyx_t_9 += __pyx_bshape_0_y_bins;
__pyx_v_dy_inv = (1.0 / ((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_y_bins.buf, __pyx_t_8, __pyx_bstride_0_y_bins)) - (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_y_bins.buf, __pyx_t_9, __pyx_bstride_0_y_bins))));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":67
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":67
* dx_inv = 1.0 / (x_bins[x_i+1] - x_bins[x_i])
* dy_inv = 1.0 / (y_bins[y_i+1] - y_bins[y_i])
* xp = (x - x_bins[x_i]) * dx_inv # <<<<<<<<<<<<<<
@@ -4301,7 +4301,7 @@
if (__pyx_t_10 < 0) __pyx_t_10 += __pyx_bshape_0_x_bins;
__pyx_v_xp = ((__pyx_v_x - (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_x_bins.buf, __pyx_t_10, __pyx_bstride_0_x_bins))) * __pyx_v_dx_inv);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":68
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":68
* dy_inv = 1.0 / (y_bins[y_i+1] - y_bins[y_i])
* xp = (x - x_bins[x_i]) * dx_inv
* yp = (y - y_bins[y_i]) * dy_inv # <<<<<<<<<<<<<<
@@ -4312,7 +4312,7 @@
if (__pyx_t_11 < 0) __pyx_t_11 += __pyx_bshape_0_y_bins;
__pyx_v_yp = ((__pyx_v_y - (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_y_bins.buf, __pyx_t_11, __pyx_bstride_0_y_bins))) * __pyx_v_dy_inv);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":69
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":69
* xp = (x - x_bins[x_i]) * dx_inv
* yp = (y - y_bins[y_i]) * dy_inv
* xm = (x_bins[x_i+1] - x) * dx_inv # <<<<<<<<<<<<<<
@@ -4323,7 +4323,7 @@
if (__pyx_t_12 < 0) __pyx_t_12 += __pyx_bshape_0_x_bins;
__pyx_v_xm = (((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_x_bins.buf, __pyx_t_12, __pyx_bstride_0_x_bins)) - __pyx_v_x) * __pyx_v_dx_inv);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":70
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":70
* yp = (y - y_bins[y_i]) * dy_inv
* xm = (x_bins[x_i+1] - x) * dx_inv
* ym = (y_bins[y_i+1] - y) * dy_inv # <<<<<<<<<<<<<<
@@ -4334,7 +4334,7 @@
if (__pyx_t_13 < 0) __pyx_t_13 += __pyx_bshape_0_y_bins;
__pyx_v_ym = (((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_y_bins.buf, __pyx_t_13, __pyx_bstride_0_y_bins)) - __pyx_v_y) * __pyx_v_dy_inv);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":71
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":71
* xm = (x_bins[x_i+1] - x) * dx_inv
* ym = (y_bins[y_i+1] - y) * dy_inv
* output[i] = table[x_i , y_i ] * (xm*ym) \ # <<<<<<<<<<<<<<
@@ -4346,7 +4346,7 @@
if (__pyx_t_14 < 0) __pyx_t_14 += __pyx_bshape_0_table;
if (__pyx_t_15 < 0) __pyx_t_15 += __pyx_bshape_1_table;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":72
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":72
* ym = (y_bins[y_i+1] - y) * dy_inv
* output[i] = table[x_i , y_i ] * (xm*ym) \
* + table[x_i+1, y_i ] * (xp*ym) \ # <<<<<<<<<<<<<<
@@ -4358,7 +4358,7 @@
if (__pyx_t_16 < 0) __pyx_t_16 += __pyx_bshape_0_table;
if (__pyx_t_17 < 0) __pyx_t_17 += __pyx_bshape_1_table;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":73
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":73
* output[i] = table[x_i , y_i ] * (xm*ym) \
* + table[x_i+1, y_i ] * (xp*ym) \
* + table[x_i , y_i+1] * (xm*yp) \ # <<<<<<<<<<<<<<
@@ -4370,7 +4370,7 @@
if (__pyx_t_18 < 0) __pyx_t_18 += __pyx_bshape_0_table;
if (__pyx_t_19 < 0) __pyx_t_19 += __pyx_bshape_1_table;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":74
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":74
* + table[x_i+1, y_i ] * (xp*ym) \
* + table[x_i , y_i+1] * (xm*yp) \
* + table[x_i+1, y_i+1] * (xp*yp) # <<<<<<<<<<<<<<
@@ -4382,7 +4382,7 @@
if (__pyx_t_20 < 0) __pyx_t_20 += __pyx_bshape_0_table;
if (__pyx_t_21 < 0) __pyx_t_21 += __pyx_bshape_1_table;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":71
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":71
* xm = (x_bins[x_i+1] - x) * dx_inv
* ym = (y_bins[y_i+1] - y) * dy_inv
* output[i] = table[x_i , y_i ] * (xm*ym) \ # <<<<<<<<<<<<<<
@@ -4426,7 +4426,7 @@
return __pyx_r;
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":77
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":77
*
* @cython.boundscheck(False)
* def TrilinearlyInterpolate(np.ndarray[np.float64_t, ndim=3] table, # <<<<<<<<<<<<<<
@@ -4757,7 +4757,7 @@
__pyx_bstride_0_output = __pyx_bstruct_output.strides[0];
__pyx_bshape_0_output = __pyx_bstruct_output.shape[0];
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":93
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":93
* cdef double dx_inv, dy_inv, dz_inv
* cdef int i, x_i, y_i, z_i
* for i in range(x_vals.shape[0]): # <<<<<<<<<<<<<<
@@ -4767,7 +4767,7 @@
for (__pyx_t_1 = 0; __pyx_t_1 < (__pyx_v_x_vals->dimensions[0]); __pyx_t_1+=1) {
__pyx_v_i = __pyx_t_1;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":94
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":94
* cdef int i, x_i, y_i, z_i
* for i in range(x_vals.shape[0]):
* x_i = x_is[i] # <<<<<<<<<<<<<<
@@ -4778,7 +4778,7 @@
if (__pyx_t_2 < 0) __pyx_t_2 += __pyx_bshape_0_x_is;
__pyx_v_x_i = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int_t *, __pyx_bstruct_x_is.buf, __pyx_t_2, __pyx_bstride_0_x_is));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":95
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":95
* for i in range(x_vals.shape[0]):
* x_i = x_is[i]
* y_i = y_is[i] # <<<<<<<<<<<<<<
@@ -4789,7 +4789,7 @@
if (__pyx_t_3 < 0) __pyx_t_3 += __pyx_bshape_0_y_is;
__pyx_v_y_i = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int_t *, __pyx_bstruct_y_is.buf, __pyx_t_3, __pyx_bstride_0_y_is));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":96
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":96
* x_i = x_is[i]
* y_i = y_is[i]
* z_i = z_is[i] # <<<<<<<<<<<<<<
@@ -4800,7 +4800,7 @@
if (__pyx_t_4 < 0) __pyx_t_4 += __pyx_bshape_0_z_is;
__pyx_v_z_i = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int_t *, __pyx_bstruct_z_is.buf, __pyx_t_4, __pyx_bstride_0_z_is));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":97
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":97
* y_i = y_is[i]
* z_i = z_is[i]
* x = x_vals[i] # <<<<<<<<<<<<<<
@@ -4811,7 +4811,7 @@
if (__pyx_t_5 < 0) __pyx_t_5 += __pyx_bshape_0_x_vals;
__pyx_v_x = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_x_vals.buf, __pyx_t_5, __pyx_bstride_0_x_vals));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":98
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":98
* z_i = z_is[i]
* x = x_vals[i]
* y = y_vals[i] # <<<<<<<<<<<<<<
@@ -4822,7 +4822,7 @@
if (__pyx_t_6 < 0) __pyx_t_6 += __pyx_bshape_0_y_vals;
__pyx_v_y = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_y_vals.buf, __pyx_t_6, __pyx_bstride_0_y_vals));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":99
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":99
* x = x_vals[i]
* y = y_vals[i]
* z = z_vals[i] # <<<<<<<<<<<<<<
@@ -4833,7 +4833,7 @@
if (__pyx_t_7 < 0) __pyx_t_7 += __pyx_bshape_0_z_vals;
__pyx_v_z = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_z_vals.buf, __pyx_t_7, __pyx_bstride_0_z_vals));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":100
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":100
* y = y_vals[i]
* z = z_vals[i]
* dx_inv = 1.0 / (x_bins[x_i+1] - x_bins[x_i]) # <<<<<<<<<<<<<<
@@ -4846,7 +4846,7 @@
if (__pyx_t_9 < 0) __pyx_t_9 += __pyx_bshape_0_x_bins;
__pyx_v_dx_inv = (1.0 / ((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_x_bins.buf, __pyx_t_8, __pyx_bstride_0_x_bins)) - (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_x_bins.buf, __pyx_t_9, __pyx_bstride_0_x_bins))));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":101
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":101
* z = z_vals[i]
* dx_inv = 1.0 / (x_bins[x_i+1] - x_bins[x_i])
* dy_inv = 1.0 / (y_bins[y_i+1] - y_bins[y_i]) # <<<<<<<<<<<<<<
@@ -4859,7 +4859,7 @@
if (__pyx_t_11 < 0) __pyx_t_11 += __pyx_bshape_0_y_bins;
__pyx_v_dy_inv = (1.0 / ((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_y_bins.buf, __pyx_t_10, __pyx_bstride_0_y_bins)) - (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_y_bins.buf, __pyx_t_11, __pyx_bstride_0_y_bins))));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":102
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":102
* dx_inv = 1.0 / (x_bins[x_i+1] - x_bins[x_i])
* dy_inv = 1.0 / (y_bins[y_i+1] - y_bins[y_i])
* dz_inv = 1.0 / (z_bins[z_i+1] - z_bins[z_i]) # <<<<<<<<<<<<<<
@@ -4872,7 +4872,7 @@
if (__pyx_t_13 < 0) __pyx_t_13 += __pyx_bshape_0_z_bins;
__pyx_v_dz_inv = (1.0 / ((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_z_bins.buf, __pyx_t_12, __pyx_bstride_0_z_bins)) - (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_z_bins.buf, __pyx_t_13, __pyx_bstride_0_z_bins))));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":103
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":103
* dy_inv = 1.0 / (y_bins[y_i+1] - y_bins[y_i])
* dz_inv = 1.0 / (z_bins[z_i+1] - z_bins[z_i])
* xp = (x - x_bins[x_i]) * dx_inv # <<<<<<<<<<<<<<
@@ -4883,7 +4883,7 @@
if (__pyx_t_14 < 0) __pyx_t_14 += __pyx_bshape_0_x_bins;
__pyx_v_xp = ((__pyx_v_x - (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_x_bins.buf, __pyx_t_14, __pyx_bstride_0_x_bins))) * __pyx_v_dx_inv);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":104
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":104
* dz_inv = 1.0 / (z_bins[z_i+1] - z_bins[z_i])
* xp = (x - x_bins[x_i]) * dx_inv
* yp = (y - y_bins[y_i]) * dy_inv # <<<<<<<<<<<<<<
@@ -4894,7 +4894,7 @@
if (__pyx_t_15 < 0) __pyx_t_15 += __pyx_bshape_0_y_bins;
__pyx_v_yp = ((__pyx_v_y - (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_y_bins.buf, __pyx_t_15, __pyx_bstride_0_y_bins))) * __pyx_v_dy_inv);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":105
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":105
* xp = (x - x_bins[x_i]) * dx_inv
* yp = (y - y_bins[y_i]) * dy_inv
* zp = (z - z_bins[z_i]) * dz_inv # <<<<<<<<<<<<<<
@@ -4905,7 +4905,7 @@
if (__pyx_t_16 < 0) __pyx_t_16 += __pyx_bshape_0_z_bins;
__pyx_v_zp = ((__pyx_v_z - (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_z_bins.buf, __pyx_t_16, __pyx_bstride_0_z_bins))) * __pyx_v_dz_inv);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":106
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":106
* yp = (y - y_bins[y_i]) * dy_inv
* zp = (z - z_bins[z_i]) * dz_inv
* xm = (x_bins[x_i+1] - x) * dx_inv # <<<<<<<<<<<<<<
@@ -4916,7 +4916,7 @@
if (__pyx_t_17 < 0) __pyx_t_17 += __pyx_bshape_0_x_bins;
__pyx_v_xm = (((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_x_bins.buf, __pyx_t_17, __pyx_bstride_0_x_bins)) - __pyx_v_x) * __pyx_v_dx_inv);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":107
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":107
* zp = (z - z_bins[z_i]) * dz_inv
* xm = (x_bins[x_i+1] - x) * dx_inv
* ym = (y_bins[y_i+1] - y) * dy_inv # <<<<<<<<<<<<<<
@@ -4927,7 +4927,7 @@
if (__pyx_t_18 < 0) __pyx_t_18 += __pyx_bshape_0_y_bins;
__pyx_v_ym = (((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_y_bins.buf, __pyx_t_18, __pyx_bstride_0_y_bins)) - __pyx_v_y) * __pyx_v_dy_inv);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":108
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":108
* xm = (x_bins[x_i+1] - x) * dx_inv
* ym = (y_bins[y_i+1] - y) * dy_inv
* zm = (z_bins[z_i+1] - z) * dz_inv # <<<<<<<<<<<<<<
@@ -4938,7 +4938,7 @@
if (__pyx_t_19 < 0) __pyx_t_19 += __pyx_bshape_0_z_bins;
__pyx_v_zm = (((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_z_bins.buf, __pyx_t_19, __pyx_bstride_0_z_bins)) - __pyx_v_z) * __pyx_v_dz_inv);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":109
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":109
* ym = (y_bins[y_i+1] - y) * dy_inv
* zm = (z_bins[z_i+1] - z) * dz_inv
* output[i] = table[x_i ,y_i ,z_i ] * (xm*ym*zm) \ # <<<<<<<<<<<<<<
@@ -4952,7 +4952,7 @@
if (__pyx_t_21 < 0) __pyx_t_21 += __pyx_bshape_1_table;
if (__pyx_t_22 < 0) __pyx_t_22 += __pyx_bshape_2_table;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":110
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":110
* zm = (z_bins[z_i+1] - z) * dz_inv
* output[i] = table[x_i ,y_i ,z_i ] * (xm*ym*zm) \
* + table[x_i+1,y_i ,z_i ] * (xp*ym*zm) \ # <<<<<<<<<<<<<<
@@ -4966,7 +4966,7 @@
if (__pyx_t_24 < 0) __pyx_t_24 += __pyx_bshape_1_table;
if (__pyx_t_25 < 0) __pyx_t_25 += __pyx_bshape_2_table;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":111
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":111
* output[i] = table[x_i ,y_i ,z_i ] * (xm*ym*zm) \
* + table[x_i+1,y_i ,z_i ] * (xp*ym*zm) \
* + table[x_i ,y_i+1,z_i ] * (xm*yp*zm) \ # <<<<<<<<<<<<<<
@@ -4980,7 +4980,7 @@
if (__pyx_t_27 < 0) __pyx_t_27 += __pyx_bshape_1_table;
if (__pyx_t_28 < 0) __pyx_t_28 += __pyx_bshape_2_table;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":112
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":112
* + table[x_i+1,y_i ,z_i ] * (xp*ym*zm) \
* + table[x_i ,y_i+1,z_i ] * (xm*yp*zm) \
* + table[x_i ,y_i ,z_i+1] * (xm*ym*zp) \ # <<<<<<<<<<<<<<
@@ -4994,7 +4994,7 @@
if (__pyx_t_30 < 0) __pyx_t_30 += __pyx_bshape_1_table;
if (__pyx_t_31 < 0) __pyx_t_31 += __pyx_bshape_2_table;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":113
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":113
* + table[x_i ,y_i+1,z_i ] * (xm*yp*zm) \
* + table[x_i ,y_i ,z_i+1] * (xm*ym*zp) \
* + table[x_i+1,y_i ,z_i+1] * (xp*ym*zp) \ # <<<<<<<<<<<<<<
@@ -5008,7 +5008,7 @@
if (__pyx_t_33 < 0) __pyx_t_33 += __pyx_bshape_1_table;
if (__pyx_t_34 < 0) __pyx_t_34 += __pyx_bshape_2_table;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":114
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":114
* + table[x_i ,y_i ,z_i+1] * (xm*ym*zp) \
* + table[x_i+1,y_i ,z_i+1] * (xp*ym*zp) \
* + table[x_i ,y_i+1,z_i+1] * (xm*yp*zp) \ # <<<<<<<<<<<<<<
@@ -5022,7 +5022,7 @@
if (__pyx_t_36 < 0) __pyx_t_36 += __pyx_bshape_1_table;
if (__pyx_t_37 < 0) __pyx_t_37 += __pyx_bshape_2_table;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":115
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":115
* + table[x_i+1,y_i ,z_i+1] * (xp*ym*zp) \
* + table[x_i ,y_i+1,z_i+1] * (xm*yp*zp) \
* + table[x_i+1,y_i+1,z_i ] * (xp*yp*zm) \ # <<<<<<<<<<<<<<
@@ -5035,7 +5035,7 @@
if (__pyx_t_39 < 0) __pyx_t_39 += __pyx_bshape_1_table;
if (__pyx_t_40 < 0) __pyx_t_40 += __pyx_bshape_2_table;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":116
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":116
* + table[x_i ,y_i+1,z_i+1] * (xm*yp*zp) \
* + table[x_i+1,y_i+1,z_i ] * (xp*yp*zm) \
* + table[x_i+1,y_i+1,z_i+1] * (xp*yp*zp) # <<<<<<<<<<<<<<
@@ -5047,7 +5047,7 @@
if (__pyx_t_42 < 0) __pyx_t_42 += __pyx_bshape_1_table;
if (__pyx_t_43 < 0) __pyx_t_43 += __pyx_bshape_2_table;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":109
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":109
* ym = (y_bins[y_i+1] - y) * dy_inv
* zm = (z_bins[z_i+1] - z) * dz_inv
* output[i] = table[x_i ,y_i ,z_i ] * (xm*ym*zm) \ # <<<<<<<<<<<<<<
@@ -5097,7 +5097,7 @@
return __pyx_r;
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/PointsInVolume.pyx":33
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/PointsInVolume.pyx":33
* @cython.wraparound(False)
* @cython.boundscheck(False)
* def PointsInVolume(np.ndarray[np.float64_t, ndim=2] points, # <<<<<<<<<<<<<<
@@ -5296,7 +5296,7 @@
__pyx_bstride_0_mask = __pyx_bstruct_mask.strides[0]; __pyx_bstride_1_mask = __pyx_bstruct_mask.strides[1]; __pyx_bstride_2_mask = __pyx_bstruct_mask.strides[2];
__pyx_bshape_0_mask = __pyx_bstruct_mask.shape[0]; __pyx_bshape_1_mask = __pyx_bstruct_mask.shape[1]; __pyx_bshape_2_mask = __pyx_bstruct_mask.shape[2];
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/PointsInVolume.pyx":40
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/PointsInVolume.pyx":40
* float dx):
* cdef np.ndarray[np.int8_t, ndim=1] \
* valid = np.zeros(points.shape[0], dtype='int8') # <<<<<<<<<<<<<<
@@ -5338,7 +5338,7 @@
__pyx_v_valid = ((PyArrayObject *)__pyx_t_2);
__pyx_t_2 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/PointsInVolume.pyx":45
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/PointsInVolume.pyx":45
* cdef double dx_inv
* cdef unsigned int idx[3]
* count = 0 # <<<<<<<<<<<<<<
@@ -5347,7 +5347,7 @@
*/
__pyx_v_count = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/PointsInVolume.pyx":46
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/PointsInVolume.pyx":46
* cdef unsigned int idx[3]
* count = 0
* dx_inv = 1.0 / dx # <<<<<<<<<<<<<<
@@ -5356,7 +5356,7 @@
*/
__pyx_v_dx_inv = (1.0 / __pyx_v_dx);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/PointsInVolume.pyx":47
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/PointsInVolume.pyx":47
* count = 0
* dx_inv = 1.0 / dx
* for i in xrange(points.shape[0]): # <<<<<<<<<<<<<<
@@ -5366,7 +5366,7 @@
for (__pyx_t_5 = 0; __pyx_t_5 < (__pyx_v_points->dimensions[0]); __pyx_t_5+=1) {
__pyx_v_i = __pyx_t_5;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/PointsInVolume.pyx":48
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/PointsInVolume.pyx":48
* dx_inv = 1.0 / dx
* for i in xrange(points.shape[0]):
* if pmask[i] == 0: # <<<<<<<<<<<<<<
@@ -5377,7 +5377,7 @@
__pyx_t_7 = ((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int8_t *, __pyx_bstruct_pmask.buf, __pyx_t_6, __pyx_bstride_0_pmask)) == 0);
if (__pyx_t_7) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/PointsInVolume.pyx":49
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/PointsInVolume.pyx":49
* for i in xrange(points.shape[0]):
* if pmask[i] == 0:
* continue # <<<<<<<<<<<<<<
@@ -5389,7 +5389,7 @@
}
__pyx_L8:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/PointsInVolume.pyx":50
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/PointsInVolume.pyx":50
* if pmask[i] == 0:
* continue
* ex = 1 # <<<<<<<<<<<<<<
@@ -5398,7 +5398,7 @@
*/
__pyx_v_ex = 1;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/PointsInVolume.pyx":51
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/PointsInVolume.pyx":51
* continue
* ex = 1
* for dim in xrange(3): # <<<<<<<<<<<<<<
@@ -5408,7 +5408,7 @@
for (__pyx_t_8 = 0; __pyx_t_8 < 3; __pyx_t_8+=1) {
__pyx_v_dim = __pyx_t_8;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/PointsInVolume.pyx":52
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/PointsInVolume.pyx":52
* ex = 1
* for dim in xrange(3):
* if points[i,dim] < left_edge[dim] or points[i,dim] > right_edge[dim]: # <<<<<<<<<<<<<<
@@ -5428,7 +5428,7 @@
}
if (__pyx_t_7) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/PointsInVolume.pyx":53
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/PointsInVolume.pyx":53
* for dim in xrange(3):
* if points[i,dim] < left_edge[dim] or points[i,dim] > right_edge[dim]:
* valid[i] = ex = 0 # <<<<<<<<<<<<<<
@@ -5439,7 +5439,7 @@
*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int8_t *, __pyx_bstruct_valid.buf, __pyx_t_15, __pyx_bstride_0_valid) = 0;
__pyx_v_ex = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/PointsInVolume.pyx":54
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/PointsInVolume.pyx":54
* if points[i,dim] < left_edge[dim] or points[i,dim] > right_edge[dim]:
* valid[i] = ex = 0
* break # <<<<<<<<<<<<<<
@@ -5453,7 +5453,7 @@
}
__pyx_L10_break:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/PointsInVolume.pyx":55
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/PointsInVolume.pyx":55
* valid[i] = ex = 0
* break
* if ex == 1: # <<<<<<<<<<<<<<
@@ -5463,7 +5463,7 @@
__pyx_t_7 = (__pyx_v_ex == 1);
if (__pyx_t_7) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/PointsInVolume.pyx":56
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/PointsInVolume.pyx":56
* break
* if ex == 1:
* for dim in xrange(3): # <<<<<<<<<<<<<<
@@ -5473,7 +5473,7 @@
for (__pyx_t_8 = 0; __pyx_t_8 < 3; __pyx_t_8+=1) {
__pyx_v_dim = __pyx_t_8;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/PointsInVolume.pyx":58
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/PointsInVolume.pyx":58
* for dim in xrange(3):
* idx[dim] = <unsigned int> \
* ((points[i,dim] - left_edge[dim]) * dx_inv) # <<<<<<<<<<<<<<
@@ -5484,7 +5484,7 @@
__pyx_t_17 = __pyx_v_dim;
__pyx_t_18 = __pyx_v_dim;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/PointsInVolume.pyx":57
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/PointsInVolume.pyx":57
* if ex == 1:
* for dim in xrange(3):
* idx[dim] = <unsigned int> \ # <<<<<<<<<<<<<<
@@ -5494,7 +5494,7 @@
(__pyx_v_idx[__pyx_v_dim]) = ((unsigned int)(((*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_points.buf, __pyx_t_16, __pyx_bstride_0_points, __pyx_t_17, __pyx_bstride_1_points)) - (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_left_edge.buf, __pyx_t_18, __pyx_bstride_0_left_edge))) * __pyx_v_dx_inv));
}
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/PointsInVolume.pyx":59
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/PointsInVolume.pyx":59
* idx[dim] = <unsigned int> \
* ((points[i,dim] - left_edge[dim]) * dx_inv)
* if mask[idx[0], idx[1], idx[2]] == 1: # <<<<<<<<<<<<<<
@@ -5507,7 +5507,7 @@
__pyx_t_7 = ((*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int32_t *, __pyx_bstruct_mask.buf, __pyx_t_19, __pyx_bstride_0_mask, __pyx_t_20, __pyx_bstride_1_mask, __pyx_t_21, __pyx_bstride_2_mask)) == 1);
if (__pyx_t_7) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/PointsInVolume.pyx":60
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/PointsInVolume.pyx":60
* ((points[i,dim] - left_edge[dim]) * dx_inv)
* if mask[idx[0], idx[1], idx[2]] == 1:
* valid[i] = 1 # <<<<<<<<<<<<<<
@@ -5517,7 +5517,7 @@
__pyx_t_8 = __pyx_v_i;
*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int8_t *, __pyx_bstruct_valid.buf, __pyx_t_8, __pyx_bstride_0_valid) = 1;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/PointsInVolume.pyx":61
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/PointsInVolume.pyx":61
* if mask[idx[0], idx[1], idx[2]] == 1:
* valid[i] = 1
* count += 1 # <<<<<<<<<<<<<<
@@ -5534,7 +5534,7 @@
__pyx_L6_continue:;
}
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/PointsInVolume.pyx":63
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/PointsInVolume.pyx":63
* count += 1
*
* cdef np.ndarray[np.int32_t, ndim=1] result = np.empty(count, dtype='int32') # <<<<<<<<<<<<<<
@@ -5576,7 +5576,7 @@
__pyx_v_result = ((PyArrayObject *)__pyx_t_3);
__pyx_t_3 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/PointsInVolume.pyx":64
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/PointsInVolume.pyx":64
*
* cdef np.ndarray[np.int32_t, ndim=1] result = np.empty(count, dtype='int32')
* count = 0 # <<<<<<<<<<<<<<
@@ -5585,7 +5585,7 @@
*/
__pyx_v_count = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/PointsInVolume.pyx":65
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/PointsInVolume.pyx":65
* cdef np.ndarray[np.int32_t, ndim=1] result = np.empty(count, dtype='int32')
* count = 0
* for i in xrange(points.shape[0]): # <<<<<<<<<<<<<<
@@ -5595,7 +5595,7 @@
for (__pyx_t_5 = 0; __pyx_t_5 < (__pyx_v_points->dimensions[0]); __pyx_t_5+=1) {
__pyx_v_i = __pyx_t_5;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/PointsInVolume.pyx":66
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/PointsInVolume.pyx":66
* count = 0
* for i in xrange(points.shape[0]):
* if valid[i] == 1 and pmask[i] == 1: # <<<<<<<<<<<<<<
@@ -5611,7 +5611,7 @@
}
if (__pyx_t_7) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/PointsInVolume.pyx":67
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/PointsInVolume.pyx":67
* for i in xrange(points.shape[0]):
* if valid[i] == 1 and pmask[i] == 1:
* result[count] = i # <<<<<<<<<<<<<<
@@ -5621,7 +5621,7 @@
__pyx_t_25 = __pyx_v_count;
*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int32_t *, __pyx_bstruct_result.buf, __pyx_t_25, __pyx_bstride_0_result) = __pyx_v_i;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/PointsInVolume.pyx":68
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/PointsInVolume.pyx":68
* if valid[i] == 1 and pmask[i] == 1:
* result[count] = i
* count += 1 # <<<<<<<<<<<<<<
@@ -5634,7 +5634,7 @@
__pyx_L18:;
}
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/PointsInVolume.pyx":70
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/PointsInVolume.pyx":70
* count += 1
*
* return result # <<<<<<<<<<<<<<
@@ -5682,7 +5682,7 @@
return __pyx_r;
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":36
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":36
*
* @cython.boundscheck(False)
* def Transfer3D(np.ndarray[np.float64_t, ndim=3] i_s, # <<<<<<<<<<<<<<
@@ -5949,7 +5949,7 @@
__pyx_bstride_0_a = __pyx_bstruct_a.strides[0]; __pyx_bstride_1_a = __pyx_bstruct_a.strides[1]; __pyx_bstride_2_a = __pyx_bstruct_a.strides[2]; __pyx_bstride_3_a = __pyx_bstruct_a.strides[3];
__pyx_bshape_0_a = __pyx_bstruct_a.shape[0]; __pyx_bshape_1_a = __pyx_bstruct_a.shape[1]; __pyx_bshape_2_a = __pyx_bstruct_a.shape[2]; __pyx_bshape_3_a = __pyx_bstruct_a.shape[3];
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":55
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":55
* cdef int k, kk
* cdef int n, nn
* nn = o_s.shape[3] # This might be slow # <<<<<<<<<<<<<<
@@ -5958,7 +5958,7 @@
*/
__pyx_v_nn = (__pyx_v_o_s->dimensions[3]);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":56
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":56
* cdef int n, nn
* nn = o_s.shape[3] # This might be slow
* cdef np.float64_t *temp = <np.float64_t *>malloc(sizeof(np.float64_t) * nn) # <<<<<<<<<<<<<<
@@ -5967,7 +5967,7 @@
*/
__pyx_v_temp = ((__pyx_t_5numpy_float64_t *)malloc(((sizeof(__pyx_t_5numpy_float64_t)) * __pyx_v_nn)));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":57
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":57
* nn = o_s.shape[3] # This might be slow
* cdef np.float64_t *temp = <np.float64_t *>malloc(sizeof(np.float64_t) * nn)
* for i in range((imax-imin)*istride): # <<<<<<<<<<<<<<
@@ -5977,7 +5977,7 @@
for (__pyx_t_1 = 0; __pyx_t_1 < ((__pyx_v_imax - __pyx_v_imin) * __pyx_v_istride); __pyx_t_1+=1) {
__pyx_v_i = __pyx_t_1;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":58
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":58
* cdef np.float64_t *temp = <np.float64_t *>malloc(sizeof(np.float64_t) * nn)
* for i in range((imax-imin)*istride):
* ii = i + imin*istride # <<<<<<<<<<<<<<
@@ -5986,7 +5986,7 @@
*/
__pyx_v_ii = (__pyx_v_i + (__pyx_v_imin * __pyx_v_istride));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":59
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":59
* for i in range((imax-imin)*istride):
* ii = i + imin*istride
* for j in range((jmax-jmin)*jstride): # <<<<<<<<<<<<<<
@@ -5996,7 +5996,7 @@
for (__pyx_t_2 = 0; __pyx_t_2 < ((__pyx_v_jmax - __pyx_v_jmin) * __pyx_v_jstride); __pyx_t_2+=1) {
__pyx_v_j = __pyx_t_2;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":60
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":60
* ii = i + imin*istride
* for j in range((jmax-jmin)*jstride):
* jj = j + jmin*jstride # <<<<<<<<<<<<<<
@@ -6005,7 +6005,7 @@
*/
__pyx_v_jj = (__pyx_v_j + (__pyx_v_jmin * __pyx_v_jstride));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":62
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":62
* jj = j + jmin*jstride
* # Not sure about the ordering of the loops here
* for n in range(nn): # <<<<<<<<<<<<<<
@@ -6015,7 +6015,7 @@
for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_v_nn; __pyx_t_3+=1) {
__pyx_v_n = __pyx_t_3;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":63
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":63
* # Not sure about the ordering of the loops here
* for n in range(nn):
* temp[n] = i_s[ii,jj,n] # <<<<<<<<<<<<<<
@@ -6031,7 +6031,7 @@
(__pyx_v_temp[__pyx_v_n]) = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_i_s.buf, __pyx_t_4, __pyx_bstride_0_i_s, __pyx_t_5, __pyx_bstride_1_i_s, __pyx_t_6, __pyx_bstride_2_i_s));
}
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":64
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":64
* for n in range(nn):
* temp[n] = i_s[ii,jj,n]
* for k in range(kmax-kmin): # <<<<<<<<<<<<<<
@@ -6041,7 +6041,7 @@
for (__pyx_t_3 = 0; __pyx_t_3 < (__pyx_v_kmax - __pyx_v_kmin); __pyx_t_3+=1) {
__pyx_v_k = __pyx_t_3;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":65
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":65
* temp[n] = i_s[ii,jj,n]
* for k in range(kmax-kmin):
* kk = k + kmin#*kstride, which doesn't make any sense # <<<<<<<<<<<<<<
@@ -6050,7 +6050,7 @@
*/
__pyx_v_kk = (__pyx_v_k + __pyx_v_kmin);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":66
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":66
* for k in range(kmax-kmin):
* kk = k + kmin#*kstride, which doesn't make any sense
* for n in range(nn): # <<<<<<<<<<<<<<
@@ -6060,7 +6060,7 @@
for (__pyx_t_7 = 0; __pyx_t_7 < __pyx_v_nn; __pyx_t_7+=1) {
__pyx_v_n = __pyx_t_7;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":67
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":67
* kk = k + kmin#*kstride, which doesn't make any sense
* for n in range(nn):
* o_s[i,j,k,n] = temp[n] + dx*(e[i,j,k,n] - temp[n]*a[i,j,k,n]) # <<<<<<<<<<<<<<
@@ -6093,7 +6093,7 @@
if (__pyx_t_19 < 0) __pyx_t_19 += __pyx_bshape_3_o_s;
*__Pyx_BufPtrStrided4d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_o_s.buf, __pyx_t_16, __pyx_bstride_0_o_s, __pyx_t_17, __pyx_bstride_1_o_s, __pyx_t_18, __pyx_bstride_2_o_s, __pyx_t_19, __pyx_bstride_3_o_s) = ((__pyx_v_temp[__pyx_v_n]) + (__pyx_v_dx * ((*__Pyx_BufPtrStrided4d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_e.buf, __pyx_t_8, __pyx_bstride_0_e, __pyx_t_9, __pyx_bstride_1_e, __pyx_t_10, __pyx_bstride_2_e, __pyx_t_11, __pyx_bstride_3_e)) - ((__pyx_v_temp[__pyx_v_n]) * (*__Pyx_BufPtrStrided4d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_a.buf, __pyx_t_12, __pyx_bstride_0_a, __pyx_t_13, __pyx_bstride_1_a, __pyx_t_14, __pyx_bstride_2_a, __pyx_t_15, __pyx_bstride_3_a))))));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":68
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":68
* for n in range(nn):
* o_s[i,j,k,n] = temp[n] + dx*(e[i,j,k,n] - temp[n]*a[i,j,k,n])
* temp[n] = o_s[i,j,k,n] # <<<<<<<<<<<<<<
@@ -6112,7 +6112,7 @@
}
}
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":69
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":69
* o_s[i,j,k,n] = temp[n] + dx*(e[i,j,k,n] - temp[n]*a[i,j,k,n])
* temp[n] = o_s[i,j,k,n]
* for n in range(nn): # <<<<<<<<<<<<<<
@@ -6122,7 +6122,7 @@
for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_v_nn; __pyx_t_3+=1) {
__pyx_v_n = __pyx_t_3;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":70
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":70
* temp[n] = o_s[i,j,k,n]
* for n in range(nn):
* i_s[ii,jj,n] = temp[n] # <<<<<<<<<<<<<<
@@ -6140,7 +6140,7 @@
}
}
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":71
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":71
* for n in range(nn):
* i_s[ii,jj,n] = temp[n]
* free(temp) # <<<<<<<<<<<<<<
@@ -6173,7 +6173,7 @@
return __pyx_r;
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":74
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":74
*
* @cython.boundscheck(False)
* def TransferShells(np.ndarray[np.float64_t, ndim=3] i_s, # <<<<<<<<<<<<<<
@@ -6329,7 +6329,7 @@
__pyx_bstride_0_shells = __pyx_bstruct_shells.strides[0]; __pyx_bstride_1_shells = __pyx_bstruct_shells.strides[1];
__pyx_bshape_0_shells = __pyx_bstruct_shells.shape[0]; __pyx_bshape_1_shells = __pyx_bstruct_shells.shape[1];
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":86
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":86
* cdef int n, nn
* cdef np.float64_t dist
* ii = data.shape[0] # <<<<<<<<<<<<<<
@@ -6338,7 +6338,7 @@
*/
__pyx_v_ii = (__pyx_v_data->dimensions[0]);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":87
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":87
* cdef np.float64_t dist
* ii = data.shape[0]
* jj = data.shape[1] # <<<<<<<<<<<<<<
@@ -6347,7 +6347,7 @@
*/
__pyx_v_jj = (__pyx_v_data->dimensions[1]);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":88
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":88
* ii = data.shape[0]
* jj = data.shape[1]
* kk = data.shape[2] # <<<<<<<<<<<<<<
@@ -6356,7 +6356,7 @@
*/
__pyx_v_kk = (__pyx_v_data->dimensions[2]);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":89
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":89
* jj = data.shape[1]
* kk = data.shape[2]
* nn = shells.shape[0] # <<<<<<<<<<<<<<
@@ -6365,7 +6365,7 @@
*/
__pyx_v_nn = (__pyx_v_shells->dimensions[0]);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":92
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":92
* cdef float rgba[4]
* cdef float alpha
* for i in range(ii): # <<<<<<<<<<<<<<
@@ -6375,7 +6375,7 @@
for (__pyx_t_1 = 0; __pyx_t_1 < __pyx_v_ii; __pyx_t_1+=1) {
__pyx_v_i = __pyx_t_1;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":93
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":93
* cdef float alpha
* for i in range(ii):
* for j in range(jj): # <<<<<<<<<<<<<<
@@ -6385,7 +6385,7 @@
for (__pyx_t_2 = 0; __pyx_t_2 < __pyx_v_jj; __pyx_t_2+=1) {
__pyx_v_j = __pyx_t_2;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":95
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":95
* for j in range(jj):
* # Not sure about the ordering of the loops here
* for k in range(kk): # <<<<<<<<<<<<<<
@@ -6395,7 +6395,7 @@
for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_v_kk; __pyx_t_3+=1) {
__pyx_v_k = __pyx_t_3;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":96
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":96
* # Not sure about the ordering of the loops here
* for k in range(kk):
* for n in range(nn): # <<<<<<<<<<<<<<
@@ -6405,7 +6405,7 @@
for (__pyx_t_4 = 0; __pyx_t_4 < __pyx_v_nn; __pyx_t_4+=1) {
__pyx_v_n = __pyx_t_4;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":97
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":97
* for k in range(kk):
* for n in range(nn):
* dist = shells[n, 0] - data[i,j,k] # <<<<<<<<<<<<<<
@@ -6424,7 +6424,7 @@
if (__pyx_t_9 < 0) __pyx_t_9 += __pyx_bshape_2_data;
__pyx_v_dist = ((*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_shells.buf, __pyx_t_5, __pyx_bstride_0_shells, __pyx_t_6, __pyx_bstride_1_shells)) - (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_data.buf, __pyx_t_7, __pyx_bstride_0_data, __pyx_t_8, __pyx_bstride_1_data, __pyx_t_9, __pyx_bstride_2_data)));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":98
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":98
* for n in range(nn):
* dist = shells[n, 0] - data[i,j,k]
* if dist < 0: dist *= -1.0 # <<<<<<<<<<<<<<
@@ -6438,7 +6438,7 @@
}
__pyx_L14:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":99
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":99
* dist = shells[n, 0] - data[i,j,k]
* if dist < 0: dist *= -1.0
* if dist < shells[n,1]: # <<<<<<<<<<<<<<
@@ -6452,7 +6452,7 @@
__pyx_t_10 = (__pyx_v_dist < (*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_shells.buf, __pyx_t_11, __pyx_bstride_0_shells, __pyx_t_12, __pyx_bstride_1_shells)));
if (__pyx_t_10) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":100
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":100
* if dist < 0: dist *= -1.0
* if dist < shells[n,1]:
* dist = exp(-dist/8.0) # <<<<<<<<<<<<<<
@@ -6461,7 +6461,7 @@
*/
__pyx_v_dist = exp(((-__pyx_v_dist) / 8.0));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":101
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":101
* if dist < shells[n,1]:
* dist = exp(-dist/8.0)
* rgba[0] = shells[n,2] # <<<<<<<<<<<<<<
@@ -6474,7 +6474,7 @@
if (__pyx_t_14 < 0) __pyx_t_14 += __pyx_bshape_1_shells;
(__pyx_v_rgba[0]) = (*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_shells.buf, __pyx_t_13, __pyx_bstride_0_shells, __pyx_t_14, __pyx_bstride_1_shells));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":102
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":102
* dist = exp(-dist/8.0)
* rgba[0] = shells[n,2]
* rgba[1] = shells[n,3] # <<<<<<<<<<<<<<
@@ -6487,7 +6487,7 @@
if (__pyx_t_16 < 0) __pyx_t_16 += __pyx_bshape_1_shells;
(__pyx_v_rgba[1]) = (*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_shells.buf, __pyx_t_15, __pyx_bstride_0_shells, __pyx_t_16, __pyx_bstride_1_shells));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":103
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":103
* rgba[0] = shells[n,2]
* rgba[1] = shells[n,3]
* rgba[2] = shells[n,4] # <<<<<<<<<<<<<<
@@ -6500,7 +6500,7 @@
if (__pyx_t_18 < 0) __pyx_t_18 += __pyx_bshape_1_shells;
(__pyx_v_rgba[2]) = (*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_shells.buf, __pyx_t_17, __pyx_bstride_0_shells, __pyx_t_18, __pyx_bstride_1_shells));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":104
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":104
* rgba[1] = shells[n,3]
* rgba[2] = shells[n,4]
* rgba[3] = shells[n,5] # <<<<<<<<<<<<<<
@@ -6513,7 +6513,7 @@
if (__pyx_t_20 < 0) __pyx_t_20 += __pyx_bshape_1_shells;
(__pyx_v_rgba[3]) = (*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_shells.buf, __pyx_t_19, __pyx_bstride_0_shells, __pyx_t_20, __pyx_bstride_1_shells));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":105
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":105
* rgba[2] = shells[n,4]
* rgba[3] = shells[n,5]
* alpha = i_s[i,j,3] # <<<<<<<<<<<<<<
@@ -6528,7 +6528,7 @@
if (__pyx_t_23 < 0) __pyx_t_23 += __pyx_bshape_2_i_s;
__pyx_v_alpha = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_i_s.buf, __pyx_t_21, __pyx_bstride_0_i_s, __pyx_t_22, __pyx_bstride_1_i_s, __pyx_t_23, __pyx_bstride_2_i_s));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":106
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":106
* rgba[3] = shells[n,5]
* alpha = i_s[i,j,3]
* dist *= dist # This might improve appearance # <<<<<<<<<<<<<<
@@ -6537,7 +6537,7 @@
*/
__pyx_v_dist *= __pyx_v_dist;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":107
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":107
* alpha = i_s[i,j,3]
* dist *= dist # This might improve appearance
* i_s[i,j,0] += (1.0 - alpha)*rgba[0]*dist*rgba[3] # <<<<<<<<<<<<<<
@@ -6552,7 +6552,7 @@
if (__pyx_t_26 < 0) __pyx_t_26 += __pyx_bshape_2_i_s;
*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_i_s.buf, __pyx_t_24, __pyx_bstride_0_i_s, __pyx_t_25, __pyx_bstride_1_i_s, __pyx_t_26, __pyx_bstride_2_i_s) += ((((1.0 - __pyx_v_alpha) * (__pyx_v_rgba[0])) * __pyx_v_dist) * (__pyx_v_rgba[3]));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":108
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":108
* dist *= dist # This might improve appearance
* i_s[i,j,0] += (1.0 - alpha)*rgba[0]*dist*rgba[3]
* i_s[i,j,1] += (1.0 - alpha)*rgba[1]*dist*rgba[3] # <<<<<<<<<<<<<<
@@ -6567,7 +6567,7 @@
if (__pyx_t_29 < 0) __pyx_t_29 += __pyx_bshape_2_i_s;
*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_i_s.buf, __pyx_t_27, __pyx_bstride_0_i_s, __pyx_t_28, __pyx_bstride_1_i_s, __pyx_t_29, __pyx_bstride_2_i_s) += ((((1.0 - __pyx_v_alpha) * (__pyx_v_rgba[1])) * __pyx_v_dist) * (__pyx_v_rgba[3]));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":109
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":109
* i_s[i,j,0] += (1.0 - alpha)*rgba[0]*dist*rgba[3]
* i_s[i,j,1] += (1.0 - alpha)*rgba[1]*dist*rgba[3]
* i_s[i,j,2] += (1.0 - alpha)*rgba[2]*dist*rgba[3] # <<<<<<<<<<<<<<
@@ -6582,7 +6582,7 @@
if (__pyx_t_32 < 0) __pyx_t_32 += __pyx_bshape_2_i_s;
*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_i_s.buf, __pyx_t_30, __pyx_bstride_0_i_s, __pyx_t_31, __pyx_bstride_1_i_s, __pyx_t_32, __pyx_bstride_2_i_s) += ((((1.0 - __pyx_v_alpha) * (__pyx_v_rgba[2])) * __pyx_v_dist) * (__pyx_v_rgba[3]));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":110
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":110
* i_s[i,j,1] += (1.0 - alpha)*rgba[1]*dist*rgba[3]
* i_s[i,j,2] += (1.0 - alpha)*rgba[2]*dist*rgba[3]
* i_s[i,j,3] += (1.0 - alpha)*rgba[3]*dist*rgba[3] # <<<<<<<<<<<<<<
@@ -6597,7 +6597,7 @@
if (__pyx_t_35 < 0) __pyx_t_35 += __pyx_bshape_2_i_s;
*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_i_s.buf, __pyx_t_33, __pyx_bstride_0_i_s, __pyx_t_34, __pyx_bstride_1_i_s, __pyx_t_35, __pyx_bstride_2_i_s) += ((((1.0 - __pyx_v_alpha) * (__pyx_v_rgba[3])) * __pyx_v_dist) * (__pyx_v_rgba[3]));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":111
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":111
* i_s[i,j,2] += (1.0 - alpha)*rgba[2]*dist*rgba[3]
* i_s[i,j,3] += (1.0 - alpha)*rgba[3]*dist*rgba[3]
* break # <<<<<<<<<<<<<<
@@ -6636,7 +6636,7 @@
return __pyx_r;
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":114
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":114
*
* @cython.boundscheck(False)
* def Transfer1D(float i_s, # <<<<<<<<<<<<<<
@@ -6794,7 +6794,7 @@
__pyx_bstride_0_dx = __pyx_bstruct_dx.strides[0];
__pyx_bshape_0_dx = __pyx_bstruct_dx.shape[0];
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":121
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":121
* int imin, int imax):
* cdef int i
* for i in range(imin, imax): # <<<<<<<<<<<<<<
@@ -6804,7 +6804,7 @@
for (__pyx_t_1 = __pyx_v_imin; __pyx_t_1 < __pyx_v_imax; __pyx_t_1+=1) {
__pyx_v_i = __pyx_t_1;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":122
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":122
* cdef int i
* for i in range(imin, imax):
* o_s[i] = i_s + dx[i]*(e[i] - i_s*a[i]) # <<<<<<<<<<<<<<
@@ -6821,7 +6821,7 @@
if (__pyx_t_5 < 0) __pyx_t_5 += __pyx_bshape_0_o_s;
*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float_t *, __pyx_bstruct_o_s.buf, __pyx_t_5, __pyx_bstride_0_o_s) = (__pyx_v_i_s + ((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float_t *, __pyx_bstruct_dx.buf, __pyx_t_2, __pyx_bstride_0_dx)) * ((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float_t *, __pyx_bstruct_e.buf, __pyx_t_3, __pyx_bstride_0_e)) - (__pyx_v_i_s * (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float_t *, __pyx_bstruct_a.buf, __pyx_t_4, __pyx_bstride_0_a))))));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":123
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":123
* for i in range(imin, imax):
* o_s[i] = i_s + dx[i]*(e[i] - i_s*a[i])
* i_s = o_s[i] # <<<<<<<<<<<<<<
@@ -6833,7 +6833,7 @@
__pyx_v_i_s = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float_t *, __pyx_bstruct_o_s.buf, __pyx_t_6, __pyx_bstride_0_o_s));
}
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":124
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":124
* o_s[i] = i_s + dx[i]*(e[i] - i_s*a[i])
* i_s = o_s[i]
* return i_s # <<<<<<<<<<<<<<
@@ -6872,7 +6872,7 @@
return __pyx_r;
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":128
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":128
* @cython.wraparound(False)
* @cython.boundscheck(False)
* def VoxelTraversal(np.ndarray[np.int_t, ndim=3] grid_mask, # <<<<<<<<<<<<<<
@@ -7304,7 +7304,7 @@
__pyx_bstride_0_v = __pyx_bstruct_v.strides[0];
__pyx_bshape_0_v = __pyx_bstruct_v.shape[0];
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":141
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":141
* cdef int i, x, y
* cdef np.float64_t tl, tr, intersect_t, enter_t, exit_t, dt_tolerance
* cdef np.ndarray[np.int64_t, ndim=1] step = np.empty((3,), dtype=np.int64) # <<<<<<<<<<<<<<
@@ -7355,7 +7355,7 @@
__pyx_v_step = ((PyArrayObject *)__pyx_t_2);
__pyx_t_2 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":142
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":142
* cdef np.float64_t tl, tr, intersect_t, enter_t, exit_t, dt_tolerance
* cdef np.ndarray[np.int64_t, ndim=1] step = np.empty((3,), dtype=np.int64)
* cdef np.ndarray[np.int64_t, ndim=1] cur_ind = np.empty((3,), dtype=np.int64) # <<<<<<<<<<<<<<
@@ -7406,7 +7406,7 @@
__pyx_v_cur_ind = ((PyArrayObject *)__pyx_t_3);
__pyx_t_3 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":143
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":143
* cdef np.ndarray[np.int64_t, ndim=1] step = np.empty((3,), dtype=np.int64)
* cdef np.ndarray[np.int64_t, ndim=1] cur_ind = np.empty((3,), dtype=np.int64)
* cdef np.ndarray[np.float64_t, ndim=1] tdelta = np.empty((3,), dtype=np.float64) # <<<<<<<<<<<<<<
@@ -7457,7 +7457,7 @@
__pyx_v_tdelta = ((PyArrayObject *)__pyx_t_1);
__pyx_t_1 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":144
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":144
* cdef np.ndarray[np.int64_t, ndim=1] cur_ind = np.empty((3,), dtype=np.int64)
* cdef np.ndarray[np.float64_t, ndim=1] tdelta = np.empty((3,), dtype=np.float64)
* cdef np.ndarray[np.float64_t, ndim=1] tmax = np.empty((3,), dtype=np.float64) # <<<<<<<<<<<<<<
@@ -7508,7 +7508,7 @@
__pyx_v_tmax = ((PyArrayObject *)__pyx_t_2);
__pyx_t_2 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":145
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":145
* cdef np.ndarray[np.float64_t, ndim=1] tdelta = np.empty((3,), dtype=np.float64)
* cdef np.ndarray[np.float64_t, ndim=1] tmax = np.empty((3,), dtype=np.float64)
* cdef np.ndarray[np.float64_t, ndim=1] intersect = np.empty((3,), dtype=np.float64) # <<<<<<<<<<<<<<
@@ -7559,7 +7559,7 @@
__pyx_v_intersect = ((PyArrayObject *)__pyx_t_3);
__pyx_t_3 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":146
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":146
* cdef np.ndarray[np.float64_t, ndim=1] tmax = np.empty((3,), dtype=np.float64)
* cdef np.ndarray[np.float64_t, ndim=1] intersect = np.empty((3,), dtype=np.float64)
* intersect_t = 1 # <<<<<<<<<<<<<<
@@ -7568,7 +7568,7 @@
*/
__pyx_v_intersect_t = 1;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":147
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":147
* cdef np.ndarray[np.float64_t, ndim=1] intersect = np.empty((3,), dtype=np.float64)
* intersect_t = 1
* dt_tolerance = 1e-6 # <<<<<<<<<<<<<<
@@ -7577,7 +7577,7 @@
*/
__pyx_v_dt_tolerance = 9.9999999999999995e-07;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":150
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":150
* # recall p = v * t + u
* # where p is position, v is our vector, u is the start point
* for i in range(3): # <<<<<<<<<<<<<<
@@ -7587,7 +7587,7 @@
for (__pyx_t_9 = 0; __pyx_t_9 < 3; __pyx_t_9+=1) {
__pyx_v_i = __pyx_t_9;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":152
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":152
* for i in range(3):
* # As long as we're iterating, set some other stuff, too
* if(v[i] < 0): step[i] = -1 # <<<<<<<<<<<<<<
@@ -7603,7 +7603,7 @@
}
/*else*/ {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":153
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":153
* # As long as we're iterating, set some other stuff, too
* if(v[i] < 0): step[i] = -1
* else: step[i] = 1 # <<<<<<<<<<<<<<
@@ -7615,7 +7615,7 @@
}
__pyx_L8:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":154
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":154
* if(v[i] < 0): step[i] = -1
* else: step[i] = 1
* x = (i+1)%3 # <<<<<<<<<<<<<<
@@ -7624,7 +7624,7 @@
*/
__pyx_v_x = ((__pyx_v_i + 1) % 3);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":155
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":155
* else: step[i] = 1
* x = (i+1)%3
* y = (i+2)%3 # <<<<<<<<<<<<<<
@@ -7633,7 +7633,7 @@
*/
__pyx_v_y = ((__pyx_v_i + 2) % 3);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":156
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":156
* x = (i+1)%3
* y = (i+2)%3
* tl = (left_edge[i] - u[i])/v[i] # <<<<<<<<<<<<<<
@@ -7645,7 +7645,7 @@
__pyx_t_16 = __pyx_v_i;
__pyx_v_tl = (((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_left_edge.buf, __pyx_t_14, __pyx_bstride_0_left_edge)) - (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_u.buf, __pyx_t_15, __pyx_bstride_0_u))) / (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_v.buf, __pyx_t_16, __pyx_bstride_0_v)));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":157
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":157
* y = (i+2)%3
* tl = (left_edge[i] - u[i])/v[i]
* tr = (right_edge[i] - u[i])/v[i] # <<<<<<<<<<<<<<
@@ -7657,7 +7657,7 @@
__pyx_t_19 = __pyx_v_i;
__pyx_v_tr = (((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_right_edge.buf, __pyx_t_17, __pyx_bstride_0_right_edge)) - (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_u.buf, __pyx_t_18, __pyx_bstride_0_u))) / (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_v.buf, __pyx_t_19, __pyx_bstride_0_v)));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":158
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":158
* tl = (left_edge[i] - u[i])/v[i]
* tr = (right_edge[i] - u[i])/v[i]
* if (left_edge[x] <= (u[x] + tl*v[x]) <= right_edge[x]) and \ # <<<<<<<<<<<<<<
@@ -7675,7 +7675,7 @@
}
if (__pyx_t_11) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":159
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":159
* tr = (right_edge[i] - u[i])/v[i]
* if (left_edge[x] <= (u[x] + tl*v[x]) <= right_edge[x]) and \
* (left_edge[y] <= (u[y] + tl*v[y]) <= right_edge[y]) and \ # <<<<<<<<<<<<<<
@@ -7693,7 +7693,7 @@
}
if (__pyx_t_28) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":160
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":160
* if (left_edge[x] <= (u[x] + tl*v[x]) <= right_edge[x]) and \
* (left_edge[y] <= (u[y] + tl*v[y]) <= right_edge[y]) and \
* (0.0 <= tl < intersect_t): # <<<<<<<<<<<<<<
@@ -7714,7 +7714,7 @@
}
if (__pyx_t_28) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":161
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":161
* (left_edge[y] <= (u[y] + tl*v[y]) <= right_edge[y]) and \
* (0.0 <= tl < intersect_t):
* intersect_t = tl # <<<<<<<<<<<<<<
@@ -7726,7 +7726,7 @@
}
__pyx_L9:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":162
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":162
* (0.0 <= tl < intersect_t):
* intersect_t = tl
* if (left_edge[x] <= (u[x] + tr*v[x]) <= right_edge[x]) and \ # <<<<<<<<<<<<<<
@@ -7744,7 +7744,7 @@
}
if (__pyx_t_28) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":163
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":163
* intersect_t = tl
* if (left_edge[x] <= (u[x] + tr*v[x]) <= right_edge[x]) and \
* (left_edge[y] <= (u[y] + tr*v[y]) <= right_edge[y]) and \ # <<<<<<<<<<<<<<
@@ -7762,7 +7762,7 @@
}
if (__pyx_t_11) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":164
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":164
* if (left_edge[x] <= (u[x] + tr*v[x]) <= right_edge[x]) and \
* (left_edge[y] <= (u[y] + tr*v[y]) <= right_edge[y]) and \
* (0.0 <= tr < intersect_t): # <<<<<<<<<<<<<<
@@ -7783,7 +7783,7 @@
}
if (__pyx_t_11) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":165
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":165
* (left_edge[y] <= (u[y] + tr*v[y]) <= right_edge[y]) and \
* (0.0 <= tr < intersect_t):
* intersect_t = tr # <<<<<<<<<<<<<<
@@ -7796,7 +7796,7 @@
__pyx_L10:;
}
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":167
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":167
* intersect_t = tr
* # if fully enclosed
* if (left_edge[0] <= u[0] <= right_edge[0]) and \ # <<<<<<<<<<<<<<
@@ -7813,7 +7813,7 @@
}
if (__pyx_t_11) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":168
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":168
* # if fully enclosed
* if (left_edge[0] <= u[0] <= right_edge[0]) and \
* (left_edge[1] <= u[1] <= right_edge[1]) and \ # <<<<<<<<<<<<<<
@@ -7830,7 +7830,7 @@
}
if (__pyx_t_28) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":169
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":169
* if (left_edge[0] <= u[0] <= right_edge[0]) and \
* (left_edge[1] <= u[1] <= right_edge[1]) and \
* (left_edge[2] <= u[2] <= right_edge[2]): # <<<<<<<<<<<<<<
@@ -7855,7 +7855,7 @@
}
if (__pyx_t_28) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":170
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":170
* (left_edge[1] <= u[1] <= right_edge[1]) and \
* (left_edge[2] <= u[2] <= right_edge[2]):
* intersect_t = 0.0 # <<<<<<<<<<<<<<
@@ -7867,7 +7867,7 @@
}
__pyx_L11:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":171
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":171
* (left_edge[2] <= u[2] <= right_edge[2]):
* intersect_t = 0.0
* if not (0 <= intersect_t <= 1): return # <<<<<<<<<<<<<<
@@ -7887,7 +7887,7 @@
}
__pyx_L12:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":173
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":173
* if not (0 <= intersect_t <= 1): return
* # Now get the indices of the intersection
* intersect = u + intersect_t * v # <<<<<<<<<<<<<<
@@ -7926,7 +7926,7 @@
__pyx_v_intersect = ((PyArrayObject *)__pyx_t_3);
__pyx_t_3 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":174
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":174
* # Now get the indices of the intersection
* intersect = u + intersect_t * v
* for i in range(3): # <<<<<<<<<<<<<<
@@ -7936,7 +7936,7 @@
for (__pyx_t_9 = 0; __pyx_t_9 < 3; __pyx_t_9+=1) {
__pyx_v_i = __pyx_t_9;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":175
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":175
* intersect = u + intersect_t * v
* for i in range(3):
* cur_ind[i] = np.floor((intersect[i] + 1e-8*dx[i] - left_edge[i])/dx[i]) # <<<<<<<<<<<<<<
@@ -7968,7 +7968,7 @@
__pyx_t_57 = __pyx_v_i;
*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_cur_ind.buf, __pyx_t_57, __pyx_bstride_0_cur_ind) = __pyx_t_56;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":176
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":176
* for i in range(3):
* cur_ind[i] = np.floor((intersect[i] + 1e-8*dx[i] - left_edge[i])/dx[i])
* tmax[i] = (((cur_ind[i]+step[i])*dx[i])+left_edge[i]-u[i])/v[i] # <<<<<<<<<<<<<<
@@ -7984,7 +7984,7 @@
__pyx_t_64 = __pyx_v_i;
*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_tmax.buf, __pyx_t_64, __pyx_bstride_0_tmax) = ((((((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_cur_ind.buf, __pyx_t_58, __pyx_bstride_0_cur_ind)) + (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_step.buf, __pyx_t_59, __pyx_bstride_0_step))) * (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_dx.buf, __pyx_t_60, __pyx_bstride_0_dx))) + (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_left_edge.buf, __pyx_t_61, __pyx_bstride_0_left_edge))) - (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_u.buf, __pyx_t_62, __pyx_bstride_0_u))) / (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_v.buf, __pyx_t_63, __pyx_bstride_0_v)));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":177
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":177
* cur_ind[i] = np.floor((intersect[i] + 1e-8*dx[i] - left_edge[i])/dx[i])
* tmax[i] = (((cur_ind[i]+step[i])*dx[i])+left_edge[i]-u[i])/v[i]
* if cur_ind[i] == grid_mask.shape[i] and step[i] < 0: # <<<<<<<<<<<<<<
@@ -8000,7 +8000,7 @@
}
if (__pyx_t_11) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":178
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":178
* tmax[i] = (((cur_ind[i]+step[i])*dx[i])+left_edge[i]-u[i])/v[i]
* if cur_ind[i] == grid_mask.shape[i] and step[i] < 0:
* cur_ind[i] = grid_mask.shape[i] - 1 # <<<<<<<<<<<<<<
@@ -8013,7 +8013,7 @@
}
__pyx_L15:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":179
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":179
* if cur_ind[i] == grid_mask.shape[i] and step[i] < 0:
* cur_ind[i] = grid_mask.shape[i] - 1
* if step[i] > 0: tmax[i] = (((cur_ind[i]+1)*dx[i])+left_edge[i]-u[i])/v[i] # <<<<<<<<<<<<<<
@@ -8034,7 +8034,7 @@
}
__pyx_L16:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":180
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":180
* cur_ind[i] = grid_mask.shape[i] - 1
* if step[i] > 0: tmax[i] = (((cur_ind[i]+1)*dx[i])+left_edge[i]-u[i])/v[i]
* if step[i] < 0: tmax[i] = (((cur_ind[i]+0)*dx[i])+left_edge[i]-u[i])/v[i] # <<<<<<<<<<<<<<
@@ -8055,7 +8055,7 @@
}
__pyx_L17:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":181
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":181
* if step[i] > 0: tmax[i] = (((cur_ind[i]+1)*dx[i])+left_edge[i]-u[i])/v[i]
* if step[i] < 0: tmax[i] = (((cur_ind[i]+0)*dx[i])+left_edge[i]-u[i])/v[i]
* tdelta[i] = (dx[i]/v[i]) # <<<<<<<<<<<<<<
@@ -8067,7 +8067,7 @@
__pyx_t_84 = __pyx_v_i;
*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_tdelta.buf, __pyx_t_84, __pyx_bstride_0_tdelta) = ((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_dx.buf, __pyx_t_82, __pyx_bstride_0_dx)) / (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_v.buf, __pyx_t_83, __pyx_bstride_0_v)));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":182
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":182
* if step[i] < 0: tmax[i] = (((cur_ind[i]+0)*dx[i])+left_edge[i]-u[i])/v[i]
* tdelta[i] = (dx[i]/v[i])
* if tdelta[i] < 0: tdelta[i] *= -1 # <<<<<<<<<<<<<<
@@ -8084,7 +8084,7 @@
__pyx_L18:;
}
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":184
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":184
* if tdelta[i] < 0: tdelta[i] *= -1
* # The variable intersect contains the point we first pierce the grid
* enter_t = intersect_t # <<<<<<<<<<<<<<
@@ -8093,7 +8093,7 @@
*/
__pyx_v_enter_t = __pyx_v_intersect_t;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":185
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":185
* # The variable intersect contains the point we first pierce the grid
* enter_t = intersect_t
* while 1: # <<<<<<<<<<<<<<
@@ -8104,7 +8104,7 @@
__pyx_t_11 = 1;
if (!__pyx_t_11) break;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":186
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":186
* enter_t = intersect_t
* while 1:
* if (not (0 <= cur_ind[0] < grid_mask.shape[0])) or \ # <<<<<<<<<<<<<<
@@ -8119,7 +8119,7 @@
}
if (!(!__pyx_t_11)) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":187
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":187
* while 1:
* if (not (0 <= cur_ind[0] < grid_mask.shape[0])) or \
* (not (0 <= cur_ind[1] < grid_mask.shape[1])) or \ # <<<<<<<<<<<<<<
@@ -8134,7 +8134,7 @@
}
if (!(!__pyx_t_28)) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":188
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":188
* if (not (0 <= cur_ind[0] < grid_mask.shape[0])) or \
* (not (0 <= cur_ind[1] < grid_mask.shape[1])) or \
* (not (0 <= cur_ind[2] < grid_mask.shape[2])): # <<<<<<<<<<<<<<
@@ -8157,7 +8157,7 @@
}
if (__pyx_t_28) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":189
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":189
* (not (0 <= cur_ind[1] < grid_mask.shape[1])) or \
* (not (0 <= cur_ind[2] < grid_mask.shape[2])):
* break # <<<<<<<<<<<<<<
@@ -8169,7 +8169,7 @@
}
__pyx_L21:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":193
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":193
* # values from what they should be.
* # If we've reached t = 1, we are done.
* grid_mask[cur_ind[0], cur_ind[1], cur_ind[2]] = 1 # <<<<<<<<<<<<<<
@@ -8184,7 +8184,7 @@
__pyx_t_94 = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_cur_ind.buf, __pyx_t_92, __pyx_bstride_0_cur_ind));
*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int_t *, __pyx_bstruct_grid_mask.buf, __pyx_t_56, __pyx_bstride_0_grid_mask, __pyx_t_93, __pyx_bstride_1_grid_mask, __pyx_t_94, __pyx_bstride_2_grid_mask) = 1;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":194
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":194
* # If we've reached t = 1, we are done.
* grid_mask[cur_ind[0], cur_ind[1], cur_ind[2]] = 1
* if (tmax[0] > 1.0) and (tmax[1] > 1.0) and (tmax[2] > 1.0): # <<<<<<<<<<<<<<
@@ -8206,7 +8206,7 @@
}
if (__pyx_t_11) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":195
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":195
* grid_mask[cur_ind[0], cur_ind[1], cur_ind[2]] = 1
* if (tmax[0] > 1.0) and (tmax[1] > 1.0) and (tmax[2] > 1.0):
* grid_dt[cur_ind[0], cur_ind[1], cur_ind[2]] = 1.0 - enter_t # <<<<<<<<<<<<<<
@@ -8221,7 +8221,7 @@
__pyx_t_103 = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_cur_ind.buf, __pyx_t_100, __pyx_bstride_0_cur_ind));
*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_grid_dt.buf, __pyx_t_101, __pyx_bstride_0_grid_dt, __pyx_t_102, __pyx_bstride_1_grid_dt, __pyx_t_103, __pyx_bstride_2_grid_dt) = (1.0 - __pyx_v_enter_t);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":196
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":196
* if (tmax[0] > 1.0) and (tmax[1] > 1.0) and (tmax[2] > 1.0):
* grid_dt[cur_ind[0], cur_ind[1], cur_ind[2]] = 1.0 - enter_t
* break # <<<<<<<<<<<<<<
@@ -8233,7 +8233,7 @@
}
__pyx_L22:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":197
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":197
* grid_dt[cur_ind[0], cur_ind[1], cur_ind[2]] = 1.0 - enter_t
* break
* if tmax[0] < tmax[1]: # <<<<<<<<<<<<<<
@@ -8245,7 +8245,7 @@
__pyx_t_11 = ((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_tmax.buf, __pyx_t_104, __pyx_bstride_0_tmax)) < (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_tmax.buf, __pyx_t_105, __pyx_bstride_0_tmax)));
if (__pyx_t_11) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":198
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":198
* break
* if tmax[0] < tmax[1]:
* if tmax[0] < tmax[2]: # <<<<<<<<<<<<<<
@@ -8257,7 +8257,7 @@
__pyx_t_11 = ((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_tmax.buf, __pyx_t_106, __pyx_bstride_0_tmax)) < (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_tmax.buf, __pyx_t_107, __pyx_bstride_0_tmax)));
if (__pyx_t_11) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":199
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":199
* if tmax[0] < tmax[1]:
* if tmax[0] < tmax[2]:
* grid_t[cur_ind[0], cur_ind[1], cur_ind[2]] = enter_t # <<<<<<<<<<<<<<
@@ -8272,7 +8272,7 @@
__pyx_t_113 = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_cur_ind.buf, __pyx_t_110, __pyx_bstride_0_cur_ind));
*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_grid_t.buf, __pyx_t_111, __pyx_bstride_0_grid_t, __pyx_t_112, __pyx_bstride_1_grid_t, __pyx_t_113, __pyx_bstride_2_grid_t) = __pyx_v_enter_t;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":200
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":200
* if tmax[0] < tmax[2]:
* grid_t[cur_ind[0], cur_ind[1], cur_ind[2]] = enter_t
* grid_dt[cur_ind[0], cur_ind[1], cur_ind[2]] = tmax[0] - enter_t # <<<<<<<<<<<<<<
@@ -8288,7 +8288,7 @@
__pyx_t_120 = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_cur_ind.buf, __pyx_t_117, __pyx_bstride_0_cur_ind));
*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_grid_dt.buf, __pyx_t_118, __pyx_bstride_0_grid_dt, __pyx_t_119, __pyx_bstride_1_grid_dt, __pyx_t_120, __pyx_bstride_2_grid_dt) = ((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_tmax.buf, __pyx_t_114, __pyx_bstride_0_tmax)) - __pyx_v_enter_t);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":201
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":201
* grid_t[cur_ind[0], cur_ind[1], cur_ind[2]] = enter_t
* grid_dt[cur_ind[0], cur_ind[1], cur_ind[2]] = tmax[0] - enter_t
* enter_t = tmax[0] # <<<<<<<<<<<<<<
@@ -8298,7 +8298,7 @@
__pyx_t_121 = 0;
__pyx_v_enter_t = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_tmax.buf, __pyx_t_121, __pyx_bstride_0_tmax));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":202
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":202
* grid_dt[cur_ind[0], cur_ind[1], cur_ind[2]] = tmax[0] - enter_t
* enter_t = tmax[0]
* tmax[0] += tdelta[0] # <<<<<<<<<<<<<<
@@ -8309,7 +8309,7 @@
__pyx_t_123 = 0;
*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_tmax.buf, __pyx_t_123, __pyx_bstride_0_tmax) += (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_tdelta.buf, __pyx_t_122, __pyx_bstride_0_tdelta));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":203
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":203
* enter_t = tmax[0]
* tmax[0] += tdelta[0]
* cur_ind[0] += step[0] # <<<<<<<<<<<<<<
@@ -8323,7 +8323,7 @@
}
/*else*/ {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":205
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":205
* cur_ind[0] += step[0]
* else:
* grid_t[cur_ind[0], cur_ind[1], cur_ind[2]] = enter_t # <<<<<<<<<<<<<<
@@ -8338,7 +8338,7 @@
__pyx_t_131 = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_cur_ind.buf, __pyx_t_128, __pyx_bstride_0_cur_ind));
*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_grid_t.buf, __pyx_t_129, __pyx_bstride_0_grid_t, __pyx_t_130, __pyx_bstride_1_grid_t, __pyx_t_131, __pyx_bstride_2_grid_t) = __pyx_v_enter_t;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":206
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":206
* else:
* grid_t[cur_ind[0], cur_ind[1], cur_ind[2]] = enter_t
* grid_dt[cur_ind[0], cur_ind[1], cur_ind[2]] = tmax[2] - enter_t # <<<<<<<<<<<<<<
@@ -8354,7 +8354,7 @@
__pyx_t_138 = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_cur_ind.buf, __pyx_t_135, __pyx_bstride_0_cur_ind));
*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_grid_dt.buf, __pyx_t_136, __pyx_bstride_0_grid_dt, __pyx_t_137, __pyx_bstride_1_grid_dt, __pyx_t_138, __pyx_bstride_2_grid_dt) = ((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_tmax.buf, __pyx_t_132, __pyx_bstride_0_tmax)) - __pyx_v_enter_t);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":207
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":207
* grid_t[cur_ind[0], cur_ind[1], cur_ind[2]] = enter_t
* grid_dt[cur_ind[0], cur_ind[1], cur_ind[2]] = tmax[2] - enter_t
* enter_t = tmax[2] # <<<<<<<<<<<<<<
@@ -8364,7 +8364,7 @@
__pyx_t_139 = 2;
__pyx_v_enter_t = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_tmax.buf, __pyx_t_139, __pyx_bstride_0_tmax));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":208
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":208
* grid_dt[cur_ind[0], cur_ind[1], cur_ind[2]] = tmax[2] - enter_t
* enter_t = tmax[2]
* tmax[2] += tdelta[2] # <<<<<<<<<<<<<<
@@ -8375,7 +8375,7 @@
__pyx_t_141 = 2;
*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_tmax.buf, __pyx_t_141, __pyx_bstride_0_tmax) += (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_tdelta.buf, __pyx_t_140, __pyx_bstride_0_tdelta));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":209
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":209
* enter_t = tmax[2]
* tmax[2] += tdelta[2]
* cur_ind[2] += step[2] # <<<<<<<<<<<<<<
@@ -8391,7 +8391,7 @@
}
/*else*/ {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":211
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":211
* cur_ind[2] += step[2]
* else:
* if tmax[1] < tmax[2]: # <<<<<<<<<<<<<<
@@ -8403,7 +8403,7 @@
__pyx_t_11 = ((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_tmax.buf, __pyx_t_144, __pyx_bstride_0_tmax)) < (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_tmax.buf, __pyx_t_145, __pyx_bstride_0_tmax)));
if (__pyx_t_11) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":212
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":212
* else:
* if tmax[1] < tmax[2]:
* grid_t[cur_ind[0], cur_ind[1], cur_ind[2]] = enter_t # <<<<<<<<<<<<<<
@@ -8418,7 +8418,7 @@
__pyx_t_151 = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_cur_ind.buf, __pyx_t_148, __pyx_bstride_0_cur_ind));
*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_grid_t.buf, __pyx_t_149, __pyx_bstride_0_grid_t, __pyx_t_150, __pyx_bstride_1_grid_t, __pyx_t_151, __pyx_bstride_2_grid_t) = __pyx_v_enter_t;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":213
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":213
* if tmax[1] < tmax[2]:
* grid_t[cur_ind[0], cur_ind[1], cur_ind[2]] = enter_t
* grid_dt[cur_ind[0], cur_ind[1], cur_ind[2]] = tmax[1] - enter_t # <<<<<<<<<<<<<<
@@ -8434,7 +8434,7 @@
__pyx_t_158 = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_cur_ind.buf, __pyx_t_155, __pyx_bstride_0_cur_ind));
*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_grid_dt.buf, __pyx_t_156, __pyx_bstride_0_grid_dt, __pyx_t_157, __pyx_bstride_1_grid_dt, __pyx_t_158, __pyx_bstride_2_grid_dt) = ((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_tmax.buf, __pyx_t_152, __pyx_bstride_0_tmax)) - __pyx_v_enter_t);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":214
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":214
* grid_t[cur_ind[0], cur_ind[1], cur_ind[2]] = enter_t
* grid_dt[cur_ind[0], cur_ind[1], cur_ind[2]] = tmax[1] - enter_t
* enter_t = tmax[1] # <<<<<<<<<<<<<<
@@ -8444,7 +8444,7 @@
__pyx_t_159 = 1;
__pyx_v_enter_t = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_tmax.buf, __pyx_t_159, __pyx_bstride_0_tmax));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":215
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":215
* grid_dt[cur_ind[0], cur_ind[1], cur_ind[2]] = tmax[1] - enter_t
* enter_t = tmax[1]
* tmax[1] += tdelta[1] # <<<<<<<<<<<<<<
@@ -8455,7 +8455,7 @@
__pyx_t_161 = 1;
*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_tmax.buf, __pyx_t_161, __pyx_bstride_0_tmax) += (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_tdelta.buf, __pyx_t_160, __pyx_bstride_0_tdelta));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":216
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":216
* enter_t = tmax[1]
* tmax[1] += tdelta[1]
* cur_ind[1] += step[1] # <<<<<<<<<<<<<<
@@ -8469,7 +8469,7 @@
}
/*else*/ {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":218
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":218
* cur_ind[1] += step[1]
* else:
* grid_t[cur_ind[0], cur_ind[1], cur_ind[2]] = enter_t # <<<<<<<<<<<<<<
@@ -8484,7 +8484,7 @@
__pyx_t_169 = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_cur_ind.buf, __pyx_t_166, __pyx_bstride_0_cur_ind));
*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_grid_t.buf, __pyx_t_167, __pyx_bstride_0_grid_t, __pyx_t_168, __pyx_bstride_1_grid_t, __pyx_t_169, __pyx_bstride_2_grid_t) = __pyx_v_enter_t;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":219
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":219
* else:
* grid_t[cur_ind[0], cur_ind[1], cur_ind[2]] = enter_t
* grid_dt[cur_ind[0], cur_ind[1], cur_ind[2]] = tmax[2] - enter_t # <<<<<<<<<<<<<<
@@ -8500,7 +8500,7 @@
__pyx_t_176 = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_cur_ind.buf, __pyx_t_173, __pyx_bstride_0_cur_ind));
*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_grid_dt.buf, __pyx_t_174, __pyx_bstride_0_grid_dt, __pyx_t_175, __pyx_bstride_1_grid_dt, __pyx_t_176, __pyx_bstride_2_grid_dt) = ((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_tmax.buf, __pyx_t_170, __pyx_bstride_0_tmax)) - __pyx_v_enter_t);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":220
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":220
* grid_t[cur_ind[0], cur_ind[1], cur_ind[2]] = enter_t
* grid_dt[cur_ind[0], cur_ind[1], cur_ind[2]] = tmax[2] - enter_t
* enter_t = tmax[2] # <<<<<<<<<<<<<<
@@ -8510,7 +8510,7 @@
__pyx_t_177 = 2;
__pyx_v_enter_t = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_tmax.buf, __pyx_t_177, __pyx_bstride_0_tmax));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":221
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":221
* grid_dt[cur_ind[0], cur_ind[1], cur_ind[2]] = tmax[2] - enter_t
* enter_t = tmax[2]
* tmax[2] += tdelta[2] # <<<<<<<<<<<<<<
@@ -8521,7 +8521,7 @@
__pyx_t_179 = 2;
*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_tmax.buf, __pyx_t_179, __pyx_bstride_0_tmax) += (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_tdelta.buf, __pyx_t_178, __pyx_bstride_0_tdelta));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":222
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":222
* enter_t = tmax[2]
* tmax[2] += tdelta[2]
* cur_ind[2] += step[2] # <<<<<<<<<<<<<<
@@ -8538,7 +8538,7 @@
}
__pyx_L20_break:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":223
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":223
* tmax[2] += tdelta[2]
* cur_ind[2] += step[2]
* return # <<<<<<<<<<<<<<
@@ -8601,7 +8601,7 @@
return __pyx_r;
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":227
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":227
* @cython.wraparound(False)
* @cython.boundscheck(False)
* def PlaneVoxelIntegration(np.ndarray[np.float64_t, ndim=1] left_edge, # <<<<<<<<<<<<<<
@@ -8839,7 +8839,7 @@
__pyx_bstride_0_shells = __pyx_bstruct_shells.strides[0]; __pyx_bstride_1_shells = __pyx_bstruct_shells.strides[1];
__pyx_bshape_0_shells = __pyx_bstruct_shells.shape[0]; __pyx_bshape_1_shells = __pyx_bstruct_shells.shape[1];
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":239
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":239
* # generalized to transfer functions
* cdef int i, x, y, vi
* intersect_t = 1 # <<<<<<<<<<<<<<
@@ -8850,7 +8850,7 @@
__Pyx_DECREF(__pyx_v_intersect_t);
__pyx_v_intersect_t = __pyx_int_1;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":240
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":240
* cdef int i, x, y, vi
* intersect_t = 1
* dt_tolerance = 1e-6 # <<<<<<<<<<<<<<
@@ -8863,7 +8863,7 @@
__pyx_v_dt_tolerance = __pyx_t_1;
__pyx_t_1 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":241
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":241
* intersect_t = 1
* dt_tolerance = 1e-6
* cdef int nv = ug.shape[0] # <<<<<<<<<<<<<<
@@ -8872,7 +8872,7 @@
*/
__pyx_v_nv = (__pyx_v_ug->dimensions[0]);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":242
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":242
* dt_tolerance = 1e-6
* cdef int nv = ug.shape[0]
* cdef int nshells = shells.shape[0] # <<<<<<<<<<<<<<
@@ -8881,7 +8881,7 @@
*/
__pyx_v_nshells = (__pyx_v_shells->dimensions[0]);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":243
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":243
* cdef int nv = ug.shape[0]
* cdef int nshells = shells.shape[0]
* cdef np.ndarray[np.float64_t, ndim=1] u = np.empty((3,), dtype=np.float64) # <<<<<<<<<<<<<<
@@ -8932,7 +8932,7 @@
__pyx_v_u = ((PyArrayObject *)__pyx_t_2);
__pyx_t_2 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":245
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":245
* cdef np.ndarray[np.float64_t, ndim=1] u = np.empty((3,), dtype=np.float64)
* # Copy things into temporary location for passing between functions
* for vi in range(nv): # <<<<<<<<<<<<<<
@@ -8942,7 +8942,7 @@
for (__pyx_t_5 = 0; __pyx_t_5 < __pyx_v_nv; __pyx_t_5+=1) {
__pyx_v_vi = __pyx_t_5;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":246
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":246
* # Copy things into temporary location for passing between functions
* for vi in range(nv):
* for i in range(3): u[i] = ug[vi, i] # <<<<<<<<<<<<<<
@@ -8957,7 +8957,7 @@
*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_u.buf, __pyx_t_9, __pyx_bstride_0_u) = (*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_ug.buf, __pyx_t_7, __pyx_bstride_0_ug, __pyx_t_8, __pyx_bstride_1_ug));
}
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":247
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":247
* for vi in range(nv):
* for i in range(3): u[i] = ug[vi, i]
* integrate_ray(u, v, left_edge, right_edge, dx, # <<<<<<<<<<<<<<
@@ -8967,7 +8967,7 @@
__pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_integrate_ray); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 247; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_2);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":248
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":248
* for i in range(3): u[i] = ug[vi, i]
* integrate_ray(u, v, left_edge, right_edge, dx,
* nshells, vi, data, shells, image) # <<<<<<<<<<<<<<
@@ -9059,7 +9059,7 @@
return __pyx_r;
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":252
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":252
* @cython.wraparound(False)
* @cython.boundscheck(False)
* def integrate_ray(np.ndarray[np.float64_t, ndim=1] u, # <<<<<<<<<<<<<<
@@ -9407,7 +9407,7 @@
__pyx_bstride_0_image = __pyx_bstruct_image.strides[0]; __pyx_bstride_1_image = __pyx_bstruct_image.strides[1];
__pyx_bshape_0_image = __pyx_bstruct_image.shape[0]; __pyx_bshape_1_image = __pyx_bstruct_image.shape[1];
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":262
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":262
* np.ndarray[np.float64_t, ndim=2] image):
* cdef int step[3], x, y, i, n
* cdef np.float64_t intersect_t = 1 # <<<<<<<<<<<<<<
@@ -9416,7 +9416,7 @@
*/
__pyx_v_intersect_t = 1;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":263
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":263
* cdef int step[3], x, y, i, n
* cdef np.float64_t intersect_t = 1
* cdef np.float64_t dt_tolerance = 1e-6 # <<<<<<<<<<<<<<
@@ -9425,7 +9425,7 @@
*/
__pyx_v_dt_tolerance = 9.9999999999999995e-07;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":271
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":271
* cdef np.float64_t dt, dv
* cdef np.float64_t dist, alpha
* cdef np.float64_t one = 1.0 # <<<<<<<<<<<<<<
@@ -9434,7 +9434,7 @@
*/
__pyx_v_one = 1.0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":274
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":274
* cdef int dims[3]
* cdef np.float64_t rgba[4], temp_x, temp_y
* for i in range(3): # <<<<<<<<<<<<<<
@@ -9444,7 +9444,7 @@
for (__pyx_t_1 = 0; __pyx_t_1 < 3; __pyx_t_1+=1) {
__pyx_v_i = __pyx_t_1;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":276
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":276
* for i in range(3):
* # As long as we're iterating, set some other stuff, too
* dims[i] = data.shape[i] # <<<<<<<<<<<<<<
@@ -9453,7 +9453,7 @@
*/
(__pyx_v_dims[__pyx_v_i]) = (__pyx_v_data->dimensions[__pyx_v_i]);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":277
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":277
* # As long as we're iterating, set some other stuff, too
* dims[i] = data.shape[i]
* if(v[i] < 0): step[i] = -1 # <<<<<<<<<<<<<<
@@ -9468,7 +9468,7 @@
}
/*else*/ {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":278
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":278
* dims[i] = data.shape[i]
* if(v[i] < 0): step[i] = -1
* else: step[i] = 1 # <<<<<<<<<<<<<<
@@ -9479,7 +9479,7 @@
}
__pyx_L8:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":279
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":279
* if(v[i] < 0): step[i] = -1
* else: step[i] = 1
* x = (i+1)%3 # <<<<<<<<<<<<<<
@@ -9488,7 +9488,7 @@
*/
__pyx_v_x = ((__pyx_v_i + 1) % 3);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":280
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":280
* else: step[i] = 1
* x = (i+1)%3
* y = (i+2)%3 # <<<<<<<<<<<<<<
@@ -9497,7 +9497,7 @@
*/
__pyx_v_y = ((__pyx_v_i + 2) % 3);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":281
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":281
* x = (i+1)%3
* y = (i+2)%3
* tl = (left_edge[i] - u[i])/v[i] # <<<<<<<<<<<<<<
@@ -9509,7 +9509,7 @@
__pyx_t_6 = __pyx_v_i;
__pyx_v_tl = (((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_left_edge.buf, __pyx_t_4, __pyx_bstride_0_left_edge)) - (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_u.buf, __pyx_t_5, __pyx_bstride_0_u))) / (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_v.buf, __pyx_t_6, __pyx_bstride_0_v)));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":282
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":282
* y = (i+2)%3
* tl = (left_edge[i] - u[i])/v[i]
* tr = (right_edge[i] - u[i])/v[i] # <<<<<<<<<<<<<<
@@ -9521,7 +9521,7 @@
__pyx_t_9 = __pyx_v_i;
__pyx_v_tr = (((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_right_edge.buf, __pyx_t_7, __pyx_bstride_0_right_edge)) - (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_u.buf, __pyx_t_8, __pyx_bstride_0_u))) / (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_v.buf, __pyx_t_9, __pyx_bstride_0_v)));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":283
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":283
* tl = (left_edge[i] - u[i])/v[i]
* tr = (right_edge[i] - u[i])/v[i]
* temp_x = (u[x] + tl*v[x]) # <<<<<<<<<<<<<<
@@ -9532,7 +9532,7 @@
__pyx_t_11 = __pyx_v_x;
__pyx_v_temp_x = ((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_u.buf, __pyx_t_10, __pyx_bstride_0_u)) + (__pyx_v_tl * (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_v.buf, __pyx_t_11, __pyx_bstride_0_v))));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":284
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":284
* tr = (right_edge[i] - u[i])/v[i]
* temp_x = (u[x] + tl*v[x])
* temp_y = (u[y] + tl*v[y]) # <<<<<<<<<<<<<<
@@ -9543,7 +9543,7 @@
__pyx_t_13 = __pyx_v_y;
__pyx_v_temp_y = ((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_u.buf, __pyx_t_12, __pyx_bstride_0_u)) + (__pyx_v_tl * (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_v.buf, __pyx_t_13, __pyx_bstride_0_v))));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":285
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":285
* temp_x = (u[x] + tl*v[x])
* temp_y = (u[y] + tl*v[y])
* if (left_edge[x] <= temp_x) and (temp_x <= right_edge[x]) and \ # <<<<<<<<<<<<<<
@@ -9555,7 +9555,7 @@
__pyx_t_15 = __pyx_v_x;
if ((__pyx_v_temp_x <= (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_right_edge.buf, __pyx_t_15, __pyx_bstride_0_right_edge)))) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":286
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":286
* temp_y = (u[y] + tl*v[y])
* if (left_edge[x] <= temp_x) and (temp_x <= right_edge[x]) and \
* (left_edge[y] <= temp_y) and (temp_y <= right_edge[y]) and \ # <<<<<<<<<<<<<<
@@ -9567,7 +9567,7 @@
__pyx_t_17 = __pyx_v_y;
if ((__pyx_v_temp_y <= (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_right_edge.buf, __pyx_t_17, __pyx_bstride_0_right_edge)))) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":287
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":287
* if (left_edge[x] <= temp_x) and (temp_x <= right_edge[x]) and \
* (left_edge[y] <= temp_y) and (temp_y <= right_edge[y]) and \
* (0.0 <= tl) and (tl < intersect_t): # <<<<<<<<<<<<<<
@@ -9597,7 +9597,7 @@
}
if (__pyx_t_3) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":288
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":288
* (left_edge[y] <= temp_y) and (temp_y <= right_edge[y]) and \
* (0.0 <= tl) and (tl < intersect_t):
* intersect_t = tl # <<<<<<<<<<<<<<
@@ -9609,7 +9609,7 @@
}
__pyx_L9:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":289
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":289
* (0.0 <= tl) and (tl < intersect_t):
* intersect_t = tl
* temp_x = (u[x] + tr*v[x]) # <<<<<<<<<<<<<<
@@ -9620,7 +9620,7 @@
__pyx_t_20 = __pyx_v_x;
__pyx_v_temp_x = ((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_u.buf, __pyx_t_19, __pyx_bstride_0_u)) + (__pyx_v_tr * (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_v.buf, __pyx_t_20, __pyx_bstride_0_v))));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":290
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":290
* intersect_t = tl
* temp_x = (u[x] + tr*v[x])
* temp_y = (u[y] + tr*v[y]) # <<<<<<<<<<<<<<
@@ -9631,7 +9631,7 @@
__pyx_t_22 = __pyx_v_y;
__pyx_v_temp_y = ((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_u.buf, __pyx_t_21, __pyx_bstride_0_u)) + (__pyx_v_tr * (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_v.buf, __pyx_t_22, __pyx_bstride_0_v))));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":291
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":291
* temp_x = (u[x] + tr*v[x])
* temp_y = (u[y] + tr*v[y])
* if (left_edge[x] <= temp_x) and (temp_x <= right_edge[x]) and \ # <<<<<<<<<<<<<<
@@ -9643,7 +9643,7 @@
__pyx_t_24 = __pyx_v_x;
if ((__pyx_v_temp_x <= (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_right_edge.buf, __pyx_t_24, __pyx_bstride_0_right_edge)))) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":292
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":292
* temp_y = (u[y] + tr*v[y])
* if (left_edge[x] <= temp_x) and (temp_x <= right_edge[x]) and \
* (left_edge[y] <= temp_y) and (temp_y <= right_edge[y]) and \ # <<<<<<<<<<<<<<
@@ -9655,7 +9655,7 @@
__pyx_t_26 = __pyx_v_y;
if ((__pyx_v_temp_y <= (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_right_edge.buf, __pyx_t_26, __pyx_bstride_0_right_edge)))) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":293
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":293
* if (left_edge[x] <= temp_x) and (temp_x <= right_edge[x]) and \
* (left_edge[y] <= temp_y) and (temp_y <= right_edge[y]) and \
* (0.0 <= tr) and (tr < intersect_t): # <<<<<<<<<<<<<<
@@ -9685,7 +9685,7 @@
}
if (__pyx_t_3) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":294
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":294
* (left_edge[y] <= temp_y) and (temp_y <= right_edge[y]) and \
* (0.0 <= tr) and (tr < intersect_t):
* intersect_t = tr # <<<<<<<<<<<<<<
@@ -9698,7 +9698,7 @@
__pyx_L10:;
}
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":296
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":296
* intersect_t = tr
* # if fully enclosed
* if (left_edge[0] <= u[0] <= right_edge[0]) and \ # <<<<<<<<<<<<<<
@@ -9715,7 +9715,7 @@
}
if (__pyx_t_3) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":297
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":297
* # if fully enclosed
* if (left_edge[0] <= u[0] <= right_edge[0]) and \
* (left_edge[1] <= u[1] <= right_edge[1]) and \ # <<<<<<<<<<<<<<
@@ -9732,7 +9732,7 @@
}
if (__pyx_t_18) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":298
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":298
* if (left_edge[0] <= u[0] <= right_edge[0]) and \
* (left_edge[1] <= u[1] <= right_edge[1]) and \
* (left_edge[2] <= u[2] <= right_edge[2]): # <<<<<<<<<<<<<<
@@ -9757,7 +9757,7 @@
}
if (__pyx_t_18) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":299
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":299
* (left_edge[1] <= u[1] <= right_edge[1]) and \
* (left_edge[2] <= u[2] <= right_edge[2]):
* intersect_t = 0.0 # <<<<<<<<<<<<<<
@@ -9769,7 +9769,7 @@
}
__pyx_L11:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":300
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":300
* (left_edge[2] <= u[2] <= right_edge[2]):
* intersect_t = 0.0
* if not (0 <= intersect_t <= 1): # <<<<<<<<<<<<<<
@@ -9783,7 +9783,7 @@
__pyx_t_3 = (!__pyx_t_18);
if (__pyx_t_3) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":302
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":302
* if not (0 <= intersect_t <= 1):
* #print "Returning: intersect_t ==", intersect_t
* return # <<<<<<<<<<<<<<
@@ -9797,7 +9797,7 @@
}
__pyx_L12:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":304
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":304
* return
* # Now get the indices of the intersection
* for i in range(3): intersect[i] = u[i] + intersect_t * v[i] # <<<<<<<<<<<<<<
@@ -9811,7 +9811,7 @@
(__pyx_v_intersect[__pyx_v_i]) = ((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_u.buf, __pyx_t_39, __pyx_bstride_0_u)) + (__pyx_v_intersect_t * (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_v.buf, __pyx_t_40, __pyx_bstride_0_v))));
}
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":305
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":305
* # Now get the indices of the intersection
* for i in range(3): intersect[i] = u[i] + intersect_t * v[i]
* cdef int ncells = 0 # <<<<<<<<<<<<<<
@@ -9820,7 +9820,7 @@
*/
__pyx_v_ncells = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":306
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":306
* for i in range(3): intersect[i] = u[i] + intersect_t * v[i]
* cdef int ncells = 0
* for i in range(3): # <<<<<<<<<<<<<<
@@ -9830,7 +9830,7 @@
for (__pyx_t_1 = 0; __pyx_t_1 < 3; __pyx_t_1+=1) {
__pyx_v_i = __pyx_t_1;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":307
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":307
* cdef int ncells = 0
* for i in range(3):
* cur_ind[i] = np.floor((intersect[i] + 1e-8*dx[i] - left_edge[i])/dx[i]) # <<<<<<<<<<<<<<
@@ -9860,7 +9860,7 @@
__Pyx_DECREF(__pyx_t_45); __pyx_t_45 = 0;
(__pyx_v_cur_ind[__pyx_v_i]) = __pyx_t_47;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":308
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":308
* for i in range(3):
* cur_ind[i] = np.floor((intersect[i] + 1e-8*dx[i] - left_edge[i])/dx[i])
* tmax[i] = (((cur_ind[i]+step[i])*dx[i])+left_edge[i]-u[i])/v[i] # <<<<<<<<<<<<<<
@@ -9873,7 +9873,7 @@
__pyx_t_51 = __pyx_v_i;
(__pyx_v_tmax[__pyx_v_i]) = ((((((__pyx_v_cur_ind[__pyx_v_i]) + (__pyx_v_step[__pyx_v_i])) * (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_dx.buf, __pyx_t_48, __pyx_bstride_0_dx))) + (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_left_edge.buf, __pyx_t_49, __pyx_bstride_0_left_edge))) - (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_u.buf, __pyx_t_50, __pyx_bstride_0_u))) / (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_v.buf, __pyx_t_51, __pyx_bstride_0_v)));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":309
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":309
* cur_ind[i] = np.floor((intersect[i] + 1e-8*dx[i] - left_edge[i])/dx[i])
* tmax[i] = (((cur_ind[i]+step[i])*dx[i])+left_edge[i]-u[i])/v[i]
* if cur_ind[i] == dims[i] and step[i] < 0: # <<<<<<<<<<<<<<
@@ -9887,7 +9887,7 @@
}
if (__pyx_t_3) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":310
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":310
* tmax[i] = (((cur_ind[i]+step[i])*dx[i])+left_edge[i]-u[i])/v[i]
* if cur_ind[i] == dims[i] and step[i] < 0:
* cur_ind[i] = dims[i] - 1 # <<<<<<<<<<<<<<
@@ -9899,7 +9899,7 @@
}
__pyx_L17:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":311
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":311
* if cur_ind[i] == dims[i] and step[i] < 0:
* cur_ind[i] = dims[i] - 1
* if step[i] > 0: tmax[i] = (((cur_ind[i]+1)*dx[i])+left_edge[i]-u[i])/v[i] # <<<<<<<<<<<<<<
@@ -9917,7 +9917,7 @@
}
__pyx_L18:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":312
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":312
* cur_ind[i] = dims[i] - 1
* if step[i] > 0: tmax[i] = (((cur_ind[i]+1)*dx[i])+left_edge[i]-u[i])/v[i]
* if step[i] < 0: tmax[i] = (((cur_ind[i]+0)*dx[i])+left_edge[i]-u[i])/v[i] # <<<<<<<<<<<<<<
@@ -9935,7 +9935,7 @@
}
__pyx_L19:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":313
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":313
* if step[i] > 0: tmax[i] = (((cur_ind[i]+1)*dx[i])+left_edge[i]-u[i])/v[i]
* if step[i] < 0: tmax[i] = (((cur_ind[i]+0)*dx[i])+left_edge[i]-u[i])/v[i]
* tdelta[i] = (dx[i]/v[i]) # <<<<<<<<<<<<<<
@@ -9946,7 +9946,7 @@
__pyx_t_61 = __pyx_v_i;
(__pyx_v_tdelta[__pyx_v_i]) = ((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_dx.buf, __pyx_t_60, __pyx_bstride_0_dx)) / (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_v.buf, __pyx_t_61, __pyx_bstride_0_v)));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":314
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":314
* if step[i] < 0: tmax[i] = (((cur_ind[i]+0)*dx[i])+left_edge[i]-u[i])/v[i]
* tdelta[i] = (dx[i]/v[i])
* if tdelta[i] < 0: tdelta[i] *= -1 # <<<<<<<<<<<<<<
@@ -9961,7 +9961,7 @@
__pyx_L20:;
}
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":316
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":316
* if tdelta[i] < 0: tdelta[i] *= -1
* # The variable intersect contains the point we first pierce the grid
* enter_t = intersect_t # <<<<<<<<<<<<<<
@@ -9970,7 +9970,7 @@
*/
__pyx_v_enter_t = __pyx_v_intersect_t;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":317
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":317
* # The variable intersect contains the point we first pierce the grid
* enter_t = intersect_t
* if (not (0 <= cur_ind[0] < dims[0])) or \ # <<<<<<<<<<<<<<
@@ -9984,7 +9984,7 @@
}
if (!(!__pyx_t_3)) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":318
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":318
* enter_t = intersect_t
* if (not (0 <= cur_ind[0] < dims[0])) or \
* (not (0 <= cur_ind[1] < dims[1])) or \ # <<<<<<<<<<<<<<
@@ -9998,7 +9998,7 @@
}
if (!(!__pyx_t_18)) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":319
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":319
* if (not (0 <= cur_ind[0] < dims[0])) or \
* (not (0 <= cur_ind[1] < dims[1])) or \
* (not (0 <= cur_ind[2] < dims[2])): # <<<<<<<<<<<<<<
@@ -10020,7 +10020,7 @@
}
if (__pyx_t_18) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":326
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":326
* #print " u :", u[0], u[1], u[2]
* #
* return # <<<<<<<<<<<<<<
@@ -10034,7 +10034,7 @@
}
__pyx_L21:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":328
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":328
* return
* #print cur_ind[0], dims[0], cur_ind[1], dims[1], cur_ind[2], dims[2]
* dv = data[cur_ind[0], cur_ind[1], cur_ind[2]] # <<<<<<<<<<<<<<
@@ -10046,7 +10046,7 @@
__pyx_t_63 = (__pyx_v_cur_ind[2]);
__pyx_v_dv = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_data.buf, __pyx_t_47, __pyx_bstride_0_data, __pyx_t_62, __pyx_bstride_1_data, __pyx_t_63, __pyx_bstride_2_data));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":330
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":330
* dv = data[cur_ind[0], cur_ind[1], cur_ind[2]]
* #dt = 1e300
* while 1: # <<<<<<<<<<<<<<
@@ -10057,7 +10057,7 @@
__pyx_t_18 = 1;
if (!__pyx_t_18) break;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":331
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":331
* #dt = 1e300
* while 1:
* if image[ind,3] >= 1.0: break # <<<<<<<<<<<<<<
@@ -10073,7 +10073,7 @@
}
__pyx_L24:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":332
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":332
* while 1:
* if image[ind,3] >= 1.0: break
* if (not (0 <= cur_ind[0] < dims[0])) or \ # <<<<<<<<<<<<<<
@@ -10087,7 +10087,7 @@
}
if (!(!__pyx_t_18)) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":333
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":333
* if image[ind,3] >= 1.0: break
* if (not (0 <= cur_ind[0] < dims[0])) or \
* (not (0 <= cur_ind[1] < dims[1])) or \ # <<<<<<<<<<<<<<
@@ -10101,7 +10101,7 @@
}
if (!(!__pyx_t_3)) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":334
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":334
* if (not (0 <= cur_ind[0] < dims[0])) or \
* (not (0 <= cur_ind[1] < dims[1])) or \
* (not (0 <= cur_ind[2] < dims[2])): # <<<<<<<<<<<<<<
@@ -10123,7 +10123,7 @@
}
if (__pyx_t_3) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":335
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":335
* (not (0 <= cur_ind[1] < dims[1])) or \
* (not (0 <= cur_ind[2] < dims[2])):
* break # <<<<<<<<<<<<<<
@@ -10135,7 +10135,7 @@
}
__pyx_L25:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":337
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":337
* break
* # Do our transfer here
* for n in range(nshells): # <<<<<<<<<<<<<<
@@ -10145,7 +10145,7 @@
for (__pyx_t_66 = 0; __pyx_t_66 < __pyx_v_nshells; __pyx_t_66+=1) {
__pyx_v_n = __pyx_t_66;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":338
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":338
* # Do our transfer here
* for n in range(nshells):
* dist = shells[n, 0] - dv # <<<<<<<<<<<<<<
@@ -10156,7 +10156,7 @@
__pyx_t_68 = 0;
__pyx_v_dist = ((*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_shells.buf, __pyx_t_67, __pyx_bstride_0_shells, __pyx_t_68, __pyx_bstride_1_shells)) - __pyx_v_dv);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":339
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":339
* for n in range(nshells):
* dist = shells[n, 0] - dv
* if dist < shells[n,1]: # <<<<<<<<<<<<<<
@@ -10168,7 +10168,7 @@
__pyx_t_3 = (__pyx_v_dist < (*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_shells.buf, __pyx_t_69, __pyx_bstride_0_shells, __pyx_t_70, __pyx_bstride_1_shells)));
if (__pyx_t_3) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":340
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":340
* dist = shells[n, 0] - dv
* if dist < shells[n,1]:
* dist = exp(-dist/8.0) # <<<<<<<<<<<<<<
@@ -10177,7 +10177,7 @@
*/
__pyx_v_dist = exp(((-__pyx_v_dist) / 8.0));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":341
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":341
* if dist < shells[n,1]:
* dist = exp(-dist/8.0)
* alpha = (1.0 - shells[n,5])*shells[n,5]#*dt # <<<<<<<<<<<<<<
@@ -10190,7 +10190,7 @@
__pyx_t_74 = 5;
__pyx_v_alpha = ((1.0 - (*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_shells.buf, __pyx_t_71, __pyx_bstride_0_shells, __pyx_t_72, __pyx_bstride_1_shells))) * (*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_shells.buf, __pyx_t_73, __pyx_bstride_0_shells, __pyx_t_74, __pyx_bstride_1_shells)));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":342
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":342
* dist = exp(-dist/8.0)
* alpha = (1.0 - shells[n,5])*shells[n,5]#*dt
* image[ind,0] += alpha*shells[n,2]*dist # <<<<<<<<<<<<<<
@@ -10203,7 +10203,7 @@
__pyx_t_78 = 0;
*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_image.buf, __pyx_t_77, __pyx_bstride_0_image, __pyx_t_78, __pyx_bstride_1_image) += ((__pyx_v_alpha * (*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_shells.buf, __pyx_t_75, __pyx_bstride_0_shells, __pyx_t_76, __pyx_bstride_1_shells))) * __pyx_v_dist);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":343
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":343
* alpha = (1.0 - shells[n,5])*shells[n,5]#*dt
* image[ind,0] += alpha*shells[n,2]*dist
* image[ind,1] += alpha*shells[n,3]*dist # <<<<<<<<<<<<<<
@@ -10216,7 +10216,7 @@
__pyx_t_82 = 1;
*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_image.buf, __pyx_t_81, __pyx_bstride_0_image, __pyx_t_82, __pyx_bstride_1_image) += ((__pyx_v_alpha * (*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_shells.buf, __pyx_t_79, __pyx_bstride_0_shells, __pyx_t_80, __pyx_bstride_1_shells))) * __pyx_v_dist);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":344
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":344
* image[ind,0] += alpha*shells[n,2]*dist
* image[ind,1] += alpha*shells[n,3]*dist
* image[ind,2] += alpha*shells[n,4]*dist # <<<<<<<<<<<<<<
@@ -10229,7 +10229,7 @@
__pyx_t_86 = 2;
*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_image.buf, __pyx_t_85, __pyx_bstride_0_image, __pyx_t_86, __pyx_bstride_1_image) += ((__pyx_v_alpha * (*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_shells.buf, __pyx_t_83, __pyx_bstride_0_shells, __pyx_t_84, __pyx_bstride_1_shells))) * __pyx_v_dist);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":345
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":345
* image[ind,1] += alpha*shells[n,3]*dist
* image[ind,2] += alpha*shells[n,4]*dist
* image[ind,3] += alpha*shells[n,5]*dist # <<<<<<<<<<<<<<
@@ -10242,7 +10242,7 @@
__pyx_t_90 = 3;
*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_image.buf, __pyx_t_89, __pyx_bstride_0_image, __pyx_t_90, __pyx_bstride_1_image) += ((__pyx_v_alpha * (*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_shells.buf, __pyx_t_87, __pyx_bstride_0_shells, __pyx_t_88, __pyx_bstride_1_shells))) * __pyx_v_dist);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":348
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":348
* #image[ind,i] += rgba[i]*dist*rgba[3]/dt
* #print rgba[i], image[ind,i], dist, dt
* break # <<<<<<<<<<<<<<
@@ -10256,7 +10256,7 @@
}
__pyx_L27_break:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":349
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":349
* #print rgba[i], image[ind,i], dist, dt
* break
* if (tmax[0] > 1.0) and (tmax[1] > 1.0) and (tmax[2] > 1.0): # <<<<<<<<<<<<<<
@@ -10275,7 +10275,7 @@
}
if (__pyx_t_18) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":350
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":350
* break
* if (tmax[0] > 1.0) and (tmax[1] > 1.0) and (tmax[2] > 1.0):
* dt = 1.0 - enter_t # <<<<<<<<<<<<<<
@@ -10284,7 +10284,7 @@
*/
__pyx_v_dt = (1.0 - __pyx_v_enter_t);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":351
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":351
* if (tmax[0] > 1.0) and (tmax[1] > 1.0) and (tmax[2] > 1.0):
* dt = 1.0 - enter_t
* break # <<<<<<<<<<<<<<
@@ -10296,7 +10296,7 @@
}
__pyx_L29:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":352
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":352
* dt = 1.0 - enter_t
* break
* if tmax[0] < tmax[1]: # <<<<<<<<<<<<<<
@@ -10306,7 +10306,7 @@
__pyx_t_18 = ((__pyx_v_tmax[0]) < (__pyx_v_tmax[1]));
if (__pyx_t_18) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":353
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":353
* break
* if tmax[0] < tmax[1]:
* if tmax[0] < tmax[2]: # <<<<<<<<<<<<<<
@@ -10316,7 +10316,7 @@
__pyx_t_18 = ((__pyx_v_tmax[0]) < (__pyx_v_tmax[2]));
if (__pyx_t_18) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":354
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":354
* if tmax[0] < tmax[1]:
* if tmax[0] < tmax[2]:
* dt = tmax[0] - enter_t # <<<<<<<<<<<<<<
@@ -10325,7 +10325,7 @@
*/
__pyx_v_dt = ((__pyx_v_tmax[0]) - __pyx_v_enter_t);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":355
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":355
* if tmax[0] < tmax[2]:
* dt = tmax[0] - enter_t
* enter_t = tmax[0] # <<<<<<<<<<<<<<
@@ -10334,7 +10334,7 @@
*/
__pyx_v_enter_t = (__pyx_v_tmax[0]);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":356
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":356
* dt = tmax[0] - enter_t
* enter_t = tmax[0]
* tmax[0] += tdelta[0] # <<<<<<<<<<<<<<
@@ -10343,7 +10343,7 @@
*/
(__pyx_v_tmax[0]) += (__pyx_v_tdelta[0]);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":357
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":357
* enter_t = tmax[0]
* tmax[0] += tdelta[0]
* cur_ind[0] += step[0] # <<<<<<<<<<<<<<
@@ -10355,7 +10355,7 @@
}
/*else*/ {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":359
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":359
* cur_ind[0] += step[0]
* else:
* dt = tmax[2] - enter_t # <<<<<<<<<<<<<<
@@ -10364,7 +10364,7 @@
*/
__pyx_v_dt = ((__pyx_v_tmax[2]) - __pyx_v_enter_t);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":360
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":360
* else:
* dt = tmax[2] - enter_t
* enter_t = tmax[2] # <<<<<<<<<<<<<<
@@ -10373,7 +10373,7 @@
*/
__pyx_v_enter_t = (__pyx_v_tmax[2]);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":361
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":361
* dt = tmax[2] - enter_t
* enter_t = tmax[2]
* tmax[2] += tdelta[2] # <<<<<<<<<<<<<<
@@ -10382,7 +10382,7 @@
*/
(__pyx_v_tmax[2]) += (__pyx_v_tdelta[2]);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":362
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":362
* enter_t = tmax[2]
* tmax[2] += tdelta[2]
* cur_ind[2] += step[2] # <<<<<<<<<<<<<<
@@ -10396,7 +10396,7 @@
}
/*else*/ {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":364
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":364
* cur_ind[2] += step[2]
* else:
* if tmax[1] < tmax[2]: # <<<<<<<<<<<<<<
@@ -10406,7 +10406,7 @@
__pyx_t_18 = ((__pyx_v_tmax[1]) < (__pyx_v_tmax[2]));
if (__pyx_t_18) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":365
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":365
* else:
* if tmax[1] < tmax[2]:
* dt = tmax[1] - enter_t # <<<<<<<<<<<<<<
@@ -10415,7 +10415,7 @@
*/
__pyx_v_dt = ((__pyx_v_tmax[1]) - __pyx_v_enter_t);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":366
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":366
* if tmax[1] < tmax[2]:
* dt = tmax[1] - enter_t
* enter_t = tmax[1] # <<<<<<<<<<<<<<
@@ -10424,7 +10424,7 @@
*/
__pyx_v_enter_t = (__pyx_v_tmax[1]);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":367
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":367
* dt = tmax[1] - enter_t
* enter_t = tmax[1]
* tmax[1] += tdelta[1] # <<<<<<<<<<<<<<
@@ -10433,7 +10433,7 @@
*/
(__pyx_v_tmax[1]) += (__pyx_v_tdelta[1]);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":368
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":368
* enter_t = tmax[1]
* tmax[1] += tdelta[1]
* cur_ind[1] += step[1] # <<<<<<<<<<<<<<
@@ -10445,7 +10445,7 @@
}
/*else*/ {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":370
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":370
* cur_ind[1] += step[1]
* else:
* dt = tmax[2] - enter_t # <<<<<<<<<<<<<<
@@ -10454,7 +10454,7 @@
*/
__pyx_v_dt = ((__pyx_v_tmax[2]) - __pyx_v_enter_t);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":371
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":371
* else:
* dt = tmax[2] - enter_t
* enter_t = tmax[2] # <<<<<<<<<<<<<<
@@ -10463,7 +10463,7 @@
*/
__pyx_v_enter_t = (__pyx_v_tmax[2]);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":372
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":372
* dt = tmax[2] - enter_t
* enter_t = tmax[2]
* tmax[2] += tdelta[2] # <<<<<<<<<<<<<<
@@ -10472,7 +10472,7 @@
*/
(__pyx_v_tmax[2]) += (__pyx_v_tdelta[2]);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":373
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":373
* enter_t = tmax[2]
* tmax[2] += tdelta[2]
* cur_ind[2] += step[2] # <<<<<<<<<<<<<<
@@ -10484,7 +10484,7 @@
}
__pyx_L30:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":374
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":374
* tmax[2] += tdelta[2]
* cur_ind[2] += step[2]
* dv = data[cur_ind[0], cur_ind[1], cur_ind[2]] # <<<<<<<<<<<<<<
@@ -10532,7 +10532,7 @@
return __pyx_r;
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":31
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":31
* from stdlib cimport malloc, free, abs
*
* cdef inline int imax(int i0, int i1): # <<<<<<<<<<<<<<
@@ -10545,7 +10545,7 @@
int __pyx_t_1;
__Pyx_SetupRefcountContext("imax");
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":32
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":32
*
* cdef inline int imax(int i0, int i1):
* if i0 > i1: return i0 # <<<<<<<<<<<<<<
@@ -10560,7 +10560,7 @@
}
__pyx_L3:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":33
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":33
* cdef inline int imax(int i0, int i1):
* if i0 > i1: return i0
* return i1 # <<<<<<<<<<<<<<
@@ -10576,7 +10576,7 @@
return __pyx_r;
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":35
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":35
* return i1
*
* cdef inline np.float64_t fmax(np.float64_t f0, np.float64_t f1): # <<<<<<<<<<<<<<
@@ -10589,7 +10589,7 @@
int __pyx_t_1;
__Pyx_SetupRefcountContext("fmax");
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":36
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":36
*
* cdef inline np.float64_t fmax(np.float64_t f0, np.float64_t f1):
* if f0 > f1: return f0 # <<<<<<<<<<<<<<
@@ -10604,7 +10604,7 @@
}
__pyx_L3:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":37
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":37
* cdef inline np.float64_t fmax(np.float64_t f0, np.float64_t f1):
* if f0 > f1: return f0
* return f1 # <<<<<<<<<<<<<<
@@ -10620,7 +10620,7 @@
return __pyx_r;
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":39
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":39
* return f1
*
* cdef inline int imin(int i0, int i1): # <<<<<<<<<<<<<<
@@ -10633,7 +10633,7 @@
int __pyx_t_1;
__Pyx_SetupRefcountContext("imin");
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":40
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":40
*
* cdef inline int imin(int i0, int i1):
* if i0 < i1: return i0 # <<<<<<<<<<<<<<
@@ -10648,7 +10648,7 @@
}
__pyx_L3:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":41
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":41
* cdef inline int imin(int i0, int i1):
* if i0 < i1: return i0
* return i1 # <<<<<<<<<<<<<<
@@ -10664,7 +10664,7 @@
return __pyx_r;
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":43
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":43
* return i1
*
* cdef inline np.float64_t fmin(np.float64_t f0, np.float64_t f1): # <<<<<<<<<<<<<<
@@ -10677,7 +10677,7 @@
int __pyx_t_1;
__Pyx_SetupRefcountContext("fmin");
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":44
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":44
*
* cdef inline np.float64_t fmin(np.float64_t f0, np.float64_t f1):
* if f0 < f1: return f0 # <<<<<<<<<<<<<<
@@ -10692,7 +10692,7 @@
}
__pyx_L3:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":45
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":45
* cdef inline np.float64_t fmin(np.float64_t f0, np.float64_t f1):
* if f0 < f1: return f0
* return f1 # <<<<<<<<<<<<<<
@@ -10708,7 +10708,7 @@
return __pyx_r;
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":47
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":47
* return f1
*
* cdef inline int iclip(int i, int a, int b): # <<<<<<<<<<<<<<
@@ -10720,7 +10720,7 @@
int __pyx_r;
__Pyx_SetupRefcountContext("iclip");
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":48
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":48
*
* cdef inline int iclip(int i, int a, int b):
* return imin(imax(i, a), b) # <<<<<<<<<<<<<<
@@ -10736,7 +10736,7 @@
return __pyx_r;
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":50
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":50
* return imin(imax(i, a), b)
*
* cdef inline np.float64_t fclip(np.float64_t f, # <<<<<<<<<<<<<<
@@ -10748,7 +10748,7 @@
__pyx_t_5numpy_float64_t __pyx_r;
__Pyx_SetupRefcountContext("fclip");
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":52
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":52
* cdef inline np.float64_t fclip(np.float64_t f,
* np.float64_t a, np.float64_t b):
* return fmin(fmax(f, a), b) # <<<<<<<<<<<<<<
@@ -10764,7 +10764,7 @@
return __pyx_r;
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":83
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":83
* cdef int use_light
* cdef public object tf_obj
* def __cinit__(self, tf_obj): # <<<<<<<<<<<<<<
@@ -10829,7 +10829,7 @@
__pyx_v_i = Py_None; __Pyx_INCREF(Py_None);
__pyx_bstruct_temp.buf = NULL;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":84
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":84
* cdef public object tf_obj
* def __cinit__(self, tf_obj):
* self.tf_obj = tf_obj # <<<<<<<<<<<<<<
@@ -10842,7 +10842,7 @@
__Pyx_DECREF(((struct __pyx_obj_2yt_9amr_utils_TransferFunctionProxy *)__pyx_v_self)->tf_obj);
((struct __pyx_obj_2yt_9amr_utils_TransferFunctionProxy *)__pyx_v_self)->tf_obj = __pyx_v_tf_obj;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":86
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":86
* self.tf_obj = tf_obj
* cdef np.ndarray[np.float64_t, ndim=1] temp
* temp = tf_obj.red.y # <<<<<<<<<<<<<<
@@ -10878,7 +10878,7 @@
__pyx_v_temp = ((PyArrayObject *)__pyx_t_2);
__pyx_t_2 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":87
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":87
* cdef np.ndarray[np.float64_t, ndim=1] temp
* temp = tf_obj.red.y
* self.vs[0] = <np.float64_t *> temp.data # <<<<<<<<<<<<<<
@@ -10887,7 +10887,7 @@
*/
(((struct __pyx_obj_2yt_9amr_utils_TransferFunctionProxy *)__pyx_v_self)->vs[0]) = ((__pyx_t_5numpy_float64_t *)__pyx_v_temp->data);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":88
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":88
* temp = tf_obj.red.y
* self.vs[0] = <np.float64_t *> temp.data
* temp = tf_obj.green.y # <<<<<<<<<<<<<<
@@ -10923,7 +10923,7 @@
__pyx_v_temp = ((PyArrayObject *)__pyx_t_1);
__pyx_t_1 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":89
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":89
* self.vs[0] = <np.float64_t *> temp.data
* temp = tf_obj.green.y
* self.vs[1] = <np.float64_t *> temp.data # <<<<<<<<<<<<<<
@@ -10932,7 +10932,7 @@
*/
(((struct __pyx_obj_2yt_9amr_utils_TransferFunctionProxy *)__pyx_v_self)->vs[1]) = ((__pyx_t_5numpy_float64_t *)__pyx_v_temp->data);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":90
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":90
* temp = tf_obj.green.y
* self.vs[1] = <np.float64_t *> temp.data
* temp = tf_obj.blue.y # <<<<<<<<<<<<<<
@@ -10968,7 +10968,7 @@
__pyx_v_temp = ((PyArrayObject *)__pyx_t_2);
__pyx_t_2 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":91
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":91
* self.vs[1] = <np.float64_t *> temp.data
* temp = tf_obj.blue.y
* self.vs[2] = <np.float64_t *> temp.data # <<<<<<<<<<<<<<
@@ -10977,7 +10977,7 @@
*/
(((struct __pyx_obj_2yt_9amr_utils_TransferFunctionProxy *)__pyx_v_self)->vs[2]) = ((__pyx_t_5numpy_float64_t *)__pyx_v_temp->data);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":92
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":92
* temp = tf_obj.blue.y
* self.vs[2] = <np.float64_t *> temp.data
* temp = tf_obj.alpha.y # <<<<<<<<<<<<<<
@@ -11013,7 +11013,7 @@
__pyx_v_temp = ((PyArrayObject *)__pyx_t_1);
__pyx_t_1 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":93
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":93
* self.vs[2] = <np.float64_t *> temp.data
* temp = tf_obj.alpha.y
* self.vs[3] = <np.float64_t *> temp.data # <<<<<<<<<<<<<<
@@ -11022,7 +11022,7 @@
*/
(((struct __pyx_obj_2yt_9amr_utils_TransferFunctionProxy *)__pyx_v_self)->vs[3]) = ((__pyx_t_5numpy_float64_t *)__pyx_v_temp->data);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":94
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":94
* temp = tf_obj.alpha.y
* self.vs[3] = <np.float64_t *> temp.data
* self.x_bounds[0] = tf_obj.x_bounds[0] # <<<<<<<<<<<<<<
@@ -11038,7 +11038,7 @@
__Pyx_DECREF(__pyx_1); __pyx_1 = 0;
(((struct __pyx_obj_2yt_9amr_utils_TransferFunctionProxy *)__pyx_v_self)->x_bounds[0]) = __pyx_t_8;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":95
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":95
* self.vs[3] = <np.float64_t *> temp.data
* self.x_bounds[0] = tf_obj.x_bounds[0]
* self.x_bounds[1] = tf_obj.x_bounds[1] # <<<<<<<<<<<<<<
@@ -11054,7 +11054,7 @@
__Pyx_DECREF(__pyx_1); __pyx_1 = 0;
(((struct __pyx_obj_2yt_9amr_utils_TransferFunctionProxy *)__pyx_v_self)->x_bounds[1]) = __pyx_t_8;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":96
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":96
* self.x_bounds[0] = tf_obj.x_bounds[0]
* self.x_bounds[1] = tf_obj.x_bounds[1]
* self.nbins = tf_obj.nbins # <<<<<<<<<<<<<<
@@ -11067,7 +11067,7 @@
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
((struct __pyx_obj_2yt_9amr_utils_TransferFunctionProxy *)__pyx_v_self)->nbins = __pyx_t_4;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":97
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":97
* self.x_bounds[1] = tf_obj.x_bounds[1]
* self.nbins = tf_obj.nbins
* self.dbin = (self.x_bounds[1] - self.x_bounds[0])/self.nbins # <<<<<<<<<<<<<<
@@ -11076,7 +11076,7 @@
*/
((struct __pyx_obj_2yt_9amr_utils_TransferFunctionProxy *)__pyx_v_self)->dbin = (((((struct __pyx_obj_2yt_9amr_utils_TransferFunctionProxy *)__pyx_v_self)->x_bounds[1]) - (((struct __pyx_obj_2yt_9amr_utils_TransferFunctionProxy *)__pyx_v_self)->x_bounds[0])) / ((struct __pyx_obj_2yt_9amr_utils_TransferFunctionProxy *)__pyx_v_self)->nbins);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":98
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":98
* self.nbins = tf_obj.nbins
* self.dbin = (self.x_bounds[1] - self.x_bounds[0])/self.nbins
* self.light_color[0] = tf_obj.light_color[0] # <<<<<<<<<<<<<<
@@ -11092,7 +11092,7 @@
__Pyx_DECREF(__pyx_1); __pyx_1 = 0;
(((struct __pyx_obj_2yt_9amr_utils_TransferFunctionProxy *)__pyx_v_self)->light_color[0]) = __pyx_t_8;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":99
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":99
* self.dbin = (self.x_bounds[1] - self.x_bounds[0])/self.nbins
* self.light_color[0] = tf_obj.light_color[0]
* self.light_color[1] = tf_obj.light_color[1] # <<<<<<<<<<<<<<
@@ -11108,7 +11108,7 @@
__Pyx_DECREF(__pyx_1); __pyx_1 = 0;
(((struct __pyx_obj_2yt_9amr_utils_TransferFunctionProxy *)__pyx_v_self)->light_color[1]) = __pyx_t_8;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":100
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":100
* self.light_color[0] = tf_obj.light_color[0]
* self.light_color[1] = tf_obj.light_color[1]
* self.light_color[2] = tf_obj.light_color[2] # <<<<<<<<<<<<<<
@@ -11124,7 +11124,7 @@
__Pyx_DECREF(__pyx_1); __pyx_1 = 0;
(((struct __pyx_obj_2yt_9amr_utils_TransferFunctionProxy *)__pyx_v_self)->light_color[2]) = __pyx_t_8;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":101
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":101
* self.light_color[1] = tf_obj.light_color[1]
* self.light_color[2] = tf_obj.light_color[2]
* self.light_dir[0] = tf_obj.light_dir[0] # <<<<<<<<<<<<<<
@@ -11140,7 +11140,7 @@
__Pyx_DECREF(__pyx_1); __pyx_1 = 0;
(((struct __pyx_obj_2yt_9amr_utils_TransferFunctionProxy *)__pyx_v_self)->light_dir[0]) = __pyx_t_8;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":102
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":102
* self.light_color[2] = tf_obj.light_color[2]
* self.light_dir[0] = tf_obj.light_dir[0]
* self.light_dir[1] = tf_obj.light_dir[1] # <<<<<<<<<<<<<<
@@ -11156,7 +11156,7 @@
__Pyx_DECREF(__pyx_1); __pyx_1 = 0;
(((struct __pyx_obj_2yt_9amr_utils_TransferFunctionProxy *)__pyx_v_self)->light_dir[1]) = __pyx_t_8;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":103
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":103
* self.light_dir[0] = tf_obj.light_dir[0]
* self.light_dir[1] = tf_obj.light_dir[1]
* self.light_dir[2] = tf_obj.light_dir[2] # <<<<<<<<<<<<<<
@@ -11172,7 +11172,7 @@
__Pyx_DECREF(__pyx_1); __pyx_1 = 0;
(((struct __pyx_obj_2yt_9amr_utils_TransferFunctionProxy *)__pyx_v_self)->light_dir[2]) = __pyx_t_8;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":104
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":104
* self.light_dir[1] = tf_obj.light_dir[1]
* self.light_dir[2] = tf_obj.light_dir[2]
* cdef np.float64_t normval = 0.0 # <<<<<<<<<<<<<<
@@ -11181,7 +11181,7 @@
*/
__pyx_v_normval = 0.0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":105
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":105
* self.light_dir[2] = tf_obj.light_dir[2]
* cdef np.float64_t normval = 0.0
* for i in range(3): normval += self.light_dir[i]**2 # <<<<<<<<<<<<<<
@@ -11226,7 +11226,7 @@
}
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":106
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":106
* cdef np.float64_t normval = 0.0
* for i in range(3): normval += self.light_dir[i]**2
* normval = normval**0.5 # <<<<<<<<<<<<<<
@@ -11235,7 +11235,7 @@
*/
__pyx_v_normval = pow(__pyx_v_normval, 0.5);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":107
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":107
* for i in range(3): normval += self.light_dir[i]**2
* normval = normval**0.5
* for i in range(3): self.light_dir[i] /= normval # <<<<<<<<<<<<<<
@@ -11280,7 +11280,7 @@
}
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":108
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":108
* normval = normval**0.5
* for i in range(3): self.light_dir[i] /= normval
* self.use_light = tf_obj.use_light # <<<<<<<<<<<<<<
@@ -11315,7 +11315,7 @@
return __pyx_r;
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":110
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":110
* self.use_light = tf_obj.use_light
*
* cdef void eval_transfer(self, np.float64_t dt, np.float64_t dv, # <<<<<<<<<<<<<<
@@ -11336,7 +11336,7 @@
int __pyx_t_1;
__Pyx_SetupRefcountContext("eval_transfer");
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":115
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":115
* cdef int bin_id
* cdef np.float64_t tf, trgba[4], bv, dx, dy, dd, ta, dot_prod
* dx = self.dbin # <<<<<<<<<<<<<<
@@ -11345,7 +11345,7 @@
*/
__pyx_v_dx = __pyx_v_self->dbin;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":120
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":120
* # First locate our points
* bin_id = iclip(<int> floor((dv - self.x_bounds[0]) / dx),
* 0, self.nbins-2) # <<<<<<<<<<<<<<
@@ -11354,7 +11354,7 @@
*/
__pyx_v_bin_id = __pyx_f_2yt_9amr_utils_iclip(((int)floor(((__pyx_v_dv - (__pyx_v_self->x_bounds[0])) / __pyx_v_dx))), 0, (__pyx_v_self->nbins - 2));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":122
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":122
* 0, self.nbins-2)
* # Recall that linear interpolation is y0 + (x-x0) * dx/dy
* bv = self.vs[3][bin_id] # This is x0 # <<<<<<<<<<<<<<
@@ -11363,7 +11363,7 @@
*/
__pyx_v_bv = ((__pyx_v_self->vs[3])[__pyx_v_bin_id]);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":123
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":123
* # Recall that linear interpolation is y0 + (x-x0) * dx/dy
* bv = self.vs[3][bin_id] # This is x0
* dy = self.vs[3][bin_id+1]-bv # dy # <<<<<<<<<<<<<<
@@ -11372,7 +11372,7 @@
*/
__pyx_v_dy = (((__pyx_v_self->vs[3])[(__pyx_v_bin_id + 1)]) - __pyx_v_bv);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":124
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":124
* bv = self.vs[3][bin_id] # This is x0
* dy = self.vs[3][bin_id+1]-bv # dy
* dd = dv-(self.x_bounds[0] + bin_id * dx) # x - x0 # <<<<<<<<<<<<<<
@@ -11381,7 +11381,7 @@
*/
__pyx_v_dd = (__pyx_v_dv - ((__pyx_v_self->x_bounds[0]) + (__pyx_v_bin_id * __pyx_v_dx)));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":126
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":126
* dd = dv-(self.x_bounds[0] + bin_id * dx) # x - x0
* # This is our final value for transfer function on the entering face
* tf = bv+dd*(dy/dx) # <<<<<<<<<<<<<<
@@ -11390,7 +11390,7 @@
*/
__pyx_v_tf = (__pyx_v_bv + (__pyx_v_dd * (__pyx_v_dy / __pyx_v_dx)));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":127
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":127
* # This is our final value for transfer function on the entering face
* tf = bv+dd*(dy/dx)
* ta = tf # Store the source alpha # <<<<<<<<<<<<<<
@@ -11399,7 +11399,7 @@
*/
__pyx_v_ta = __pyx_v_tf;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":128
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":128
* tf = bv+dd*(dy/dx)
* ta = tf # Store the source alpha
* dot_prod = 0.0 # <<<<<<<<<<<<<<
@@ -11408,7 +11408,7 @@
*/
__pyx_v_dot_prod = 0.0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":129
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":129
* ta = tf # Store the source alpha
* dot_prod = 0.0
* for i in range(3): # <<<<<<<<<<<<<<
@@ -11418,7 +11418,7 @@
for (__pyx_t_1 = 0; __pyx_t_1 < 3; __pyx_t_1+=1) {
__pyx_v_i = __pyx_t_1;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":130
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":130
* dot_prod = 0.0
* for i in range(3):
* dot_prod += self.light_dir[i] * grad[i] # <<<<<<<<<<<<<<
@@ -11428,7 +11428,7 @@
__pyx_v_dot_prod += ((__pyx_v_self->light_dir[__pyx_v_i]) * (__pyx_v_grad[__pyx_v_i]));
}
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":132
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":132
* dot_prod += self.light_dir[i] * grad[i]
* #print dot_prod, grad[0], grad[1], grad[2]
* dot_prod = fmax(0.0, dot_prod) # <<<<<<<<<<<<<<
@@ -11437,7 +11437,7 @@
*/
__pyx_v_dot_prod = __pyx_f_2yt_9amr_utils_fmax(0.0, __pyx_v_dot_prod);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":133
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":133
* #print dot_prod, grad[0], grad[1], grad[2]
* dot_prod = fmax(0.0, dot_prod)
* for i in range(3): # <<<<<<<<<<<<<<
@@ -11447,7 +11447,7 @@
for (__pyx_t_1 = 0; __pyx_t_1 < 3; __pyx_t_1+=1) {
__pyx_v_i = __pyx_t_1;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":135
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":135
* for i in range(3):
* # Recall that linear interpolation is y0 + (x-x0) * dx/dy
* bv = self.vs[i][bin_id] # This is x0 # <<<<<<<<<<<<<<
@@ -11456,7 +11456,7 @@
*/
__pyx_v_bv = ((__pyx_v_self->vs[__pyx_v_i])[__pyx_v_bin_id]);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":136
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":136
* # Recall that linear interpolation is y0 + (x-x0) * dx/dy
* bv = self.vs[i][bin_id] # This is x0
* dy = self.vs[i][bin_id+1]-bv # dy # <<<<<<<<<<<<<<
@@ -11465,7 +11465,7 @@
*/
__pyx_v_dy = (((__pyx_v_self->vs[__pyx_v_i])[(__pyx_v_bin_id + 1)]) - __pyx_v_bv);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":137
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":137
* bv = self.vs[i][bin_id] # This is x0
* dy = self.vs[i][bin_id+1]-bv # dy
* dd = dv-(self.x_bounds[0] + bin_id * dx) # x - x0 # <<<<<<<<<<<<<<
@@ -11474,7 +11474,7 @@
*/
__pyx_v_dd = (__pyx_v_dv - ((__pyx_v_self->x_bounds[0]) + (__pyx_v_bin_id * __pyx_v_dx)));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":139
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":139
* dd = dv-(self.x_bounds[0] + bin_id * dx) # x - x0
* # This is our final value for transfer function on the entering face
* tf = bv+dd*(dy/dx) + dot_prod * self.light_color[i] # <<<<<<<<<<<<<<
@@ -11483,7 +11483,7 @@
*/
__pyx_v_tf = ((__pyx_v_bv + (__pyx_v_dd * (__pyx_v_dy / __pyx_v_dx))) + (__pyx_v_dot_prod * (__pyx_v_self->light_color[__pyx_v_i])));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":141
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":141
* tf = bv+dd*(dy/dx) + dot_prod * self.light_color[i]
* # alpha blending
* rgba[i] += (1. - rgba[3])*ta*tf*dt # <<<<<<<<<<<<<<
@@ -11493,7 +11493,7 @@
(__pyx_v_rgba[__pyx_v_i]) += ((((1.0 - (__pyx_v_rgba[3])) * __pyx_v_ta) * __pyx_v_tf) * __pyx_v_dt);
}
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":143
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":143
* rgba[i] += (1. - rgba[3])*ta*tf*dt
* #update alpha
* rgba[3] += (1. - rgba[3])*ta*dt # <<<<<<<<<<<<<<
@@ -11505,7 +11505,7 @@
__Pyx_FinishRefcountContext();
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":157
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":157
* cdef np.float64_t *x_vec, *y_vec
*
* def __cinit__(self, # <<<<<<<<<<<<<<
@@ -11688,7 +11688,7 @@
__pyx_bstride_0_y_vec = __pyx_bstruct_y_vec.strides[0];
__pyx_bshape_0_y_vec = __pyx_bstruct_y_vec.shape[0];
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":166
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":166
* np.ndarray[np.float64_t, ndim=1] y_vec):
* cdef int i, j
* self.avp_pos = vp_pos # <<<<<<<<<<<<<<
@@ -11701,7 +11701,7 @@
__Pyx_DECREF(((struct __pyx_obj_2yt_9amr_utils_VectorPlane *)__pyx_v_self)->avp_pos);
((struct __pyx_obj_2yt_9amr_utils_VectorPlane *)__pyx_v_self)->avp_pos = ((PyObject *)__pyx_v_vp_pos);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":167
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":167
* cdef int i, j
* self.avp_pos = vp_pos
* self.avp_dir = vp_dir # <<<<<<<<<<<<<<
@@ -11714,7 +11714,7 @@
__Pyx_DECREF(((struct __pyx_obj_2yt_9amr_utils_VectorPlane *)__pyx_v_self)->avp_dir);
((struct __pyx_obj_2yt_9amr_utils_VectorPlane *)__pyx_v_self)->avp_dir = ((PyObject *)__pyx_v_vp_dir);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":168
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":168
* self.avp_pos = vp_pos
* self.avp_dir = vp_dir
* self.acenter = center # <<<<<<<<<<<<<<
@@ -11727,7 +11727,7 @@
__Pyx_DECREF(((struct __pyx_obj_2yt_9amr_utils_VectorPlane *)__pyx_v_self)->acenter);
((struct __pyx_obj_2yt_9amr_utils_VectorPlane *)__pyx_v_self)->acenter = ((PyObject *)__pyx_v_center);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":169
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":169
* self.avp_dir = vp_dir
* self.acenter = center
* self.aimage = image # <<<<<<<<<<<<<<
@@ -11740,7 +11740,7 @@
__Pyx_DECREF(((struct __pyx_obj_2yt_9amr_utils_VectorPlane *)__pyx_v_self)->aimage);
((struct __pyx_obj_2yt_9amr_utils_VectorPlane *)__pyx_v_self)->aimage = ((PyObject *)__pyx_v_image);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":170
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":170
* self.acenter = center
* self.aimage = image
* self.ax_vec = x_vec # <<<<<<<<<<<<<<
@@ -11753,7 +11753,7 @@
__Pyx_DECREF(((struct __pyx_obj_2yt_9amr_utils_VectorPlane *)__pyx_v_self)->ax_vec);
((struct __pyx_obj_2yt_9amr_utils_VectorPlane *)__pyx_v_self)->ax_vec = ((PyObject *)__pyx_v_x_vec);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":171
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":171
* self.aimage = image
* self.ax_vec = x_vec
* self.ay_vec = y_vec # <<<<<<<<<<<<<<
@@ -11766,7 +11766,7 @@
__Pyx_DECREF(((struct __pyx_obj_2yt_9amr_utils_VectorPlane *)__pyx_v_self)->ay_vec);
((struct __pyx_obj_2yt_9amr_utils_VectorPlane *)__pyx_v_self)->ay_vec = ((PyObject *)__pyx_v_y_vec);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":172
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":172
* self.ax_vec = x_vec
* self.ay_vec = y_vec
* self.vp_pos = <np.float64_t *> vp_pos.data # <<<<<<<<<<<<<<
@@ -11775,7 +11775,7 @@
*/
((struct __pyx_obj_2yt_9amr_utils_VectorPlane *)__pyx_v_self)->vp_pos = ((__pyx_t_5numpy_float64_t *)__pyx_v_vp_pos->data);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":173
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":173
* self.ay_vec = y_vec
* self.vp_pos = <np.float64_t *> vp_pos.data
* self.vp_dir = <np.float64_t *> vp_dir.data # <<<<<<<<<<<<<<
@@ -11784,7 +11784,7 @@
*/
((struct __pyx_obj_2yt_9amr_utils_VectorPlane *)__pyx_v_self)->vp_dir = ((__pyx_t_5numpy_float64_t *)__pyx_v_vp_dir->data);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":174
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":174
* self.vp_pos = <np.float64_t *> vp_pos.data
* self.vp_dir = <np.float64_t *> vp_dir.data
* self.center = <np.float64_t *> center.data # <<<<<<<<<<<<<<
@@ -11793,7 +11793,7 @@
*/
((struct __pyx_obj_2yt_9amr_utils_VectorPlane *)__pyx_v_self)->center = ((__pyx_t_5numpy_float64_t *)__pyx_v_center->data);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":175
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":175
* self.vp_dir = <np.float64_t *> vp_dir.data
* self.center = <np.float64_t *> center.data
* self.image = <np.float64_t *> image.data # <<<<<<<<<<<<<<
@@ -11802,7 +11802,7 @@
*/
((struct __pyx_obj_2yt_9amr_utils_VectorPlane *)__pyx_v_self)->image = ((__pyx_t_5numpy_float64_t *)__pyx_v_image->data);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":176
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":176
* self.center = <np.float64_t *> center.data
* self.image = <np.float64_t *> image.data
* self.x_vec = <np.float64_t *> x_vec.data # <<<<<<<<<<<<<<
@@ -11811,7 +11811,7 @@
*/
((struct __pyx_obj_2yt_9amr_utils_VectorPlane *)__pyx_v_self)->x_vec = ((__pyx_t_5numpy_float64_t *)__pyx_v_x_vec->data);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":177
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":177
* self.image = <np.float64_t *> image.data
* self.x_vec = <np.float64_t *> x_vec.data
* self.y_vec = <np.float64_t *> y_vec.data # <<<<<<<<<<<<<<
@@ -11820,7 +11820,7 @@
*/
((struct __pyx_obj_2yt_9amr_utils_VectorPlane *)__pyx_v_self)->y_vec = ((__pyx_t_5numpy_float64_t *)__pyx_v_y_vec->data);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":178
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":178
* self.x_vec = <np.float64_t *> x_vec.data
* self.y_vec = <np.float64_t *> y_vec.data
* self.nv = vp_pos.shape[0] # <<<<<<<<<<<<<<
@@ -11829,7 +11829,7 @@
*/
((struct __pyx_obj_2yt_9amr_utils_VectorPlane *)__pyx_v_self)->nv = (__pyx_v_vp_pos->dimensions[0]);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":179
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":179
* self.y_vec = <np.float64_t *> y_vec.data
* self.nv = vp_pos.shape[0]
* for i in range(4): self.bounds[i] = bounds[i] # <<<<<<<<<<<<<<
@@ -11845,7 +11845,7 @@
(((struct __pyx_obj_2yt_9amr_utils_VectorPlane *)__pyx_v_self)->bounds[__pyx_v_i]) = __pyx_t_2;
}
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":180
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":180
* self.nv = vp_pos.shape[0]
* for i in range(4): self.bounds[i] = bounds[i]
* self.pdx = (self.bounds[1] - self.bounds[0])/self.nv # <<<<<<<<<<<<<<
@@ -11854,7 +11854,7 @@
*/
((struct __pyx_obj_2yt_9amr_utils_VectorPlane *)__pyx_v_self)->pdx = (((((struct __pyx_obj_2yt_9amr_utils_VectorPlane *)__pyx_v_self)->bounds[1]) - (((struct __pyx_obj_2yt_9amr_utils_VectorPlane *)__pyx_v_self)->bounds[0])) / ((struct __pyx_obj_2yt_9amr_utils_VectorPlane *)__pyx_v_self)->nv);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":181
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":181
* for i in range(4): self.bounds[i] = bounds[i]
* self.pdx = (self.bounds[1] - self.bounds[0])/self.nv
* self.pdy = (self.bounds[3] - self.bounds[2])/self.nv # <<<<<<<<<<<<<<
@@ -11891,7 +11891,7 @@
return __pyx_r;
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":183
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":183
* self.pdy = (self.bounds[3] - self.bounds[2])/self.nv
*
* cdef void get_start_stop(self, np.float64_t *ex, int *rv): # <<<<<<<<<<<<<<
@@ -11911,7 +11911,7 @@
__Pyx_SetupRefcountContext("get_start_stop");
__pyx_v_i = Py_None; __Pyx_INCREF(Py_None);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":186
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":186
* # Extrema need to be re-centered
* cdef np.float64_t cx, cy
* cx = cy = 0.0 # <<<<<<<<<<<<<<
@@ -11921,7 +11921,7 @@
__pyx_v_cx = 0.0;
__pyx_v_cy = 0.0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":187
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":187
* cdef np.float64_t cx, cy
* cx = cy = 0.0
* for i in range(3): # <<<<<<<<<<<<<<
@@ -11962,7 +11962,7 @@
__pyx_v_i = __pyx_t_3;
__pyx_t_3 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":188
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":188
* cx = cy = 0.0
* for i in range(3):
* cx += self.center[i] * self.x_vec[i] # <<<<<<<<<<<<<<
@@ -11973,7 +11973,7 @@
__pyx_t_5 = __Pyx_PyIndex_AsSsize_t(__pyx_v_i); if (unlikely((__pyx_t_5 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 188; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__pyx_v_cx += ((__pyx_v_self->center[__pyx_t_4]) * (__pyx_v_self->x_vec[__pyx_t_5]));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":189
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":189
* for i in range(3):
* cx += self.center[i] * self.x_vec[i]
* cy += self.center[i] * self.y_vec[i] # <<<<<<<<<<<<<<
@@ -11986,7 +11986,7 @@
}
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":190
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":190
* cx += self.center[i] * self.x_vec[i]
* cy += self.center[i] * self.y_vec[i]
* rv[0] = <int> floor((ex[0] - cx - self.bounds[0])/self.pdx) # <<<<<<<<<<<<<<
@@ -11995,7 +11995,7 @@
*/
(__pyx_v_rv[0]) = ((int)floor(((((__pyx_v_ex[0]) - __pyx_v_cx) - (__pyx_v_self->bounds[0])) / __pyx_v_self->pdx)));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":191
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":191
* cy += self.center[i] * self.y_vec[i]
* rv[0] = <int> floor((ex[0] - cx - self.bounds[0])/self.pdx)
* rv[1] = rv[0] + <int> ceil((ex[1] - ex[0])/self.pdx) # <<<<<<<<<<<<<<
@@ -12004,7 +12004,7 @@
*/
(__pyx_v_rv[1]) = ((__pyx_v_rv[0]) + ((int)ceil((((__pyx_v_ex[1]) - (__pyx_v_ex[0])) / __pyx_v_self->pdx))));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":192
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":192
* rv[0] = <int> floor((ex[0] - cx - self.bounds[0])/self.pdx)
* rv[1] = rv[0] + <int> ceil((ex[1] - ex[0])/self.pdx)
* rv[2] = <int> floor((ex[2] - cy - self.bounds[2])/self.pdy) # <<<<<<<<<<<<<<
@@ -12013,7 +12013,7 @@
*/
(__pyx_v_rv[2]) = ((int)floor(((((__pyx_v_ex[2]) - __pyx_v_cy) - (__pyx_v_self->bounds[2])) / __pyx_v_self->pdy)));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":193
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":193
* rv[1] = rv[0] + <int> ceil((ex[1] - ex[0])/self.pdx)
* rv[2] = <int> floor((ex[2] - cy - self.bounds[2])/self.pdy)
* rv[3] = rv[2] + <int> ceil((ex[3] - ex[2])/self.pdy) # <<<<<<<<<<<<<<
@@ -12032,7 +12032,7 @@
__Pyx_FinishRefcountContext();
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":195
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":195
* rv[3] = rv[2] + <int> ceil((ex[3] - ex[2])/self.pdy)
*
* cdef inline void copy_into(self, np.float64_t *fv, np.float64_t *tv, # <<<<<<<<<<<<<<
@@ -12045,7 +12045,7 @@
int __pyx_t_1;
__Pyx_SetupRefcountContext("copy_into");
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":200
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":200
* # to-vector is flat and 'ni' long
* cdef int k
* for k in range(nk): # <<<<<<<<<<<<<<
@@ -12055,7 +12055,7 @@
for (__pyx_t_1 = 0; __pyx_t_1 < __pyx_v_nk; __pyx_t_1+=1) {
__pyx_v_k = __pyx_t_1;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":201
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":201
* cdef int k
* for k in range(nk):
* tv[k] = fv[(((k*self.nv)+j)*self.nv+i)] # <<<<<<<<<<<<<<
@@ -12068,7 +12068,7 @@
__Pyx_FinishRefcountContext();
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":203
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":203
* tv[k] = fv[(((k*self.nv)+j)*self.nv+i)]
*
* cdef inline void copy_back(self, np.float64_t *fv, np.float64_t *tv, # <<<<<<<<<<<<<<
@@ -12081,7 +12081,7 @@
int __pyx_t_1;
__Pyx_SetupRefcountContext("copy_back");
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":206
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":206
* int i, int j, int nk):
* cdef int k
* for k in range(nk): # <<<<<<<<<<<<<<
@@ -12091,7 +12091,7 @@
for (__pyx_t_1 = 0; __pyx_t_1 < __pyx_v_nk; __pyx_t_1+=1) {
__pyx_v_k = __pyx_t_1;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":207
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":207
* cdef int k
* for k in range(nk):
* tv[(((k*self.nv)+j)*self.nv+i)] = fv[k] # <<<<<<<<<<<<<<
@@ -12104,7 +12104,7 @@
__Pyx_FinishRefcountContext();
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":223
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":223
* @cython.boundscheck(False)
* @cython.wraparound(False)
* def __cinit__(self, # <<<<<<<<<<<<<<
@@ -12233,7 +12233,7 @@
__pyx_bstride_0_dims = __pyx_bstruct_dims.strides[0];
__pyx_bshape_0_dims = __pyx_bstruct_dims.shape[0];
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":230
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":230
* # The data is likely brought in via a slice, so we copy it
* cdef int i, j, k, size
* self.LeftEdge = left_edge # <<<<<<<<<<<<<<
@@ -12246,7 +12246,7 @@
__Pyx_DECREF(((struct __pyx_obj_2yt_9amr_utils_PartitionedGrid *)__pyx_v_self)->LeftEdge);
((struct __pyx_obj_2yt_9amr_utils_PartitionedGrid *)__pyx_v_self)->LeftEdge = ((PyObject *)__pyx_v_left_edge);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":231
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":231
* cdef int i, j, k, size
* self.LeftEdge = left_edge
* self.RightEdge = right_edge # <<<<<<<<<<<<<<
@@ -12259,7 +12259,7 @@
__Pyx_DECREF(((struct __pyx_obj_2yt_9amr_utils_PartitionedGrid *)__pyx_v_self)->RightEdge);
((struct __pyx_obj_2yt_9amr_utils_PartitionedGrid *)__pyx_v_self)->RightEdge = ((PyObject *)__pyx_v_right_edge);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":232
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":232
* self.LeftEdge = left_edge
* self.RightEdge = right_edge
* for i in range(3): # <<<<<<<<<<<<<<
@@ -12269,7 +12269,7 @@
for (__pyx_t_1 = 0; __pyx_t_1 < 3; __pyx_t_1+=1) {
__pyx_v_i = __pyx_t_1;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":233
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":233
* self.RightEdge = right_edge
* for i in range(3):
* self.left_edge[i] = left_edge[i] # <<<<<<<<<<<<<<
@@ -12279,7 +12279,7 @@
__pyx_t_2 = __pyx_v_i;
(((struct __pyx_obj_2yt_9amr_utils_PartitionedGrid *)__pyx_v_self)->left_edge[__pyx_v_i]) = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_left_edge.buf, __pyx_t_2, __pyx_bstride_0_left_edge));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":234
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":234
* for i in range(3):
* self.left_edge[i] = left_edge[i]
* self.right_edge[i] = right_edge[i] # <<<<<<<<<<<<<<
@@ -12289,7 +12289,7 @@
__pyx_t_3 = __pyx_v_i;
(((struct __pyx_obj_2yt_9amr_utils_PartitionedGrid *)__pyx_v_self)->right_edge[__pyx_v_i]) = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_right_edge.buf, __pyx_t_3, __pyx_bstride_0_right_edge));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":235
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":235
* self.left_edge[i] = left_edge[i]
* self.right_edge[i] = right_edge[i]
* self.dims[i] = dims[i] # <<<<<<<<<<<<<<
@@ -12299,7 +12299,7 @@
__pyx_t_4 = __pyx_v_i;
(((struct __pyx_obj_2yt_9amr_utils_PartitionedGrid *)__pyx_v_self)->dims[__pyx_v_i]) = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_dims.buf, __pyx_t_4, __pyx_bstride_0_dims));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":236
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":236
* self.right_edge[i] = right_edge[i]
* self.dims[i] = dims[i]
* self.dds[i] = (self.right_edge[i] - self.left_edge[i])/dims[i] # <<<<<<<<<<<<<<
@@ -12310,7 +12310,7 @@
(((struct __pyx_obj_2yt_9amr_utils_PartitionedGrid *)__pyx_v_self)->dds[__pyx_v_i]) = (((((struct __pyx_obj_2yt_9amr_utils_PartitionedGrid *)__pyx_v_self)->right_edge[__pyx_v_i]) - (((struct __pyx_obj_2yt_9amr_utils_PartitionedGrid *)__pyx_v_self)->left_edge[__pyx_v_i])) / (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_dims.buf, __pyx_t_5, __pyx_bstride_0_dims)));
}
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":237
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":237
* self.dims[i] = dims[i]
* self.dds[i] = (self.right_edge[i] - self.left_edge[i])/dims[i]
* self.my_data = data # <<<<<<<<<<<<<<
@@ -12323,7 +12323,7 @@
__Pyx_DECREF(((struct __pyx_obj_2yt_9amr_utils_PartitionedGrid *)__pyx_v_self)->my_data);
((struct __pyx_obj_2yt_9amr_utils_PartitionedGrid *)__pyx_v_self)->my_data = ((PyObject *)__pyx_v_data);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":238
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":238
* self.dds[i] = (self.right_edge[i] - self.left_edge[i])/dims[i]
* self.my_data = data
* self.data = <np.float64_t*> data.data # <<<<<<<<<<<<<<
@@ -12355,7 +12355,7 @@
return __pyx_r;
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":242
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":242
* @cython.boundscheck(False)
* @cython.wraparound(False)
* def cast_plane(self, TransferFunctionProxy tf, VectorPlane vp): # <<<<<<<<<<<<<<
@@ -12423,7 +12423,7 @@
if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_tf), __pyx_ptype_2yt_9amr_utils_TransferFunctionProxy, 1, "tf", 0))) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 242; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_vp), __pyx_ptype_2yt_9amr_utils_VectorPlane, 1, "vp", 0))) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 242; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":247
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":247
* # like http://courses.csusm.edu/cs697exz/ray_box.htm
* cdef int vi, vj, hit, i, ni, nj, nn
* self.ns = 5 #* (1 + <int> log2(self.dds[0] / self.min_dds)) # <<<<<<<<<<<<<<
@@ -12432,7 +12432,7 @@
*/
((struct __pyx_obj_2yt_9amr_utils_PartitionedGrid *)__pyx_v_self)->ns = 5;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":250
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":250
* cdef int iter[4]
* cdef np.float64_t v_pos[3], v_dir[3], rgba[4], extrema[4]
* self.calculate_extent(vp, extrema) # <<<<<<<<<<<<<<
@@ -12441,7 +12441,7 @@
*/
((struct __pyx_vtabstruct_2yt_9amr_utils_PartitionedGrid *)((struct __pyx_obj_2yt_9amr_utils_PartitionedGrid *)__pyx_v_self)->__pyx_vtab)->calculate_extent(((struct __pyx_obj_2yt_9amr_utils_PartitionedGrid *)__pyx_v_self), __pyx_v_vp, __pyx_v_extrema);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":251
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":251
* cdef np.float64_t v_pos[3], v_dir[3], rgba[4], extrema[4]
* self.calculate_extent(vp, extrema)
* vp.get_start_stop(extrema, iter) # <<<<<<<<<<<<<<
@@ -12450,7 +12450,7 @@
*/
((struct __pyx_vtabstruct_2yt_9amr_utils_VectorPlane *)__pyx_v_vp->__pyx_vtab)->get_start_stop(__pyx_v_vp, __pyx_v_extrema, __pyx_v_iter);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":252
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":252
* self.calculate_extent(vp, extrema)
* vp.get_start_stop(extrema, iter)
* for i in range(4): iter[i] = iclip(iter[i], 0, vp.nv) # <<<<<<<<<<<<<<
@@ -12462,7 +12462,7 @@
(__pyx_v_iter[__pyx_v_i]) = __pyx_f_2yt_9amr_utils_iclip((__pyx_v_iter[__pyx_v_i]), 0, __pyx_v_vp->nv);
}
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":253
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":253
* vp.get_start_stop(extrema, iter)
* for i in range(4): iter[i] = iclip(iter[i], 0, vp.nv)
* hit = 0 # <<<<<<<<<<<<<<
@@ -12471,7 +12471,7 @@
*/
__pyx_v_hit = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":254
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":254
* for i in range(4): iter[i] = iclip(iter[i], 0, vp.nv)
* hit = 0
* for vj in range(iter[0], iter[1]): # <<<<<<<<<<<<<<
@@ -12481,7 +12481,7 @@
for (__pyx_t_1 = (__pyx_v_iter[0]); __pyx_t_1 < (__pyx_v_iter[1]); __pyx_t_1+=1) {
__pyx_v_vj = __pyx_t_1;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":255
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":255
* hit = 0
* for vj in range(iter[0], iter[1]):
* for vi in range(iter[2], iter[3]): # <<<<<<<<<<<<<<
@@ -12491,7 +12491,7 @@
for (__pyx_t_2 = (__pyx_v_iter[2]); __pyx_t_2 < (__pyx_v_iter[3]); __pyx_t_2+=1) {
__pyx_v_vi = __pyx_t_2;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":256
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":256
* for vj in range(iter[0], iter[1]):
* for vi in range(iter[2], iter[3]):
* vp.copy_into(vp.vp_pos, v_pos, vi, vj, 3) # <<<<<<<<<<<<<<
@@ -12500,7 +12500,7 @@
*/
((struct __pyx_vtabstruct_2yt_9amr_utils_VectorPlane *)__pyx_v_vp->__pyx_vtab)->copy_into(__pyx_v_vp, __pyx_v_vp->vp_pos, __pyx_v_v_pos, __pyx_v_vi, __pyx_v_vj, 3);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":257
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":257
* for vi in range(iter[2], iter[3]):
* vp.copy_into(vp.vp_pos, v_pos, vi, vj, 3)
* vp.copy_into(vp.image, rgba, vi, vj, 4) # <<<<<<<<<<<<<<
@@ -12509,7 +12509,7 @@
*/
((struct __pyx_vtabstruct_2yt_9amr_utils_VectorPlane *)__pyx_v_vp->__pyx_vtab)->copy_into(__pyx_v_vp, __pyx_v_vp->image, __pyx_v_rgba, __pyx_v_vi, __pyx_v_vj, 4);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":258
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":258
* vp.copy_into(vp.vp_pos, v_pos, vi, vj, 3)
* vp.copy_into(vp.image, rgba, vi, vj, 4)
* self.integrate_ray(v_pos, vp.vp_dir, rgba, tf) # <<<<<<<<<<<<<<
@@ -12518,7 +12518,7 @@
*/
((struct __pyx_vtabstruct_2yt_9amr_utils_PartitionedGrid *)((struct __pyx_obj_2yt_9amr_utils_PartitionedGrid *)__pyx_v_self)->__pyx_vtab)->integrate_ray(((struct __pyx_obj_2yt_9amr_utils_PartitionedGrid *)__pyx_v_self), __pyx_v_v_pos, __pyx_v_vp->vp_dir, __pyx_v_rgba, __pyx_v_tf);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":259
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":259
* vp.copy_into(vp.image, rgba, vi, vj, 4)
* self.integrate_ray(v_pos, vp.vp_dir, rgba, tf)
* vp.copy_back(rgba, vp.image, vi, vj, 4) # <<<<<<<<<<<<<<
@@ -12529,7 +12529,7 @@
}
}
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":260
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":260
* self.integrate_ray(v_pos, vp.vp_dir, rgba, tf)
* vp.copy_back(rgba, vp.image, vi, vj, 4)
* return hit # <<<<<<<<<<<<<<
@@ -12555,7 +12555,7 @@
return __pyx_r;
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":264
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":264
* @cython.boundscheck(False)
* @cython.wraparound(False)
* cdef void calculate_extent(self, VectorPlane vp, # <<<<<<<<<<<<<<
@@ -12576,7 +12576,7 @@
int __pyx_t_5;
__Pyx_SetupRefcountContext("calculate_extent");
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":268
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":268
* # We do this for all eight corners
* cdef np.float64_t *edges[2], temp
* edges[0] = self.left_edge # <<<<<<<<<<<<<<
@@ -12585,7 +12585,7 @@
*/
(__pyx_v_edges[0]) = __pyx_v_self->left_edge;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":269
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":269
* cdef np.float64_t *edges[2], temp
* edges[0] = self.left_edge
* edges[1] = self.right_edge # <<<<<<<<<<<<<<
@@ -12594,7 +12594,7 @@
*/
(__pyx_v_edges[1]) = __pyx_v_self->right_edge;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":270
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":270
* edges[0] = self.left_edge
* edges[1] = self.right_edge
* extrema[0] = extrema[2] = 1e300; extrema[1] = extrema[3] = -1e300 # <<<<<<<<<<<<<<
@@ -12607,7 +12607,7 @@
(__pyx_v_extrema[1]) = __pyx_t_1;
(__pyx_v_extrema[3]) = __pyx_t_1;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":272
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":272
* extrema[0] = extrema[2] = 1e300; extrema[1] = extrema[3] = -1e300
* cdef int i, j, k
* for i in range(2): # <<<<<<<<<<<<<<
@@ -12617,7 +12617,7 @@
for (__pyx_t_2 = 0; __pyx_t_2 < 2; __pyx_t_2+=1) {
__pyx_v_i = __pyx_t_2;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":273
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":273
* cdef int i, j, k
* for i in range(2):
* for j in range(2): # <<<<<<<<<<<<<<
@@ -12627,7 +12627,7 @@
for (__pyx_t_3 = 0; __pyx_t_3 < 2; __pyx_t_3+=1) {
__pyx_v_j = __pyx_t_3;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":274
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":274
* for i in range(2):
* for j in range(2):
* for k in range(2): # <<<<<<<<<<<<<<
@@ -12637,7 +12637,7 @@
for (__pyx_t_4 = 0; __pyx_t_4 < 2; __pyx_t_4+=1) {
__pyx_v_k = __pyx_t_4;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":276
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":276
* for k in range(2):
* # This should rotate it into the vector plane
* temp = edges[i][0] * vp.x_vec[0] # <<<<<<<<<<<<<<
@@ -12646,7 +12646,7 @@
*/
__pyx_v_temp = (((__pyx_v_edges[__pyx_v_i])[0]) * (__pyx_v_vp->x_vec[0]));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":277
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":277
* # This should rotate it into the vector plane
* temp = edges[i][0] * vp.x_vec[0]
* temp += edges[j][1] * vp.x_vec[1] # <<<<<<<<<<<<<<
@@ -12655,7 +12655,7 @@
*/
__pyx_v_temp += (((__pyx_v_edges[__pyx_v_j])[1]) * (__pyx_v_vp->x_vec[1]));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":278
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":278
* temp = edges[i][0] * vp.x_vec[0]
* temp += edges[j][1] * vp.x_vec[1]
* temp += edges[k][2] * vp.x_vec[2] # <<<<<<<<<<<<<<
@@ -12664,7 +12664,7 @@
*/
__pyx_v_temp += (((__pyx_v_edges[__pyx_v_k])[2]) * (__pyx_v_vp->x_vec[2]));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":279
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":279
* temp += edges[j][1] * vp.x_vec[1]
* temp += edges[k][2] * vp.x_vec[2]
* if temp < extrema[0]: extrema[0] = temp # <<<<<<<<<<<<<<
@@ -12678,7 +12678,7 @@
}
__pyx_L9:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":280
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":280
* temp += edges[k][2] * vp.x_vec[2]
* if temp < extrema[0]: extrema[0] = temp
* if temp > extrema[1]: extrema[1] = temp # <<<<<<<<<<<<<<
@@ -12692,7 +12692,7 @@
}
__pyx_L10:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":281
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":281
* if temp < extrema[0]: extrema[0] = temp
* if temp > extrema[1]: extrema[1] = temp
* temp = edges[i][0] * vp.y_vec[0] # <<<<<<<<<<<<<<
@@ -12701,7 +12701,7 @@
*/
__pyx_v_temp = (((__pyx_v_edges[__pyx_v_i])[0]) * (__pyx_v_vp->y_vec[0]));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":282
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":282
* if temp > extrema[1]: extrema[1] = temp
* temp = edges[i][0] * vp.y_vec[0]
* temp += edges[j][1] * vp.y_vec[1] # <<<<<<<<<<<<<<
@@ -12710,7 +12710,7 @@
*/
__pyx_v_temp += (((__pyx_v_edges[__pyx_v_j])[1]) * (__pyx_v_vp->y_vec[1]));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":283
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":283
* temp = edges[i][0] * vp.y_vec[0]
* temp += edges[j][1] * vp.y_vec[1]
* temp += edges[k][2] * vp.y_vec[2] # <<<<<<<<<<<<<<
@@ -12719,7 +12719,7 @@
*/
__pyx_v_temp += (((__pyx_v_edges[__pyx_v_k])[2]) * (__pyx_v_vp->y_vec[2]));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":284
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":284
* temp += edges[j][1] * vp.y_vec[1]
* temp += edges[k][2] * vp.y_vec[2]
* if temp < extrema[2]: extrema[2] = temp # <<<<<<<<<<<<<<
@@ -12733,7 +12733,7 @@
}
__pyx_L11:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":285
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":285
* temp += edges[k][2] * vp.y_vec[2]
* if temp < extrema[2]: extrema[2] = temp
* if temp > extrema[3]: extrema[3] = temp # <<<<<<<<<<<<<<
@@ -12753,7 +12753,7 @@
__Pyx_FinishRefcountContext();
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":290
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":290
* @cython.boundscheck(False)
* @cython.wraparound(False)
* cdef int integrate_ray(self, np.float64_t v_pos[3], # <<<<<<<<<<<<<<
@@ -12787,7 +12787,7 @@
int __pyx_t_5;
__Pyx_SetupRefcountContext("integrate_ray");
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":295
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":295
* TransferFunctionProxy tf):
* cdef int cur_ind[3], step[3], x, y, i, n, flat_ind, hit, direction
* cdef np.float64_t intersect_t = 1.0 # <<<<<<<<<<<<<<
@@ -12796,7 +12796,7 @@
*/
__pyx_v_intersect_t = 1.0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":299
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":299
* cdef np.float64_t enter_t, dist, alpha, dt
* cdef np.float64_t tr, tl, temp_x, temp_y, dv
* for i in range(3): # <<<<<<<<<<<<<<
@@ -12806,7 +12806,7 @@
for (__pyx_t_1 = 0; __pyx_t_1 < 3; __pyx_t_1+=1) {
__pyx_v_i = __pyx_t_1;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":300
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":300
* cdef np.float64_t tr, tl, temp_x, temp_y, dv
* for i in range(3):
* if (v_dir[i] < 0): # <<<<<<<<<<<<<<
@@ -12816,7 +12816,7 @@
__pyx_t_2 = ((__pyx_v_v_dir[__pyx_v_i]) < 0);
if (__pyx_t_2) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":301
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":301
* for i in range(3):
* if (v_dir[i] < 0):
* step[i] = -1 # <<<<<<<<<<<<<<
@@ -12828,7 +12828,7 @@
}
/*else*/ {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":303
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":303
* step[i] = -1
* else:
* step[i] = 1 # <<<<<<<<<<<<<<
@@ -12839,7 +12839,7 @@
}
__pyx_L5:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":304
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":304
* else:
* step[i] = 1
* x = (i+1) % 3 # <<<<<<<<<<<<<<
@@ -12848,7 +12848,7 @@
*/
__pyx_v_x = ((__pyx_v_i + 1) % 3);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":305
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":305
* step[i] = 1
* x = (i+1) % 3
* y = (i+2) % 3 # <<<<<<<<<<<<<<
@@ -12857,7 +12857,7 @@
*/
__pyx_v_y = ((__pyx_v_i + 2) % 3);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":306
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":306
* x = (i+1) % 3
* y = (i+2) % 3
* tl = (self.left_edge[i] - v_pos[i])/v_dir[i] # <<<<<<<<<<<<<<
@@ -12866,7 +12866,7 @@
*/
__pyx_v_tl = (((__pyx_v_self->left_edge[__pyx_v_i]) - (__pyx_v_v_pos[__pyx_v_i])) / (__pyx_v_v_dir[__pyx_v_i]));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":307
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":307
* y = (i+2) % 3
* tl = (self.left_edge[i] - v_pos[i])/v_dir[i]
* tr = (self.right_edge[i] - v_pos[i])/v_dir[i] # <<<<<<<<<<<<<<
@@ -12875,7 +12875,7 @@
*/
__pyx_v_tr = (((__pyx_v_self->right_edge[__pyx_v_i]) - (__pyx_v_v_pos[__pyx_v_i])) / (__pyx_v_v_dir[__pyx_v_i]));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":308
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":308
* tl = (self.left_edge[i] - v_pos[i])/v_dir[i]
* tr = (self.right_edge[i] - v_pos[i])/v_dir[i]
* temp_x = (v_pos[x] + tl*v_dir[x]) # <<<<<<<<<<<<<<
@@ -12884,7 +12884,7 @@
*/
__pyx_v_temp_x = ((__pyx_v_v_pos[__pyx_v_x]) + (__pyx_v_tl * (__pyx_v_v_dir[__pyx_v_x])));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":309
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":309
* tr = (self.right_edge[i] - v_pos[i])/v_dir[i]
* temp_x = (v_pos[x] + tl*v_dir[x])
* temp_y = (v_pos[y] + tl*v_dir[y]) # <<<<<<<<<<<<<<
@@ -12893,7 +12893,7 @@
*/
__pyx_v_temp_y = ((__pyx_v_v_pos[__pyx_v_y]) + (__pyx_v_tl * (__pyx_v_v_dir[__pyx_v_y])));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":310
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":310
* temp_x = (v_pos[x] + tl*v_dir[x])
* temp_y = (v_pos[y] + tl*v_dir[y])
* if self.left_edge[x] <= temp_x and temp_x <= self.right_edge[x] and \ # <<<<<<<<<<<<<<
@@ -12903,7 +12903,7 @@
if (((__pyx_v_self->left_edge[__pyx_v_x]) <= __pyx_v_temp_x)) {
if ((__pyx_v_temp_x <= (__pyx_v_self->right_edge[__pyx_v_x]))) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":311
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":311
* temp_y = (v_pos[y] + tl*v_dir[y])
* if self.left_edge[x] <= temp_x and temp_x <= self.right_edge[x] and \
* self.left_edge[y] <= temp_y and temp_y <= self.right_edge[y] and \ # <<<<<<<<<<<<<<
@@ -12913,7 +12913,7 @@
if (((__pyx_v_self->left_edge[__pyx_v_y]) <= __pyx_v_temp_y)) {
if ((__pyx_v_temp_y <= (__pyx_v_self->right_edge[__pyx_v_y]))) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":312
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":312
* if self.left_edge[x] <= temp_x and temp_x <= self.right_edge[x] and \
* self.left_edge[y] <= temp_y and temp_y <= self.right_edge[y] and \
* 0.0 <= tl and tl < intersect_t: # <<<<<<<<<<<<<<
@@ -12943,7 +12943,7 @@
}
if (__pyx_t_2) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":313
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":313
* self.left_edge[y] <= temp_y and temp_y <= self.right_edge[y] and \
* 0.0 <= tl and tl < intersect_t:
* direction = i # <<<<<<<<<<<<<<
@@ -12952,7 +12952,7 @@
*/
__pyx_v_direction = __pyx_v_i;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":314
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":314
* 0.0 <= tl and tl < intersect_t:
* direction = i
* intersect_t = tl # <<<<<<<<<<<<<<
@@ -12964,7 +12964,7 @@
}
__pyx_L6:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":315
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":315
* direction = i
* intersect_t = tl
* temp_x = (v_pos[x] + tr*v_dir[x]) # <<<<<<<<<<<<<<
@@ -12973,7 +12973,7 @@
*/
__pyx_v_temp_x = ((__pyx_v_v_pos[__pyx_v_x]) + (__pyx_v_tr * (__pyx_v_v_dir[__pyx_v_x])));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":316
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":316
* intersect_t = tl
* temp_x = (v_pos[x] + tr*v_dir[x])
* temp_y = (v_pos[y] + tr*v_dir[y]) # <<<<<<<<<<<<<<
@@ -12982,7 +12982,7 @@
*/
__pyx_v_temp_y = ((__pyx_v_v_pos[__pyx_v_y]) + (__pyx_v_tr * (__pyx_v_v_dir[__pyx_v_y])));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":317
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":317
* temp_x = (v_pos[x] + tr*v_dir[x])
* temp_y = (v_pos[y] + tr*v_dir[y])
* if self.left_edge[x] <= temp_x and temp_x <= self.right_edge[x] and \ # <<<<<<<<<<<<<<
@@ -12992,7 +12992,7 @@
if (((__pyx_v_self->left_edge[__pyx_v_x]) <= __pyx_v_temp_x)) {
if ((__pyx_v_temp_x <= (__pyx_v_self->right_edge[__pyx_v_x]))) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":318
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":318
* temp_y = (v_pos[y] + tr*v_dir[y])
* if self.left_edge[x] <= temp_x and temp_x <= self.right_edge[x] and \
* self.left_edge[y] <= temp_y and temp_y <= self.right_edge[y] and \ # <<<<<<<<<<<<<<
@@ -13002,7 +13002,7 @@
if (((__pyx_v_self->left_edge[__pyx_v_y]) <= __pyx_v_temp_y)) {
if ((__pyx_v_temp_y <= (__pyx_v_self->right_edge[__pyx_v_y]))) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":319
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":319
* if self.left_edge[x] <= temp_x and temp_x <= self.right_edge[x] and \
* self.left_edge[y] <= temp_y and temp_y <= self.right_edge[y] and \
* 0.0 <= tr and tr < intersect_t: # <<<<<<<<<<<<<<
@@ -13032,7 +13032,7 @@
}
if (__pyx_t_2) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":320
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":320
* self.left_edge[y] <= temp_y and temp_y <= self.right_edge[y] and \
* 0.0 <= tr and tr < intersect_t:
* direction = i # <<<<<<<<<<<<<<
@@ -13041,7 +13041,7 @@
*/
__pyx_v_direction = __pyx_v_i;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":321
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":321
* 0.0 <= tr and tr < intersect_t:
* direction = i
* intersect_t = tr # <<<<<<<<<<<<<<
@@ -13054,7 +13054,7 @@
__pyx_L7:;
}
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":322
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":322
* direction = i
* intersect_t = tr
* if self.left_edge[0] <= v_pos[0] and v_pos[0] <= self.right_edge[0] and \ # <<<<<<<<<<<<<<
@@ -13064,7 +13064,7 @@
if (((__pyx_v_self->left_edge[0]) <= (__pyx_v_v_pos[0]))) {
if (((__pyx_v_v_pos[0]) <= (__pyx_v_self->right_edge[0]))) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":323
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":323
* intersect_t = tr
* if self.left_edge[0] <= v_pos[0] and v_pos[0] <= self.right_edge[0] and \
* self.left_edge[1] <= v_pos[1] and v_pos[1] <= self.right_edge[1] and \ # <<<<<<<<<<<<<<
@@ -13074,7 +13074,7 @@
if (((__pyx_v_self->left_edge[1]) <= (__pyx_v_v_pos[1]))) {
if (((__pyx_v_v_pos[1]) <= (__pyx_v_self->right_edge[1]))) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":324
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":324
* if self.left_edge[0] <= v_pos[0] and v_pos[0] <= self.right_edge[0] and \
* self.left_edge[1] <= v_pos[1] and v_pos[1] <= self.right_edge[1] and \
* self.left_edge[2] <= v_pos[2] and v_pos[2] <= self.right_edge[2]: # <<<<<<<<<<<<<<
@@ -13104,7 +13104,7 @@
}
if (__pyx_t_2) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":325
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":325
* self.left_edge[1] <= v_pos[1] and v_pos[1] <= self.right_edge[1] and \
* self.left_edge[2] <= v_pos[2] and v_pos[2] <= self.right_edge[2]:
* intersect_t = 0.0 # <<<<<<<<<<<<<<
@@ -13116,7 +13116,7 @@
}
__pyx_L8:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":326
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":326
* self.left_edge[2] <= v_pos[2] and v_pos[2] <= self.right_edge[2]:
* intersect_t = 0.0
* if not ((0.0 <= intersect_t) and (intersect_t < 1.0)): return 0 # <<<<<<<<<<<<<<
@@ -13136,7 +13136,7 @@
}
__pyx_L9:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":327
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":327
* intersect_t = 0.0
* if not ((0.0 <= intersect_t) and (intersect_t < 1.0)): return 0
* for i in range(3): # <<<<<<<<<<<<<<
@@ -13146,7 +13146,7 @@
for (__pyx_t_1 = 0; __pyx_t_1 < 3; __pyx_t_1+=1) {
__pyx_v_i = __pyx_t_1;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":328
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":328
* if not ((0.0 <= intersect_t) and (intersect_t < 1.0)): return 0
* for i in range(3):
* intersect[i] = v_pos[i] + intersect_t * v_dir[i] # <<<<<<<<<<<<<<
@@ -13155,7 +13155,7 @@
*/
(__pyx_v_intersect[__pyx_v_i]) = ((__pyx_v_v_pos[__pyx_v_i]) + (__pyx_v_intersect_t * (__pyx_v_v_dir[__pyx_v_i])));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":329
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":329
* for i in range(3):
* intersect[i] = v_pos[i] + intersect_t * v_dir[i]
* cur_ind[i] = <int> floor((intersect[i] + # <<<<<<<<<<<<<<
@@ -13164,7 +13164,7 @@
*/
(__pyx_v_cur_ind[__pyx_v_i]) = ((int)floor(((((__pyx_v_intersect[__pyx_v_i]) + (((__pyx_v_step[__pyx_v_i]) * 1e-08) * (__pyx_v_self->dds[__pyx_v_i]))) - (__pyx_v_self->left_edge[__pyx_v_i])) / (__pyx_v_self->dds[__pyx_v_i]))));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":332
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":332
* step[i]*1e-8*self.dds[i] -
* self.left_edge[i])/self.dds[i])
* tmax[i] = (((cur_ind[i]+step[i])*self.dds[i])+ # <<<<<<<<<<<<<<
@@ -13173,7 +13173,7 @@
*/
(__pyx_v_tmax[__pyx_v_i]) = ((((((__pyx_v_cur_ind[__pyx_v_i]) + (__pyx_v_step[__pyx_v_i])) * (__pyx_v_self->dds[__pyx_v_i])) + (__pyx_v_self->left_edge[__pyx_v_i])) - (__pyx_v_v_pos[__pyx_v_i])) / (__pyx_v_v_dir[__pyx_v_i]));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":334
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":334
* tmax[i] = (((cur_ind[i]+step[i])*self.dds[i])+
* self.left_edge[i]-v_pos[i])/v_dir[i]
* if cur_ind[i] == self.dims[i] and step[i] < 0: # <<<<<<<<<<<<<<
@@ -13187,7 +13187,7 @@
}
if (__pyx_t_3) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":335
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":335
* self.left_edge[i]-v_pos[i])/v_dir[i]
* if cur_ind[i] == self.dims[i] and step[i] < 0:
* cur_ind[i] = self.dims[i] - 1 # <<<<<<<<<<<<<<
@@ -13199,7 +13199,7 @@
}
__pyx_L12:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":336
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":336
* if cur_ind[i] == self.dims[i] and step[i] < 0:
* cur_ind[i] = self.dims[i] - 1
* if cur_ind[i] < 0 or cur_ind[i] >= self.dims[i]: return 0 # <<<<<<<<<<<<<<
@@ -13218,7 +13218,7 @@
}
__pyx_L13:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":337
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":337
* cur_ind[i] = self.dims[i] - 1
* if cur_ind[i] < 0 or cur_ind[i] >= self.dims[i]: return 0
* if step[i] > 0: # <<<<<<<<<<<<<<
@@ -13228,7 +13228,7 @@
__pyx_t_3 = ((__pyx_v_step[__pyx_v_i]) > 0);
if (__pyx_t_3) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":338
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":338
* if cur_ind[i] < 0 or cur_ind[i] >= self.dims[i]: return 0
* if step[i] > 0:
* tmax[i] = (((cur_ind[i]+1)*self.dds[i]) # <<<<<<<<<<<<<<
@@ -13240,7 +13240,7 @@
}
__pyx_L14:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":340
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":340
* tmax[i] = (((cur_ind[i]+1)*self.dds[i])
* +self.left_edge[i]-v_pos[i])/v_dir[i]
* if step[i] < 0: # <<<<<<<<<<<<<<
@@ -13250,7 +13250,7 @@
__pyx_t_3 = ((__pyx_v_step[__pyx_v_i]) < 0);
if (__pyx_t_3) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":341
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":341
* +self.left_edge[i]-v_pos[i])/v_dir[i]
* if step[i] < 0:
* tmax[i] = (((cur_ind[i]+0)*self.dds[i]) # <<<<<<<<<<<<<<
@@ -13262,7 +13262,7 @@
}
__pyx_L15:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":343
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":343
* tmax[i] = (((cur_ind[i]+0)*self.dds[i])
* +self.left_edge[i]-v_pos[i])/v_dir[i]
* tdelta[i] = (self.dds[i]/v_dir[i]) # <<<<<<<<<<<<<<
@@ -13271,7 +13271,7 @@
*/
(__pyx_v_tdelta[__pyx_v_i]) = ((__pyx_v_self->dds[__pyx_v_i]) / (__pyx_v_v_dir[__pyx_v_i]));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":344
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":344
* +self.left_edge[i]-v_pos[i])/v_dir[i]
* tdelta[i] = (self.dds[i]/v_dir[i])
* if tdelta[i] < 0: tdelta[i] *= -1 # <<<<<<<<<<<<<<
@@ -13286,7 +13286,7 @@
__pyx_L16:;
}
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":346
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":346
* if tdelta[i] < 0: tdelta[i] *= -1
* # We have to jumpstart our calculation
* enter_t = intersect_t # <<<<<<<<<<<<<<
@@ -13295,7 +13295,7 @@
*/
__pyx_v_enter_t = __pyx_v_intersect_t;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":347
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":347
* # We have to jumpstart our calculation
* enter_t = intersect_t
* while 1: # <<<<<<<<<<<<<<
@@ -13306,7 +13306,7 @@
__pyx_t_3 = 1;
if (!__pyx_t_3) break;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":350
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":350
* # dims here is one less than the dimensions of the data,
* # but we are tracing on the grid, not on the data...
* if (not (0 <= cur_ind[0] < self.dims[0])) or \ # <<<<<<<<<<<<<<
@@ -13320,7 +13320,7 @@
}
if (!(!__pyx_t_3)) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":351
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":351
* # but we are tracing on the grid, not on the data...
* if (not (0 <= cur_ind[0] < self.dims[0])) or \
* (not (0 <= cur_ind[1] < self.dims[1])) or \ # <<<<<<<<<<<<<<
@@ -13334,7 +13334,7 @@
}
if (!(!__pyx_t_2)) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":352
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":352
* if (not (0 <= cur_ind[0] < self.dims[0])) or \
* (not (0 <= cur_ind[1] < self.dims[1])) or \
* (not (0 <= cur_ind[2] < self.dims[2])): # <<<<<<<<<<<<<<
@@ -13356,7 +13356,7 @@
}
if (__pyx_t_2) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":353
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":353
* (not (0 <= cur_ind[1] < self.dims[1])) or \
* (not (0 <= cur_ind[2] < self.dims[2])):
* break # <<<<<<<<<<<<<<
@@ -13368,7 +13368,7 @@
}
__pyx_L19:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":354
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":354
* (not (0 <= cur_ind[2] < self.dims[2])):
* break
* hit += 1 # <<<<<<<<<<<<<<
@@ -13377,7 +13377,7 @@
*/
__pyx_v_hit += 1;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":355
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":355
* break
* hit += 1
* if tmax[0] < tmax[1]: # <<<<<<<<<<<<<<
@@ -13387,7 +13387,7 @@
__pyx_t_2 = ((__pyx_v_tmax[0]) < (__pyx_v_tmax[1]));
if (__pyx_t_2) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":356
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":356
* hit += 1
* if tmax[0] < tmax[1]:
* if tmax[0] < tmax[2]: # <<<<<<<<<<<<<<
@@ -13397,7 +13397,7 @@
__pyx_t_2 = ((__pyx_v_tmax[0]) < (__pyx_v_tmax[2]));
if (__pyx_t_2) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":358
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":358
* if tmax[0] < tmax[2]:
* self.sample_values(v_pos, v_dir, enter_t, tmax[0], cur_ind,
* rgba, tf) # <<<<<<<<<<<<<<
@@ -13406,7 +13406,7 @@
*/
((struct __pyx_vtabstruct_2yt_9amr_utils_PartitionedGrid *)__pyx_v_self->__pyx_vtab)->sample_values(__pyx_v_self, __pyx_v_v_pos, __pyx_v_v_dir, __pyx_v_enter_t, (__pyx_v_tmax[0]), __pyx_v_cur_ind, __pyx_v_rgba, __pyx_v_tf);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":359
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":359
* self.sample_values(v_pos, v_dir, enter_t, tmax[0], cur_ind,
* rgba, tf)
* cur_ind[0] += step[0] # <<<<<<<<<<<<<<
@@ -13415,7 +13415,7 @@
*/
(__pyx_v_cur_ind[0]) += (__pyx_v_step[0]);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":360
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":360
* rgba, tf)
* cur_ind[0] += step[0]
* dt = fmin(tmax[0], 1.0) - enter_t # <<<<<<<<<<<<<<
@@ -13424,7 +13424,7 @@
*/
__pyx_v_dt = (__pyx_f_2yt_9amr_utils_fmin((__pyx_v_tmax[0]), 1.0) - __pyx_v_enter_t);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":361
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":361
* cur_ind[0] += step[0]
* dt = fmin(tmax[0], 1.0) - enter_t
* enter_t = tmax[0] # <<<<<<<<<<<<<<
@@ -13433,7 +13433,7 @@
*/
__pyx_v_enter_t = (__pyx_v_tmax[0]);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":362
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":362
* dt = fmin(tmax[0], 1.0) - enter_t
* enter_t = tmax[0]
* tmax[0] += tdelta[0] # <<<<<<<<<<<<<<
@@ -13445,7 +13445,7 @@
}
/*else*/ {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":365
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":365
* else:
* self.sample_values(v_pos, v_dir, enter_t, tmax[2], cur_ind,
* rgba, tf) # <<<<<<<<<<<<<<
@@ -13454,7 +13454,7 @@
*/
((struct __pyx_vtabstruct_2yt_9amr_utils_PartitionedGrid *)__pyx_v_self->__pyx_vtab)->sample_values(__pyx_v_self, __pyx_v_v_pos, __pyx_v_v_dir, __pyx_v_enter_t, (__pyx_v_tmax[2]), __pyx_v_cur_ind, __pyx_v_rgba, __pyx_v_tf);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":366
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":366
* self.sample_values(v_pos, v_dir, enter_t, tmax[2], cur_ind,
* rgba, tf)
* cur_ind[2] += step[2] # <<<<<<<<<<<<<<
@@ -13463,7 +13463,7 @@
*/
(__pyx_v_cur_ind[2]) += (__pyx_v_step[2]);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":367
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":367
* rgba, tf)
* cur_ind[2] += step[2]
* dt = fmin(tmax[2], 1.0) - enter_t # <<<<<<<<<<<<<<
@@ -13472,7 +13472,7 @@
*/
__pyx_v_dt = (__pyx_f_2yt_9amr_utils_fmin((__pyx_v_tmax[2]), 1.0) - __pyx_v_enter_t);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":368
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":368
* cur_ind[2] += step[2]
* dt = fmin(tmax[2], 1.0) - enter_t
* enter_t = tmax[2] # <<<<<<<<<<<<<<
@@ -13481,7 +13481,7 @@
*/
__pyx_v_enter_t = (__pyx_v_tmax[2]);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":369
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":369
* dt = fmin(tmax[2], 1.0) - enter_t
* enter_t = tmax[2]
* tmax[2] += tdelta[2] # <<<<<<<<<<<<<<
@@ -13495,7 +13495,7 @@
}
/*else*/ {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":371
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":371
* tmax[2] += tdelta[2]
* else:
* if tmax[1] < tmax[2]: # <<<<<<<<<<<<<<
@@ -13505,7 +13505,7 @@
__pyx_t_2 = ((__pyx_v_tmax[1]) < (__pyx_v_tmax[2]));
if (__pyx_t_2) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":373
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":373
* if tmax[1] < tmax[2]:
* self.sample_values(v_pos, v_dir, enter_t, tmax[1], cur_ind,
* rgba, tf) # <<<<<<<<<<<<<<
@@ -13514,7 +13514,7 @@
*/
((struct __pyx_vtabstruct_2yt_9amr_utils_PartitionedGrid *)__pyx_v_self->__pyx_vtab)->sample_values(__pyx_v_self, __pyx_v_v_pos, __pyx_v_v_dir, __pyx_v_enter_t, (__pyx_v_tmax[1]), __pyx_v_cur_ind, __pyx_v_rgba, __pyx_v_tf);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":374
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":374
* self.sample_values(v_pos, v_dir, enter_t, tmax[1], cur_ind,
* rgba, tf)
* cur_ind[1] += step[1] # <<<<<<<<<<<<<<
@@ -13523,7 +13523,7 @@
*/
(__pyx_v_cur_ind[1]) += (__pyx_v_step[1]);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":375
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":375
* rgba, tf)
* cur_ind[1] += step[1]
* dt = fmin(tmax[1], 1.0) - enter_t # <<<<<<<<<<<<<<
@@ -13532,7 +13532,7 @@
*/
__pyx_v_dt = (__pyx_f_2yt_9amr_utils_fmin((__pyx_v_tmax[1]), 1.0) - __pyx_v_enter_t);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":376
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":376
* cur_ind[1] += step[1]
* dt = fmin(tmax[1], 1.0) - enter_t
* enter_t = tmax[1] # <<<<<<<<<<<<<<
@@ -13541,7 +13541,7 @@
*/
__pyx_v_enter_t = (__pyx_v_tmax[1]);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":377
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":377
* dt = fmin(tmax[1], 1.0) - enter_t
* enter_t = tmax[1]
* tmax[1] += tdelta[1] # <<<<<<<<<<<<<<
@@ -13553,7 +13553,7 @@
}
/*else*/ {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":380
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":380
* else:
* self.sample_values(v_pos, v_dir, enter_t, tmax[2], cur_ind,
* rgba, tf) # <<<<<<<<<<<<<<
@@ -13562,7 +13562,7 @@
*/
((struct __pyx_vtabstruct_2yt_9amr_utils_PartitionedGrid *)__pyx_v_self->__pyx_vtab)->sample_values(__pyx_v_self, __pyx_v_v_pos, __pyx_v_v_dir, __pyx_v_enter_t, (__pyx_v_tmax[2]), __pyx_v_cur_ind, __pyx_v_rgba, __pyx_v_tf);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":381
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":381
* self.sample_values(v_pos, v_dir, enter_t, tmax[2], cur_ind,
* rgba, tf)
* cur_ind[2] += step[2] # <<<<<<<<<<<<<<
@@ -13571,7 +13571,7 @@
*/
(__pyx_v_cur_ind[2]) += (__pyx_v_step[2]);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":382
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":382
* rgba, tf)
* cur_ind[2] += step[2]
* dt = fmin(tmax[2], 1.0) - enter_t # <<<<<<<<<<<<<<
@@ -13580,7 +13580,7 @@
*/
__pyx_v_dt = (__pyx_f_2yt_9amr_utils_fmin((__pyx_v_tmax[2]), 1.0) - __pyx_v_enter_t);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":383
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":383
* cur_ind[2] += step[2]
* dt = fmin(tmax[2], 1.0) - enter_t
* enter_t = tmax[2] # <<<<<<<<<<<<<<
@@ -13589,7 +13589,7 @@
*/
__pyx_v_enter_t = (__pyx_v_tmax[2]);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":384
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":384
* dt = fmin(tmax[2], 1.0) - enter_t
* enter_t = tmax[2]
* tmax[2] += tdelta[2] # <<<<<<<<<<<<<<
@@ -13602,7 +13602,7 @@
}
__pyx_L20:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":385
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":385
* enter_t = tmax[2]
* tmax[2] += tdelta[2]
* if enter_t > 1.0: break # <<<<<<<<<<<<<<
@@ -13618,7 +13618,7 @@
}
__pyx_L18_break:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":386
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":386
* tmax[2] += tdelta[2]
* if enter_t > 1.0: break
* return hit # <<<<<<<<<<<<<<
@@ -13634,7 +13634,7 @@
return __pyx_r;
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":388
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":388
* return hit
*
* cdef void sample_values(self, # <<<<<<<<<<<<<<
@@ -13656,7 +13656,7 @@
int __pyx_t_3;
__Pyx_SetupRefcountContext("sample_values");
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":399
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":399
* cdef np.float64_t grad[3]
* cdef int dti, i
* dt = (exit_t - enter_t) / (self.ns-1) # five samples, so divide by four # <<<<<<<<<<<<<<
@@ -13665,7 +13665,7 @@
*/
__pyx_v_dt = ((__pyx_v_exit_t - __pyx_v_enter_t) / (__pyx_v_self->ns - 1));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":400
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":400
* cdef int dti, i
* dt = (exit_t - enter_t) / (self.ns-1) # five samples, so divide by four
* for dti in range(self.ns - 1): # <<<<<<<<<<<<<<
@@ -13675,7 +13675,7 @@
for (__pyx_t_1 = 0; __pyx_t_1 < (__pyx_v_self->ns - 1); __pyx_t_1+=1) {
__pyx_v_dti = __pyx_t_1;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":401
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":401
* dt = (exit_t - enter_t) / (self.ns-1) # five samples, so divide by four
* for dti in range(self.ns - 1):
* t = enter_t + dt * dti # <<<<<<<<<<<<<<
@@ -13684,7 +13684,7 @@
*/
__pyx_v_t = (__pyx_v_enter_t + (__pyx_v_dt * __pyx_v_dti));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":402
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":402
* for dti in range(self.ns - 1):
* t = enter_t + dt * dti
* for i in range(3): # <<<<<<<<<<<<<<
@@ -13694,7 +13694,7 @@
for (__pyx_t_2 = 0; __pyx_t_2 < 3; __pyx_t_2+=1) {
__pyx_v_i = __pyx_t_2;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":403
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":403
* t = enter_t + dt * dti
* for i in range(3):
* cp[i] = v_pos[i] + t * v_dir[i] # <<<<<<<<<<<<<<
@@ -13703,7 +13703,7 @@
*/
(__pyx_v_cp[__pyx_v_i]) = ((__pyx_v_v_pos[__pyx_v_i]) + (__pyx_v_t * (__pyx_v_v_dir[__pyx_v_i])));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":404
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":404
* for i in range(3):
* cp[i] = v_pos[i] + t * v_dir[i]
* dp[i] = fclip(fmod(cp[i], self.dds[i])/self.dds[i], 0, 1.0) # <<<<<<<<<<<<<<
@@ -13713,7 +13713,7 @@
(__pyx_v_dp[__pyx_v_i]) = __pyx_f_2yt_9amr_utils_fclip((fmod((__pyx_v_cp[__pyx_v_i]), (__pyx_v_self->dds[__pyx_v_i])) / (__pyx_v_self->dds[__pyx_v_i])), 0, 1.0);
}
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":405
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":405
* cp[i] = v_pos[i] + t * v_dir[i]
* dp[i] = fclip(fmod(cp[i], self.dds[i])/self.dds[i], 0, 1.0)
* dv = trilinear_interpolate(self.dims, ci, dp, self.data) # <<<<<<<<<<<<<<
@@ -13722,7 +13722,7 @@
*/
__pyx_v_dv = trilinear_interpolate(__pyx_v_self->dims, __pyx_v_ci, __pyx_v_dp, __pyx_v_self->data);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":406
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":406
* dp[i] = fclip(fmod(cp[i], self.dds[i])/self.dds[i], 0, 1.0)
* dv = trilinear_interpolate(self.dims, ci, dp, self.data)
* if tf.use_light == 1: # <<<<<<<<<<<<<<
@@ -13732,7 +13732,7 @@
__pyx_t_3 = (__pyx_v_tf->use_light == 1);
if (__pyx_t_3) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":407
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":407
* dv = trilinear_interpolate(self.dims, ci, dp, self.data)
* if tf.use_light == 1:
* eval_gradient(self.dims, ci, dp, self.data, grad) # <<<<<<<<<<<<<<
@@ -13744,7 +13744,7 @@
}
__pyx_L7:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":408
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":408
* if tf.use_light == 1:
* eval_gradient(self.dims, ci, dp, self.data, grad)
* tf.eval_transfer(dt, dv, rgba, grad) # <<<<<<<<<<<<<<
@@ -13757,7 +13757,7 @@
__Pyx_FinishRefcountContext();
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":418
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":418
* @cython.boundscheck(False)
* @cython.wraparound(False)
* def __init__(self, grid, int direction, int left): # <<<<<<<<<<<<<<
@@ -13828,7 +13828,7 @@
return -1;
__pyx_L4_argument_unpacking_done:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":419
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":419
* @cython.wraparound(False)
* def __init__(self, grid, int direction, int left):
* self.direction = direction # <<<<<<<<<<<<<<
@@ -13837,7 +13837,7 @@
*/
((struct __pyx_obj_2yt_9amr_utils_GridFace *)__pyx_v_self)->direction = __pyx_v_direction;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":420
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":420
* def __init__(self, grid, int direction, int left):
* self.direction = direction
* if left == 1: # <<<<<<<<<<<<<<
@@ -13847,7 +13847,7 @@
__pyx_t_1 = (__pyx_v_left == 1);
if (__pyx_t_1) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":421
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":421
* self.direction = direction
* if left == 1:
* self.coord = grid.LeftEdge[direction] # <<<<<<<<<<<<<<
@@ -13866,7 +13866,7 @@
}
/*else*/ {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":423
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":423
* self.coord = grid.LeftEdge[direction]
* else:
* self.coord = grid.RightEdge[direction] # <<<<<<<<<<<<<<
@@ -13884,7 +13884,7 @@
}
__pyx_L6:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":425
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":425
* self.coord = grid.RightEdge[direction]
* cdef int i
* for i in range(3): # <<<<<<<<<<<<<<
@@ -13894,7 +13894,7 @@
for (__pyx_t_4 = 0; __pyx_t_4 < 3; __pyx_t_4+=1) {
__pyx_v_i = __pyx_t_4;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":426
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":426
* cdef int i
* for i in range(3):
* self.left_edge[i] = grid.LeftEdge[i] # <<<<<<<<<<<<<<
@@ -13910,7 +13910,7 @@
__Pyx_DECREF(__pyx_1); __pyx_1 = 0;
(((struct __pyx_obj_2yt_9amr_utils_GridFace *)__pyx_v_self)->left_edge[__pyx_v_i]) = __pyx_t_3;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":427
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":427
* for i in range(3):
* self.left_edge[i] = grid.LeftEdge[i]
* self.right_edge[i] = grid.RightEdge[i] # <<<<<<<<<<<<<<
@@ -13927,7 +13927,7 @@
(((struct __pyx_obj_2yt_9amr_utils_GridFace *)__pyx_v_self)->right_edge[__pyx_v_i]) = __pyx_t_3;
}
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":428
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":428
* self.left_edge[i] = grid.LeftEdge[i]
* self.right_edge[i] = grid.RightEdge[i]
* self.left_edge[direction] = self.right_edge[direction] = self.coord # <<<<<<<<<<<<<<
@@ -13949,7 +13949,7 @@
return __pyx_r;
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":432
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":432
* @cython.boundscheck(False)
* @cython.wraparound(False)
* cdef int proj_overlap(self, np.float64_t *left_edge, np.float64_t *right_edge): # <<<<<<<<<<<<<<
@@ -13964,7 +13964,7 @@
int __pyx_t_1;
__Pyx_SetupRefcountContext("proj_overlap");
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":434
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":434
* cdef int proj_overlap(self, np.float64_t *left_edge, np.float64_t *right_edge):
* cdef int xax, yax
* xax = (self.direction + 1) % 3 # <<<<<<<<<<<<<<
@@ -13973,7 +13973,7 @@
*/
__pyx_v_xax = ((__pyx_v_self->direction + 1) % 3);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":435
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":435
* cdef int xax, yax
* xax = (self.direction + 1) % 3
* yax = (self.direction + 2) % 3 # <<<<<<<<<<<<<<
@@ -13982,7 +13982,7 @@
*/
__pyx_v_yax = ((__pyx_v_self->direction + 2) % 3);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":436
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":436
* xax = (self.direction + 1) % 3
* yax = (self.direction + 2) % 3
* if left_edge[xax] >= self.right_edge[xax]: return 0 # <<<<<<<<<<<<<<
@@ -13997,7 +13997,7 @@
}
__pyx_L3:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":437
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":437
* yax = (self.direction + 2) % 3
* if left_edge[xax] >= self.right_edge[xax]: return 0
* if right_edge[xax] <= self.left_edge[xax]: return 0 # <<<<<<<<<<<<<<
@@ -14012,7 +14012,7 @@
}
__pyx_L4:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":438
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":438
* if left_edge[xax] >= self.right_edge[xax]: return 0
* if right_edge[xax] <= self.left_edge[xax]: return 0
* if left_edge[yax] >= self.right_edge[yax]: return 0 # <<<<<<<<<<<<<<
@@ -14027,7 +14027,7 @@
}
__pyx_L5:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":439
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":439
* if right_edge[xax] <= self.left_edge[xax]: return 0
* if left_edge[yax] >= self.right_edge[yax]: return 0
* if right_edge[yax] <= self.left_edge[yax]: return 0 # <<<<<<<<<<<<<<
@@ -14042,7 +14042,7 @@
}
__pyx_L6:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":440
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":440
* if left_edge[yax] >= self.right_edge[yax]: return 0
* if right_edge[yax] <= self.left_edge[yax]: return 0
* return 1 # <<<<<<<<<<<<<<
@@ -14058,7 +14058,7 @@
return __pyx_r;
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":448
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":448
* cdef public object RightEdge
* cdef public object subgrid_faces
* def __cinit__(self, np.ndarray[np.float64_t, ndim=1] left_edge, # <<<<<<<<<<<<<<
@@ -14150,7 +14150,7 @@
__pyx_bstride_0_right_edge = __pyx_bstruct_right_edge.strides[0];
__pyx_bshape_0_right_edge = __pyx_bstruct_right_edge.shape[0];
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":452
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":452
* subgrid_faces):
* cdef int i
* self.LeftEdge = left_edge # <<<<<<<<<<<<<<
@@ -14163,7 +14163,7 @@
__Pyx_DECREF(((struct __pyx_obj_2yt_9amr_utils_ProtoPrism *)__pyx_v_self)->LeftEdge);
((struct __pyx_obj_2yt_9amr_utils_ProtoPrism *)__pyx_v_self)->LeftEdge = ((PyObject *)__pyx_v_left_edge);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":453
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":453
* cdef int i
* self.LeftEdge = left_edge
* self.RightEdge = right_edge # <<<<<<<<<<<<<<
@@ -14176,7 +14176,7 @@
__Pyx_DECREF(((struct __pyx_obj_2yt_9amr_utils_ProtoPrism *)__pyx_v_self)->RightEdge);
((struct __pyx_obj_2yt_9amr_utils_ProtoPrism *)__pyx_v_self)->RightEdge = ((PyObject *)__pyx_v_right_edge);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":454
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":454
* self.LeftEdge = left_edge
* self.RightEdge = right_edge
* for i in range(3): # <<<<<<<<<<<<<<
@@ -14186,7 +14186,7 @@
for (__pyx_t_1 = 0; __pyx_t_1 < 3; __pyx_t_1+=1) {
__pyx_v_i = __pyx_t_1;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":455
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":455
* self.RightEdge = right_edge
* for i in range(3):
* self.left_edge[i] = left_edge[i] # <<<<<<<<<<<<<<
@@ -14205,7 +14205,7 @@
}
(((struct __pyx_obj_2yt_9amr_utils_ProtoPrism *)__pyx_v_self)->left_edge[__pyx_v_i]) = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_left_edge.buf, __pyx_t_2, __pyx_bstride_0_left_edge));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":456
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":456
* for i in range(3):
* self.left_edge[i] = left_edge[i]
* self.right_edge[i] = right_edge[i] # <<<<<<<<<<<<<<
@@ -14225,7 +14225,7 @@
(((struct __pyx_obj_2yt_9amr_utils_ProtoPrism *)__pyx_v_self)->right_edge[__pyx_v_i]) = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_right_edge.buf, __pyx_t_3, __pyx_bstride_0_right_edge));
}
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":457
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":457
* self.left_edge[i] = left_edge[i]
* self.right_edge[i] = right_edge[i]
* self.subgrid_faces = subgrid_faces # <<<<<<<<<<<<<<
@@ -14257,7 +14257,7 @@
return __pyx_r;
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":461
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":461
* @cython.boundscheck(False)
* @cython.wraparound(False)
* def sweep(self, int direction = 0, int stack = 0): # <<<<<<<<<<<<<<
@@ -14347,7 +14347,7 @@
__pyx_v_LC = Py_None; __Pyx_INCREF(Py_None);
__pyx_v_RC = Py_None; __Pyx_INCREF(Py_None);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":465
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":465
* cdef GridFace face
* cdef np.float64_t proto_split[3]
* for i in range(3): proto_split[i] = self.right_edge[i] # <<<<<<<<<<<<<<
@@ -14359,7 +14359,7 @@
(__pyx_v_proto_split[__pyx_v_i]) = (((struct __pyx_obj_2yt_9amr_utils_ProtoPrism *)__pyx_v_self)->right_edge[__pyx_v_i]);
}
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":466
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":466
* cdef np.float64_t proto_split[3]
* for i in range(3): proto_split[i] = self.right_edge[i]
* for face in self.subgrid_faces[direction]: # <<<<<<<<<<<<<<
@@ -14395,7 +14395,7 @@
__pyx_v_face = ((struct __pyx_obj_2yt_9amr_utils_GridFace *)__pyx_t_4);
__pyx_t_4 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":467
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":467
* for i in range(3): proto_split[i] = self.right_edge[i]
* for face in self.subgrid_faces[direction]:
* proto_split[direction] = face.coord # <<<<<<<<<<<<<<
@@ -14404,7 +14404,7 @@
*/
(__pyx_v_proto_split[__pyx_v_direction]) = __pyx_v_face->coord;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":468
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":468
* for face in self.subgrid_faces[direction]:
* proto_split[direction] = face.coord
* if proto_split[direction] <= self.left_edge[direction]: # <<<<<<<<<<<<<<
@@ -14414,7 +14414,7 @@
__pyx_t_5 = ((__pyx_v_proto_split[__pyx_v_direction]) <= (((struct __pyx_obj_2yt_9amr_utils_ProtoPrism *)__pyx_v_self)->left_edge[__pyx_v_direction]));
if (__pyx_t_5) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":469
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":469
* proto_split[direction] = face.coord
* if proto_split[direction] <= self.left_edge[direction]:
* continue # <<<<<<<<<<<<<<
@@ -14426,7 +14426,7 @@
}
__pyx_L10:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":470
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":470
* if proto_split[direction] <= self.left_edge[direction]:
* continue
* if proto_split[direction] == self.right_edge[direction]: # <<<<<<<<<<<<<<
@@ -14436,7 +14436,7 @@
__pyx_t_5 = ((__pyx_v_proto_split[__pyx_v_direction]) == (((struct __pyx_obj_2yt_9amr_utils_ProtoPrism *)__pyx_v_self)->right_edge[__pyx_v_direction]));
if (__pyx_t_5) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":471
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":471
* continue
* if proto_split[direction] == self.right_edge[direction]:
* if stack == 2: return [self] # <<<<<<<<<<<<<<
@@ -14459,7 +14459,7 @@
}
__pyx_L12:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":472
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":472
* if proto_split[direction] == self.right_edge[direction]:
* if stack == 2: return [self]
* return self.sweep((direction + 1) % 3, stack + 1) # <<<<<<<<<<<<<<
@@ -14493,7 +14493,7 @@
}
__pyx_L11:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":473
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":473
* if stack == 2: return [self]
* return self.sweep((direction + 1) % 3, stack + 1)
* if face.proj_overlap(self.left_edge, proto_split) == 1: # <<<<<<<<<<<<<<
@@ -14503,7 +14503,7 @@
__pyx_t_5 = (((struct __pyx_vtabstruct_2yt_9amr_utils_GridFace *)__pyx_v_face->__pyx_vtab)->proj_overlap(__pyx_v_face, ((struct __pyx_obj_2yt_9amr_utils_ProtoPrism *)__pyx_v_self)->left_edge, __pyx_v_proto_split) == 1);
if (__pyx_t_5) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":474
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":474
* return self.sweep((direction + 1) % 3, stack + 1)
* if face.proj_overlap(self.left_edge, proto_split) == 1:
* left, right = self.split(proto_split, direction) # <<<<<<<<<<<<<<
@@ -14541,7 +14541,7 @@
__pyx_3 = 0;
}
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":475
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":475
* if face.proj_overlap(self.left_edge, proto_split) == 1:
* left, right = self.split(proto_split, direction)
* LC = left.sweep((direction + 1) % 3) # <<<<<<<<<<<<<<
@@ -14565,7 +14565,7 @@
__pyx_v_LC = __pyx_t_8;
__pyx_t_8 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":476
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":476
* left, right = self.split(proto_split, direction)
* LC = left.sweep((direction + 1) % 3)
* RC = right.sweep(direction) # <<<<<<<<<<<<<<
@@ -14589,7 +14589,7 @@
__pyx_v_RC = __pyx_t_4;
__pyx_t_4 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":477
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":477
* LC = left.sweep((direction + 1) % 3)
* RC = right.sweep(direction)
* return LC + RC # <<<<<<<<<<<<<<
@@ -14610,7 +14610,7 @@
}
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":478
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":478
* RC = right.sweep(direction)
* return LC + RC
* raise RuntimeError # <<<<<<<<<<<<<<
@@ -14644,7 +14644,7 @@
return __pyx_r;
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":482
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":482
* @cython.boundscheck(False)
* @cython.wraparound(False)
* cdef object split(self, np.float64_t *sp, int direction): # <<<<<<<<<<<<<<
@@ -14666,7 +14666,7 @@
__pyx_v_left = Py_None; __Pyx_INCREF(Py_None);
__pyx_v_right = Py_None; __Pyx_INCREF(Py_None);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":484
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":484
* cdef object split(self, np.float64_t *sp, int direction):
* cdef int i
* cdef np.ndarray split_left = self.LeftEdge.copy() # <<<<<<<<<<<<<<
@@ -14682,7 +14682,7 @@
__pyx_v_split_left = ((PyArrayObject *)__pyx_t_2);
__pyx_t_2 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":485
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":485
* cdef int i
* cdef np.ndarray split_left = self.LeftEdge.copy()
* cdef np.ndarray split_right = self.RightEdge.copy() # <<<<<<<<<<<<<<
@@ -14698,7 +14698,7 @@
__pyx_v_split_right = ((PyArrayObject *)__pyx_t_1);
__pyx_t_1 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":487
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":487
* cdef np.ndarray split_right = self.RightEdge.copy()
*
* for i in range(3): split_left[i] = self.right_edge[i] # <<<<<<<<<<<<<<
@@ -14713,7 +14713,7 @@
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
}
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":488
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":488
*
* for i in range(3): split_left[i] = self.right_edge[i]
* split_left[direction] = sp[direction] # <<<<<<<<<<<<<<
@@ -14725,7 +14725,7 @@
if (__Pyx_SetItemInt(((PyObject *)__pyx_v_split_left), __pyx_v_direction, __pyx_t_1, sizeof(int), PyInt_FromLong) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 488; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":489
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":489
* for i in range(3): split_left[i] = self.right_edge[i]
* split_left[direction] = sp[direction]
* left = ProtoPrism(self.LeftEdge, split_left, self.subgrid_faces) # <<<<<<<<<<<<<<
@@ -14750,7 +14750,7 @@
__pyx_v_left = __pyx_t_2;
__pyx_t_2 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":491
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":491
* left = ProtoPrism(self.LeftEdge, split_left, self.subgrid_faces)
*
* for i in range(3): split_right[i] = self.left_edge[i] # <<<<<<<<<<<<<<
@@ -14765,7 +14765,7 @@
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
}
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":492
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":492
*
* for i in range(3): split_right[i] = self.left_edge[i]
* split_right[direction] = sp[direction] # <<<<<<<<<<<<<<
@@ -14777,7 +14777,7 @@
if (__Pyx_SetItemInt(((PyObject *)__pyx_v_split_right), __pyx_v_direction, __pyx_t_2, sizeof(int), PyInt_FromLong) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 492; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":493
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":493
* for i in range(3): split_right[i] = self.left_edge[i]
* split_right[direction] = sp[direction]
* right = ProtoPrism(split_right, self.RightEdge, self.subgrid_faces) # <<<<<<<<<<<<<<
@@ -14802,7 +14802,7 @@
__pyx_v_right = __pyx_t_1;
__pyx_t_1 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":495
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":495
* right = ProtoPrism(split_right, self.RightEdge, self.subgrid_faces)
*
* return (left, right) # <<<<<<<<<<<<<<
@@ -14839,7 +14839,7 @@
return __pyx_r;
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":499
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":499
* @cython.boundscheck(False)
* @cython.wraparound(False)
* def get_brick(self, np.ndarray[np.float64_t, ndim=1] grid_left_edge, # <<<<<<<<<<<<<<
@@ -14991,7 +14991,7 @@
__pyx_bstride_0_data = __pyx_bstruct_data.strides[0]; __pyx_bstride_1_data = __pyx_bstruct_data.strides[1]; __pyx_bstride_2_data = __pyx_bstruct_data.strides[2];
__pyx_bshape_0_data = __pyx_bstruct_data.shape[0]; __pyx_bshape_1_data = __pyx_bstruct_data.shape[1]; __pyx_bshape_2_data = __pyx_bstruct_data.shape[2];
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":507
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":507
* cdef PartitionedGrid PG
* cdef int li[3], ri[3], idims[3], i
* for i in range(3): # <<<<<<<<<<<<<<
@@ -15001,7 +15001,7 @@
for (__pyx_t_1 = 0; __pyx_t_1 < 3; __pyx_t_1+=1) {
__pyx_v_i = __pyx_t_1;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":508
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":508
* cdef int li[3], ri[3], idims[3], i
* for i in range(3):
* li[i] = lrint((self.left_edge[i] - grid_left_edge[i])/grid_dds[i]) # <<<<<<<<<<<<<<
@@ -15012,7 +15012,7 @@
__pyx_t_3 = __pyx_v_i;
(__pyx_v_li[__pyx_v_i]) = lrint((((((struct __pyx_obj_2yt_9amr_utils_ProtoPrism *)__pyx_v_self)->left_edge[__pyx_v_i]) - (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_grid_left_edge.buf, __pyx_t_2, __pyx_bstride_0_grid_left_edge))) / (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_grid_dds.buf, __pyx_t_3, __pyx_bstride_0_grid_dds))));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":509
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":509
* for i in range(3):
* li[i] = lrint((self.left_edge[i] - grid_left_edge[i])/grid_dds[i])
* ri[i] = lrint((self.right_edge[i] - grid_left_edge[i])/grid_dds[i]) # <<<<<<<<<<<<<<
@@ -15023,7 +15023,7 @@
__pyx_t_5 = __pyx_v_i;
(__pyx_v_ri[__pyx_v_i]) = lrint((((((struct __pyx_obj_2yt_9amr_utils_ProtoPrism *)__pyx_v_self)->right_edge[__pyx_v_i]) - (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_grid_left_edge.buf, __pyx_t_4, __pyx_bstride_0_grid_left_edge))) / (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_grid_dds.buf, __pyx_t_5, __pyx_bstride_0_grid_dds))));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":510
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":510
* li[i] = lrint((self.left_edge[i] - grid_left_edge[i])/grid_dds[i])
* ri[i] = lrint((self.right_edge[i] - grid_left_edge[i])/grid_dds[i])
* idims[i] = ri[i] - li[i] # <<<<<<<<<<<<<<
@@ -15033,7 +15033,7 @@
(__pyx_v_idims[__pyx_v_i]) = ((__pyx_v_ri[__pyx_v_i]) - (__pyx_v_li[__pyx_v_i]));
}
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":511
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":511
* ri[i] = lrint((self.right_edge[i] - grid_left_edge[i])/grid_dds[i])
* idims[i] = ri[i] - li[i]
* if child_mask[li[0], li[1], li[2]] == 0: return [] # <<<<<<<<<<<<<<
@@ -15076,7 +15076,7 @@
}
__pyx_L8:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":512
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":512
* idims[i] = ri[i] - li[i]
* if child_mask[li[0], li[1], li[2]] == 0: return []
* cdef np.ndarray[np.int64_t, ndim=1] dims = np.empty(3, dtype='int64') # <<<<<<<<<<<<<<
@@ -15116,7 +15116,7 @@
__pyx_v_dims = ((PyArrayObject *)__pyx_t_7);
__pyx_t_7 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":513
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":513
* if child_mask[li[0], li[1], li[2]] == 0: return []
* cdef np.ndarray[np.int64_t, ndim=1] dims = np.empty(3, dtype='int64')
* for i in range(3): # <<<<<<<<<<<<<<
@@ -15126,7 +15126,7 @@
for (__pyx_t_1 = 0; __pyx_t_1 < 3; __pyx_t_1+=1) {
__pyx_v_i = __pyx_t_1;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":514
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":514
* cdef np.ndarray[np.int64_t, ndim=1] dims = np.empty(3, dtype='int64')
* for i in range(3):
* dims[i] = idims[i] # <<<<<<<<<<<<<<
@@ -15137,7 +15137,7 @@
*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_dims.buf, __pyx_t_12, __pyx_bstride_0_dims) = (__pyx_v_idims[__pyx_v_i]);
}
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":516
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":516
* dims[i] = idims[i]
* cdef np.ndarray[np.float64_t, ndim=3] new_data
* new_data = data[li[0]:ri[0]+1,li[1]:ri[1]+1,li[2]:ri[2]+1].copy() # <<<<<<<<<<<<<<
@@ -15212,7 +15212,7 @@
__pyx_v_new_data = ((PyArrayObject *)__pyx_t_7);
__pyx_t_7 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":517
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":517
* cdef np.ndarray[np.float64_t, ndim=3] new_data
* new_data = data[li[0]:ri[0]+1,li[1]:ri[1]+1,li[2]:ri[2]+1].copy()
* PG = PartitionedGrid(new_data, self.LeftEdge, self.RightEdge, dims) # <<<<<<<<<<<<<<
@@ -15240,7 +15240,7 @@
__pyx_v_PG = ((struct __pyx_obj_2yt_9amr_utils_PartitionedGrid *)__pyx_t_8);
__pyx_t_8 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":518
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":518
* new_data = data[li[0]:ri[0]+1,li[1]:ri[1]+1,li[2]:ri[2]+1].copy()
* PG = PartitionedGrid(new_data, self.LeftEdge, self.RightEdge, dims)
* return [PG] # <<<<<<<<<<<<<<
@@ -15291,7 +15291,7 @@
return __pyx_r;
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/CICDeposit.pyx":28
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/CICDeposit.pyx":28
* @cython.boundscheck(False)
* @cython.wraparound(False)
* def CICDeposit_3(np.ndarray[np.float64_t, ndim=1] posx, # <<<<<<<<<<<<<<
@@ -15560,7 +15560,7 @@
__pyx_bstride_0_gridDimension = __pyx_bstruct_gridDimension.strides[0];
__pyx_bshape_0_gridDimension = __pyx_bstruct_gridDimension.shape[0];
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/CICDeposit.pyx":44
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/CICDeposit.pyx":44
* cdef float dx, dy, dz, dx2, dy2, dz2
*
* edge0 = (<float> gridDimension[0]) - 0.5001 # <<<<<<<<<<<<<<
@@ -15570,7 +15570,7 @@
__pyx_t_1 = 0;
__pyx_v_edge0 = (((float)(*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int32_t *, __pyx_bstruct_gridDimension.buf, __pyx_t_1, __pyx_bstride_0_gridDimension))) - 0.50009999999999999);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/CICDeposit.pyx":45
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/CICDeposit.pyx":45
*
* edge0 = (<float> gridDimension[0]) - 0.5001
* edge1 = (<float> gridDimension[1]) - 0.5001 # <<<<<<<<<<<<<<
@@ -15580,7 +15580,7 @@
__pyx_t_2 = 1;
__pyx_v_edge1 = (((float)(*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int32_t *, __pyx_bstruct_gridDimension.buf, __pyx_t_2, __pyx_bstride_0_gridDimension))) - 0.50009999999999999);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/CICDeposit.pyx":46
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/CICDeposit.pyx":46
* edge0 = (<float> gridDimension[0]) - 0.5001
* edge1 = (<float> gridDimension[1]) - 0.5001
* edge2 = (<float> gridDimension[2]) - 0.5001 # <<<<<<<<<<<<<<
@@ -15590,7 +15590,7 @@
__pyx_t_3 = 2;
__pyx_v_edge2 = (((float)(*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int32_t *, __pyx_bstruct_gridDimension.buf, __pyx_t_3, __pyx_bstride_0_gridDimension))) - 0.50009999999999999);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/CICDeposit.pyx":47
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/CICDeposit.pyx":47
* edge1 = (<float> gridDimension[1]) - 0.5001
* edge2 = (<float> gridDimension[2]) - 0.5001
* fact = 1.0 / cellSize # <<<<<<<<<<<<<<
@@ -15599,7 +15599,7 @@
*/
__pyx_v_fact = (1.0 / __pyx_v_cellSize);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/CICDeposit.pyx":49
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/CICDeposit.pyx":49
* fact = 1.0 / cellSize
*
* le0 = leftEdge[0] # <<<<<<<<<<<<<<
@@ -15609,7 +15609,7 @@
__pyx_t_4 = 0;
__pyx_v_le0 = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_leftEdge.buf, __pyx_t_4, __pyx_bstride_0_leftEdge));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/CICDeposit.pyx":50
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/CICDeposit.pyx":50
*
* le0 = leftEdge[0]
* le1 = leftEdge[1] # <<<<<<<<<<<<<<
@@ -15619,7 +15619,7 @@
__pyx_t_5 = 1;
__pyx_v_le1 = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_leftEdge.buf, __pyx_t_5, __pyx_bstride_0_leftEdge));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/CICDeposit.pyx":51
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/CICDeposit.pyx":51
* le0 = leftEdge[0]
* le1 = leftEdge[1]
* le2 = leftEdge[2] # <<<<<<<<<<<<<<
@@ -15629,7 +15629,7 @@
__pyx_t_6 = 2;
__pyx_v_le2 = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_leftEdge.buf, __pyx_t_6, __pyx_bstride_0_leftEdge));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/CICDeposit.pyx":53
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/CICDeposit.pyx":53
* le2 = leftEdge[2]
*
* for n in range(npositions): # <<<<<<<<<<<<<<
@@ -15639,7 +15639,7 @@
for (__pyx_t_7 = 0; __pyx_t_7 < __pyx_v_npositions; __pyx_t_7+=1) {
__pyx_v_n = __pyx_t_7;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/CICDeposit.pyx":56
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/CICDeposit.pyx":56
*
* # Compute the position of the central cell
* xpos = fmin(fmax((posx[n] - le0)*fact, 0.5001), edge0) # <<<<<<<<<<<<<<
@@ -15649,7 +15649,7 @@
__pyx_t_8 = __pyx_v_n;
__pyx_v_xpos = __pyx_f_2yt_9amr_utils_fmin(__pyx_f_2yt_9amr_utils_fmax((((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_posx.buf, __pyx_t_8, __pyx_bstride_0_posx)) - __pyx_v_le0) * __pyx_v_fact), 0.50009999999999999), __pyx_v_edge0);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/CICDeposit.pyx":57
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/CICDeposit.pyx":57
* # Compute the position of the central cell
* xpos = fmin(fmax((posx[n] - le0)*fact, 0.5001), edge0)
* ypos = fmin(fmax((posy[n] - le1)*fact, 0.5001), edge1) # <<<<<<<<<<<<<<
@@ -15659,7 +15659,7 @@
__pyx_t_9 = __pyx_v_n;
__pyx_v_ypos = __pyx_f_2yt_9amr_utils_fmin(__pyx_f_2yt_9amr_utils_fmax((((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_posy.buf, __pyx_t_9, __pyx_bstride_0_posy)) - __pyx_v_le1) * __pyx_v_fact), 0.50009999999999999), __pyx_v_edge1);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/CICDeposit.pyx":58
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/CICDeposit.pyx":58
* xpos = fmin(fmax((posx[n] - le0)*fact, 0.5001), edge0)
* ypos = fmin(fmax((posy[n] - le1)*fact, 0.5001), edge1)
* zpos = fmin(fmax((posz[n] - le2)*fact, 0.5001), edge2) # <<<<<<<<<<<<<<
@@ -15669,7 +15669,7 @@
__pyx_t_10 = __pyx_v_n;
__pyx_v_zpos = __pyx_f_2yt_9amr_utils_fmin(__pyx_f_2yt_9amr_utils_fmax((((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_posz.buf, __pyx_t_10, __pyx_bstride_0_posz)) - __pyx_v_le2) * __pyx_v_fact), 0.50009999999999999), __pyx_v_edge2);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/CICDeposit.pyx":60
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/CICDeposit.pyx":60
* zpos = fmin(fmax((posz[n] - le2)*fact, 0.5001), edge2)
*
* i1 = <int> (xpos + 0.5) # <<<<<<<<<<<<<<
@@ -15678,7 +15678,7 @@
*/
__pyx_v_i1 = ((int)(__pyx_v_xpos + 0.5));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/CICDeposit.pyx":61
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/CICDeposit.pyx":61
*
* i1 = <int> (xpos + 0.5)
* j1 = <int> (ypos + 0.5) # <<<<<<<<<<<<<<
@@ -15687,7 +15687,7 @@
*/
__pyx_v_j1 = ((int)(__pyx_v_ypos + 0.5));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/CICDeposit.pyx":62
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/CICDeposit.pyx":62
* i1 = <int> (xpos + 0.5)
* j1 = <int> (ypos + 0.5)
* k1 = <int> (zpos + 0.5) # <<<<<<<<<<<<<<
@@ -15696,7 +15696,7 @@
*/
__pyx_v_k1 = ((int)(__pyx_v_zpos + 0.5));
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/CICDeposit.pyx":65
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/CICDeposit.pyx":65
*
* # Compute the weights
* dx = (<float> i1) + 0.5 - xpos # <<<<<<<<<<<<<<
@@ -15705,7 +15705,7 @@
*/
__pyx_v_dx = ((((float)__pyx_v_i1) + 0.5) - __pyx_v_xpos);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/CICDeposit.pyx":66
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/CICDeposit.pyx":66
* # Compute the weights
* dx = (<float> i1) + 0.5 - xpos
* dy = (<float> j1) + 0.5 - ypos # <<<<<<<<<<<<<<
@@ -15714,7 +15714,7 @@
*/
__pyx_v_dy = ((((float)__pyx_v_j1) + 0.5) - __pyx_v_ypos);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/CICDeposit.pyx":67
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/CICDeposit.pyx":67
* dx = (<float> i1) + 0.5 - xpos
* dy = (<float> j1) + 0.5 - ypos
* dz = (<float> k1) + 0.5 - zpos # <<<<<<<<<<<<<<
@@ -15723,7 +15723,7 @@
*/
__pyx_v_dz = ((((float)__pyx_v_k1) + 0.5) - __pyx_v_zpos);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/CICDeposit.pyx":68
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/CICDeposit.pyx":68
* dy = (<float> j1) + 0.5 - ypos
* dz = (<float> k1) + 0.5 - zpos
* dx2 = 1.0 - dx # <<<<<<<<<<<<<<
@@ -15732,7 +15732,7 @@
*/
__pyx_v_dx2 = (1.0 - __pyx_v_dx);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/CICDeposit.pyx":69
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/CICDeposit.pyx":69
* dz = (<float> k1) + 0.5 - zpos
* dx2 = 1.0 - dx
* dy2 = 1.0 - dy # <<<<<<<<<<<<<<
@@ -15741,7 +15741,7 @@
*/
__pyx_v_dy2 = (1.0 - __pyx_v_dy);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/CICDeposit.pyx":70
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/CICDeposit.pyx":70
* dx2 = 1.0 - dx
* dy2 = 1.0 - dy
* dz2 = 1.0 - dz # <<<<<<<<<<<<<<
@@ -15750,7 +15750,7 @@
*/
__pyx_v_dz2 = (1.0 - __pyx_v_dz);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/CICDeposit.pyx":73
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/CICDeposit.pyx":73
*
* # Interpolate from field into sumfield
* field[i1-1,j1-1,k1-1] += mass[n] * dx * dy * dz # <<<<<<<<<<<<<<
@@ -15763,7 +15763,7 @@
__pyx_t_14 = (__pyx_v_k1 - 1);
*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_float32_t *, __pyx_bstruct_field.buf, __pyx_t_12, __pyx_bstride_0_field, __pyx_t_13, __pyx_bstride_1_field, __pyx_t_14, __pyx_bstride_2_field) += ((((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float32_t *, __pyx_bstruct_mass.buf, __pyx_t_11, __pyx_bstride_0_mass)) * __pyx_v_dx) * __pyx_v_dy) * __pyx_v_dz);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/CICDeposit.pyx":74
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/CICDeposit.pyx":74
* # Interpolate from field into sumfield
* field[i1-1,j1-1,k1-1] += mass[n] * dx * dy * dz
* field[i1 ,j1-1,k1-1] += mass[n] * dx2 * dy * dz # <<<<<<<<<<<<<<
@@ -15776,7 +15776,7 @@
__pyx_t_18 = (__pyx_v_k1 - 1);
*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_float32_t *, __pyx_bstruct_field.buf, __pyx_t_16, __pyx_bstride_0_field, __pyx_t_17, __pyx_bstride_1_field, __pyx_t_18, __pyx_bstride_2_field) += ((((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float32_t *, __pyx_bstruct_mass.buf, __pyx_t_15, __pyx_bstride_0_mass)) * __pyx_v_dx2) * __pyx_v_dy) * __pyx_v_dz);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/CICDeposit.pyx":75
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/CICDeposit.pyx":75
* field[i1-1,j1-1,k1-1] += mass[n] * dx * dy * dz
* field[i1 ,j1-1,k1-1] += mass[n] * dx2 * dy * dz
* field[i1-1,j1 ,k1-1] += mass[n] * dx * dy2 * dz # <<<<<<<<<<<<<<
@@ -15789,7 +15789,7 @@
__pyx_t_22 = (__pyx_v_k1 - 1);
*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_float32_t *, __pyx_bstruct_field.buf, __pyx_t_20, __pyx_bstride_0_field, __pyx_t_21, __pyx_bstride_1_field, __pyx_t_22, __pyx_bstride_2_field) += ((((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float32_t *, __pyx_bstruct_mass.buf, __pyx_t_19, __pyx_bstride_0_mass)) * __pyx_v_dx) * __pyx_v_dy2) * __pyx_v_dz);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/CICDeposit.pyx":76
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/CICDeposit.pyx":76
* field[i1 ,j1-1,k1-1] += mass[n] * dx2 * dy * dz
* field[i1-1,j1 ,k1-1] += mass[n] * dx * dy2 * dz
* field[i1 ,j1 ,k1-1] += mass[n] * dx2 * dy2 * dz # <<<<<<<<<<<<<<
@@ -15802,7 +15802,7 @@
__pyx_t_26 = (__pyx_v_k1 - 1);
*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_float32_t *, __pyx_bstruct_field.buf, __pyx_t_24, __pyx_bstride_0_field, __pyx_t_25, __pyx_bstride_1_field, __pyx_t_26, __pyx_bstride_2_field) += ((((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float32_t *, __pyx_bstruct_mass.buf, __pyx_t_23, __pyx_bstride_0_mass)) * __pyx_v_dx2) * __pyx_v_dy2) * __pyx_v_dz);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/CICDeposit.pyx":77
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/CICDeposit.pyx":77
* field[i1-1,j1 ,k1-1] += mass[n] * dx * dy2 * dz
* field[i1 ,j1 ,k1-1] += mass[n] * dx2 * dy2 * dz
* field[i1-1,j1-1,k1 ] += mass[n] * dx * dy * dz2 # <<<<<<<<<<<<<<
@@ -15815,7 +15815,7 @@
__pyx_t_30 = __pyx_v_k1;
*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_float32_t *, __pyx_bstruct_field.buf, __pyx_t_28, __pyx_bstride_0_field, __pyx_t_29, __pyx_bstride_1_field, __pyx_t_30, __pyx_bstride_2_field) += ((((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float32_t *, __pyx_bstruct_mass.buf, __pyx_t_27, __pyx_bstride_0_mass)) * __pyx_v_dx) * __pyx_v_dy) * __pyx_v_dz2);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/CICDeposit.pyx":78
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/CICDeposit.pyx":78
* field[i1 ,j1 ,k1-1] += mass[n] * dx2 * dy2 * dz
* field[i1-1,j1-1,k1 ] += mass[n] * dx * dy * dz2
* field[i1 ,j1-1,k1 ] += mass[n] * dx2 * dy * dz2 # <<<<<<<<<<<<<<
@@ -15828,7 +15828,7 @@
__pyx_t_34 = __pyx_v_k1;
*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_float32_t *, __pyx_bstruct_field.buf, __pyx_t_32, __pyx_bstride_0_field, __pyx_t_33, __pyx_bstride_1_field, __pyx_t_34, __pyx_bstride_2_field) += ((((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float32_t *, __pyx_bstruct_mass.buf, __pyx_t_31, __pyx_bstride_0_mass)) * __pyx_v_dx2) * __pyx_v_dy) * __pyx_v_dz2);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/CICDeposit.pyx":79
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/CICDeposit.pyx":79
* field[i1-1,j1-1,k1 ] += mass[n] * dx * dy * dz2
* field[i1 ,j1-1,k1 ] += mass[n] * dx2 * dy * dz2
* field[i1-1,j1 ,k1 ] += mass[n] * dx * dy2 * dz2 # <<<<<<<<<<<<<<
@@ -15840,7 +15840,7 @@
__pyx_t_38 = __pyx_v_k1;
*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_float32_t *, __pyx_bstruct_field.buf, __pyx_t_36, __pyx_bstride_0_field, __pyx_t_37, __pyx_bstride_1_field, __pyx_t_38, __pyx_bstride_2_field) += ((((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float32_t *, __pyx_bstruct_mass.buf, __pyx_t_35, __pyx_bstride_0_mass)) * __pyx_v_dx) * __pyx_v_dy2) * __pyx_v_dz2);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/CICDeposit.pyx":80
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/CICDeposit.pyx":80
* field[i1 ,j1-1,k1 ] += mass[n] * dx2 * dy * dz2
* field[i1-1,j1 ,k1 ] += mass[n] * dx * dy2 * dz2
* field[i1 ,j1 ,k1 ] += mass[n] * dx2 * dy2 * dz2 # <<<<<<<<<<<<<<
@@ -15882,7 +15882,7 @@
return __pyx_r;
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":30
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":30
* cimport cython
*
* cdef inline np.int64_t i64max(np.int64_t i0, np.int64_t i1): # <<<<<<<<<<<<<<
@@ -15895,7 +15895,7 @@
int __pyx_t_1;
__Pyx_SetupRefcountContext("i64max");
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":31
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":31
*
* cdef inline np.int64_t i64max(np.int64_t i0, np.int64_t i1):
* if i0 > i1: return i0 # <<<<<<<<<<<<<<
@@ -15910,7 +15910,7 @@
}
__pyx_L3:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":32
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":32
* cdef inline np.int64_t i64max(np.int64_t i0, np.int64_t i1):
* if i0 > i1: return i0
* return i1 # <<<<<<<<<<<<<<
@@ -15926,7 +15926,7 @@
return __pyx_r;
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":34
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":34
* return i1
*
* cdef inline np.int64_t i64min(np.int64_t i0, np.int64_t i1): # <<<<<<<<<<<<<<
@@ -15939,7 +15939,7 @@
int __pyx_t_1;
__Pyx_SetupRefcountContext("i64min");
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":35
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":35
*
* cdef inline np.int64_t i64min(np.int64_t i0, np.int64_t i1):
* if i0 < i1: return i0 # <<<<<<<<<<<<<<
@@ -15954,7 +15954,7 @@
}
__pyx_L3:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":36
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":36
* cdef inline np.int64_t i64min(np.int64_t i0, np.int64_t i1):
* if i0 < i1: return i0
* return i1 # <<<<<<<<<<<<<<
@@ -15970,7 +15970,7 @@
return __pyx_r;
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":39
+/* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":39
*
* @cython.boundscheck(False)
* def construct_boundary_relationships( # <<<<<<<<<<<<<<
@@ -15985,6 +15985,10 @@
int __pyx_v_nx;
int __pyx_v_ny;
int __pyx_v_nz;
+ int __pyx_v_offset_i;
+ int __pyx_v_offset_j;
+ int __pyx_v_oi;
+ int __pyx_v_oj;
__pyx_t_5numpy_int64_t __pyx_v_c1;
__pyx_t_5numpy_int64_t __pyx_v_c2;
PyObject *__pyx_v_tree;
@@ -15999,45 +16003,47 @@
PyObject *__pyx_t_1 = NULL;
int __pyx_t_2;
int __pyx_t_3;
- long __pyx_t_4;
+ int __pyx_t_4;
int __pyx_t_5;
int __pyx_t_6;
long __pyx_t_7;
int __pyx_t_8;
int __pyx_t_9;
- int __pyx_t_10;
- PyObject *__pyx_t_11 = NULL;
- PyObject *__pyx_t_12 = NULL;
- long __pyx_t_13;
- int __pyx_t_14;
- int __pyx_t_15;
- long __pyx_t_16;
+ long __pyx_t_10;
+ int __pyx_t_11;
+ int __pyx_t_12;
+ PyObject *__pyx_t_13 = NULL;
+ PyObject *__pyx_t_14 = NULL;
+ long __pyx_t_15;
+ int __pyx_t_16;
int __pyx_t_17;
- int __pyx_t_18;
+ long __pyx_t_18;
int __pyx_t_19;
- long __pyx_t_20;
+ int __pyx_t_20;
int __pyx_t_21;
- int __pyx_t_22;
- long __pyx_t_23;
+ long __pyx_t_22;
+ int __pyx_t_23;
int __pyx_t_24;
- int __pyx_t_25;
- long __pyx_t_26;
+ long __pyx_t_25;
+ int __pyx_t_26;
int __pyx_t_27;
- int __pyx_t_28;
- long __pyx_t_29;
+ long __pyx_t_28;
+ int __pyx_t_29;
int __pyx_t_30;
- int __pyx_t_31;
+ long __pyx_t_31;
int __pyx_t_32;
- long __pyx_t_33;
+ int __pyx_t_33;
int __pyx_t_34;
- int __pyx_t_35;
- long __pyx_t_36;
+ long __pyx_t_35;
+ int __pyx_t_36;
int __pyx_t_37;
- int __pyx_t_38;
- long __pyx_t_39;
+ long __pyx_t_38;
+ int __pyx_t_39;
int __pyx_t_40;
- int __pyx_t_41;
- long __pyx_t_42;
+ long __pyx_t_41;
+ int __pyx_t_42;
+ int __pyx_t_43;
+ long __pyx_t_44;
__Pyx_SetupRefcountContext("construct_boundary_relationships");
__pyx_self = __pyx_self;
__pyx_v_tree = Py_None; __Pyx_INCREF(Py_None);
@@ -16050,8 +16056,8 @@
__pyx_bstride_0_contour_ids = __pyx_bstruct_contour_ids.strides[0]; __pyx_bstride_1_contour_ids = __pyx_bstruct_contour_ids.strides[1]; __pyx_bstride_2_contour_ids = __pyx_bstruct_contour_ids.strides[2];
__pyx_bshape_0_contour_ids = __pyx_bstruct_contour_ids.shape[0]; __pyx_bshape_1_contour_ids = __pyx_bstruct_contour_ids.shape[1]; __pyx_bshape_2_contour_ids = __pyx_bstruct_contour_ids.shape[2];
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":44
- * cdef int i, j, nx, ny, nz
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":44
+ * cdef int i, j, nx, ny, nz, offset_i, offset_j, oi, oj
* cdef np.int64_t c1, c2
* tree = [] # <<<<<<<<<<<<<<
* nx = contour_ids.shape[0]
@@ -16063,7 +16069,7 @@
__pyx_v_tree = ((PyObject *)__pyx_t_1);
__pyx_t_1 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":45
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":45
* cdef np.int64_t c1, c2
* tree = []
* nx = contour_ids.shape[0] # <<<<<<<<<<<<<<
@@ -16072,7 +16078,7 @@
*/
__pyx_v_nx = (((PyArrayObject *)__pyx_v_contour_ids)->dimensions[0]);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":46
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":46
* tree = []
* nx = contour_ids.shape[0]
* ny = contour_ids.shape[1] # <<<<<<<<<<<<<<
@@ -16081,7 +16087,7 @@
*/
__pyx_v_ny = (((PyArrayObject *)__pyx_v_contour_ids)->dimensions[1]);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":47
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":47
* nx = contour_ids.shape[0]
* ny = contour_ids.shape[1]
* nz = contour_ids.shape[2] # <<<<<<<<<<<<<<
@@ -16090,500 +16096,842 @@
*/
__pyx_v_nz = (((PyArrayObject *)__pyx_v_contour_ids)->dimensions[2]);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":49
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":49
* nz = contour_ids.shape[2]
* # First x-pass
* for i in range(ny): # <<<<<<<<<<<<<<
* for j in range(nz):
- * c1 = contour_ids[0, i, j]
+ * for offset_i in range(3):
*/
for (__pyx_t_2 = 0; __pyx_t_2 < __pyx_v_ny; __pyx_t_2+=1) {
__pyx_v_i = __pyx_t_2;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":50
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":50
* # First x-pass
* for i in range(ny):
* for j in range(nz): # <<<<<<<<<<<<<<
- * c1 = contour_ids[0, i, j]
- * c2 = contour_ids[1, i, j]
+ * for offset_i in range(3):
+ * oi = offset_i - 1
*/
for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_v_nz; __pyx_t_3+=1) {
__pyx_v_j = __pyx_t_3;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":51
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":51
* for i in range(ny):
* for j in range(nz):
- * c1 = contour_ids[0, i, j] # <<<<<<<<<<<<<<
- * c2 = contour_ids[1, i, j]
- * if c1 > -1 and c2 > -1:
+ * for offset_i in range(3): # <<<<<<<<<<<<<<
+ * oi = offset_i - 1
+ * if i == 0 and oi == -1: continue
*/
- __pyx_t_4 = 0;
- __pyx_t_5 = __pyx_v_i;
- __pyx_t_6 = __pyx_v_j;
- if (__pyx_t_4 < 0) __pyx_t_4 += __pyx_bshape_0_contour_ids;
- if (__pyx_t_5 < 0) __pyx_t_5 += __pyx_bshape_1_contour_ids;
- if (__pyx_t_6 < 0) __pyx_t_6 += __pyx_bshape_2_contour_ids;
- __pyx_v_c1 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_4, __pyx_bstride_0_contour_ids, __pyx_t_5, __pyx_bstride_1_contour_ids, __pyx_t_6, __pyx_bstride_2_contour_ids));
+ for (__pyx_t_4 = 0; __pyx_t_4 < 3; __pyx_t_4+=1) {
+ __pyx_v_offset_i = __pyx_t_4;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":52
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":52
* for j in range(nz):
- * c1 = contour_ids[0, i, j]
- * c2 = contour_ids[1, i, j] # <<<<<<<<<<<<<<
- * if c1 > -1 and c2 > -1:
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ * for offset_i in range(3):
+ * oi = offset_i - 1 # <<<<<<<<<<<<<<
+ * if i == 0 and oi == -1: continue
+ * if i == ny - 1 and oj == 1: continue
+ */
+ __pyx_v_oi = (__pyx_v_offset_i - 1);
+
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":53
+ * for offset_i in range(3):
+ * oi = offset_i - 1
+ * if i == 0 and oi == -1: continue # <<<<<<<<<<<<<<
+ * if i == ny - 1 and oj == 1: continue
+ * for offset_j in range(3):
*/
- __pyx_t_7 = 1;
- __pyx_t_8 = __pyx_v_i;
- __pyx_t_9 = __pyx_v_j;
- if (__pyx_t_7 < 0) __pyx_t_7 += __pyx_bshape_0_contour_ids;
- if (__pyx_t_8 < 0) __pyx_t_8 += __pyx_bshape_1_contour_ids;
- if (__pyx_t_9 < 0) __pyx_t_9 += __pyx_bshape_2_contour_ids;
- __pyx_v_c2 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_7, __pyx_bstride_0_contour_ids, __pyx_t_8, __pyx_bstride_1_contour_ids, __pyx_t_9, __pyx_bstride_2_contour_ids));
-
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":53
- * c1 = contour_ids[0, i, j]
- * c2 = contour_ids[1, i, j]
- * if c1 > -1 and c2 > -1: # <<<<<<<<<<<<<<
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
- * c1 = contour_ids[nx-1, i, j]
+ if ((__pyx_v_i == 0)) {
+ __pyx_t_5 = (__pyx_v_oi == -1);
+ } else {
+ __pyx_t_5 = (__pyx_v_i == 0);
+ }
+ if (__pyx_t_5) {
+ goto __pyx_L9_continue;
+ goto __pyx_L11;
+ }
+ __pyx_L11:;
+
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":54
+ * oi = offset_i - 1
+ * if i == 0 and oi == -1: continue
+ * if i == ny - 1 and oj == 1: continue # <<<<<<<<<<<<<<
+ * for offset_j in range(3):
+ * oj = offset_j - 1
*/
- if ((__pyx_v_c1 > -1)) {
- __pyx_t_10 = (__pyx_v_c2 > -1);
- } else {
- __pyx_t_10 = (__pyx_v_c1 > -1);
- }
- if (__pyx_t_10) {
+ if ((__pyx_v_i == (__pyx_v_ny - 1))) {
+ __pyx_t_5 = (__pyx_v_oj == 1);
+ } else {
+ __pyx_t_5 = (__pyx_v_i == (__pyx_v_ny - 1));
+ }
+ if (__pyx_t_5) {
+ goto __pyx_L9_continue;
+ goto __pyx_L12;
+ }
+ __pyx_L12:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":54
- * c2 = contour_ids[1, i, j]
- * if c1 > -1 and c2 > -1:
- * tree.append((i64max(c1,c2), i64min(c1,c2))) # <<<<<<<<<<<<<<
- * c1 = contour_ids[nx-1, i, j]
- * c2 = contour_ids[nx-2, i, j]
- */
- __pyx_t_1 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64max(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 54; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_t_1);
- __pyx_t_11 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64min(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 54; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_t_11);
- __pyx_t_12 = PyTuple_New(2); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 54; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(((PyObject *)__pyx_t_12));
- PyTuple_SET_ITEM(__pyx_t_12, 0, __pyx_t_1);
- __Pyx_GIVEREF(__pyx_t_1);
- PyTuple_SET_ITEM(__pyx_t_12, 1, __pyx_t_11);
- __Pyx_GIVEREF(__pyx_t_11);
- __pyx_t_1 = 0;
- __pyx_t_11 = 0;
- __pyx_t_11 = __Pyx_PyObject_Append(__pyx_v_tree, ((PyObject *)__pyx_t_12)); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 54; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_t_11);
- __Pyx_DECREF(((PyObject *)__pyx_t_12)); __pyx_t_12 = 0;
- __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
- goto __pyx_L9;
- }
- __pyx_L9:;
-
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":55
- * if c1 > -1 and c2 > -1:
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
- * c1 = contour_ids[nx-1, i, j] # <<<<<<<<<<<<<<
- * c2 = contour_ids[nx-2, i, j]
- * if c1 > -1 and c2 > -1:
- */
- __pyx_t_13 = (__pyx_v_nx - 1);
- __pyx_t_14 = __pyx_v_i;
- __pyx_t_15 = __pyx_v_j;
- if (__pyx_t_13 < 0) __pyx_t_13 += __pyx_bshape_0_contour_ids;
- if (__pyx_t_14 < 0) __pyx_t_14 += __pyx_bshape_1_contour_ids;
- if (__pyx_t_15 < 0) __pyx_t_15 += __pyx_bshape_2_contour_ids;
- __pyx_v_c1 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_13, __pyx_bstride_0_contour_ids, __pyx_t_14, __pyx_bstride_1_contour_ids, __pyx_t_15, __pyx_bstride_2_contour_ids));
-
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":56
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
- * c1 = contour_ids[nx-1, i, j]
- * c2 = contour_ids[nx-2, i, j] # <<<<<<<<<<<<<<
- * if c1 > -1 and c2 > -1:
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
- */
- __pyx_t_16 = (__pyx_v_nx - 2);
- __pyx_t_17 = __pyx_v_i;
- __pyx_t_18 = __pyx_v_j;
- if (__pyx_t_16 < 0) __pyx_t_16 += __pyx_bshape_0_contour_ids;
- if (__pyx_t_17 < 0) __pyx_t_17 += __pyx_bshape_1_contour_ids;
- if (__pyx_t_18 < 0) __pyx_t_18 += __pyx_bshape_2_contour_ids;
- __pyx_v_c2 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_16, __pyx_bstride_0_contour_ids, __pyx_t_17, __pyx_bstride_1_contour_ids, __pyx_t_18, __pyx_bstride_2_contour_ids));
-
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":57
- * c1 = contour_ids[nx-1, i, j]
- * c2 = contour_ids[nx-2, i, j]
- * if c1 > -1 and c2 > -1: # <<<<<<<<<<<<<<
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":55
+ * if i == 0 and oi == -1: continue
+ * if i == ny - 1 and oj == 1: continue
+ * for offset_j in range(3): # <<<<<<<<<<<<<<
+ * oj = offset_j - 1
+ * if j == 0 and oj == -1: continue
+ */
+ for (__pyx_t_6 = 0; __pyx_t_6 < 3; __pyx_t_6+=1) {
+ __pyx_v_offset_j = __pyx_t_6;
+
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":56
+ * if i == ny - 1 and oj == 1: continue
+ * for offset_j in range(3):
+ * oj = offset_j - 1 # <<<<<<<<<<<<<<
+ * if j == 0 and oj == -1: continue
+ * if j == nz - 1 and oj == 1: continue
+ */
+ __pyx_v_oj = (__pyx_v_offset_j - 1);
+
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":57
+ * for offset_j in range(3):
+ * oj = offset_j - 1
+ * if j == 0 and oj == -1: continue # <<<<<<<<<<<<<<
+ * if j == nz - 1 and oj == 1: continue
+ * c1 = contour_ids[0, i, j]
+ */
+ if ((__pyx_v_j == 0)) {
+ __pyx_t_5 = (__pyx_v_oj == -1);
+ } else {
+ __pyx_t_5 = (__pyx_v_j == 0);
+ }
+ if (__pyx_t_5) {
+ goto __pyx_L13_continue;
+ goto __pyx_L15;
+ }
+ __pyx_L15:;
+
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":58
+ * oj = offset_j - 1
+ * if j == 0 and oj == -1: continue
+ * if j == nz - 1 and oj == 1: continue # <<<<<<<<<<<<<<
+ * c1 = contour_ids[0, i, j]
+ * c2 = contour_ids[1, i + oi, j + oj]
+ */
+ if ((__pyx_v_j == (__pyx_v_nz - 1))) {
+ __pyx_t_5 = (__pyx_v_oj == 1);
+ } else {
+ __pyx_t_5 = (__pyx_v_j == (__pyx_v_nz - 1));
+ }
+ if (__pyx_t_5) {
+ goto __pyx_L13_continue;
+ goto __pyx_L16;
+ }
+ __pyx_L16:;
+
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":59
+ * if j == 0 and oj == -1: continue
+ * if j == nz - 1 and oj == 1: continue
+ * c1 = contour_ids[0, i, j] # <<<<<<<<<<<<<<
+ * c2 = contour_ids[1, i + oi, j + oj]
+ * if c1 > -1 and c2 > -1:
+ */
+ __pyx_t_7 = 0;
+ __pyx_t_8 = __pyx_v_i;
+ __pyx_t_9 = __pyx_v_j;
+ if (__pyx_t_7 < 0) __pyx_t_7 += __pyx_bshape_0_contour_ids;
+ if (__pyx_t_8 < 0) __pyx_t_8 += __pyx_bshape_1_contour_ids;
+ if (__pyx_t_9 < 0) __pyx_t_9 += __pyx_bshape_2_contour_ids;
+ __pyx_v_c1 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_7, __pyx_bstride_0_contour_ids, __pyx_t_8, __pyx_bstride_1_contour_ids, __pyx_t_9, __pyx_bstride_2_contour_ids));
+
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":60
+ * if j == nz - 1 and oj == 1: continue
+ * c1 = contour_ids[0, i, j]
+ * c2 = contour_ids[1, i + oi, j + oj] # <<<<<<<<<<<<<<
+ * if c1 > -1 and c2 > -1:
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ */
+ __pyx_t_10 = 1;
+ __pyx_t_11 = (__pyx_v_i + __pyx_v_oi);
+ __pyx_t_12 = (__pyx_v_j + __pyx_v_oj);
+ if (__pyx_t_10 < 0) __pyx_t_10 += __pyx_bshape_0_contour_ids;
+ if (__pyx_t_11 < 0) __pyx_t_11 += __pyx_bshape_1_contour_ids;
+ if (__pyx_t_12 < 0) __pyx_t_12 += __pyx_bshape_2_contour_ids;
+ __pyx_v_c2 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_10, __pyx_bstride_0_contour_ids, __pyx_t_11, __pyx_bstride_1_contour_ids, __pyx_t_12, __pyx_bstride_2_contour_ids));
+
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":61
+ * c1 = contour_ids[0, i, j]
+ * c2 = contour_ids[1, i + oi, j + oj]
+ * if c1 > -1 and c2 > -1: # <<<<<<<<<<<<<<
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ * c1 = contour_ids[nx-1, i, j]
+ */
+ if ((__pyx_v_c1 > -1)) {
+ __pyx_t_5 = (__pyx_v_c2 > -1);
+ } else {
+ __pyx_t_5 = (__pyx_v_c1 > -1);
+ }
+ if (__pyx_t_5) {
+
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":62
+ * c2 = contour_ids[1, i + oi, j + oj]
+ * if c1 > -1 and c2 > -1:
+ * tree.append((i64max(c1,c2), i64min(c1,c2))) # <<<<<<<<<<<<<<
+ * c1 = contour_ids[nx-1, i, j]
+ * c2 = contour_ids[nx-2, i + oi, j + oj]
+ */
+ __pyx_t_1 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64max(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_1);
+ __pyx_t_13 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64min(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_13)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_13);
+ __pyx_t_14 = PyTuple_New(2); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(((PyObject *)__pyx_t_14));
+ PyTuple_SET_ITEM(__pyx_t_14, 0, __pyx_t_1);
+ __Pyx_GIVEREF(__pyx_t_1);
+ PyTuple_SET_ITEM(__pyx_t_14, 1, __pyx_t_13);
+ __Pyx_GIVEREF(__pyx_t_13);
+ __pyx_t_1 = 0;
+ __pyx_t_13 = 0;
+ __pyx_t_13 = __Pyx_PyObject_Append(__pyx_v_tree, ((PyObject *)__pyx_t_14)); if (unlikely(!__pyx_t_13)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_13);
+ __Pyx_DECREF(((PyObject *)__pyx_t_14)); __pyx_t_14 = 0;
+ __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0;
+ goto __pyx_L17;
+ }
+ __pyx_L17:;
+
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":63
+ * if c1 > -1 and c2 > -1:
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ * c1 = contour_ids[nx-1, i, j] # <<<<<<<<<<<<<<
+ * c2 = contour_ids[nx-2, i + oi, j + oj]
+ * if c1 > -1 and c2 > -1:
+ */
+ __pyx_t_15 = (__pyx_v_nx - 1);
+ __pyx_t_16 = __pyx_v_i;
+ __pyx_t_17 = __pyx_v_j;
+ if (__pyx_t_15 < 0) __pyx_t_15 += __pyx_bshape_0_contour_ids;
+ if (__pyx_t_16 < 0) __pyx_t_16 += __pyx_bshape_1_contour_ids;
+ if (__pyx_t_17 < 0) __pyx_t_17 += __pyx_bshape_2_contour_ids;
+ __pyx_v_c1 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_15, __pyx_bstride_0_contour_ids, __pyx_t_16, __pyx_bstride_1_contour_ids, __pyx_t_17, __pyx_bstride_2_contour_ids));
+
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":64
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ * c1 = contour_ids[nx-1, i, j]
+ * c2 = contour_ids[nx-2, i + oi, j + oj] # <<<<<<<<<<<<<<
+ * if c1 > -1 and c2 > -1:
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ */
+ __pyx_t_18 = (__pyx_v_nx - 2);
+ __pyx_t_19 = (__pyx_v_i + __pyx_v_oi);
+ __pyx_t_20 = (__pyx_v_j + __pyx_v_oj);
+ if (__pyx_t_18 < 0) __pyx_t_18 += __pyx_bshape_0_contour_ids;
+ if (__pyx_t_19 < 0) __pyx_t_19 += __pyx_bshape_1_contour_ids;
+ if (__pyx_t_20 < 0) __pyx_t_20 += __pyx_bshape_2_contour_ids;
+ __pyx_v_c2 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_18, __pyx_bstride_0_contour_ids, __pyx_t_19, __pyx_bstride_1_contour_ids, __pyx_t_20, __pyx_bstride_2_contour_ids));
+
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":65
+ * c1 = contour_ids[nx-1, i, j]
+ * c2 = contour_ids[nx-2, i + oi, j + oj]
+ * if c1 > -1 and c2 > -1: # <<<<<<<<<<<<<<
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
* # Now y-pass
*/
- if ((__pyx_v_c1 > -1)) {
- __pyx_t_10 = (__pyx_v_c2 > -1);
- } else {
- __pyx_t_10 = (__pyx_v_c1 > -1);
- }
- if (__pyx_t_10) {
+ if ((__pyx_v_c1 > -1)) {
+ __pyx_t_5 = (__pyx_v_c2 > -1);
+ } else {
+ __pyx_t_5 = (__pyx_v_c1 > -1);
+ }
+ if (__pyx_t_5) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":58
- * c2 = contour_ids[nx-2, i, j]
- * if c1 > -1 and c2 > -1:
- * tree.append((i64max(c1,c2), i64min(c1,c2))) # <<<<<<<<<<<<<<
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":66
+ * c2 = contour_ids[nx-2, i + oi, j + oj]
+ * if c1 > -1 and c2 > -1:
+ * tree.append((i64max(c1,c2), i64min(c1,c2))) # <<<<<<<<<<<<<<
* # Now y-pass
* for i in range(nx):
*/
- __pyx_t_11 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64max(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_t_11);
- __pyx_t_12 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64min(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_t_12);
- __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(((PyObject *)__pyx_t_1));
- PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_11);
- __Pyx_GIVEREF(__pyx_t_11);
- PyTuple_SET_ITEM(__pyx_t_1, 1, __pyx_t_12);
- __Pyx_GIVEREF(__pyx_t_12);
- __pyx_t_11 = 0;
- __pyx_t_12 = 0;
- __pyx_t_12 = __Pyx_PyObject_Append(__pyx_v_tree, ((PyObject *)__pyx_t_1)); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_t_12);
- __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
- __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0;
- goto __pyx_L10;
+ __pyx_t_13 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64max(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_13)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_13);
+ __pyx_t_14 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64min(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_14);
+ __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+ PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_13);
+ __Pyx_GIVEREF(__pyx_t_13);
+ PyTuple_SET_ITEM(__pyx_t_1, 1, __pyx_t_14);
+ __Pyx_GIVEREF(__pyx_t_14);
+ __pyx_t_13 = 0;
+ __pyx_t_14 = 0;
+ __pyx_t_14 = __Pyx_PyObject_Append(__pyx_v_tree, ((PyObject *)__pyx_t_1)); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_14);
+ __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+ __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0;
+ goto __pyx_L18;
+ }
+ __pyx_L18:;
+ __pyx_L13_continue:;
+ }
+ __pyx_L9_continue:;
}
- __pyx_L10:;
}
}
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":60
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":68
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
* # Now y-pass
* for i in range(nx): # <<<<<<<<<<<<<<
* for j in range(nz):
- * c1 = contour_ids[i, 0, j]
+ * for offset_i in range(3):
*/
for (__pyx_t_2 = 0; __pyx_t_2 < __pyx_v_nx; __pyx_t_2+=1) {
__pyx_v_i = __pyx_t_2;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":61
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":69
* # Now y-pass
* for i in range(nx):
* for j in range(nz): # <<<<<<<<<<<<<<
- * c1 = contour_ids[i, 0, j]
- * c2 = contour_ids[i, 1, j]
+ * for offset_i in range(3):
+ * oi = offset_i - 1
*/
for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_v_nz; __pyx_t_3+=1) {
__pyx_v_j = __pyx_t_3;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":62
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":70
* for i in range(nx):
* for j in range(nz):
- * c1 = contour_ids[i, 0, j] # <<<<<<<<<<<<<<
- * c2 = contour_ids[i, 1, j]
- * if c1 > -1 and c2 > -1:
- */
- __pyx_t_19 = __pyx_v_i;
- __pyx_t_20 = 0;
- __pyx_t_21 = __pyx_v_j;
- if (__pyx_t_19 < 0) __pyx_t_19 += __pyx_bshape_0_contour_ids;
- if (__pyx_t_20 < 0) __pyx_t_20 += __pyx_bshape_1_contour_ids;
- if (__pyx_t_21 < 0) __pyx_t_21 += __pyx_bshape_2_contour_ids;
- __pyx_v_c1 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_19, __pyx_bstride_0_contour_ids, __pyx_t_20, __pyx_bstride_1_contour_ids, __pyx_t_21, __pyx_bstride_2_contour_ids));
+ * for offset_i in range(3): # <<<<<<<<<<<<<<
+ * oi = offset_i - 1
+ * if i == 0 and oi == -1: continue
+ */
+ for (__pyx_t_4 = 0; __pyx_t_4 < 3; __pyx_t_4+=1) {
+ __pyx_v_offset_i = __pyx_t_4;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":63
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":71
* for j in range(nz):
- * c1 = contour_ids[i, 0, j]
- * c2 = contour_ids[i, 1, j] # <<<<<<<<<<<<<<
- * if c1 > -1 and c2 > -1:
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
- */
- __pyx_t_22 = __pyx_v_i;
- __pyx_t_23 = 1;
- __pyx_t_24 = __pyx_v_j;
- if (__pyx_t_22 < 0) __pyx_t_22 += __pyx_bshape_0_contour_ids;
- if (__pyx_t_23 < 0) __pyx_t_23 += __pyx_bshape_1_contour_ids;
- if (__pyx_t_24 < 0) __pyx_t_24 += __pyx_bshape_2_contour_ids;
- __pyx_v_c2 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_22, __pyx_bstride_0_contour_ids, __pyx_t_23, __pyx_bstride_1_contour_ids, __pyx_t_24, __pyx_bstride_2_contour_ids));
-
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":64
- * c1 = contour_ids[i, 0, j]
- * c2 = contour_ids[i, 1, j]
- * if c1 > -1 and c2 > -1: # <<<<<<<<<<<<<<
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
- * c1 = contour_ids[i, ny-1, j]
+ * for offset_i in range(3):
+ * oi = offset_i - 1 # <<<<<<<<<<<<<<
+ * if i == 0 and oi == -1: continue
+ * if i == nx - 1 and oj == 1: continue
+ */
+ __pyx_v_oi = (__pyx_v_offset_i - 1);
+
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":72
+ * for offset_i in range(3):
+ * oi = offset_i - 1
+ * if i == 0 and oi == -1: continue # <<<<<<<<<<<<<<
+ * if i == nx - 1 and oj == 1: continue
+ * for offset_j in range(3):
*/
- if ((__pyx_v_c1 > -1)) {
- __pyx_t_10 = (__pyx_v_c2 > -1);
- } else {
- __pyx_t_10 = (__pyx_v_c1 > -1);
- }
- if (__pyx_t_10) {
+ if ((__pyx_v_i == 0)) {
+ __pyx_t_5 = (__pyx_v_oi == -1);
+ } else {
+ __pyx_t_5 = (__pyx_v_i == 0);
+ }
+ if (__pyx_t_5) {
+ goto __pyx_L23_continue;
+ goto __pyx_L25;
+ }
+ __pyx_L25:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":65
- * c2 = contour_ids[i, 1, j]
- * if c1 > -1 and c2 > -1:
- * tree.append((i64max(c1,c2), i64min(c1,c2))) # <<<<<<<<<<<<<<
- * c1 = contour_ids[i, ny-1, j]
- * c2 = contour_ids[i, ny-2, j]
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":73
+ * oi = offset_i - 1
+ * if i == 0 and oi == -1: continue
+ * if i == nx - 1 and oj == 1: continue # <<<<<<<<<<<<<<
+ * for offset_j in range(3):
+ * oj = offset_j - 1
*/
- __pyx_t_12 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64max(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_t_12);
- __pyx_t_1 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64min(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_t_1);
- __pyx_t_11 = PyTuple_New(2); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(((PyObject *)__pyx_t_11));
- PyTuple_SET_ITEM(__pyx_t_11, 0, __pyx_t_12);
- __Pyx_GIVEREF(__pyx_t_12);
- PyTuple_SET_ITEM(__pyx_t_11, 1, __pyx_t_1);
- __Pyx_GIVEREF(__pyx_t_1);
- __pyx_t_12 = 0;
- __pyx_t_1 = 0;
- __pyx_t_1 = __Pyx_PyObject_Append(__pyx_v_tree, ((PyObject *)__pyx_t_11)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_t_1);
- __Pyx_DECREF(((PyObject *)__pyx_t_11)); __pyx_t_11 = 0;
- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- goto __pyx_L15;
- }
- __pyx_L15:;
+ if ((__pyx_v_i == (__pyx_v_nx - 1))) {
+ __pyx_t_5 = (__pyx_v_oj == 1);
+ } else {
+ __pyx_t_5 = (__pyx_v_i == (__pyx_v_nx - 1));
+ }
+ if (__pyx_t_5) {
+ goto __pyx_L23_continue;
+ goto __pyx_L26;
+ }
+ __pyx_L26:;
+
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":74
+ * if i == 0 and oi == -1: continue
+ * if i == nx - 1 and oj == 1: continue
+ * for offset_j in range(3): # <<<<<<<<<<<<<<
+ * oj = offset_j - 1
+ * if j == 0 and oj == -1: continue
+ */
+ for (__pyx_t_6 = 0; __pyx_t_6 < 3; __pyx_t_6+=1) {
+ __pyx_v_offset_j = __pyx_t_6;
+
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":75
+ * if i == nx - 1 and oj == 1: continue
+ * for offset_j in range(3):
+ * oj = offset_j - 1 # <<<<<<<<<<<<<<
+ * if j == 0 and oj == -1: continue
+ * if j == nz - 1 and oj == 1: continue
+ */
+ __pyx_v_oj = (__pyx_v_offset_j - 1);
+
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":76
+ * for offset_j in range(3):
+ * oj = offset_j - 1
+ * if j == 0 and oj == -1: continue # <<<<<<<<<<<<<<
+ * if j == nz - 1 and oj == 1: continue
+ * c1 = contour_ids[i, 0, j]
+ */
+ if ((__pyx_v_j == 0)) {
+ __pyx_t_5 = (__pyx_v_oj == -1);
+ } else {
+ __pyx_t_5 = (__pyx_v_j == 0);
+ }
+ if (__pyx_t_5) {
+ goto __pyx_L27_continue;
+ goto __pyx_L29;
+ }
+ __pyx_L29:;
+
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":77
+ * oj = offset_j - 1
+ * if j == 0 and oj == -1: continue
+ * if j == nz - 1 and oj == 1: continue # <<<<<<<<<<<<<<
+ * c1 = contour_ids[i, 0, j]
+ * c2 = contour_ids[i + oi, 1, j + oj]
+ */
+ if ((__pyx_v_j == (__pyx_v_nz - 1))) {
+ __pyx_t_5 = (__pyx_v_oj == 1);
+ } else {
+ __pyx_t_5 = (__pyx_v_j == (__pyx_v_nz - 1));
+ }
+ if (__pyx_t_5) {
+ goto __pyx_L27_continue;
+ goto __pyx_L30;
+ }
+ __pyx_L30:;
+
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":78
+ * if j == 0 and oj == -1: continue
+ * if j == nz - 1 and oj == 1: continue
+ * c1 = contour_ids[i, 0, j] # <<<<<<<<<<<<<<
+ * c2 = contour_ids[i + oi, 1, j + oj]
+ * if c1 > -1 and c2 > -1:
+ */
+ __pyx_t_21 = __pyx_v_i;
+ __pyx_t_22 = 0;
+ __pyx_t_23 = __pyx_v_j;
+ if (__pyx_t_21 < 0) __pyx_t_21 += __pyx_bshape_0_contour_ids;
+ if (__pyx_t_22 < 0) __pyx_t_22 += __pyx_bshape_1_contour_ids;
+ if (__pyx_t_23 < 0) __pyx_t_23 += __pyx_bshape_2_contour_ids;
+ __pyx_v_c1 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_21, __pyx_bstride_0_contour_ids, __pyx_t_22, __pyx_bstride_1_contour_ids, __pyx_t_23, __pyx_bstride_2_contour_ids));
+
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":79
+ * if j == nz - 1 and oj == 1: continue
+ * c1 = contour_ids[i, 0, j]
+ * c2 = contour_ids[i + oi, 1, j + oj] # <<<<<<<<<<<<<<
+ * if c1 > -1 and c2 > -1:
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ */
+ __pyx_t_24 = (__pyx_v_i + __pyx_v_oi);
+ __pyx_t_25 = 1;
+ __pyx_t_26 = (__pyx_v_j + __pyx_v_oj);
+ if (__pyx_t_24 < 0) __pyx_t_24 += __pyx_bshape_0_contour_ids;
+ if (__pyx_t_25 < 0) __pyx_t_25 += __pyx_bshape_1_contour_ids;
+ if (__pyx_t_26 < 0) __pyx_t_26 += __pyx_bshape_2_contour_ids;
+ __pyx_v_c2 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_24, __pyx_bstride_0_contour_ids, __pyx_t_25, __pyx_bstride_1_contour_ids, __pyx_t_26, __pyx_bstride_2_contour_ids));
+
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":80
+ * c1 = contour_ids[i, 0, j]
+ * c2 = contour_ids[i + oi, 1, j + oj]
+ * if c1 > -1 and c2 > -1: # <<<<<<<<<<<<<<
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ * c1 = contour_ids[i, ny-1, j]
+ */
+ if ((__pyx_v_c1 > -1)) {
+ __pyx_t_5 = (__pyx_v_c2 > -1);
+ } else {
+ __pyx_t_5 = (__pyx_v_c1 > -1);
+ }
+ if (__pyx_t_5) {
+
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":81
+ * c2 = contour_ids[i + oi, 1, j + oj]
+ * if c1 > -1 and c2 > -1:
+ * tree.append((i64max(c1,c2), i64min(c1,c2))) # <<<<<<<<<<<<<<
+ * c1 = contour_ids[i, ny-1, j]
+ * c2 = contour_ids[i + oi, ny-2, j + oj]
+ */
+ __pyx_t_14 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64max(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_14);
+ __pyx_t_1 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64min(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_1);
+ __pyx_t_13 = PyTuple_New(2); if (unlikely(!__pyx_t_13)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(((PyObject *)__pyx_t_13));
+ PyTuple_SET_ITEM(__pyx_t_13, 0, __pyx_t_14);
+ __Pyx_GIVEREF(__pyx_t_14);
+ PyTuple_SET_ITEM(__pyx_t_13, 1, __pyx_t_1);
+ __Pyx_GIVEREF(__pyx_t_1);
+ __pyx_t_14 = 0;
+ __pyx_t_1 = 0;
+ __pyx_t_1 = __Pyx_PyObject_Append(__pyx_v_tree, ((PyObject *)__pyx_t_13)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_1);
+ __Pyx_DECREF(((PyObject *)__pyx_t_13)); __pyx_t_13 = 0;
+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+ goto __pyx_L31;
+ }
+ __pyx_L31:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":66
- * if c1 > -1 and c2 > -1:
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
- * c1 = contour_ids[i, ny-1, j] # <<<<<<<<<<<<<<
- * c2 = contour_ids[i, ny-2, j]
- * if c1 > -1 and c2 > -1:
- */
- __pyx_t_25 = __pyx_v_i;
- __pyx_t_26 = (__pyx_v_ny - 1);
- __pyx_t_27 = __pyx_v_j;
- if (__pyx_t_25 < 0) __pyx_t_25 += __pyx_bshape_0_contour_ids;
- if (__pyx_t_26 < 0) __pyx_t_26 += __pyx_bshape_1_contour_ids;
- if (__pyx_t_27 < 0) __pyx_t_27 += __pyx_bshape_2_contour_ids;
- __pyx_v_c1 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_25, __pyx_bstride_0_contour_ids, __pyx_t_26, __pyx_bstride_1_contour_ids, __pyx_t_27, __pyx_bstride_2_contour_ids));
-
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":67
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
- * c1 = contour_ids[i, ny-1, j]
- * c2 = contour_ids[i, ny-2, j] # <<<<<<<<<<<<<<
- * if c1 > -1 and c2 > -1:
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
- */
- __pyx_t_28 = __pyx_v_i;
- __pyx_t_29 = (__pyx_v_ny - 2);
- __pyx_t_30 = __pyx_v_j;
- if (__pyx_t_28 < 0) __pyx_t_28 += __pyx_bshape_0_contour_ids;
- if (__pyx_t_29 < 0) __pyx_t_29 += __pyx_bshape_1_contour_ids;
- if (__pyx_t_30 < 0) __pyx_t_30 += __pyx_bshape_2_contour_ids;
- __pyx_v_c2 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_28, __pyx_bstride_0_contour_ids, __pyx_t_29, __pyx_bstride_1_contour_ids, __pyx_t_30, __pyx_bstride_2_contour_ids));
-
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":68
- * c1 = contour_ids[i, ny-1, j]
- * c2 = contour_ids[i, ny-2, j]
- * if c1 > -1 and c2 > -1: # <<<<<<<<<<<<<<
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":82
+ * if c1 > -1 and c2 > -1:
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ * c1 = contour_ids[i, ny-1, j] # <<<<<<<<<<<<<<
+ * c2 = contour_ids[i + oi, ny-2, j + oj]
+ * if c1 > -1 and c2 > -1:
+ */
+ __pyx_t_27 = __pyx_v_i;
+ __pyx_t_28 = (__pyx_v_ny - 1);
+ __pyx_t_29 = __pyx_v_j;
+ if (__pyx_t_27 < 0) __pyx_t_27 += __pyx_bshape_0_contour_ids;
+ if (__pyx_t_28 < 0) __pyx_t_28 += __pyx_bshape_1_contour_ids;
+ if (__pyx_t_29 < 0) __pyx_t_29 += __pyx_bshape_2_contour_ids;
+ __pyx_v_c1 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_27, __pyx_bstride_0_contour_ids, __pyx_t_28, __pyx_bstride_1_contour_ids, __pyx_t_29, __pyx_bstride_2_contour_ids));
+
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":83
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ * c1 = contour_ids[i, ny-1, j]
+ * c2 = contour_ids[i + oi, ny-2, j + oj] # <<<<<<<<<<<<<<
+ * if c1 > -1 and c2 > -1:
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ */
+ __pyx_t_30 = (__pyx_v_i + __pyx_v_oi);
+ __pyx_t_31 = (__pyx_v_ny - 2);
+ __pyx_t_32 = (__pyx_v_j + __pyx_v_oj);
+ if (__pyx_t_30 < 0) __pyx_t_30 += __pyx_bshape_0_contour_ids;
+ if (__pyx_t_31 < 0) __pyx_t_31 += __pyx_bshape_1_contour_ids;
+ if (__pyx_t_32 < 0) __pyx_t_32 += __pyx_bshape_2_contour_ids;
+ __pyx_v_c2 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_30, __pyx_bstride_0_contour_ids, __pyx_t_31, __pyx_bstride_1_contour_ids, __pyx_t_32, __pyx_bstride_2_contour_ids));
+
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":84
+ * c1 = contour_ids[i, ny-1, j]
+ * c2 = contour_ids[i + oi, ny-2, j + oj]
+ * if c1 > -1 and c2 > -1: # <<<<<<<<<<<<<<
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
* for i in range(nx):
*/
- if ((__pyx_v_c1 > -1)) {
- __pyx_t_10 = (__pyx_v_c2 > -1);
- } else {
- __pyx_t_10 = (__pyx_v_c1 > -1);
- }
- if (__pyx_t_10) {
+ if ((__pyx_v_c1 > -1)) {
+ __pyx_t_5 = (__pyx_v_c2 > -1);
+ } else {
+ __pyx_t_5 = (__pyx_v_c1 > -1);
+ }
+ if (__pyx_t_5) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":69
- * c2 = contour_ids[i, ny-2, j]
- * if c1 > -1 and c2 > -1:
- * tree.append((i64max(c1,c2), i64min(c1,c2))) # <<<<<<<<<<<<<<
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":85
+ * c2 = contour_ids[i + oi, ny-2, j + oj]
+ * if c1 > -1 and c2 > -1:
+ * tree.append((i64max(c1,c2), i64min(c1,c2))) # <<<<<<<<<<<<<<
* for i in range(nx):
* for j in range(ny):
*/
- __pyx_t_1 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64max(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_t_1);
- __pyx_t_11 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64min(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_t_11);
- __pyx_t_12 = PyTuple_New(2); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(((PyObject *)__pyx_t_12));
- PyTuple_SET_ITEM(__pyx_t_12, 0, __pyx_t_1);
- __Pyx_GIVEREF(__pyx_t_1);
- PyTuple_SET_ITEM(__pyx_t_12, 1, __pyx_t_11);
- __Pyx_GIVEREF(__pyx_t_11);
- __pyx_t_1 = 0;
- __pyx_t_11 = 0;
- __pyx_t_11 = __Pyx_PyObject_Append(__pyx_v_tree, ((PyObject *)__pyx_t_12)); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_t_11);
- __Pyx_DECREF(((PyObject *)__pyx_t_12)); __pyx_t_12 = 0;
- __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
- goto __pyx_L16;
+ __pyx_t_1 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64max(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_1);
+ __pyx_t_13 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64min(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_13)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_13);
+ __pyx_t_14 = PyTuple_New(2); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(((PyObject *)__pyx_t_14));
+ PyTuple_SET_ITEM(__pyx_t_14, 0, __pyx_t_1);
+ __Pyx_GIVEREF(__pyx_t_1);
+ PyTuple_SET_ITEM(__pyx_t_14, 1, __pyx_t_13);
+ __Pyx_GIVEREF(__pyx_t_13);
+ __pyx_t_1 = 0;
+ __pyx_t_13 = 0;
+ __pyx_t_13 = __Pyx_PyObject_Append(__pyx_v_tree, ((PyObject *)__pyx_t_14)); if (unlikely(!__pyx_t_13)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_13);
+ __Pyx_DECREF(((PyObject *)__pyx_t_14)); __pyx_t_14 = 0;
+ __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0;
+ goto __pyx_L32;
+ }
+ __pyx_L32:;
+ __pyx_L27_continue:;
+ }
+ __pyx_L23_continue:;
}
- __pyx_L16:;
}
}
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":70
- * if c1 > -1 and c2 > -1:
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":86
+ * if c1 > -1 and c2 > -1:
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
* for i in range(nx): # <<<<<<<<<<<<<<
* for j in range(ny):
- * c1 = contour_ids[i, j, 0]
+ * for offset_i in range(3):
*/
for (__pyx_t_2 = 0; __pyx_t_2 < __pyx_v_nx; __pyx_t_2+=1) {
__pyx_v_i = __pyx_t_2;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":71
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":87
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
* for i in range(nx):
* for j in range(ny): # <<<<<<<<<<<<<<
- * c1 = contour_ids[i, j, 0]
- * c2 = contour_ids[i, j, 1]
+ * for offset_i in range(3):
+ * oi = offset_i - 1
*/
for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_v_ny; __pyx_t_3+=1) {
__pyx_v_j = __pyx_t_3;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":72
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":88
* for i in range(nx):
* for j in range(ny):
- * c1 = contour_ids[i, j, 0] # <<<<<<<<<<<<<<
- * c2 = contour_ids[i, j, 1]
- * if c1 > -1 and c2 > -1:
- */
- __pyx_t_31 = __pyx_v_i;
- __pyx_t_32 = __pyx_v_j;
- __pyx_t_33 = 0;
- if (__pyx_t_31 < 0) __pyx_t_31 += __pyx_bshape_0_contour_ids;
- if (__pyx_t_32 < 0) __pyx_t_32 += __pyx_bshape_1_contour_ids;
- if (__pyx_t_33 < 0) __pyx_t_33 += __pyx_bshape_2_contour_ids;
- __pyx_v_c1 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_31, __pyx_bstride_0_contour_ids, __pyx_t_32, __pyx_bstride_1_contour_ids, __pyx_t_33, __pyx_bstride_2_contour_ids));
+ * for offset_i in range(3): # <<<<<<<<<<<<<<
+ * oi = offset_i - 1
+ * if i == 0 and oi == -1: continue
+ */
+ for (__pyx_t_4 = 0; __pyx_t_4 < 3; __pyx_t_4+=1) {
+ __pyx_v_offset_i = __pyx_t_4;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":73
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":89
* for j in range(ny):
- * c1 = contour_ids[i, j, 0]
- * c2 = contour_ids[i, j, 1] # <<<<<<<<<<<<<<
- * if c1 > -1 and c2 > -1:
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
- */
- __pyx_t_34 = __pyx_v_i;
- __pyx_t_35 = __pyx_v_j;
- __pyx_t_36 = 1;
- if (__pyx_t_34 < 0) __pyx_t_34 += __pyx_bshape_0_contour_ids;
- if (__pyx_t_35 < 0) __pyx_t_35 += __pyx_bshape_1_contour_ids;
- if (__pyx_t_36 < 0) __pyx_t_36 += __pyx_bshape_2_contour_ids;
- __pyx_v_c2 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_34, __pyx_bstride_0_contour_ids, __pyx_t_35, __pyx_bstride_1_contour_ids, __pyx_t_36, __pyx_bstride_2_contour_ids));
-
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":74
- * c1 = contour_ids[i, j, 0]
- * c2 = contour_ids[i, j, 1]
- * if c1 > -1 and c2 > -1: # <<<<<<<<<<<<<<
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
- * c1 = contour_ids[i, j, nz-1]
+ * for offset_i in range(3):
+ * oi = offset_i - 1 # <<<<<<<<<<<<<<
+ * if i == 0 and oi == -1: continue
+ * if i == nx - 1 and oj == 1: continue
+ */
+ __pyx_v_oi = (__pyx_v_offset_i - 1);
+
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":90
+ * for offset_i in range(3):
+ * oi = offset_i - 1
+ * if i == 0 and oi == -1: continue # <<<<<<<<<<<<<<
+ * if i == nx - 1 and oj == 1: continue
+ * for offset_j in range(3):
*/
- if ((__pyx_v_c1 > -1)) {
- __pyx_t_10 = (__pyx_v_c2 > -1);
- } else {
- __pyx_t_10 = (__pyx_v_c1 > -1);
- }
- if (__pyx_t_10) {
+ if ((__pyx_v_i == 0)) {
+ __pyx_t_5 = (__pyx_v_oi == -1);
+ } else {
+ __pyx_t_5 = (__pyx_v_i == 0);
+ }
+ if (__pyx_t_5) {
+ goto __pyx_L37_continue;
+ goto __pyx_L39;
+ }
+ __pyx_L39:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":75
- * c2 = contour_ids[i, j, 1]
- * if c1 > -1 and c2 > -1:
- * tree.append((i64max(c1,c2), i64min(c1,c2))) # <<<<<<<<<<<<<<
- * c1 = contour_ids[i, j, nz-1]
- * c2 = contour_ids[i, j, nz-2]
- */
- __pyx_t_11 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64max(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_t_11);
- __pyx_t_12 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64min(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_t_12);
- __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(((PyObject *)__pyx_t_1));
- PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_11);
- __Pyx_GIVEREF(__pyx_t_11);
- PyTuple_SET_ITEM(__pyx_t_1, 1, __pyx_t_12);
- __Pyx_GIVEREF(__pyx_t_12);
- __pyx_t_11 = 0;
- __pyx_t_12 = 0;
- __pyx_t_12 = __Pyx_PyObject_Append(__pyx_v_tree, ((PyObject *)__pyx_t_1)); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_t_12);
- __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
- __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0;
- goto __pyx_L21;
- }
- __pyx_L21:;
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":91
+ * oi = offset_i - 1
+ * if i == 0 and oi == -1: continue
+ * if i == nx - 1 and oj == 1: continue # <<<<<<<<<<<<<<
+ * for offset_j in range(3):
+ * oj = offset_j - 1
+ */
+ if ((__pyx_v_i == (__pyx_v_nx - 1))) {
+ __pyx_t_5 = (__pyx_v_oj == 1);
+ } else {
+ __pyx_t_5 = (__pyx_v_i == (__pyx_v_nx - 1));
+ }
+ if (__pyx_t_5) {
+ goto __pyx_L37_continue;
+ goto __pyx_L40;
+ }
+ __pyx_L40:;
+
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":92
+ * if i == 0 and oi == -1: continue
+ * if i == nx - 1 and oj == 1: continue
+ * for offset_j in range(3): # <<<<<<<<<<<<<<
+ * oj = offset_j - 1
+ * if j == 0 and oj == -1: continue
+ */
+ for (__pyx_t_6 = 0; __pyx_t_6 < 3; __pyx_t_6+=1) {
+ __pyx_v_offset_j = __pyx_t_6;
+
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":93
+ * if i == nx - 1 and oj == 1: continue
+ * for offset_j in range(3):
+ * oj = offset_j - 1 # <<<<<<<<<<<<<<
+ * if j == 0 and oj == -1: continue
+ * if j == ny - 1 and oj == 1: continue
+ */
+ __pyx_v_oj = (__pyx_v_offset_j - 1);
+
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":94
+ * for offset_j in range(3):
+ * oj = offset_j - 1
+ * if j == 0 and oj == -1: continue # <<<<<<<<<<<<<<
+ * if j == ny - 1 and oj == 1: continue
+ * c1 = contour_ids[i, j, 0]
+ */
+ if ((__pyx_v_j == 0)) {
+ __pyx_t_5 = (__pyx_v_oj == -1);
+ } else {
+ __pyx_t_5 = (__pyx_v_j == 0);
+ }
+ if (__pyx_t_5) {
+ goto __pyx_L41_continue;
+ goto __pyx_L43;
+ }
+ __pyx_L43:;
+
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":95
+ * oj = offset_j - 1
+ * if j == 0 and oj == -1: continue
+ * if j == ny - 1 and oj == 1: continue # <<<<<<<<<<<<<<
+ * c1 = contour_ids[i, j, 0]
+ * c2 = contour_ids[i + oi, j + oj, 1]
+ */
+ if ((__pyx_v_j == (__pyx_v_ny - 1))) {
+ __pyx_t_5 = (__pyx_v_oj == 1);
+ } else {
+ __pyx_t_5 = (__pyx_v_j == (__pyx_v_ny - 1));
+ }
+ if (__pyx_t_5) {
+ goto __pyx_L41_continue;
+ goto __pyx_L44;
+ }
+ __pyx_L44:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":76
- * if c1 > -1 and c2 > -1:
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
- * c1 = contour_ids[i, j, nz-1] # <<<<<<<<<<<<<<
- * c2 = contour_ids[i, j, nz-2]
- * if c1 > -1 and c2 > -1:
- */
- __pyx_t_37 = __pyx_v_i;
- __pyx_t_38 = __pyx_v_j;
- __pyx_t_39 = (__pyx_v_nz - 1);
- if (__pyx_t_37 < 0) __pyx_t_37 += __pyx_bshape_0_contour_ids;
- if (__pyx_t_38 < 0) __pyx_t_38 += __pyx_bshape_1_contour_ids;
- if (__pyx_t_39 < 0) __pyx_t_39 += __pyx_bshape_2_contour_ids;
- __pyx_v_c1 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_37, __pyx_bstride_0_contour_ids, __pyx_t_38, __pyx_bstride_1_contour_ids, __pyx_t_39, __pyx_bstride_2_contour_ids));
-
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":77
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
- * c1 = contour_ids[i, j, nz-1]
- * c2 = contour_ids[i, j, nz-2] # <<<<<<<<<<<<<<
- * if c1 > -1 and c2 > -1:
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
- */
- __pyx_t_40 = __pyx_v_i;
- __pyx_t_41 = __pyx_v_j;
- __pyx_t_42 = (__pyx_v_nz - 2);
- if (__pyx_t_40 < 0) __pyx_t_40 += __pyx_bshape_0_contour_ids;
- if (__pyx_t_41 < 0) __pyx_t_41 += __pyx_bshape_1_contour_ids;
- if (__pyx_t_42 < 0) __pyx_t_42 += __pyx_bshape_2_contour_ids;
- __pyx_v_c2 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_40, __pyx_bstride_0_contour_ids, __pyx_t_41, __pyx_bstride_1_contour_ids, __pyx_t_42, __pyx_bstride_2_contour_ids));
-
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":78
- * c1 = contour_ids[i, j, nz-1]
- * c2 = contour_ids[i, j, nz-2]
- * if c1 > -1 and c2 > -1: # <<<<<<<<<<<<<<
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":96
+ * if j == 0 and oj == -1: continue
+ * if j == ny - 1 and oj == 1: continue
+ * c1 = contour_ids[i, j, 0] # <<<<<<<<<<<<<<
+ * c2 = contour_ids[i + oi, j + oj, 1]
+ * if c1 > -1 and c2 > -1:
+ */
+ __pyx_t_33 = __pyx_v_i;
+ __pyx_t_34 = __pyx_v_j;
+ __pyx_t_35 = 0;
+ if (__pyx_t_33 < 0) __pyx_t_33 += __pyx_bshape_0_contour_ids;
+ if (__pyx_t_34 < 0) __pyx_t_34 += __pyx_bshape_1_contour_ids;
+ if (__pyx_t_35 < 0) __pyx_t_35 += __pyx_bshape_2_contour_ids;
+ __pyx_v_c1 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_33, __pyx_bstride_0_contour_ids, __pyx_t_34, __pyx_bstride_1_contour_ids, __pyx_t_35, __pyx_bstride_2_contour_ids));
+
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":97
+ * if j == ny - 1 and oj == 1: continue
+ * c1 = contour_ids[i, j, 0]
+ * c2 = contour_ids[i + oi, j + oj, 1] # <<<<<<<<<<<<<<
+ * if c1 > -1 and c2 > -1:
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ */
+ __pyx_t_36 = (__pyx_v_i + __pyx_v_oi);
+ __pyx_t_37 = (__pyx_v_j + __pyx_v_oj);
+ __pyx_t_38 = 1;
+ if (__pyx_t_36 < 0) __pyx_t_36 += __pyx_bshape_0_contour_ids;
+ if (__pyx_t_37 < 0) __pyx_t_37 += __pyx_bshape_1_contour_ids;
+ if (__pyx_t_38 < 0) __pyx_t_38 += __pyx_bshape_2_contour_ids;
+ __pyx_v_c2 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_36, __pyx_bstride_0_contour_ids, __pyx_t_37, __pyx_bstride_1_contour_ids, __pyx_t_38, __pyx_bstride_2_contour_ids));
+
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":98
+ * c1 = contour_ids[i, j, 0]
+ * c2 = contour_ids[i + oi, j + oj, 1]
+ * if c1 > -1 and c2 > -1: # <<<<<<<<<<<<<<
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ * c1 = contour_ids[i, j, nz-1]
+ */
+ if ((__pyx_v_c1 > -1)) {
+ __pyx_t_5 = (__pyx_v_c2 > -1);
+ } else {
+ __pyx_t_5 = (__pyx_v_c1 > -1);
+ }
+ if (__pyx_t_5) {
+
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":99
+ * c2 = contour_ids[i + oi, j + oj, 1]
+ * if c1 > -1 and c2 > -1:
+ * tree.append((i64max(c1,c2), i64min(c1,c2))) # <<<<<<<<<<<<<<
+ * c1 = contour_ids[i, j, nz-1]
+ * c2 = contour_ids[i + oi, j + oj, nz-2]
+ */
+ __pyx_t_13 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64max(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_13)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_13);
+ __pyx_t_14 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64min(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_14);
+ __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+ PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_13);
+ __Pyx_GIVEREF(__pyx_t_13);
+ PyTuple_SET_ITEM(__pyx_t_1, 1, __pyx_t_14);
+ __Pyx_GIVEREF(__pyx_t_14);
+ __pyx_t_13 = 0;
+ __pyx_t_14 = 0;
+ __pyx_t_14 = __Pyx_PyObject_Append(__pyx_v_tree, ((PyObject *)__pyx_t_1)); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_14);
+ __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+ __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0;
+ goto __pyx_L45;
+ }
+ __pyx_L45:;
+
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":100
+ * if c1 > -1 and c2 > -1:
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ * c1 = contour_ids[i, j, nz-1] # <<<<<<<<<<<<<<
+ * c2 = contour_ids[i + oi, j + oj, nz-2]
+ * if c1 > -1 and c2 > -1:
+ */
+ __pyx_t_39 = __pyx_v_i;
+ __pyx_t_40 = __pyx_v_j;
+ __pyx_t_41 = (__pyx_v_nz - 1);
+ if (__pyx_t_39 < 0) __pyx_t_39 += __pyx_bshape_0_contour_ids;
+ if (__pyx_t_40 < 0) __pyx_t_40 += __pyx_bshape_1_contour_ids;
+ if (__pyx_t_41 < 0) __pyx_t_41 += __pyx_bshape_2_contour_ids;
+ __pyx_v_c1 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_39, __pyx_bstride_0_contour_ids, __pyx_t_40, __pyx_bstride_1_contour_ids, __pyx_t_41, __pyx_bstride_2_contour_ids));
+
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":101
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ * c1 = contour_ids[i, j, nz-1]
+ * c2 = contour_ids[i + oi, j + oj, nz-2] # <<<<<<<<<<<<<<
+ * if c1 > -1 and c2 > -1:
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ */
+ __pyx_t_42 = (__pyx_v_i + __pyx_v_oi);
+ __pyx_t_43 = (__pyx_v_j + __pyx_v_oj);
+ __pyx_t_44 = (__pyx_v_nz - 2);
+ if (__pyx_t_42 < 0) __pyx_t_42 += __pyx_bshape_0_contour_ids;
+ if (__pyx_t_43 < 0) __pyx_t_43 += __pyx_bshape_1_contour_ids;
+ if (__pyx_t_44 < 0) __pyx_t_44 += __pyx_bshape_2_contour_ids;
+ __pyx_v_c2 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_42, __pyx_bstride_0_contour_ids, __pyx_t_43, __pyx_bstride_1_contour_ids, __pyx_t_44, __pyx_bstride_2_contour_ids));
+
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":102
+ * c1 = contour_ids[i, j, nz-1]
+ * c2 = contour_ids[i + oi, j + oj, nz-2]
+ * if c1 > -1 and c2 > -1: # <<<<<<<<<<<<<<
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
* return tree
*/
- if ((__pyx_v_c1 > -1)) {
- __pyx_t_10 = (__pyx_v_c2 > -1);
- } else {
- __pyx_t_10 = (__pyx_v_c1 > -1);
- }
- if (__pyx_t_10) {
+ if ((__pyx_v_c1 > -1)) {
+ __pyx_t_5 = (__pyx_v_c2 > -1);
+ } else {
+ __pyx_t_5 = (__pyx_v_c1 > -1);
+ }
+ if (__pyx_t_5) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":79
- * c2 = contour_ids[i, j, nz-2]
- * if c1 > -1 and c2 > -1:
- * tree.append((i64max(c1,c2), i64min(c1,c2))) # <<<<<<<<<<<<<<
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":103
+ * c2 = contour_ids[i + oi, j + oj, nz-2]
+ * if c1 > -1 and c2 > -1:
+ * tree.append((i64max(c1,c2), i64min(c1,c2))) # <<<<<<<<<<<<<<
* return tree
*/
- __pyx_t_12 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64max(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 79; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_t_12);
- __pyx_t_1 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64min(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 79; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_t_1);
- __pyx_t_11 = PyTuple_New(2); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 79; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(((PyObject *)__pyx_t_11));
- PyTuple_SET_ITEM(__pyx_t_11, 0, __pyx_t_12);
- __Pyx_GIVEREF(__pyx_t_12);
- PyTuple_SET_ITEM(__pyx_t_11, 1, __pyx_t_1);
- __Pyx_GIVEREF(__pyx_t_1);
- __pyx_t_12 = 0;
- __pyx_t_1 = 0;
- __pyx_t_1 = __Pyx_PyObject_Append(__pyx_v_tree, ((PyObject *)__pyx_t_11)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 79; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_t_1);
- __Pyx_DECREF(((PyObject *)__pyx_t_11)); __pyx_t_11 = 0;
- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- goto __pyx_L22;
+ __pyx_t_14 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64max(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 103; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_14);
+ __pyx_t_1 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64min(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 103; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_1);
+ __pyx_t_13 = PyTuple_New(2); if (unlikely(!__pyx_t_13)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 103; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(((PyObject *)__pyx_t_13));
+ PyTuple_SET_ITEM(__pyx_t_13, 0, __pyx_t_14);
+ __Pyx_GIVEREF(__pyx_t_14);
+ PyTuple_SET_ITEM(__pyx_t_13, 1, __pyx_t_1);
+ __Pyx_GIVEREF(__pyx_t_1);
+ __pyx_t_14 = 0;
+ __pyx_t_1 = 0;
+ __pyx_t_1 = __Pyx_PyObject_Append(__pyx_v_tree, ((PyObject *)__pyx_t_13)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 103; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_1);
+ __Pyx_DECREF(((PyObject *)__pyx_t_13)); __pyx_t_13 = 0;
+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+ goto __pyx_L46;
+ }
+ __pyx_L46:;
+ __pyx_L41_continue:;
+ }
+ __pyx_L37_continue:;
}
- __pyx_L22:;
}
}
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":80
- * if c1 > -1 and c2 > -1:
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":104
+ * if c1 > -1 and c2 > -1:
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
* return tree # <<<<<<<<<<<<<<
*/
__Pyx_XDECREF(__pyx_r);
@@ -16595,8 +16943,8 @@
goto __pyx_L0;
__pyx_L1_error:;
__Pyx_XDECREF(__pyx_t_1);
- __Pyx_XDECREF(__pyx_t_11);
- __Pyx_XDECREF(__pyx_t_12);
+ __Pyx_XDECREF(__pyx_t_13);
+ __Pyx_XDECREF(__pyx_t_14);
{ PyObject *__pyx_type, *__pyx_value, *__pyx_tb;
__Pyx_ErrFetch(&__pyx_type, &__pyx_value, &__pyx_tb);
__Pyx_SafeReleaseBuffer(&__pyx_bstruct_contour_ids);
@@ -20146,7 +20494,7 @@
/*--- Function import code ---*/
/*--- Execution code ---*/
- /* "/Users/matthewturk/Development/yt/trunk/yt/amr_utils.pyx":32
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/amr_utils.pyx":32
*
* # Set up some imports
* import numpy as np # <<<<<<<<<<<<<<
@@ -20158,7 +20506,7 @@
if (PyObject_SetAttr(__pyx_m, __pyx_kp_np, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_DECREF(__pyx_1); __pyx_1 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":26
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/DepthFirstOctree.pyx":26
* """
*
* import numpy as np # <<<<<<<<<<<<<<
@@ -20170,7 +20518,7 @@
if (PyObject_SetAttr(__pyx_m, __pyx_kp_np, __pyx_1) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_DECREF(__pyx_1); __pyx_1 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/Interpolators.pyx":1
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/Interpolators.pyx":1
* """ # <<<<<<<<<<<<<<
* Simple interpolators
*
@@ -20180,7 +20528,7 @@
if (PyObject_SetAttr(__pyx_m, __pyx_kp_np, __pyx_1) < 0) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_DECREF(__pyx_1); __pyx_1 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/PointsInVolume.pyx":27
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/PointsInVolume.pyx":27
*
*
* import numpy as np # <<<<<<<<<<<<<<
@@ -20192,7 +20540,7 @@
if (PyObject_SetAttr(__pyx_m, __pyx_kp_np, __pyx_1) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_DECREF(__pyx_1); __pyx_1 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/RayIntegrators.pyx":26
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/RayIntegrators.pyx":26
* """
*
* import numpy as np # <<<<<<<<<<<<<<
@@ -20204,7 +20552,7 @@
if (PyObject_SetAttr(__pyx_m, __pyx_kp_np, __pyx_1) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_DECREF(__pyx_1); __pyx_1 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":1
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/VolumeIntegrator.pyx":1
* """ # <<<<<<<<<<<<<<
* Simple integrators for the radiative transfer equation
*
@@ -20214,7 +20562,7 @@
if (PyObject_SetAttr(__pyx_m, __pyx_kp_np, __pyx_1) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_DECREF(__pyx_1); __pyx_1 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":26
+ /* "/Users/matthewturk/Development/yt/branches/yt-1.6/yt/_amr_utils/ContourFinding.pyx":26
* """
*
* import numpy as np # <<<<<<<<<<<<<<
Modified: trunk/yt/amr_utils.c
==============================================================================
--- trunk/yt/amr_utils.c (original)
+++ trunk/yt/amr_utils.c Thu Jan 21 20:35:50 2010
@@ -1,4 +1,4 @@
-/* Generated by Cython 0.11.3 on Thu Jan 21 14:00:51 2010 */
+/* Generated by Cython 0.11.3 on Thu Jan 21 20:35:22 2010 */
#define PY_SSIZE_T_CLEAN
#include "Python.h"
@@ -15985,6 +15985,10 @@
int __pyx_v_nx;
int __pyx_v_ny;
int __pyx_v_nz;
+ int __pyx_v_offset_i;
+ int __pyx_v_offset_j;
+ int __pyx_v_oi;
+ int __pyx_v_oj;
__pyx_t_5numpy_int64_t __pyx_v_c1;
__pyx_t_5numpy_int64_t __pyx_v_c2;
PyObject *__pyx_v_tree;
@@ -15999,45 +16003,47 @@
PyObject *__pyx_t_1 = NULL;
int __pyx_t_2;
int __pyx_t_3;
- long __pyx_t_4;
+ int __pyx_t_4;
int __pyx_t_5;
int __pyx_t_6;
long __pyx_t_7;
int __pyx_t_8;
int __pyx_t_9;
- int __pyx_t_10;
- PyObject *__pyx_t_11 = NULL;
- PyObject *__pyx_t_12 = NULL;
- long __pyx_t_13;
- int __pyx_t_14;
- int __pyx_t_15;
- long __pyx_t_16;
+ long __pyx_t_10;
+ int __pyx_t_11;
+ int __pyx_t_12;
+ PyObject *__pyx_t_13 = NULL;
+ PyObject *__pyx_t_14 = NULL;
+ long __pyx_t_15;
+ int __pyx_t_16;
int __pyx_t_17;
- int __pyx_t_18;
+ long __pyx_t_18;
int __pyx_t_19;
- long __pyx_t_20;
+ int __pyx_t_20;
int __pyx_t_21;
- int __pyx_t_22;
- long __pyx_t_23;
+ long __pyx_t_22;
+ int __pyx_t_23;
int __pyx_t_24;
- int __pyx_t_25;
- long __pyx_t_26;
+ long __pyx_t_25;
+ int __pyx_t_26;
int __pyx_t_27;
- int __pyx_t_28;
- long __pyx_t_29;
+ long __pyx_t_28;
+ int __pyx_t_29;
int __pyx_t_30;
- int __pyx_t_31;
+ long __pyx_t_31;
int __pyx_t_32;
- long __pyx_t_33;
+ int __pyx_t_33;
int __pyx_t_34;
- int __pyx_t_35;
- long __pyx_t_36;
+ long __pyx_t_35;
+ int __pyx_t_36;
int __pyx_t_37;
- int __pyx_t_38;
- long __pyx_t_39;
+ long __pyx_t_38;
+ int __pyx_t_39;
int __pyx_t_40;
- int __pyx_t_41;
- long __pyx_t_42;
+ long __pyx_t_41;
+ int __pyx_t_42;
+ int __pyx_t_43;
+ long __pyx_t_44;
__Pyx_SetupRefcountContext("construct_boundary_relationships");
__pyx_self = __pyx_self;
__pyx_v_tree = Py_None; __Pyx_INCREF(Py_None);
@@ -16051,7 +16057,7 @@
__pyx_bshape_0_contour_ids = __pyx_bstruct_contour_ids.shape[0]; __pyx_bshape_1_contour_ids = __pyx_bstruct_contour_ids.shape[1]; __pyx_bshape_2_contour_ids = __pyx_bstruct_contour_ids.shape[2];
/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":44
- * cdef int i, j, nx, ny, nz
+ * cdef int i, j, nx, ny, nz, offset_i, offset_j, oi, oj
* cdef np.int64_t c1, c2
* tree = [] # <<<<<<<<<<<<<<
* nx = contour_ids.shape[0]
@@ -16095,7 +16101,7 @@
* # First x-pass
* for i in range(ny): # <<<<<<<<<<<<<<
* for j in range(nz):
- * c1 = contour_ids[0, i, j]
+ * for offset_i in range(3):
*/
for (__pyx_t_2 = 0; __pyx_t_2 < __pyx_v_ny; __pyx_t_2+=1) {
__pyx_v_i = __pyx_t_2;
@@ -16104,8 +16110,8 @@
* # First x-pass
* for i in range(ny):
* for j in range(nz): # <<<<<<<<<<<<<<
- * c1 = contour_ids[0, i, j]
- * c2 = contour_ids[1, i, j]
+ * for offset_i in range(3):
+ * oi = offset_i - 1
*/
for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_v_nz; __pyx_t_3+=1) {
__pyx_v_j = __pyx_t_3;
@@ -16113,477 +16119,819 @@
/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":51
* for i in range(ny):
* for j in range(nz):
- * c1 = contour_ids[0, i, j] # <<<<<<<<<<<<<<
- * c2 = contour_ids[1, i, j]
- * if c1 > -1 and c2 > -1:
+ * for offset_i in range(3): # <<<<<<<<<<<<<<
+ * oi = offset_i - 1
+ * if i == 0 and oi == -1: continue
*/
- __pyx_t_4 = 0;
- __pyx_t_5 = __pyx_v_i;
- __pyx_t_6 = __pyx_v_j;
- if (__pyx_t_4 < 0) __pyx_t_4 += __pyx_bshape_0_contour_ids;
- if (__pyx_t_5 < 0) __pyx_t_5 += __pyx_bshape_1_contour_ids;
- if (__pyx_t_6 < 0) __pyx_t_6 += __pyx_bshape_2_contour_ids;
- __pyx_v_c1 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_4, __pyx_bstride_0_contour_ids, __pyx_t_5, __pyx_bstride_1_contour_ids, __pyx_t_6, __pyx_bstride_2_contour_ids));
+ for (__pyx_t_4 = 0; __pyx_t_4 < 3; __pyx_t_4+=1) {
+ __pyx_v_offset_i = __pyx_t_4;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":52
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":52
* for j in range(nz):
- * c1 = contour_ids[0, i, j]
- * c2 = contour_ids[1, i, j] # <<<<<<<<<<<<<<
- * if c1 > -1 and c2 > -1:
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ * for offset_i in range(3):
+ * oi = offset_i - 1 # <<<<<<<<<<<<<<
+ * if i == 0 and oi == -1: continue
+ * if i == ny - 1 and oj == 1: continue
+ */
+ __pyx_v_oi = (__pyx_v_offset_i - 1);
+
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":53
+ * for offset_i in range(3):
+ * oi = offset_i - 1
+ * if i == 0 and oi == -1: continue # <<<<<<<<<<<<<<
+ * if i == ny - 1 and oj == 1: continue
+ * for offset_j in range(3):
*/
- __pyx_t_7 = 1;
- __pyx_t_8 = __pyx_v_i;
- __pyx_t_9 = __pyx_v_j;
- if (__pyx_t_7 < 0) __pyx_t_7 += __pyx_bshape_0_contour_ids;
- if (__pyx_t_8 < 0) __pyx_t_8 += __pyx_bshape_1_contour_ids;
- if (__pyx_t_9 < 0) __pyx_t_9 += __pyx_bshape_2_contour_ids;
- __pyx_v_c2 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_7, __pyx_bstride_0_contour_ids, __pyx_t_8, __pyx_bstride_1_contour_ids, __pyx_t_9, __pyx_bstride_2_contour_ids));
-
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":53
- * c1 = contour_ids[0, i, j]
- * c2 = contour_ids[1, i, j]
- * if c1 > -1 and c2 > -1: # <<<<<<<<<<<<<<
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
- * c1 = contour_ids[nx-1, i, j]
- */
- if ((__pyx_v_c1 > -1)) {
- __pyx_t_10 = (__pyx_v_c2 > -1);
- } else {
- __pyx_t_10 = (__pyx_v_c1 > -1);
- }
- if (__pyx_t_10) {
+ if ((__pyx_v_i == 0)) {
+ __pyx_t_5 = (__pyx_v_oi == -1);
+ } else {
+ __pyx_t_5 = (__pyx_v_i == 0);
+ }
+ if (__pyx_t_5) {
+ goto __pyx_L9_continue;
+ goto __pyx_L11;
+ }
+ __pyx_L11:;
/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":54
- * c2 = contour_ids[1, i, j]
- * if c1 > -1 and c2 > -1:
- * tree.append((i64max(c1,c2), i64min(c1,c2))) # <<<<<<<<<<<<<<
- * c1 = contour_ids[nx-1, i, j]
- * c2 = contour_ids[nx-2, i, j]
- */
- __pyx_t_1 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64max(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 54; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_t_1);
- __pyx_t_11 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64min(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 54; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_t_11);
- __pyx_t_12 = PyTuple_New(2); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 54; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(((PyObject *)__pyx_t_12));
- PyTuple_SET_ITEM(__pyx_t_12, 0, __pyx_t_1);
- __Pyx_GIVEREF(__pyx_t_1);
- PyTuple_SET_ITEM(__pyx_t_12, 1, __pyx_t_11);
- __Pyx_GIVEREF(__pyx_t_11);
- __pyx_t_1 = 0;
- __pyx_t_11 = 0;
- __pyx_t_11 = __Pyx_PyObject_Append(__pyx_v_tree, ((PyObject *)__pyx_t_12)); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 54; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_t_11);
- __Pyx_DECREF(((PyObject *)__pyx_t_12)); __pyx_t_12 = 0;
- __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
- goto __pyx_L9;
- }
- __pyx_L9:;
-
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":55
- * if c1 > -1 and c2 > -1:
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
- * c1 = contour_ids[nx-1, i, j] # <<<<<<<<<<<<<<
- * c2 = contour_ids[nx-2, i, j]
- * if c1 > -1 and c2 > -1:
- */
- __pyx_t_13 = (__pyx_v_nx - 1);
- __pyx_t_14 = __pyx_v_i;
- __pyx_t_15 = __pyx_v_j;
- if (__pyx_t_13 < 0) __pyx_t_13 += __pyx_bshape_0_contour_ids;
- if (__pyx_t_14 < 0) __pyx_t_14 += __pyx_bshape_1_contour_ids;
- if (__pyx_t_15 < 0) __pyx_t_15 += __pyx_bshape_2_contour_ids;
- __pyx_v_c1 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_13, __pyx_bstride_0_contour_ids, __pyx_t_14, __pyx_bstride_1_contour_ids, __pyx_t_15, __pyx_bstride_2_contour_ids));
-
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":56
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
- * c1 = contour_ids[nx-1, i, j]
- * c2 = contour_ids[nx-2, i, j] # <<<<<<<<<<<<<<
- * if c1 > -1 and c2 > -1:
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
- */
- __pyx_t_16 = (__pyx_v_nx - 2);
- __pyx_t_17 = __pyx_v_i;
- __pyx_t_18 = __pyx_v_j;
- if (__pyx_t_16 < 0) __pyx_t_16 += __pyx_bshape_0_contour_ids;
- if (__pyx_t_17 < 0) __pyx_t_17 += __pyx_bshape_1_contour_ids;
- if (__pyx_t_18 < 0) __pyx_t_18 += __pyx_bshape_2_contour_ids;
- __pyx_v_c2 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_16, __pyx_bstride_0_contour_ids, __pyx_t_17, __pyx_bstride_1_contour_ids, __pyx_t_18, __pyx_bstride_2_contour_ids));
-
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":57
- * c1 = contour_ids[nx-1, i, j]
- * c2 = contour_ids[nx-2, i, j]
- * if c1 > -1 and c2 > -1: # <<<<<<<<<<<<<<
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ * oi = offset_i - 1
+ * if i == 0 and oi == -1: continue
+ * if i == ny - 1 and oj == 1: continue # <<<<<<<<<<<<<<
+ * for offset_j in range(3):
+ * oj = offset_j - 1
+ */
+ if ((__pyx_v_i == (__pyx_v_ny - 1))) {
+ __pyx_t_5 = (__pyx_v_oj == 1);
+ } else {
+ __pyx_t_5 = (__pyx_v_i == (__pyx_v_ny - 1));
+ }
+ if (__pyx_t_5) {
+ goto __pyx_L9_continue;
+ goto __pyx_L12;
+ }
+ __pyx_L12:;
+
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":55
+ * if i == 0 and oi == -1: continue
+ * if i == ny - 1 and oj == 1: continue
+ * for offset_j in range(3): # <<<<<<<<<<<<<<
+ * oj = offset_j - 1
+ * if j == 0 and oj == -1: continue
+ */
+ for (__pyx_t_6 = 0; __pyx_t_6 < 3; __pyx_t_6+=1) {
+ __pyx_v_offset_j = __pyx_t_6;
+
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":56
+ * if i == ny - 1 and oj == 1: continue
+ * for offset_j in range(3):
+ * oj = offset_j - 1 # <<<<<<<<<<<<<<
+ * if j == 0 and oj == -1: continue
+ * if j == nz - 1 and oj == 1: continue
+ */
+ __pyx_v_oj = (__pyx_v_offset_j - 1);
+
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":57
+ * for offset_j in range(3):
+ * oj = offset_j - 1
+ * if j == 0 and oj == -1: continue # <<<<<<<<<<<<<<
+ * if j == nz - 1 and oj == 1: continue
+ * c1 = contour_ids[0, i, j]
+ */
+ if ((__pyx_v_j == 0)) {
+ __pyx_t_5 = (__pyx_v_oj == -1);
+ } else {
+ __pyx_t_5 = (__pyx_v_j == 0);
+ }
+ if (__pyx_t_5) {
+ goto __pyx_L13_continue;
+ goto __pyx_L15;
+ }
+ __pyx_L15:;
+
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":58
+ * oj = offset_j - 1
+ * if j == 0 and oj == -1: continue
+ * if j == nz - 1 and oj == 1: continue # <<<<<<<<<<<<<<
+ * c1 = contour_ids[0, i, j]
+ * c2 = contour_ids[1, i + oi, j + oj]
+ */
+ if ((__pyx_v_j == (__pyx_v_nz - 1))) {
+ __pyx_t_5 = (__pyx_v_oj == 1);
+ } else {
+ __pyx_t_5 = (__pyx_v_j == (__pyx_v_nz - 1));
+ }
+ if (__pyx_t_5) {
+ goto __pyx_L13_continue;
+ goto __pyx_L16;
+ }
+ __pyx_L16:;
+
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":59
+ * if j == 0 and oj == -1: continue
+ * if j == nz - 1 and oj == 1: continue
+ * c1 = contour_ids[0, i, j] # <<<<<<<<<<<<<<
+ * c2 = contour_ids[1, i + oi, j + oj]
+ * if c1 > -1 and c2 > -1:
+ */
+ __pyx_t_7 = 0;
+ __pyx_t_8 = __pyx_v_i;
+ __pyx_t_9 = __pyx_v_j;
+ if (__pyx_t_7 < 0) __pyx_t_7 += __pyx_bshape_0_contour_ids;
+ if (__pyx_t_8 < 0) __pyx_t_8 += __pyx_bshape_1_contour_ids;
+ if (__pyx_t_9 < 0) __pyx_t_9 += __pyx_bshape_2_contour_ids;
+ __pyx_v_c1 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_7, __pyx_bstride_0_contour_ids, __pyx_t_8, __pyx_bstride_1_contour_ids, __pyx_t_9, __pyx_bstride_2_contour_ids));
+
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":60
+ * if j == nz - 1 and oj == 1: continue
+ * c1 = contour_ids[0, i, j]
+ * c2 = contour_ids[1, i + oi, j + oj] # <<<<<<<<<<<<<<
+ * if c1 > -1 and c2 > -1:
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ */
+ __pyx_t_10 = 1;
+ __pyx_t_11 = (__pyx_v_i + __pyx_v_oi);
+ __pyx_t_12 = (__pyx_v_j + __pyx_v_oj);
+ if (__pyx_t_10 < 0) __pyx_t_10 += __pyx_bshape_0_contour_ids;
+ if (__pyx_t_11 < 0) __pyx_t_11 += __pyx_bshape_1_contour_ids;
+ if (__pyx_t_12 < 0) __pyx_t_12 += __pyx_bshape_2_contour_ids;
+ __pyx_v_c2 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_10, __pyx_bstride_0_contour_ids, __pyx_t_11, __pyx_bstride_1_contour_ids, __pyx_t_12, __pyx_bstride_2_contour_ids));
+
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":61
+ * c1 = contour_ids[0, i, j]
+ * c2 = contour_ids[1, i + oi, j + oj]
+ * if c1 > -1 and c2 > -1: # <<<<<<<<<<<<<<
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ * c1 = contour_ids[nx-1, i, j]
+ */
+ if ((__pyx_v_c1 > -1)) {
+ __pyx_t_5 = (__pyx_v_c2 > -1);
+ } else {
+ __pyx_t_5 = (__pyx_v_c1 > -1);
+ }
+ if (__pyx_t_5) {
+
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":62
+ * c2 = contour_ids[1, i + oi, j + oj]
+ * if c1 > -1 and c2 > -1:
+ * tree.append((i64max(c1,c2), i64min(c1,c2))) # <<<<<<<<<<<<<<
+ * c1 = contour_ids[nx-1, i, j]
+ * c2 = contour_ids[nx-2, i + oi, j + oj]
+ */
+ __pyx_t_1 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64max(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_1);
+ __pyx_t_13 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64min(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_13)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_13);
+ __pyx_t_14 = PyTuple_New(2); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(((PyObject *)__pyx_t_14));
+ PyTuple_SET_ITEM(__pyx_t_14, 0, __pyx_t_1);
+ __Pyx_GIVEREF(__pyx_t_1);
+ PyTuple_SET_ITEM(__pyx_t_14, 1, __pyx_t_13);
+ __Pyx_GIVEREF(__pyx_t_13);
+ __pyx_t_1 = 0;
+ __pyx_t_13 = 0;
+ __pyx_t_13 = __Pyx_PyObject_Append(__pyx_v_tree, ((PyObject *)__pyx_t_14)); if (unlikely(!__pyx_t_13)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_13);
+ __Pyx_DECREF(((PyObject *)__pyx_t_14)); __pyx_t_14 = 0;
+ __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0;
+ goto __pyx_L17;
+ }
+ __pyx_L17:;
+
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":63
+ * if c1 > -1 and c2 > -1:
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ * c1 = contour_ids[nx-1, i, j] # <<<<<<<<<<<<<<
+ * c2 = contour_ids[nx-2, i + oi, j + oj]
+ * if c1 > -1 and c2 > -1:
+ */
+ __pyx_t_15 = (__pyx_v_nx - 1);
+ __pyx_t_16 = __pyx_v_i;
+ __pyx_t_17 = __pyx_v_j;
+ if (__pyx_t_15 < 0) __pyx_t_15 += __pyx_bshape_0_contour_ids;
+ if (__pyx_t_16 < 0) __pyx_t_16 += __pyx_bshape_1_contour_ids;
+ if (__pyx_t_17 < 0) __pyx_t_17 += __pyx_bshape_2_contour_ids;
+ __pyx_v_c1 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_15, __pyx_bstride_0_contour_ids, __pyx_t_16, __pyx_bstride_1_contour_ids, __pyx_t_17, __pyx_bstride_2_contour_ids));
+
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":64
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ * c1 = contour_ids[nx-1, i, j]
+ * c2 = contour_ids[nx-2, i + oi, j + oj] # <<<<<<<<<<<<<<
+ * if c1 > -1 and c2 > -1:
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ */
+ __pyx_t_18 = (__pyx_v_nx - 2);
+ __pyx_t_19 = (__pyx_v_i + __pyx_v_oi);
+ __pyx_t_20 = (__pyx_v_j + __pyx_v_oj);
+ if (__pyx_t_18 < 0) __pyx_t_18 += __pyx_bshape_0_contour_ids;
+ if (__pyx_t_19 < 0) __pyx_t_19 += __pyx_bshape_1_contour_ids;
+ if (__pyx_t_20 < 0) __pyx_t_20 += __pyx_bshape_2_contour_ids;
+ __pyx_v_c2 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_18, __pyx_bstride_0_contour_ids, __pyx_t_19, __pyx_bstride_1_contour_ids, __pyx_t_20, __pyx_bstride_2_contour_ids));
+
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":65
+ * c1 = contour_ids[nx-1, i, j]
+ * c2 = contour_ids[nx-2, i + oi, j + oj]
+ * if c1 > -1 and c2 > -1: # <<<<<<<<<<<<<<
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
* # Now y-pass
*/
- if ((__pyx_v_c1 > -1)) {
- __pyx_t_10 = (__pyx_v_c2 > -1);
- } else {
- __pyx_t_10 = (__pyx_v_c1 > -1);
- }
- if (__pyx_t_10) {
+ if ((__pyx_v_c1 > -1)) {
+ __pyx_t_5 = (__pyx_v_c2 > -1);
+ } else {
+ __pyx_t_5 = (__pyx_v_c1 > -1);
+ }
+ if (__pyx_t_5) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":58
- * c2 = contour_ids[nx-2, i, j]
- * if c1 > -1 and c2 > -1:
- * tree.append((i64max(c1,c2), i64min(c1,c2))) # <<<<<<<<<<<<<<
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":66
+ * c2 = contour_ids[nx-2, i + oi, j + oj]
+ * if c1 > -1 and c2 > -1:
+ * tree.append((i64max(c1,c2), i64min(c1,c2))) # <<<<<<<<<<<<<<
* # Now y-pass
* for i in range(nx):
*/
- __pyx_t_11 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64max(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_t_11);
- __pyx_t_12 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64min(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_t_12);
- __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(((PyObject *)__pyx_t_1));
- PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_11);
- __Pyx_GIVEREF(__pyx_t_11);
- PyTuple_SET_ITEM(__pyx_t_1, 1, __pyx_t_12);
- __Pyx_GIVEREF(__pyx_t_12);
- __pyx_t_11 = 0;
- __pyx_t_12 = 0;
- __pyx_t_12 = __Pyx_PyObject_Append(__pyx_v_tree, ((PyObject *)__pyx_t_1)); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_t_12);
- __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
- __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0;
- goto __pyx_L10;
+ __pyx_t_13 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64max(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_13)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_13);
+ __pyx_t_14 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64min(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_14);
+ __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+ PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_13);
+ __Pyx_GIVEREF(__pyx_t_13);
+ PyTuple_SET_ITEM(__pyx_t_1, 1, __pyx_t_14);
+ __Pyx_GIVEREF(__pyx_t_14);
+ __pyx_t_13 = 0;
+ __pyx_t_14 = 0;
+ __pyx_t_14 = __Pyx_PyObject_Append(__pyx_v_tree, ((PyObject *)__pyx_t_1)); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_14);
+ __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+ __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0;
+ goto __pyx_L18;
+ }
+ __pyx_L18:;
+ __pyx_L13_continue:;
+ }
+ __pyx_L9_continue:;
}
- __pyx_L10:;
}
}
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":60
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":68
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
* # Now y-pass
* for i in range(nx): # <<<<<<<<<<<<<<
* for j in range(nz):
- * c1 = contour_ids[i, 0, j]
+ * for offset_i in range(3):
*/
for (__pyx_t_2 = 0; __pyx_t_2 < __pyx_v_nx; __pyx_t_2+=1) {
__pyx_v_i = __pyx_t_2;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":61
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":69
* # Now y-pass
* for i in range(nx):
* for j in range(nz): # <<<<<<<<<<<<<<
- * c1 = contour_ids[i, 0, j]
- * c2 = contour_ids[i, 1, j]
+ * for offset_i in range(3):
+ * oi = offset_i - 1
*/
for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_v_nz; __pyx_t_3+=1) {
__pyx_v_j = __pyx_t_3;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":62
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":70
* for i in range(nx):
* for j in range(nz):
- * c1 = contour_ids[i, 0, j] # <<<<<<<<<<<<<<
- * c2 = contour_ids[i, 1, j]
- * if c1 > -1 and c2 > -1:
- */
- __pyx_t_19 = __pyx_v_i;
- __pyx_t_20 = 0;
- __pyx_t_21 = __pyx_v_j;
- if (__pyx_t_19 < 0) __pyx_t_19 += __pyx_bshape_0_contour_ids;
- if (__pyx_t_20 < 0) __pyx_t_20 += __pyx_bshape_1_contour_ids;
- if (__pyx_t_21 < 0) __pyx_t_21 += __pyx_bshape_2_contour_ids;
- __pyx_v_c1 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_19, __pyx_bstride_0_contour_ids, __pyx_t_20, __pyx_bstride_1_contour_ids, __pyx_t_21, __pyx_bstride_2_contour_ids));
+ * for offset_i in range(3): # <<<<<<<<<<<<<<
+ * oi = offset_i - 1
+ * if i == 0 and oi == -1: continue
+ */
+ for (__pyx_t_4 = 0; __pyx_t_4 < 3; __pyx_t_4+=1) {
+ __pyx_v_offset_i = __pyx_t_4;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":63
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":71
* for j in range(nz):
- * c1 = contour_ids[i, 0, j]
- * c2 = contour_ids[i, 1, j] # <<<<<<<<<<<<<<
- * if c1 > -1 and c2 > -1:
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
- */
- __pyx_t_22 = __pyx_v_i;
- __pyx_t_23 = 1;
- __pyx_t_24 = __pyx_v_j;
- if (__pyx_t_22 < 0) __pyx_t_22 += __pyx_bshape_0_contour_ids;
- if (__pyx_t_23 < 0) __pyx_t_23 += __pyx_bshape_1_contour_ids;
- if (__pyx_t_24 < 0) __pyx_t_24 += __pyx_bshape_2_contour_ids;
- __pyx_v_c2 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_22, __pyx_bstride_0_contour_ids, __pyx_t_23, __pyx_bstride_1_contour_ids, __pyx_t_24, __pyx_bstride_2_contour_ids));
-
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":64
- * c1 = contour_ids[i, 0, j]
- * c2 = contour_ids[i, 1, j]
- * if c1 > -1 and c2 > -1: # <<<<<<<<<<<<<<
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
- * c1 = contour_ids[i, ny-1, j]
+ * for offset_i in range(3):
+ * oi = offset_i - 1 # <<<<<<<<<<<<<<
+ * if i == 0 and oi == -1: continue
+ * if i == nx - 1 and oj == 1: continue
+ */
+ __pyx_v_oi = (__pyx_v_offset_i - 1);
+
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":72
+ * for offset_i in range(3):
+ * oi = offset_i - 1
+ * if i == 0 and oi == -1: continue # <<<<<<<<<<<<<<
+ * if i == nx - 1 and oj == 1: continue
+ * for offset_j in range(3):
*/
- if ((__pyx_v_c1 > -1)) {
- __pyx_t_10 = (__pyx_v_c2 > -1);
- } else {
- __pyx_t_10 = (__pyx_v_c1 > -1);
- }
- if (__pyx_t_10) {
+ if ((__pyx_v_i == 0)) {
+ __pyx_t_5 = (__pyx_v_oi == -1);
+ } else {
+ __pyx_t_5 = (__pyx_v_i == 0);
+ }
+ if (__pyx_t_5) {
+ goto __pyx_L23_continue;
+ goto __pyx_L25;
+ }
+ __pyx_L25:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":65
- * c2 = contour_ids[i, 1, j]
- * if c1 > -1 and c2 > -1:
- * tree.append((i64max(c1,c2), i64min(c1,c2))) # <<<<<<<<<<<<<<
- * c1 = contour_ids[i, ny-1, j]
- * c2 = contour_ids[i, ny-2, j]
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":73
+ * oi = offset_i - 1
+ * if i == 0 and oi == -1: continue
+ * if i == nx - 1 and oj == 1: continue # <<<<<<<<<<<<<<
+ * for offset_j in range(3):
+ * oj = offset_j - 1
*/
- __pyx_t_12 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64max(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_t_12);
- __pyx_t_1 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64min(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_t_1);
- __pyx_t_11 = PyTuple_New(2); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(((PyObject *)__pyx_t_11));
- PyTuple_SET_ITEM(__pyx_t_11, 0, __pyx_t_12);
- __Pyx_GIVEREF(__pyx_t_12);
- PyTuple_SET_ITEM(__pyx_t_11, 1, __pyx_t_1);
- __Pyx_GIVEREF(__pyx_t_1);
- __pyx_t_12 = 0;
- __pyx_t_1 = 0;
- __pyx_t_1 = __Pyx_PyObject_Append(__pyx_v_tree, ((PyObject *)__pyx_t_11)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_t_1);
- __Pyx_DECREF(((PyObject *)__pyx_t_11)); __pyx_t_11 = 0;
- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- goto __pyx_L15;
- }
- __pyx_L15:;
+ if ((__pyx_v_i == (__pyx_v_nx - 1))) {
+ __pyx_t_5 = (__pyx_v_oj == 1);
+ } else {
+ __pyx_t_5 = (__pyx_v_i == (__pyx_v_nx - 1));
+ }
+ if (__pyx_t_5) {
+ goto __pyx_L23_continue;
+ goto __pyx_L26;
+ }
+ __pyx_L26:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":66
- * if c1 > -1 and c2 > -1:
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
- * c1 = contour_ids[i, ny-1, j] # <<<<<<<<<<<<<<
- * c2 = contour_ids[i, ny-2, j]
- * if c1 > -1 and c2 > -1:
- */
- __pyx_t_25 = __pyx_v_i;
- __pyx_t_26 = (__pyx_v_ny - 1);
- __pyx_t_27 = __pyx_v_j;
- if (__pyx_t_25 < 0) __pyx_t_25 += __pyx_bshape_0_contour_ids;
- if (__pyx_t_26 < 0) __pyx_t_26 += __pyx_bshape_1_contour_ids;
- if (__pyx_t_27 < 0) __pyx_t_27 += __pyx_bshape_2_contour_ids;
- __pyx_v_c1 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_25, __pyx_bstride_0_contour_ids, __pyx_t_26, __pyx_bstride_1_contour_ids, __pyx_t_27, __pyx_bstride_2_contour_ids));
-
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":67
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
- * c1 = contour_ids[i, ny-1, j]
- * c2 = contour_ids[i, ny-2, j] # <<<<<<<<<<<<<<
- * if c1 > -1 and c2 > -1:
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
- */
- __pyx_t_28 = __pyx_v_i;
- __pyx_t_29 = (__pyx_v_ny - 2);
- __pyx_t_30 = __pyx_v_j;
- if (__pyx_t_28 < 0) __pyx_t_28 += __pyx_bshape_0_contour_ids;
- if (__pyx_t_29 < 0) __pyx_t_29 += __pyx_bshape_1_contour_ids;
- if (__pyx_t_30 < 0) __pyx_t_30 += __pyx_bshape_2_contour_ids;
- __pyx_v_c2 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_28, __pyx_bstride_0_contour_ids, __pyx_t_29, __pyx_bstride_1_contour_ids, __pyx_t_30, __pyx_bstride_2_contour_ids));
-
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":68
- * c1 = contour_ids[i, ny-1, j]
- * c2 = contour_ids[i, ny-2, j]
- * if c1 > -1 and c2 > -1: # <<<<<<<<<<<<<<
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":74
+ * if i == 0 and oi == -1: continue
+ * if i == nx - 1 and oj == 1: continue
+ * for offset_j in range(3): # <<<<<<<<<<<<<<
+ * oj = offset_j - 1
+ * if j == 0 and oj == -1: continue
+ */
+ for (__pyx_t_6 = 0; __pyx_t_6 < 3; __pyx_t_6+=1) {
+ __pyx_v_offset_j = __pyx_t_6;
+
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":75
+ * if i == nx - 1 and oj == 1: continue
+ * for offset_j in range(3):
+ * oj = offset_j - 1 # <<<<<<<<<<<<<<
+ * if j == 0 and oj == -1: continue
+ * if j == nz - 1 and oj == 1: continue
+ */
+ __pyx_v_oj = (__pyx_v_offset_j - 1);
+
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":76
+ * for offset_j in range(3):
+ * oj = offset_j - 1
+ * if j == 0 and oj == -1: continue # <<<<<<<<<<<<<<
+ * if j == nz - 1 and oj == 1: continue
+ * c1 = contour_ids[i, 0, j]
+ */
+ if ((__pyx_v_j == 0)) {
+ __pyx_t_5 = (__pyx_v_oj == -1);
+ } else {
+ __pyx_t_5 = (__pyx_v_j == 0);
+ }
+ if (__pyx_t_5) {
+ goto __pyx_L27_continue;
+ goto __pyx_L29;
+ }
+ __pyx_L29:;
+
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":77
+ * oj = offset_j - 1
+ * if j == 0 and oj == -1: continue
+ * if j == nz - 1 and oj == 1: continue # <<<<<<<<<<<<<<
+ * c1 = contour_ids[i, 0, j]
+ * c2 = contour_ids[i + oi, 1, j + oj]
+ */
+ if ((__pyx_v_j == (__pyx_v_nz - 1))) {
+ __pyx_t_5 = (__pyx_v_oj == 1);
+ } else {
+ __pyx_t_5 = (__pyx_v_j == (__pyx_v_nz - 1));
+ }
+ if (__pyx_t_5) {
+ goto __pyx_L27_continue;
+ goto __pyx_L30;
+ }
+ __pyx_L30:;
+
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":78
+ * if j == 0 and oj == -1: continue
+ * if j == nz - 1 and oj == 1: continue
+ * c1 = contour_ids[i, 0, j] # <<<<<<<<<<<<<<
+ * c2 = contour_ids[i + oi, 1, j + oj]
+ * if c1 > -1 and c2 > -1:
+ */
+ __pyx_t_21 = __pyx_v_i;
+ __pyx_t_22 = 0;
+ __pyx_t_23 = __pyx_v_j;
+ if (__pyx_t_21 < 0) __pyx_t_21 += __pyx_bshape_0_contour_ids;
+ if (__pyx_t_22 < 0) __pyx_t_22 += __pyx_bshape_1_contour_ids;
+ if (__pyx_t_23 < 0) __pyx_t_23 += __pyx_bshape_2_contour_ids;
+ __pyx_v_c1 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_21, __pyx_bstride_0_contour_ids, __pyx_t_22, __pyx_bstride_1_contour_ids, __pyx_t_23, __pyx_bstride_2_contour_ids));
+
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":79
+ * if j == nz - 1 and oj == 1: continue
+ * c1 = contour_ids[i, 0, j]
+ * c2 = contour_ids[i + oi, 1, j + oj] # <<<<<<<<<<<<<<
+ * if c1 > -1 and c2 > -1:
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ */
+ __pyx_t_24 = (__pyx_v_i + __pyx_v_oi);
+ __pyx_t_25 = 1;
+ __pyx_t_26 = (__pyx_v_j + __pyx_v_oj);
+ if (__pyx_t_24 < 0) __pyx_t_24 += __pyx_bshape_0_contour_ids;
+ if (__pyx_t_25 < 0) __pyx_t_25 += __pyx_bshape_1_contour_ids;
+ if (__pyx_t_26 < 0) __pyx_t_26 += __pyx_bshape_2_contour_ids;
+ __pyx_v_c2 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_24, __pyx_bstride_0_contour_ids, __pyx_t_25, __pyx_bstride_1_contour_ids, __pyx_t_26, __pyx_bstride_2_contour_ids));
+
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":80
+ * c1 = contour_ids[i, 0, j]
+ * c2 = contour_ids[i + oi, 1, j + oj]
+ * if c1 > -1 and c2 > -1: # <<<<<<<<<<<<<<
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ * c1 = contour_ids[i, ny-1, j]
+ */
+ if ((__pyx_v_c1 > -1)) {
+ __pyx_t_5 = (__pyx_v_c2 > -1);
+ } else {
+ __pyx_t_5 = (__pyx_v_c1 > -1);
+ }
+ if (__pyx_t_5) {
+
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":81
+ * c2 = contour_ids[i + oi, 1, j + oj]
+ * if c1 > -1 and c2 > -1:
+ * tree.append((i64max(c1,c2), i64min(c1,c2))) # <<<<<<<<<<<<<<
+ * c1 = contour_ids[i, ny-1, j]
+ * c2 = contour_ids[i + oi, ny-2, j + oj]
+ */
+ __pyx_t_14 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64max(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_14);
+ __pyx_t_1 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64min(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_1);
+ __pyx_t_13 = PyTuple_New(2); if (unlikely(!__pyx_t_13)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(((PyObject *)__pyx_t_13));
+ PyTuple_SET_ITEM(__pyx_t_13, 0, __pyx_t_14);
+ __Pyx_GIVEREF(__pyx_t_14);
+ PyTuple_SET_ITEM(__pyx_t_13, 1, __pyx_t_1);
+ __Pyx_GIVEREF(__pyx_t_1);
+ __pyx_t_14 = 0;
+ __pyx_t_1 = 0;
+ __pyx_t_1 = __Pyx_PyObject_Append(__pyx_v_tree, ((PyObject *)__pyx_t_13)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_1);
+ __Pyx_DECREF(((PyObject *)__pyx_t_13)); __pyx_t_13 = 0;
+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+ goto __pyx_L31;
+ }
+ __pyx_L31:;
+
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":82
+ * if c1 > -1 and c2 > -1:
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ * c1 = contour_ids[i, ny-1, j] # <<<<<<<<<<<<<<
+ * c2 = contour_ids[i + oi, ny-2, j + oj]
+ * if c1 > -1 and c2 > -1:
+ */
+ __pyx_t_27 = __pyx_v_i;
+ __pyx_t_28 = (__pyx_v_ny - 1);
+ __pyx_t_29 = __pyx_v_j;
+ if (__pyx_t_27 < 0) __pyx_t_27 += __pyx_bshape_0_contour_ids;
+ if (__pyx_t_28 < 0) __pyx_t_28 += __pyx_bshape_1_contour_ids;
+ if (__pyx_t_29 < 0) __pyx_t_29 += __pyx_bshape_2_contour_ids;
+ __pyx_v_c1 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_27, __pyx_bstride_0_contour_ids, __pyx_t_28, __pyx_bstride_1_contour_ids, __pyx_t_29, __pyx_bstride_2_contour_ids));
+
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":83
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ * c1 = contour_ids[i, ny-1, j]
+ * c2 = contour_ids[i + oi, ny-2, j + oj] # <<<<<<<<<<<<<<
+ * if c1 > -1 and c2 > -1:
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ */
+ __pyx_t_30 = (__pyx_v_i + __pyx_v_oi);
+ __pyx_t_31 = (__pyx_v_ny - 2);
+ __pyx_t_32 = (__pyx_v_j + __pyx_v_oj);
+ if (__pyx_t_30 < 0) __pyx_t_30 += __pyx_bshape_0_contour_ids;
+ if (__pyx_t_31 < 0) __pyx_t_31 += __pyx_bshape_1_contour_ids;
+ if (__pyx_t_32 < 0) __pyx_t_32 += __pyx_bshape_2_contour_ids;
+ __pyx_v_c2 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_30, __pyx_bstride_0_contour_ids, __pyx_t_31, __pyx_bstride_1_contour_ids, __pyx_t_32, __pyx_bstride_2_contour_ids));
+
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":84
+ * c1 = contour_ids[i, ny-1, j]
+ * c2 = contour_ids[i + oi, ny-2, j + oj]
+ * if c1 > -1 and c2 > -1: # <<<<<<<<<<<<<<
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
* for i in range(nx):
*/
- if ((__pyx_v_c1 > -1)) {
- __pyx_t_10 = (__pyx_v_c2 > -1);
- } else {
- __pyx_t_10 = (__pyx_v_c1 > -1);
- }
- if (__pyx_t_10) {
+ if ((__pyx_v_c1 > -1)) {
+ __pyx_t_5 = (__pyx_v_c2 > -1);
+ } else {
+ __pyx_t_5 = (__pyx_v_c1 > -1);
+ }
+ if (__pyx_t_5) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":69
- * c2 = contour_ids[i, ny-2, j]
- * if c1 > -1 and c2 > -1:
- * tree.append((i64max(c1,c2), i64min(c1,c2))) # <<<<<<<<<<<<<<
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":85
+ * c2 = contour_ids[i + oi, ny-2, j + oj]
+ * if c1 > -1 and c2 > -1:
+ * tree.append((i64max(c1,c2), i64min(c1,c2))) # <<<<<<<<<<<<<<
* for i in range(nx):
* for j in range(ny):
*/
- __pyx_t_1 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64max(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_t_1);
- __pyx_t_11 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64min(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_t_11);
- __pyx_t_12 = PyTuple_New(2); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(((PyObject *)__pyx_t_12));
- PyTuple_SET_ITEM(__pyx_t_12, 0, __pyx_t_1);
- __Pyx_GIVEREF(__pyx_t_1);
- PyTuple_SET_ITEM(__pyx_t_12, 1, __pyx_t_11);
- __Pyx_GIVEREF(__pyx_t_11);
- __pyx_t_1 = 0;
- __pyx_t_11 = 0;
- __pyx_t_11 = __Pyx_PyObject_Append(__pyx_v_tree, ((PyObject *)__pyx_t_12)); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_t_11);
- __Pyx_DECREF(((PyObject *)__pyx_t_12)); __pyx_t_12 = 0;
- __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
- goto __pyx_L16;
+ __pyx_t_1 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64max(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_1);
+ __pyx_t_13 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64min(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_13)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_13);
+ __pyx_t_14 = PyTuple_New(2); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(((PyObject *)__pyx_t_14));
+ PyTuple_SET_ITEM(__pyx_t_14, 0, __pyx_t_1);
+ __Pyx_GIVEREF(__pyx_t_1);
+ PyTuple_SET_ITEM(__pyx_t_14, 1, __pyx_t_13);
+ __Pyx_GIVEREF(__pyx_t_13);
+ __pyx_t_1 = 0;
+ __pyx_t_13 = 0;
+ __pyx_t_13 = __Pyx_PyObject_Append(__pyx_v_tree, ((PyObject *)__pyx_t_14)); if (unlikely(!__pyx_t_13)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_13);
+ __Pyx_DECREF(((PyObject *)__pyx_t_14)); __pyx_t_14 = 0;
+ __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0;
+ goto __pyx_L32;
+ }
+ __pyx_L32:;
+ __pyx_L27_continue:;
+ }
+ __pyx_L23_continue:;
}
- __pyx_L16:;
}
}
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":70
- * if c1 > -1 and c2 > -1:
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":86
+ * if c1 > -1 and c2 > -1:
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
* for i in range(nx): # <<<<<<<<<<<<<<
* for j in range(ny):
- * c1 = contour_ids[i, j, 0]
+ * for offset_i in range(3):
*/
for (__pyx_t_2 = 0; __pyx_t_2 < __pyx_v_nx; __pyx_t_2+=1) {
__pyx_v_i = __pyx_t_2;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":71
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":87
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
* for i in range(nx):
* for j in range(ny): # <<<<<<<<<<<<<<
- * c1 = contour_ids[i, j, 0]
- * c2 = contour_ids[i, j, 1]
+ * for offset_i in range(3):
+ * oi = offset_i - 1
*/
for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_v_ny; __pyx_t_3+=1) {
__pyx_v_j = __pyx_t_3;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":72
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":88
* for i in range(nx):
* for j in range(ny):
- * c1 = contour_ids[i, j, 0] # <<<<<<<<<<<<<<
- * c2 = contour_ids[i, j, 1]
- * if c1 > -1 and c2 > -1:
- */
- __pyx_t_31 = __pyx_v_i;
- __pyx_t_32 = __pyx_v_j;
- __pyx_t_33 = 0;
- if (__pyx_t_31 < 0) __pyx_t_31 += __pyx_bshape_0_contour_ids;
- if (__pyx_t_32 < 0) __pyx_t_32 += __pyx_bshape_1_contour_ids;
- if (__pyx_t_33 < 0) __pyx_t_33 += __pyx_bshape_2_contour_ids;
- __pyx_v_c1 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_31, __pyx_bstride_0_contour_ids, __pyx_t_32, __pyx_bstride_1_contour_ids, __pyx_t_33, __pyx_bstride_2_contour_ids));
+ * for offset_i in range(3): # <<<<<<<<<<<<<<
+ * oi = offset_i - 1
+ * if i == 0 and oi == -1: continue
+ */
+ for (__pyx_t_4 = 0; __pyx_t_4 < 3; __pyx_t_4+=1) {
+ __pyx_v_offset_i = __pyx_t_4;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":73
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":89
* for j in range(ny):
- * c1 = contour_ids[i, j, 0]
- * c2 = contour_ids[i, j, 1] # <<<<<<<<<<<<<<
- * if c1 > -1 and c2 > -1:
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
- */
- __pyx_t_34 = __pyx_v_i;
- __pyx_t_35 = __pyx_v_j;
- __pyx_t_36 = 1;
- if (__pyx_t_34 < 0) __pyx_t_34 += __pyx_bshape_0_contour_ids;
- if (__pyx_t_35 < 0) __pyx_t_35 += __pyx_bshape_1_contour_ids;
- if (__pyx_t_36 < 0) __pyx_t_36 += __pyx_bshape_2_contour_ids;
- __pyx_v_c2 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_34, __pyx_bstride_0_contour_ids, __pyx_t_35, __pyx_bstride_1_contour_ids, __pyx_t_36, __pyx_bstride_2_contour_ids));
-
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":74
- * c1 = contour_ids[i, j, 0]
- * c2 = contour_ids[i, j, 1]
- * if c1 > -1 and c2 > -1: # <<<<<<<<<<<<<<
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
- * c1 = contour_ids[i, j, nz-1]
+ * for offset_i in range(3):
+ * oi = offset_i - 1 # <<<<<<<<<<<<<<
+ * if i == 0 and oi == -1: continue
+ * if i == nx - 1 and oj == 1: continue
+ */
+ __pyx_v_oi = (__pyx_v_offset_i - 1);
+
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":90
+ * for offset_i in range(3):
+ * oi = offset_i - 1
+ * if i == 0 and oi == -1: continue # <<<<<<<<<<<<<<
+ * if i == nx - 1 and oj == 1: continue
+ * for offset_j in range(3):
*/
- if ((__pyx_v_c1 > -1)) {
- __pyx_t_10 = (__pyx_v_c2 > -1);
- } else {
- __pyx_t_10 = (__pyx_v_c1 > -1);
- }
- if (__pyx_t_10) {
+ if ((__pyx_v_i == 0)) {
+ __pyx_t_5 = (__pyx_v_oi == -1);
+ } else {
+ __pyx_t_5 = (__pyx_v_i == 0);
+ }
+ if (__pyx_t_5) {
+ goto __pyx_L37_continue;
+ goto __pyx_L39;
+ }
+ __pyx_L39:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":75
- * c2 = contour_ids[i, j, 1]
- * if c1 > -1 and c2 > -1:
- * tree.append((i64max(c1,c2), i64min(c1,c2))) # <<<<<<<<<<<<<<
- * c1 = contour_ids[i, j, nz-1]
- * c2 = contour_ids[i, j, nz-2]
- */
- __pyx_t_11 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64max(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_t_11);
- __pyx_t_12 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64min(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_t_12);
- __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(((PyObject *)__pyx_t_1));
- PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_11);
- __Pyx_GIVEREF(__pyx_t_11);
- PyTuple_SET_ITEM(__pyx_t_1, 1, __pyx_t_12);
- __Pyx_GIVEREF(__pyx_t_12);
- __pyx_t_11 = 0;
- __pyx_t_12 = 0;
- __pyx_t_12 = __Pyx_PyObject_Append(__pyx_v_tree, ((PyObject *)__pyx_t_1)); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_t_12);
- __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
- __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0;
- goto __pyx_L21;
- }
- __pyx_L21:;
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":91
+ * oi = offset_i - 1
+ * if i == 0 and oi == -1: continue
+ * if i == nx - 1 and oj == 1: continue # <<<<<<<<<<<<<<
+ * for offset_j in range(3):
+ * oj = offset_j - 1
+ */
+ if ((__pyx_v_i == (__pyx_v_nx - 1))) {
+ __pyx_t_5 = (__pyx_v_oj == 1);
+ } else {
+ __pyx_t_5 = (__pyx_v_i == (__pyx_v_nx - 1));
+ }
+ if (__pyx_t_5) {
+ goto __pyx_L37_continue;
+ goto __pyx_L40;
+ }
+ __pyx_L40:;
+
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":92
+ * if i == 0 and oi == -1: continue
+ * if i == nx - 1 and oj == 1: continue
+ * for offset_j in range(3): # <<<<<<<<<<<<<<
+ * oj = offset_j - 1
+ * if j == 0 and oj == -1: continue
+ */
+ for (__pyx_t_6 = 0; __pyx_t_6 < 3; __pyx_t_6+=1) {
+ __pyx_v_offset_j = __pyx_t_6;
+
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":93
+ * if i == nx - 1 and oj == 1: continue
+ * for offset_j in range(3):
+ * oj = offset_j - 1 # <<<<<<<<<<<<<<
+ * if j == 0 and oj == -1: continue
+ * if j == ny - 1 and oj == 1: continue
+ */
+ __pyx_v_oj = (__pyx_v_offset_j - 1);
+
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":94
+ * for offset_j in range(3):
+ * oj = offset_j - 1
+ * if j == 0 and oj == -1: continue # <<<<<<<<<<<<<<
+ * if j == ny - 1 and oj == 1: continue
+ * c1 = contour_ids[i, j, 0]
+ */
+ if ((__pyx_v_j == 0)) {
+ __pyx_t_5 = (__pyx_v_oj == -1);
+ } else {
+ __pyx_t_5 = (__pyx_v_j == 0);
+ }
+ if (__pyx_t_5) {
+ goto __pyx_L41_continue;
+ goto __pyx_L43;
+ }
+ __pyx_L43:;
+
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":95
+ * oj = offset_j - 1
+ * if j == 0 and oj == -1: continue
+ * if j == ny - 1 and oj == 1: continue # <<<<<<<<<<<<<<
+ * c1 = contour_ids[i, j, 0]
+ * c2 = contour_ids[i + oi, j + oj, 1]
+ */
+ if ((__pyx_v_j == (__pyx_v_ny - 1))) {
+ __pyx_t_5 = (__pyx_v_oj == 1);
+ } else {
+ __pyx_t_5 = (__pyx_v_j == (__pyx_v_ny - 1));
+ }
+ if (__pyx_t_5) {
+ goto __pyx_L41_continue;
+ goto __pyx_L44;
+ }
+ __pyx_L44:;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":76
- * if c1 > -1 and c2 > -1:
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
- * c1 = contour_ids[i, j, nz-1] # <<<<<<<<<<<<<<
- * c2 = contour_ids[i, j, nz-2]
- * if c1 > -1 and c2 > -1:
- */
- __pyx_t_37 = __pyx_v_i;
- __pyx_t_38 = __pyx_v_j;
- __pyx_t_39 = (__pyx_v_nz - 1);
- if (__pyx_t_37 < 0) __pyx_t_37 += __pyx_bshape_0_contour_ids;
- if (__pyx_t_38 < 0) __pyx_t_38 += __pyx_bshape_1_contour_ids;
- if (__pyx_t_39 < 0) __pyx_t_39 += __pyx_bshape_2_contour_ids;
- __pyx_v_c1 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_37, __pyx_bstride_0_contour_ids, __pyx_t_38, __pyx_bstride_1_contour_ids, __pyx_t_39, __pyx_bstride_2_contour_ids));
-
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":77
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
- * c1 = contour_ids[i, j, nz-1]
- * c2 = contour_ids[i, j, nz-2] # <<<<<<<<<<<<<<
- * if c1 > -1 and c2 > -1:
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
- */
- __pyx_t_40 = __pyx_v_i;
- __pyx_t_41 = __pyx_v_j;
- __pyx_t_42 = (__pyx_v_nz - 2);
- if (__pyx_t_40 < 0) __pyx_t_40 += __pyx_bshape_0_contour_ids;
- if (__pyx_t_41 < 0) __pyx_t_41 += __pyx_bshape_1_contour_ids;
- if (__pyx_t_42 < 0) __pyx_t_42 += __pyx_bshape_2_contour_ids;
- __pyx_v_c2 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_40, __pyx_bstride_0_contour_ids, __pyx_t_41, __pyx_bstride_1_contour_ids, __pyx_t_42, __pyx_bstride_2_contour_ids));
-
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":78
- * c1 = contour_ids[i, j, nz-1]
- * c2 = contour_ids[i, j, nz-2]
- * if c1 > -1 and c2 > -1: # <<<<<<<<<<<<<<
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":96
+ * if j == 0 and oj == -1: continue
+ * if j == ny - 1 and oj == 1: continue
+ * c1 = contour_ids[i, j, 0] # <<<<<<<<<<<<<<
+ * c2 = contour_ids[i + oi, j + oj, 1]
+ * if c1 > -1 and c2 > -1:
+ */
+ __pyx_t_33 = __pyx_v_i;
+ __pyx_t_34 = __pyx_v_j;
+ __pyx_t_35 = 0;
+ if (__pyx_t_33 < 0) __pyx_t_33 += __pyx_bshape_0_contour_ids;
+ if (__pyx_t_34 < 0) __pyx_t_34 += __pyx_bshape_1_contour_ids;
+ if (__pyx_t_35 < 0) __pyx_t_35 += __pyx_bshape_2_contour_ids;
+ __pyx_v_c1 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_33, __pyx_bstride_0_contour_ids, __pyx_t_34, __pyx_bstride_1_contour_ids, __pyx_t_35, __pyx_bstride_2_contour_ids));
+
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":97
+ * if j == ny - 1 and oj == 1: continue
+ * c1 = contour_ids[i, j, 0]
+ * c2 = contour_ids[i + oi, j + oj, 1] # <<<<<<<<<<<<<<
+ * if c1 > -1 and c2 > -1:
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ */
+ __pyx_t_36 = (__pyx_v_i + __pyx_v_oi);
+ __pyx_t_37 = (__pyx_v_j + __pyx_v_oj);
+ __pyx_t_38 = 1;
+ if (__pyx_t_36 < 0) __pyx_t_36 += __pyx_bshape_0_contour_ids;
+ if (__pyx_t_37 < 0) __pyx_t_37 += __pyx_bshape_1_contour_ids;
+ if (__pyx_t_38 < 0) __pyx_t_38 += __pyx_bshape_2_contour_ids;
+ __pyx_v_c2 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_36, __pyx_bstride_0_contour_ids, __pyx_t_37, __pyx_bstride_1_contour_ids, __pyx_t_38, __pyx_bstride_2_contour_ids));
+
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":98
+ * c1 = contour_ids[i, j, 0]
+ * c2 = contour_ids[i + oi, j + oj, 1]
+ * if c1 > -1 and c2 > -1: # <<<<<<<<<<<<<<
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ * c1 = contour_ids[i, j, nz-1]
+ */
+ if ((__pyx_v_c1 > -1)) {
+ __pyx_t_5 = (__pyx_v_c2 > -1);
+ } else {
+ __pyx_t_5 = (__pyx_v_c1 > -1);
+ }
+ if (__pyx_t_5) {
+
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":99
+ * c2 = contour_ids[i + oi, j + oj, 1]
+ * if c1 > -1 and c2 > -1:
+ * tree.append((i64max(c1,c2), i64min(c1,c2))) # <<<<<<<<<<<<<<
+ * c1 = contour_ids[i, j, nz-1]
+ * c2 = contour_ids[i + oi, j + oj, nz-2]
+ */
+ __pyx_t_13 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64max(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_13)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_13);
+ __pyx_t_14 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64min(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_14);
+ __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+ PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_13);
+ __Pyx_GIVEREF(__pyx_t_13);
+ PyTuple_SET_ITEM(__pyx_t_1, 1, __pyx_t_14);
+ __Pyx_GIVEREF(__pyx_t_14);
+ __pyx_t_13 = 0;
+ __pyx_t_14 = 0;
+ __pyx_t_14 = __Pyx_PyObject_Append(__pyx_v_tree, ((PyObject *)__pyx_t_1)); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_14);
+ __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+ __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0;
+ goto __pyx_L45;
+ }
+ __pyx_L45:;
+
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":100
+ * if c1 > -1 and c2 > -1:
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ * c1 = contour_ids[i, j, nz-1] # <<<<<<<<<<<<<<
+ * c2 = contour_ids[i + oi, j + oj, nz-2]
+ * if c1 > -1 and c2 > -1:
+ */
+ __pyx_t_39 = __pyx_v_i;
+ __pyx_t_40 = __pyx_v_j;
+ __pyx_t_41 = (__pyx_v_nz - 1);
+ if (__pyx_t_39 < 0) __pyx_t_39 += __pyx_bshape_0_contour_ids;
+ if (__pyx_t_40 < 0) __pyx_t_40 += __pyx_bshape_1_contour_ids;
+ if (__pyx_t_41 < 0) __pyx_t_41 += __pyx_bshape_2_contour_ids;
+ __pyx_v_c1 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_39, __pyx_bstride_0_contour_ids, __pyx_t_40, __pyx_bstride_1_contour_ids, __pyx_t_41, __pyx_bstride_2_contour_ids));
+
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":101
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ * c1 = contour_ids[i, j, nz-1]
+ * c2 = contour_ids[i + oi, j + oj, nz-2] # <<<<<<<<<<<<<<
+ * if c1 > -1 and c2 > -1:
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ */
+ __pyx_t_42 = (__pyx_v_i + __pyx_v_oi);
+ __pyx_t_43 = (__pyx_v_j + __pyx_v_oj);
+ __pyx_t_44 = (__pyx_v_nz - 2);
+ if (__pyx_t_42 < 0) __pyx_t_42 += __pyx_bshape_0_contour_ids;
+ if (__pyx_t_43 < 0) __pyx_t_43 += __pyx_bshape_1_contour_ids;
+ if (__pyx_t_44 < 0) __pyx_t_44 += __pyx_bshape_2_contour_ids;
+ __pyx_v_c2 = (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_int64_t *, __pyx_bstruct_contour_ids.buf, __pyx_t_42, __pyx_bstride_0_contour_ids, __pyx_t_43, __pyx_bstride_1_contour_ids, __pyx_t_44, __pyx_bstride_2_contour_ids));
+
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":102
+ * c1 = contour_ids[i, j, nz-1]
+ * c2 = contour_ids[i + oi, j + oj, nz-2]
+ * if c1 > -1 and c2 > -1: # <<<<<<<<<<<<<<
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
* return tree
*/
- if ((__pyx_v_c1 > -1)) {
- __pyx_t_10 = (__pyx_v_c2 > -1);
- } else {
- __pyx_t_10 = (__pyx_v_c1 > -1);
- }
- if (__pyx_t_10) {
+ if ((__pyx_v_c1 > -1)) {
+ __pyx_t_5 = (__pyx_v_c2 > -1);
+ } else {
+ __pyx_t_5 = (__pyx_v_c1 > -1);
+ }
+ if (__pyx_t_5) {
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":79
- * c2 = contour_ids[i, j, nz-2]
- * if c1 > -1 and c2 > -1:
- * tree.append((i64max(c1,c2), i64min(c1,c2))) # <<<<<<<<<<<<<<
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":103
+ * c2 = contour_ids[i + oi, j + oj, nz-2]
+ * if c1 > -1 and c2 > -1:
+ * tree.append((i64max(c1,c2), i64min(c1,c2))) # <<<<<<<<<<<<<<
* return tree
*/
- __pyx_t_12 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64max(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 79; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_t_12);
- __pyx_t_1 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64min(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 79; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_t_1);
- __pyx_t_11 = PyTuple_New(2); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 79; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(((PyObject *)__pyx_t_11));
- PyTuple_SET_ITEM(__pyx_t_11, 0, __pyx_t_12);
- __Pyx_GIVEREF(__pyx_t_12);
- PyTuple_SET_ITEM(__pyx_t_11, 1, __pyx_t_1);
- __Pyx_GIVEREF(__pyx_t_1);
- __pyx_t_12 = 0;
- __pyx_t_1 = 0;
- __pyx_t_1 = __Pyx_PyObject_Append(__pyx_v_tree, ((PyObject *)__pyx_t_11)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 79; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_t_1);
- __Pyx_DECREF(((PyObject *)__pyx_t_11)); __pyx_t_11 = 0;
- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- goto __pyx_L22;
+ __pyx_t_14 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64max(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 103; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_14);
+ __pyx_t_1 = __Pyx_PyInt_to_py_npy_int64(__pyx_f_2yt_9amr_utils_i64min(__pyx_v_c1, __pyx_v_c2)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 103; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_1);
+ __pyx_t_13 = PyTuple_New(2); if (unlikely(!__pyx_t_13)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 103; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(((PyObject *)__pyx_t_13));
+ PyTuple_SET_ITEM(__pyx_t_13, 0, __pyx_t_14);
+ __Pyx_GIVEREF(__pyx_t_14);
+ PyTuple_SET_ITEM(__pyx_t_13, 1, __pyx_t_1);
+ __Pyx_GIVEREF(__pyx_t_1);
+ __pyx_t_14 = 0;
+ __pyx_t_1 = 0;
+ __pyx_t_1 = __Pyx_PyObject_Append(__pyx_v_tree, ((PyObject *)__pyx_t_13)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 103; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_1);
+ __Pyx_DECREF(((PyObject *)__pyx_t_13)); __pyx_t_13 = 0;
+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+ goto __pyx_L46;
+ }
+ __pyx_L46:;
+ __pyx_L41_continue:;
+ }
+ __pyx_L37_continue:;
}
- __pyx_L22:;
}
}
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":80
- * if c1 > -1 and c2 > -1:
- * tree.append((i64max(c1,c2), i64min(c1,c2)))
+ /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/ContourFinding.pyx":104
+ * if c1 > -1 and c2 > -1:
+ * tree.append((i64max(c1,c2), i64min(c1,c2)))
* return tree # <<<<<<<<<<<<<<
*/
__Pyx_XDECREF(__pyx_r);
@@ -16595,8 +16943,8 @@
goto __pyx_L0;
__pyx_L1_error:;
__Pyx_XDECREF(__pyx_t_1);
- __Pyx_XDECREF(__pyx_t_11);
- __Pyx_XDECREF(__pyx_t_12);
+ __Pyx_XDECREF(__pyx_t_13);
+ __Pyx_XDECREF(__pyx_t_14);
{ PyObject *__pyx_type, *__pyx_value, *__pyx_tb;
__Pyx_ErrFetch(&__pyx_type, &__pyx_value, &__pyx_tb);
__Pyx_SafeReleaseBuffer(&__pyx_bstruct_contour_ids);
More information about the yt-svn
mailing list