[Yt-svn] yt: Applying fix from the 'yt' branch to get the black lines to ...
hg at spacepope.org
hg at spacepope.org
Fri Nov 5 07:23:29 PDT 2010
hg Repository: yt
details: yt/rev/8ef3d6ea764a
changeset: 3502:8ef3d6ea764a
user: Matthew Turk <matthewturk at gmail.com>
date:
Fri Nov 05 10:22:24 2010 -0400
description:
Applying fix from the 'yt' branch to get the black lines to disappear
diffstat:
yt/_amr_utils/VolumeIntegrator.pyx | 8 +-
yt/amr_utils.c | 132 ++++++++++++++++++------------------
2 files changed, 70 insertions(+), 70 deletions(-)
diffs (264 lines):
diff -r 9f53eb88c444 -r 8ef3d6ea764a yt/_amr_utils/VolumeIntegrator.pyx
--- a/yt/_amr_utils/VolumeIntegrator.pyx Tue Oct 26 15:18:22 2010 -0700
+++ b/yt/_amr_utils/VolumeIntegrator.pyx Fri Nov 05 10:22:24 2010 -0400
@@ -347,10 +347,10 @@
hit = 0
self.calculate_extent(vp, extrema)
vp.get_start_stop(extrema, iter)
- iter[0] = iclip(iter[0], 0, vp.nv[0])
- iter[1] = iclip(iter[1], 0, vp.nv[0])
- iter[2] = iclip(iter[2], 0, vp.nv[1])
- iter[3] = iclip(iter[3], 0, vp.nv[1])
+ iter[0] = iclip(iter[0]-1, 0, vp.nv[0])
+ iter[1] = iclip(iter[1]+1, 0, vp.nv[0])
+ iter[2] = iclip(iter[2]-1, 0, vp.nv[1])
+ iter[3] = iclip(iter[3]+1, 0, vp.nv[1])
if vp.vd_strides[0] == -1:
for vi in range(iter[0], iter[1]):
for vj in range(iter[2], iter[3]):
diff -r 9f53eb88c444 -r 8ef3d6ea764a yt/amr_utils.c
--- a/yt/amr_utils.c Tue Oct 26 15:18:22 2010 -0700
+++ b/yt/amr_utils.c Fri Nov 05 10:22:24 2010 -0400
@@ -1,4 +1,4 @@
-/* Generated by Cython 0.13.beta0 on Mon Aug 2 07:18:26 2010 */
+/* Generated by Cython 0.13.beta0 on Fri Nov 5 10:20:38 2010 */
#define PY_SSIZE_T_CLEAN
#include "Python.h"
@@ -2994,37 +2994,37 @@
/* "/Users/matthewturk/yt/yt/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): # <<<<<<<<<<<<<<
- * k = k_off + k_i
- * cz = (leftedges[2] + k*dx)
- */
- __pyx_t_8 = __pyx_v_k_f;
+ * for i_off in range(i_f): # <<<<<<<<<<<<<<
+ * i = i_off + i_i
+ * cx = (leftedges[0] + i*dx)
+ */
+ __pyx_t_8 = __pyx_v_i_f;
for (__pyx_t_9 = 0; __pyx_t_9 < __pyx_t_8; __pyx_t_9+=1) {
- __pyx_v_k_off = __pyx_t_9;
+ __pyx_v_i_off = __pyx_t_9;
/* "/Users/matthewturk/yt/yt/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 # <<<<<<<<<<<<<<
- * cz = (leftedges[2] + k*dx)
+ * for i_off in range(i_f):
+ * i = i_off + i_i # <<<<<<<<<<<<<<
+ * cx = (leftedges[0] + i*dx)
* for j_off in range(j_f):
*/
- __pyx_v_k = (__pyx_v_k_off + __pyx_v_k_i);
+ __pyx_v_i = (__pyx_v_i_off + __pyx_v_i_i);
/* "/Users/matthewturk/yt/yt/yt/_amr_utils/DepthFirstOctree.pyx":82
- * for k_off in range(k_f):
- * k = k_off + k_i
- * cz = (leftedges[2] + k*dx) # <<<<<<<<<<<<<<
+ * for i_off in range(i_f):
+ * i = i_off + i_i
+ * cx = (leftedges[0] + i*dx) # <<<<<<<<<<<<<<
* for j_off in range(j_f):
* j = j_off + j_i
*/
- __pyx_t_1 = 2;
+ __pyx_t_1 = 0;
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));
+ __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/yt/yt/yt/_amr_utils/DepthFirstOctree.pyx":83
- * k = k_off + k_i
- * cz = (leftedges[2] + k*dx)
+ * i = i_off + i_i
+ * cx = (leftedges[0] + i*dx)
* for j_off in range(j_f): # <<<<<<<<<<<<<<
* j = j_off + j_i
* cy = (leftedges[1] + j*dx)
@@ -3034,11 +3034,11 @@
__pyx_v_j_off = __pyx_t_11;
/* "/Users/matthewturk/yt/yt/yt/_amr_utils/DepthFirstOctree.pyx":84
- * cz = (leftedges[2] + k*dx)
+ * cx = (leftedges[0] + i*dx)
* for j_off in range(j_f):
* j = j_off + j_i # <<<<<<<<<<<<<<
* cy = (leftedges[1] + j*dx)
- * for i_off in range(i_f):
+ * for k_off in range(k_f):
*/
__pyx_v_j = (__pyx_v_j_off + __pyx_v_j_i);
@@ -3046,8 +3046,8 @@
* for j_off in range(j_f):
* j = j_off + j_i
* cy = (leftedges[1] + j*dx) # <<<<<<<<<<<<<<
- * for i_off in range(i_f):
- * i = i_off + i_i
+ * for k_off in range(k_f):
+ * k = k_off + k_i
*/
__pyx_t_12 = 1;
if (__pyx_t_12 < 0) __pyx_t_12 += __pyx_bshape_0_leftedges;
@@ -3056,37 +3056,37 @@
/* "/Users/matthewturk/yt/yt/yt/_amr_utils/DepthFirstOctree.pyx":86
* j = j_off + j_i
* cy = (leftedges[1] + j*dx)
- * for i_off in range(i_f): # <<<<<<<<<<<<<<
- * i = i_off + i_i
- * cx = (leftedges[0] + i*dx)
- */
- __pyx_t_13 = __pyx_v_i_f;
+ * for k_off in range(k_f): # <<<<<<<<<<<<<<
+ * k = k_off + k_i
+ * cz = (leftedges[2] + k*dx)
+ */
+ __pyx_t_13 = __pyx_v_k_f;
for (__pyx_t_14 = 0; __pyx_t_14 < __pyx_t_13; __pyx_t_14+=1) {
- __pyx_v_i_off = __pyx_t_14;
+ __pyx_v_k_off = __pyx_t_14;
/* "/Users/matthewturk/yt/yt/yt/_amr_utils/DepthFirstOctree.pyx":87
* cy = (leftedges[1] + j*dx)
- * for i_off in range(i_f):
- * i = i_off + i_i # <<<<<<<<<<<<<<
- * cx = (leftedges[0] + i*dx)
+ * for k_off in range(k_f):
+ * k = k_off + k_i # <<<<<<<<<<<<<<
+ * cz = (leftedges[2] + k*dx)
* ci = grid.child_indices[i,j,k]
*/
- __pyx_v_i = (__pyx_v_i_off + __pyx_v_i_i);
+ __pyx_v_k = (__pyx_v_k_off + __pyx_v_k_i);
/* "/Users/matthewturk/yt/yt/yt/_amr_utils/DepthFirstOctree.pyx":88
- * for i_off in range(i_f):
- * i = i_off + i_i
- * cx = (leftedges[0] + i*dx) # <<<<<<<<<<<<<<
+ * for k_off in range(k_f):
+ * k = k_off + k_i
+ * cz = (leftedges[2] + k*dx) # <<<<<<<<<<<<<<
* ci = grid.child_indices[i,j,k]
* if ci == -1:
*/
- __pyx_t_15 = 0;
+ __pyx_t_15 = 2;
if (__pyx_t_15 < 0) __pyx_t_15 += __pyx_bshape_0_leftedges;
- __pyx_v_cx = ((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_leftedges.buf, __pyx_t_15, __pyx_bstride_0_leftedges)) + (__pyx_v_i * __pyx_v_dx));
+ __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/yt/yt/yt/_amr_utils/DepthFirstOctree.pyx":89
- * i = i_off + i_i
- * cx = (leftedges[0] + i*dx)
+ * k = k_off + k_i
+ * cz = (leftedges[2] + k*dx)
* ci = grid.child_indices[i,j,k] # <<<<<<<<<<<<<<
* if ci == -1:
* for fi in range(fields.shape[0]):
@@ -3116,7 +3116,7 @@
__pyx_v_ci = __pyx_t_19;
/* "/Users/matthewturk/yt/yt/yt/_amr_utils/DepthFirstOctree.pyx":90
- * cx = (leftedges[0] + i*dx)
+ * cz = (leftedges[2] + k*dx)
* ci = grid.child_indices[i,j,k]
* if ci == -1: # <<<<<<<<<<<<<<
* for fi in range(fields.shape[0]):
@@ -15960,7 +15960,7 @@
* hit = 0
* self.calculate_extent(vp, extrema) # <<<<<<<<<<<<<<
* vp.get_start_stop(extrema, iter)
- * iter[0] = iclip(iter[0], 0, vp.nv[0])
+ * iter[0] = iclip(iter[0]-1, 0, vp.nv[0])
*/
((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);
@@ -15968,50 +15968,50 @@
* hit = 0
* self.calculate_extent(vp, extrema)
* vp.get_start_stop(extrema, iter) # <<<<<<<<<<<<<<
- * iter[0] = iclip(iter[0], 0, vp.nv[0])
- * iter[1] = iclip(iter[1], 0, vp.nv[0])
+ * iter[0] = iclip(iter[0]-1, 0, vp.nv[0])
+ * iter[1] = iclip(iter[1]+1, 0, vp.nv[0])
*/
((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/yt/yt/yt/_amr_utils/VolumeIntegrator.pyx":350
* self.calculate_extent(vp, extrema)
* vp.get_start_stop(extrema, iter)
- * iter[0] = iclip(iter[0], 0, vp.nv[0]) # <<<<<<<<<<<<<<
- * iter[1] = iclip(iter[1], 0, vp.nv[0])
- * iter[2] = iclip(iter[2], 0, vp.nv[1])
- */
- (__pyx_v_iter[0]) = __pyx_f_2yt_9amr_utils_iclip((__pyx_v_iter[0]), 0, (__pyx_v_vp->nv[0]));
+ * iter[0] = iclip(iter[0]-1, 0, vp.nv[0]) # <<<<<<<<<<<<<<
+ * iter[1] = iclip(iter[1]+1, 0, vp.nv[0])
+ * iter[2] = iclip(iter[2]-1, 0, vp.nv[1])
+ */
+ (__pyx_v_iter[0]) = __pyx_f_2yt_9amr_utils_iclip(((__pyx_v_iter[0]) - 1), 0, (__pyx_v_vp->nv[0]));
/* "/Users/matthewturk/yt/yt/yt/_amr_utils/VolumeIntegrator.pyx":351
* vp.get_start_stop(extrema, iter)
- * iter[0] = iclip(iter[0], 0, vp.nv[0])
- * iter[1] = iclip(iter[1], 0, vp.nv[0]) # <<<<<<<<<<<<<<
- * iter[2] = iclip(iter[2], 0, vp.nv[1])
- * iter[3] = iclip(iter[3], 0, vp.nv[1])
- */
- (__pyx_v_iter[1]) = __pyx_f_2yt_9amr_utils_iclip((__pyx_v_iter[1]), 0, (__pyx_v_vp->nv[0]));
+ * iter[0] = iclip(iter[0]-1, 0, vp.nv[0])
+ * iter[1] = iclip(iter[1]+1, 0, vp.nv[0]) # <<<<<<<<<<<<<<
+ * iter[2] = iclip(iter[2]-1, 0, vp.nv[1])
+ * iter[3] = iclip(iter[3]+1, 0, vp.nv[1])
+ */
+ (__pyx_v_iter[1]) = __pyx_f_2yt_9amr_utils_iclip(((__pyx_v_iter[1]) + 1), 0, (__pyx_v_vp->nv[0]));
/* "/Users/matthewturk/yt/yt/yt/_amr_utils/VolumeIntegrator.pyx":352
- * iter[0] = iclip(iter[0], 0, vp.nv[0])
- * iter[1] = iclip(iter[1], 0, vp.nv[0])
- * iter[2] = iclip(iter[2], 0, vp.nv[1]) # <<<<<<<<<<<<<<
- * iter[3] = iclip(iter[3], 0, vp.nv[1])
+ * iter[0] = iclip(iter[0]-1, 0, vp.nv[0])
+ * iter[1] = iclip(iter[1]+1, 0, vp.nv[0])
+ * iter[2] = iclip(iter[2]-1, 0, vp.nv[1]) # <<<<<<<<<<<<<<
+ * iter[3] = iclip(iter[3]+1, 0, vp.nv[1])
* if vp.vd_strides[0] == -1:
*/
- (__pyx_v_iter[2]) = __pyx_f_2yt_9amr_utils_iclip((__pyx_v_iter[2]), 0, (__pyx_v_vp->nv[1]));
+ (__pyx_v_iter[2]) = __pyx_f_2yt_9amr_utils_iclip(((__pyx_v_iter[2]) - 1), 0, (__pyx_v_vp->nv[1]));
/* "/Users/matthewturk/yt/yt/yt/_amr_utils/VolumeIntegrator.pyx":353
- * iter[1] = iclip(iter[1], 0, vp.nv[0])
- * iter[2] = iclip(iter[2], 0, vp.nv[1])
- * iter[3] = iclip(iter[3], 0, vp.nv[1]) # <<<<<<<<<<<<<<
+ * iter[1] = iclip(iter[1]+1, 0, vp.nv[0])
+ * iter[2] = iclip(iter[2]-1, 0, vp.nv[1])
+ * iter[3] = iclip(iter[3]+1, 0, vp.nv[1]) # <<<<<<<<<<<<<<
* if vp.vd_strides[0] == -1:
* for vi in range(iter[0], iter[1]):
*/
- (__pyx_v_iter[3]) = __pyx_f_2yt_9amr_utils_iclip((__pyx_v_iter[3]), 0, (__pyx_v_vp->nv[1]));
+ (__pyx_v_iter[3]) = __pyx_f_2yt_9amr_utils_iclip(((__pyx_v_iter[3]) + 1), 0, (__pyx_v_vp->nv[1]));
/* "/Users/matthewturk/yt/yt/yt/_amr_utils/VolumeIntegrator.pyx":354
- * iter[2] = iclip(iter[2], 0, vp.nv[1])
- * iter[3] = iclip(iter[3], 0, vp.nv[1])
+ * iter[2] = iclip(iter[2]-1, 0, vp.nv[1])
+ * iter[3] = iclip(iter[3]+1, 0, vp.nv[1])
* if vp.vd_strides[0] == -1: # <<<<<<<<<<<<<<
* for vi in range(iter[0], iter[1]):
* for vj in range(iter[2], iter[3]):
@@ -16020,7 +16020,7 @@
if (__pyx_t_1) {
/* "/Users/matthewturk/yt/yt/yt/_amr_utils/VolumeIntegrator.pyx":355
- * iter[3] = iclip(iter[3], 0, vp.nv[1])
+ * iter[3] = iclip(iter[3]+1, 0, vp.nv[1])
* if vp.vd_strides[0] == -1:
* for vi in range(iter[0], iter[1]): # <<<<<<<<<<<<<<
* for vj in range(iter[2], iter[3]):
More information about the yt-svn
mailing list