[Yt-svn] yt-commit r1368 - trunk/yt/lagos
mturk at wrangler.dreamhost.com
mturk at wrangler.dreamhost.com
Wed Jul 8 16:50:28 PDT 2009
Author: mturk
Date: Wed Jul 8 16:50:27 2009
New Revision: 1368
URL: http://yt.spacepope.org/changeset/1368
Log:
Update the compiled Cython module
Modified:
trunk/yt/lagos/RTIntegrator.c
Modified: trunk/yt/lagos/RTIntegrator.c
==============================================================================
--- trunk/yt/lagos/RTIntegrator.c (original)
+++ trunk/yt/lagos/RTIntegrator.c Wed Jul 8 16:50:27 2009
@@ -1,4 +1,4 @@
-/* Generated by Cython 0.11.2 on Wed Jul 8 10:54:08 2009 */
+/* Generated by Cython 0.11.2 on Wed Jul 8 16:54:23 2009 */
#define PY_SSIZE_T_CLEAN
#include "Python.h"
@@ -1858,7 +1858,7 @@
* cdef np.ndarray tdelta = np.zeros(3, dtype=np.float64)
* cdef np.ndarray tmax = np.zeros(3, dtype=np.float64) # <<<<<<<<<<<<<<
* cdef np.ndarray intersect = np.zeros(3, dtype=np.float64)
- * intersect_t = 1e30
+ * intersect_t = 1
*/
__pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_np); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 89; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_2);
@@ -1892,7 +1892,7 @@
* cdef np.ndarray tdelta = np.zeros(3, dtype=np.float64)
* cdef np.ndarray tmax = np.zeros(3, dtype=np.float64)
* cdef np.ndarray intersect = np.zeros(3, dtype=np.float64) # <<<<<<<<<<<<<<
- * intersect_t = 1e30
+ * intersect_t = 1
* # recall p = v * t + u
*/
__pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_np); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -1926,11 +1926,11 @@
/* "yt/lagos/RTIntegrator.pyx":91
* cdef np.ndarray tmax = np.zeros(3, dtype=np.float64)
* cdef np.ndarray intersect = np.zeros(3, dtype=np.float64)
- * intersect_t = 1e30 # <<<<<<<<<<<<<<
+ * intersect_t = 1 # <<<<<<<<<<<<<<
* # recall p = v * t + u
* # where p is position, v is our vector, u is the start point
*/
- __pyx_v_intersect_t = 1e+30;
+ __pyx_v_intersect_t = 1;
/* "yt/lagos/RTIntegrator.pyx":94
* # recall p = v * t + u
@@ -2206,7 +2206,7 @@
* (left_edge[1] <= u[1] <= right_edge[1]) and \
* (left_edge[2] <= u[2] <= right_edge[2]): # <<<<<<<<<<<<<<
* intersect_t = 0
- * if intersect_t > 1e29: return
+ * if intersect_t > 1: return
*/
__pyx_t_39 = 2;
if (__pyx_t_39 < 0) __pyx_t_39 += __pyx_bshape_0_left_edge;
@@ -2233,7 +2233,7 @@
* (left_edge[1] <= u[1] <= right_edge[1]) and \
* (left_edge[2] <= u[2] <= right_edge[2]):
* intersect_t = 0 # <<<<<<<<<<<<<<
- * if intersect_t > 1e29: return
+ * if intersect_t > 1: return
* # Now get the indices of the intersection
*/
__pyx_v_intersect_t = 0;
@@ -2244,11 +2244,11 @@
/* "yt/lagos/RTIntegrator.pyx":114
* (left_edge[2] <= u[2] <= right_edge[2]):
* intersect_t = 0
- * if intersect_t > 1e29: return # <<<<<<<<<<<<<<
+ * if intersect_t > 1: return # <<<<<<<<<<<<<<
* # Now get the indices of the intersection
* intersect = u + intersect_t * v
*/
- __pyx_t_21 = (__pyx_v_intersect_t > 9.9999999999999991e+28);
+ __pyx_t_21 = (__pyx_v_intersect_t > 1);
if (__pyx_t_21) {
__Pyx_XDECREF(__pyx_r);
__pyx_r = Py_None; __Pyx_INCREF(Py_None);
@@ -2258,7 +2258,7 @@
__pyx_L12:;
/* "yt/lagos/RTIntegrator.pyx":116
- * if intersect_t > 1e29: return
+ * if intersect_t > 1: return
* # Now get the indices of the intersection
* intersect = u + intersect_t * v # <<<<<<<<<<<<<<
* for i in range(3):
@@ -2575,66 +2575,118 @@
}
__pyx_L18:;
- /* "yt/lagos/RTIntegrator.pyx":134
- * # Note that we are calculating t on the fly, but we get *negative* t
+ /* "yt/lagos/RTIntegrator.pyx":135
* # values from what they should be.
+ * # If we've reached t = 1, we are done.
+ * if tmax[0] > 1 and tmax[1] > 1 and tmax[2] > 1: # <<<<<<<<<<<<<<
+ * break
+ * if tmax[0] < tmax[1]:
+ */
+ __pyx_1 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tmax), 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 135; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_1);
+ __pyx_t_2 = PyObject_RichCompare(__pyx_1, __pyx_int_1, Py_GT); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 135; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_2);
+ __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+ __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 135; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+ if (__pyx_t_6) {
+ __pyx_2 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tmax), 1, sizeof(long), PyInt_FromLong); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 135; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_2);
+ __pyx_t_2 = PyObject_RichCompare(__pyx_2, __pyx_int_1, Py_GT); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 135; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_2);
+ __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+ __pyx_t_21 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_21 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 135; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+ if (__pyx_t_21) {
+ __pyx_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tmax), 2, sizeof(long), PyInt_FromLong); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 135; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_3);
+ __pyx_t_2 = PyObject_RichCompare(__pyx_3, __pyx_int_1, Py_GT); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 135; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_2);
+ __Pyx_DECREF(__pyx_3); __pyx_3 = 0;
+ __pyx_t_23 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_23 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 135; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+ __pyx_t_24 = __pyx_t_23;
+ } else {
+ __pyx_t_24 = __pyx_t_21;
+ }
+ __pyx_t_21 = __pyx_t_24;
+ } else {
+ __pyx_t_21 = __pyx_t_6;
+ }
+ if (__pyx_t_21) {
+
+ /* "yt/lagos/RTIntegrator.pyx":136
+ * # If we've reached t = 1, we are done.
+ * if tmax[0] > 1 and tmax[1] > 1 and tmax[2] > 1:
+ * break # <<<<<<<<<<<<<<
+ * if tmax[0] < tmax[1]:
+ * if tmax[0] < tmax[2]:
+ */
+ goto __pyx_L17_break;
+ goto __pyx_L19;
+ }
+ __pyx_L19:;
+
+ /* "yt/lagos/RTIntegrator.pyx":137
+ * if tmax[0] > 1 and tmax[1] > 1 and tmax[2] > 1:
+ * break
* if tmax[0] < tmax[1]: # <<<<<<<<<<<<<<
* if tmax[0] < tmax[2]:
* grid_t[cur_ind[0], cur_ind[1], cur_ind[2]] = tmax[0] - enter_t
*/
- __pyx_1 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tmax), 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 134; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_1 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tmax), 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_1);
- __pyx_2 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tmax), 1, sizeof(long), PyInt_FromLong); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 134; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_2 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tmax), 1, sizeof(long), PyInt_FromLong); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_2);
- __pyx_t_2 = PyObject_RichCompare(__pyx_1, __pyx_2, Py_LT); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 134; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_t_2 = PyObject_RichCompare(__pyx_1, __pyx_2, Py_LT); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_1); __pyx_1 = 0;
__Pyx_DECREF(__pyx_2); __pyx_2 = 0;
- __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 134; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_t_21 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_21 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- if (__pyx_t_6) {
+ if (__pyx_t_21) {
- /* "yt/lagos/RTIntegrator.pyx":135
- * # values from what they should be.
+ /* "yt/lagos/RTIntegrator.pyx":138
+ * break
* if tmax[0] < tmax[1]:
* if tmax[0] < tmax[2]: # <<<<<<<<<<<<<<
* grid_t[cur_ind[0], cur_ind[1], cur_ind[2]] = tmax[0] - enter_t
* enter_t = tmax[0]
*/
- __pyx_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tmax), 0, sizeof(long), PyInt_FromLong); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 135; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tmax), 0, sizeof(long), PyInt_FromLong); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 138; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_3);
- __pyx_1 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tmax), 2, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 135; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_1 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tmax), 2, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 138; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_1);
- __pyx_t_2 = PyObject_RichCompare(__pyx_3, __pyx_1, Py_LT); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 135; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_t_2 = PyObject_RichCompare(__pyx_3, __pyx_1, Py_LT); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 138; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_3); __pyx_3 = 0;
__Pyx_DECREF(__pyx_1); __pyx_1 = 0;
- __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 135; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_t_21 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_21 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 138; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- if (__pyx_t_6) {
+ if (__pyx_t_21) {
- /* "yt/lagos/RTIntegrator.pyx":136
+ /* "yt/lagos/RTIntegrator.pyx":139
* if tmax[0] < tmax[1]:
* if tmax[0] < tmax[2]:
* grid_t[cur_ind[0], cur_ind[1], cur_ind[2]] = tmax[0] - enter_t # <<<<<<<<<<<<<<
* enter_t = tmax[0]
* tmax[0] += tdelta[0]
*/
- __pyx_2 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tmax), 0, sizeof(long), PyInt_FromLong); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 136; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_2 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tmax), 0, sizeof(long), PyInt_FromLong); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 139; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_2);
- __pyx_t_2 = PyFloat_FromDouble(__pyx_v_enter_t); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 136; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_t_2 = PyFloat_FromDouble(__pyx_v_enter_t); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 139; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_44 = PyNumber_Subtract(__pyx_2, __pyx_t_2); if (unlikely(!__pyx_t_44)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 136; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_t_44 = PyNumber_Subtract(__pyx_2, __pyx_t_2); if (unlikely(!__pyx_t_44)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 139; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_t_44);
__Pyx_DECREF(__pyx_2); __pyx_2 = 0;
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_cur_ind), 0, sizeof(long), PyInt_FromLong); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 136; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_cur_ind), 0, sizeof(long), PyInt_FromLong); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 139; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_3);
- __pyx_1 = __Pyx_GetItemInt(((PyObject *)__pyx_v_cur_ind), 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 136; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_1 = __Pyx_GetItemInt(((PyObject *)__pyx_v_cur_ind), 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 139; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_1);
- __pyx_2 = __Pyx_GetItemInt(((PyObject *)__pyx_v_cur_ind), 2, sizeof(long), PyInt_FromLong); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 136; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_2 = __Pyx_GetItemInt(((PyObject *)__pyx_v_cur_ind), 2, sizeof(long), PyInt_FromLong); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 139; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_2);
- __pyx_t_2 = PyTuple_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 136; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_t_2 = PyTuple_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 139; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(((PyObject *)__pyx_t_2));
PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_3);
__Pyx_GIVEREF(__pyx_3);
@@ -2645,84 +2697,84 @@
__pyx_3 = 0;
__pyx_1 = 0;
__pyx_2 = 0;
- if (PyObject_SetItem(((PyObject *)__pyx_v_grid_t), ((PyObject *)__pyx_t_2), __pyx_t_44) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 136; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ if (PyObject_SetItem(((PyObject *)__pyx_v_grid_t), ((PyObject *)__pyx_t_2), __pyx_t_44) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 139; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
__Pyx_DECREF(__pyx_t_44); __pyx_t_44 = 0;
- /* "yt/lagos/RTIntegrator.pyx":137
+ /* "yt/lagos/RTIntegrator.pyx":140
* if tmax[0] < tmax[2]:
* grid_t[cur_ind[0], cur_ind[1], cur_ind[2]] = tmax[0] - enter_t
* enter_t = tmax[0] # <<<<<<<<<<<<<<
* tmax[0] += tdelta[0]
* cur_ind[0] += step[0]
*/
- __pyx_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tmax), 0, sizeof(long), PyInt_FromLong); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tmax), 0, sizeof(long), PyInt_FromLong); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 140; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_3);
- __pyx_t_51 = __pyx_PyFloat_AsDouble(__pyx_3); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_t_51 = __pyx_PyFloat_AsDouble(__pyx_3); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 140; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_DECREF(__pyx_3); __pyx_3 = 0;
__pyx_v_enter_t = __pyx_t_51;
- /* "yt/lagos/RTIntegrator.pyx":138
+ /* "yt/lagos/RTIntegrator.pyx":141
* grid_t[cur_ind[0], cur_ind[1], cur_ind[2]] = tmax[0] - enter_t
* enter_t = tmax[0]
* tmax[0] += tdelta[0] # <<<<<<<<<<<<<<
* cur_ind[0] += step[0]
* else:
*/
- __pyx_2 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tdelta), 0, sizeof(long), PyInt_FromLong); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 138; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_2 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tdelta), 0, sizeof(long), PyInt_FromLong); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 141; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_2);
- __pyx_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tmax), 0, sizeof(long), PyInt_FromLong); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 138; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tmax), 0, sizeof(long), PyInt_FromLong); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 141; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_3);
- __pyx_1 = PyNumber_InPlaceAdd(__pyx_3, __pyx_2); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 138; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_1 = PyNumber_InPlaceAdd(__pyx_3, __pyx_2); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 141; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_1);
__Pyx_DECREF(__pyx_2); __pyx_2 = 0;
__Pyx_DECREF(__pyx_3); __pyx_3 = 0;
- if (__Pyx_SetItemInt(((PyObject *)__pyx_v_tmax), 0, __pyx_1, sizeof(long), PyInt_FromLong) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 138; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ if (__Pyx_SetItemInt(((PyObject *)__pyx_v_tmax), 0, __pyx_1, sizeof(long), PyInt_FromLong) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 141; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_DECREF(__pyx_1); __pyx_1 = 0;
- /* "yt/lagos/RTIntegrator.pyx":139
+ /* "yt/lagos/RTIntegrator.pyx":142
* enter_t = tmax[0]
* tmax[0] += tdelta[0]
* cur_ind[0] += step[0] # <<<<<<<<<<<<<<
* else:
* grid_t[cur_ind[0], cur_ind[1], cur_ind[2]] = tmax[2] - enter_t
*/
- __pyx_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_step), 0, sizeof(long), PyInt_FromLong); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 139; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_step), 0, sizeof(long), PyInt_FromLong); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 142; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_3);
- __pyx_1 = __Pyx_GetItemInt(((PyObject *)__pyx_v_cur_ind), 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 139; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_1 = __Pyx_GetItemInt(((PyObject *)__pyx_v_cur_ind), 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 142; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_1);
- __pyx_2 = PyNumber_InPlaceAdd(__pyx_1, __pyx_3); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 139; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_2 = PyNumber_InPlaceAdd(__pyx_1, __pyx_3); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 142; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_2);
__Pyx_DECREF(__pyx_3); __pyx_3 = 0;
__Pyx_DECREF(__pyx_1); __pyx_1 = 0;
- if (__Pyx_SetItemInt(((PyObject *)__pyx_v_cur_ind), 0, __pyx_2, sizeof(long), PyInt_FromLong) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 139; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ if (__Pyx_SetItemInt(((PyObject *)__pyx_v_cur_ind), 0, __pyx_2, sizeof(long), PyInt_FromLong) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 142; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_DECREF(__pyx_2); __pyx_2 = 0;
- goto __pyx_L20;
+ goto __pyx_L21;
}
/*else*/ {
- /* "yt/lagos/RTIntegrator.pyx":141
+ /* "yt/lagos/RTIntegrator.pyx":144
* cur_ind[0] += step[0]
* else:
* grid_t[cur_ind[0], cur_ind[1], cur_ind[2]] = tmax[2] - enter_t # <<<<<<<<<<<<<<
* enter_t = tmax[2]
* tmax[2] += tdelta[2]
*/
- __pyx_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tmax), 2, sizeof(long), PyInt_FromLong); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 141; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tmax), 2, sizeof(long), PyInt_FromLong); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 144; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_3);
- __pyx_t_44 = PyFloat_FromDouble(__pyx_v_enter_t); if (unlikely(!__pyx_t_44)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 141; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_t_44 = PyFloat_FromDouble(__pyx_v_enter_t); if (unlikely(!__pyx_t_44)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 144; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_t_44);
- __pyx_t_2 = PyNumber_Subtract(__pyx_3, __pyx_t_44); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 141; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_t_2 = PyNumber_Subtract(__pyx_3, __pyx_t_44); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 144; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_3); __pyx_3 = 0;
__Pyx_DECREF(__pyx_t_44); __pyx_t_44 = 0;
- __pyx_1 = __Pyx_GetItemInt(((PyObject *)__pyx_v_cur_ind), 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 141; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_1 = __Pyx_GetItemInt(((PyObject *)__pyx_v_cur_ind), 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 144; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_1);
- __pyx_2 = __Pyx_GetItemInt(((PyObject *)__pyx_v_cur_ind), 1, sizeof(long), PyInt_FromLong); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 141; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_2 = __Pyx_GetItemInt(((PyObject *)__pyx_v_cur_ind), 1, sizeof(long), PyInt_FromLong); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 144; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_2);
- __pyx_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_cur_ind), 2, sizeof(long), PyInt_FromLong); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 141; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_cur_ind), 2, sizeof(long), PyInt_FromLong); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 144; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_3);
- __pyx_t_44 = PyTuple_New(3); if (unlikely(!__pyx_t_44)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 141; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_t_44 = PyTuple_New(3); if (unlikely(!__pyx_t_44)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 144; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(((PyObject *)__pyx_t_44));
PyTuple_SET_ITEM(__pyx_t_44, 0, __pyx_1);
__Pyx_GIVEREF(__pyx_1);
@@ -2733,105 +2785,105 @@
__pyx_1 = 0;
__pyx_2 = 0;
__pyx_3 = 0;
- if (PyObject_SetItem(((PyObject *)__pyx_v_grid_t), ((PyObject *)__pyx_t_44), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 141; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ if (PyObject_SetItem(((PyObject *)__pyx_v_grid_t), ((PyObject *)__pyx_t_44), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 144; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_DECREF(((PyObject *)__pyx_t_44)); __pyx_t_44 = 0;
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- /* "yt/lagos/RTIntegrator.pyx":142
+ /* "yt/lagos/RTIntegrator.pyx":145
* else:
* grid_t[cur_ind[0], cur_ind[1], cur_ind[2]] = tmax[2] - enter_t
* enter_t = tmax[2] # <<<<<<<<<<<<<<
* tmax[2] += tdelta[2]
* cur_ind[2] += step[2]
*/
- __pyx_1 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tmax), 2, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 142; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_1 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tmax), 2, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_1);
- __pyx_t_51 = __pyx_PyFloat_AsDouble(__pyx_1); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 142; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_t_51 = __pyx_PyFloat_AsDouble(__pyx_1); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_DECREF(__pyx_1); __pyx_1 = 0;
__pyx_v_enter_t = __pyx_t_51;
- /* "yt/lagos/RTIntegrator.pyx":143
+ /* "yt/lagos/RTIntegrator.pyx":146
* grid_t[cur_ind[0], cur_ind[1], cur_ind[2]] = tmax[2] - enter_t
* enter_t = tmax[2]
* tmax[2] += tdelta[2] # <<<<<<<<<<<<<<
* cur_ind[2] += step[2]
* else:
*/
- __pyx_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tdelta), 2, sizeof(long), PyInt_FromLong); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 143; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tdelta), 2, sizeof(long), PyInt_FromLong); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_3);
- __pyx_1 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tmax), 2, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 143; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_1 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tmax), 2, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_1);
- __pyx_2 = PyNumber_InPlaceAdd(__pyx_1, __pyx_3); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 143; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_2 = PyNumber_InPlaceAdd(__pyx_1, __pyx_3); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_2);
__Pyx_DECREF(__pyx_3); __pyx_3 = 0;
__Pyx_DECREF(__pyx_1); __pyx_1 = 0;
- if (__Pyx_SetItemInt(((PyObject *)__pyx_v_tmax), 2, __pyx_2, sizeof(long), PyInt_FromLong) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 143; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ if (__Pyx_SetItemInt(((PyObject *)__pyx_v_tmax), 2, __pyx_2, sizeof(long), PyInt_FromLong) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_DECREF(__pyx_2); __pyx_2 = 0;
- /* "yt/lagos/RTIntegrator.pyx":144
+ /* "yt/lagos/RTIntegrator.pyx":147
* enter_t = tmax[2]
* tmax[2] += tdelta[2]
* cur_ind[2] += step[2] # <<<<<<<<<<<<<<
* else:
* if tmax[1] < tmax[2]:
*/
- __pyx_1 = __Pyx_GetItemInt(((PyObject *)__pyx_v_step), 2, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 144; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_1 = __Pyx_GetItemInt(((PyObject *)__pyx_v_step), 2, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 147; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_1);
- __pyx_2 = __Pyx_GetItemInt(((PyObject *)__pyx_v_cur_ind), 2, sizeof(long), PyInt_FromLong); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 144; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_2 = __Pyx_GetItemInt(((PyObject *)__pyx_v_cur_ind), 2, sizeof(long), PyInt_FromLong); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 147; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_2);
- __pyx_3 = PyNumber_InPlaceAdd(__pyx_2, __pyx_1); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 144; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_3 = PyNumber_InPlaceAdd(__pyx_2, __pyx_1); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 147; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_3);
__Pyx_DECREF(__pyx_1); __pyx_1 = 0;
__Pyx_DECREF(__pyx_2); __pyx_2 = 0;
- if (__Pyx_SetItemInt(((PyObject *)__pyx_v_cur_ind), 2, __pyx_3, sizeof(long), PyInt_FromLong) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 144; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ if (__Pyx_SetItemInt(((PyObject *)__pyx_v_cur_ind), 2, __pyx_3, sizeof(long), PyInt_FromLong) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 147; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_DECREF(__pyx_3); __pyx_3 = 0;
}
- __pyx_L20:;
- goto __pyx_L19;
+ __pyx_L21:;
+ goto __pyx_L20;
}
/*else*/ {
- /* "yt/lagos/RTIntegrator.pyx":146
+ /* "yt/lagos/RTIntegrator.pyx":149
* cur_ind[2] += step[2]
* else:
* if tmax[1] < tmax[2]: # <<<<<<<<<<<<<<
* grid_t[cur_ind[0], cur_ind[1], cur_ind[2]] = tmax[1] - enter_t
* enter_t = tmax[1]
*/
- __pyx_1 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tmax), 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_1 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tmax), 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_1);
- __pyx_2 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tmax), 2, sizeof(long), PyInt_FromLong); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_2 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tmax), 2, sizeof(long), PyInt_FromLong); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_2);
- __pyx_t_2 = PyObject_RichCompare(__pyx_1, __pyx_2, Py_LT); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_t_2 = PyObject_RichCompare(__pyx_1, __pyx_2, Py_LT); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_1); __pyx_1 = 0;
__Pyx_DECREF(__pyx_2); __pyx_2 = 0;
- __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_t_21 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_21 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- if (__pyx_t_6) {
+ if (__pyx_t_21) {
- /* "yt/lagos/RTIntegrator.pyx":147
+ /* "yt/lagos/RTIntegrator.pyx":150
* else:
* if tmax[1] < tmax[2]:
* grid_t[cur_ind[0], cur_ind[1], cur_ind[2]] = tmax[1] - enter_t # <<<<<<<<<<<<<<
* enter_t = tmax[1]
* tmax[1] += tdelta[1]
*/
- __pyx_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tmax), 1, sizeof(long), PyInt_FromLong); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 147; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tmax), 1, sizeof(long), PyInt_FromLong); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_3);
- __pyx_t_2 = PyFloat_FromDouble(__pyx_v_enter_t); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 147; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_t_2 = PyFloat_FromDouble(__pyx_v_enter_t); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_44 = PyNumber_Subtract(__pyx_3, __pyx_t_2); if (unlikely(!__pyx_t_44)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 147; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_t_44 = PyNumber_Subtract(__pyx_3, __pyx_t_2); if (unlikely(!__pyx_t_44)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_t_44);
__Pyx_DECREF(__pyx_3); __pyx_3 = 0;
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_1 = __Pyx_GetItemInt(((PyObject *)__pyx_v_cur_ind), 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 147; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_1 = __Pyx_GetItemInt(((PyObject *)__pyx_v_cur_ind), 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_1);
- __pyx_2 = __Pyx_GetItemInt(((PyObject *)__pyx_v_cur_ind), 1, sizeof(long), PyInt_FromLong); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 147; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_2 = __Pyx_GetItemInt(((PyObject *)__pyx_v_cur_ind), 1, sizeof(long), PyInt_FromLong); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_2);
- __pyx_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_cur_ind), 2, sizeof(long), PyInt_FromLong); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 147; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_cur_ind), 2, sizeof(long), PyInt_FromLong); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_3);
- __pyx_t_2 = PyTuple_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 147; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_t_2 = PyTuple_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(((PyObject *)__pyx_t_2));
PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_1);
__Pyx_GIVEREF(__pyx_1);
@@ -2842,84 +2894,84 @@
__pyx_1 = 0;
__pyx_2 = 0;
__pyx_3 = 0;
- if (PyObject_SetItem(((PyObject *)__pyx_v_grid_t), ((PyObject *)__pyx_t_2), __pyx_t_44) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 147; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ if (PyObject_SetItem(((PyObject *)__pyx_v_grid_t), ((PyObject *)__pyx_t_2), __pyx_t_44) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
__Pyx_DECREF(__pyx_t_44); __pyx_t_44 = 0;
- /* "yt/lagos/RTIntegrator.pyx":148
+ /* "yt/lagos/RTIntegrator.pyx":151
* if tmax[1] < tmax[2]:
* grid_t[cur_ind[0], cur_ind[1], cur_ind[2]] = tmax[1] - enter_t
* enter_t = tmax[1] # <<<<<<<<<<<<<<
* tmax[1] += tdelta[1]
* cur_ind[1] += step[1]
*/
- __pyx_1 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tmax), 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 148; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_1 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tmax), 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 151; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_1);
- __pyx_t_51 = __pyx_PyFloat_AsDouble(__pyx_1); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 148; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_t_51 = __pyx_PyFloat_AsDouble(__pyx_1); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 151; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_DECREF(__pyx_1); __pyx_1 = 0;
__pyx_v_enter_t = __pyx_t_51;
- /* "yt/lagos/RTIntegrator.pyx":149
+ /* "yt/lagos/RTIntegrator.pyx":152
* grid_t[cur_ind[0], cur_ind[1], cur_ind[2]] = tmax[1] - enter_t
* enter_t = tmax[1]
* tmax[1] += tdelta[1] # <<<<<<<<<<<<<<
* cur_ind[1] += step[1]
* else:
*/
- __pyx_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tdelta), 1, sizeof(long), PyInt_FromLong); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tdelta), 1, sizeof(long), PyInt_FromLong); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 152; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_3);
- __pyx_1 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tmax), 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_1 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tmax), 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 152; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_1);
- __pyx_2 = PyNumber_InPlaceAdd(__pyx_1, __pyx_3); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_2 = PyNumber_InPlaceAdd(__pyx_1, __pyx_3); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 152; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_2);
__Pyx_DECREF(__pyx_3); __pyx_3 = 0;
__Pyx_DECREF(__pyx_1); __pyx_1 = 0;
- if (__Pyx_SetItemInt(((PyObject *)__pyx_v_tmax), 1, __pyx_2, sizeof(long), PyInt_FromLong) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ if (__Pyx_SetItemInt(((PyObject *)__pyx_v_tmax), 1, __pyx_2, sizeof(long), PyInt_FromLong) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 152; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_DECREF(__pyx_2); __pyx_2 = 0;
- /* "yt/lagos/RTIntegrator.pyx":150
+ /* "yt/lagos/RTIntegrator.pyx":153
* enter_t = tmax[1]
* tmax[1] += tdelta[1]
* cur_ind[1] += step[1] # <<<<<<<<<<<<<<
* else:
* grid_t[cur_ind[0], cur_ind[1], cur_ind[2]] = tmax[2] - enter_t
*/
- __pyx_1 = __Pyx_GetItemInt(((PyObject *)__pyx_v_step), 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_1 = __Pyx_GetItemInt(((PyObject *)__pyx_v_step), 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 153; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_1);
- __pyx_2 = __Pyx_GetItemInt(((PyObject *)__pyx_v_cur_ind), 1, sizeof(long), PyInt_FromLong); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_2 = __Pyx_GetItemInt(((PyObject *)__pyx_v_cur_ind), 1, sizeof(long), PyInt_FromLong); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 153; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_2);
- __pyx_3 = PyNumber_InPlaceAdd(__pyx_2, __pyx_1); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_3 = PyNumber_InPlaceAdd(__pyx_2, __pyx_1); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 153; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_3);
__Pyx_DECREF(__pyx_1); __pyx_1 = 0;
__Pyx_DECREF(__pyx_2); __pyx_2 = 0;
- if (__Pyx_SetItemInt(((PyObject *)__pyx_v_cur_ind), 1, __pyx_3, sizeof(long), PyInt_FromLong) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ if (__Pyx_SetItemInt(((PyObject *)__pyx_v_cur_ind), 1, __pyx_3, sizeof(long), PyInt_FromLong) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 153; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_DECREF(__pyx_3); __pyx_3 = 0;
- goto __pyx_L21;
+ goto __pyx_L22;
}
/*else*/ {
- /* "yt/lagos/RTIntegrator.pyx":152
+ /* "yt/lagos/RTIntegrator.pyx":155
* cur_ind[1] += step[1]
* else:
* grid_t[cur_ind[0], cur_ind[1], cur_ind[2]] = tmax[2] - enter_t # <<<<<<<<<<<<<<
* enter_t = tmax[2]
* tmax[2] += tdelta[2]
*/
- __pyx_1 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tmax), 2, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 152; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_1 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tmax), 2, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 155; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_1);
- __pyx_t_44 = PyFloat_FromDouble(__pyx_v_enter_t); if (unlikely(!__pyx_t_44)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 152; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_t_44 = PyFloat_FromDouble(__pyx_v_enter_t); if (unlikely(!__pyx_t_44)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 155; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_t_44);
- __pyx_t_2 = PyNumber_Subtract(__pyx_1, __pyx_t_44); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 152; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_t_2 = PyNumber_Subtract(__pyx_1, __pyx_t_44); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 155; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_1); __pyx_1 = 0;
__Pyx_DECREF(__pyx_t_44); __pyx_t_44 = 0;
- __pyx_2 = __Pyx_GetItemInt(((PyObject *)__pyx_v_cur_ind), 0, sizeof(long), PyInt_FromLong); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 152; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_2 = __Pyx_GetItemInt(((PyObject *)__pyx_v_cur_ind), 0, sizeof(long), PyInt_FromLong); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 155; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_2);
- __pyx_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_cur_ind), 1, sizeof(long), PyInt_FromLong); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 152; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_cur_ind), 1, sizeof(long), PyInt_FromLong); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 155; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_3);
- __pyx_1 = __Pyx_GetItemInt(((PyObject *)__pyx_v_cur_ind), 2, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 152; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_1 = __Pyx_GetItemInt(((PyObject *)__pyx_v_cur_ind), 2, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 155; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_1);
- __pyx_t_44 = PyTuple_New(3); if (unlikely(!__pyx_t_44)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 152; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_t_44 = PyTuple_New(3); if (unlikely(!__pyx_t_44)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 155; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(((PyObject *)__pyx_t_44));
PyTuple_SET_ITEM(__pyx_t_44, 0, __pyx_2);
__Pyx_GIVEREF(__pyx_2);
@@ -2930,65 +2982,65 @@
__pyx_2 = 0;
__pyx_3 = 0;
__pyx_1 = 0;
- if (PyObject_SetItem(((PyObject *)__pyx_v_grid_t), ((PyObject *)__pyx_t_44), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 152; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ if (PyObject_SetItem(((PyObject *)__pyx_v_grid_t), ((PyObject *)__pyx_t_44), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 155; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_DECREF(((PyObject *)__pyx_t_44)); __pyx_t_44 = 0;
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- /* "yt/lagos/RTIntegrator.pyx":153
+ /* "yt/lagos/RTIntegrator.pyx":156
* else:
* grid_t[cur_ind[0], cur_ind[1], cur_ind[2]] = tmax[2] - enter_t
* enter_t = tmax[2] # <<<<<<<<<<<<<<
* tmax[2] += tdelta[2]
* cur_ind[2] += step[2]
*/
- __pyx_2 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tmax), 2, sizeof(long), PyInt_FromLong); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 153; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_2 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tmax), 2, sizeof(long), PyInt_FromLong); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 156; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_2);
- __pyx_t_51 = __pyx_PyFloat_AsDouble(__pyx_2); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 153; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_t_51 = __pyx_PyFloat_AsDouble(__pyx_2); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 156; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_DECREF(__pyx_2); __pyx_2 = 0;
__pyx_v_enter_t = __pyx_t_51;
- /* "yt/lagos/RTIntegrator.pyx":154
+ /* "yt/lagos/RTIntegrator.pyx":157
* grid_t[cur_ind[0], cur_ind[1], cur_ind[2]] = tmax[2] - enter_t
* enter_t = tmax[2]
* tmax[2] += tdelta[2] # <<<<<<<<<<<<<<
* cur_ind[2] += step[2]
* return
*/
- __pyx_1 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tdelta), 2, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 154; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_1 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tdelta), 2, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 157; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_1);
- __pyx_2 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tmax), 2, sizeof(long), PyInt_FromLong); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 154; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_2 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tmax), 2, sizeof(long), PyInt_FromLong); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 157; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_2);
- __pyx_3 = PyNumber_InPlaceAdd(__pyx_2, __pyx_1); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 154; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_3 = PyNumber_InPlaceAdd(__pyx_2, __pyx_1); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 157; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_3);
__Pyx_DECREF(__pyx_1); __pyx_1 = 0;
__Pyx_DECREF(__pyx_2); __pyx_2 = 0;
- if (__Pyx_SetItemInt(((PyObject *)__pyx_v_tmax), 2, __pyx_3, sizeof(long), PyInt_FromLong) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 154; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ if (__Pyx_SetItemInt(((PyObject *)__pyx_v_tmax), 2, __pyx_3, sizeof(long), PyInt_FromLong) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 157; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_DECREF(__pyx_3); __pyx_3 = 0;
- /* "yt/lagos/RTIntegrator.pyx":155
+ /* "yt/lagos/RTIntegrator.pyx":158
* enter_t = tmax[2]
* tmax[2] += tdelta[2]
* cur_ind[2] += step[2] # <<<<<<<<<<<<<<
* return
*/
- __pyx_2 = __Pyx_GetItemInt(((PyObject *)__pyx_v_step), 2, sizeof(long), PyInt_FromLong); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 155; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_2 = __Pyx_GetItemInt(((PyObject *)__pyx_v_step), 2, sizeof(long), PyInt_FromLong); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_2);
- __pyx_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_cur_ind), 2, sizeof(long), PyInt_FromLong); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 155; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_cur_ind), 2, sizeof(long), PyInt_FromLong); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_3);
- __pyx_1 = PyNumber_InPlaceAdd(__pyx_3, __pyx_2); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 155; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_1 = PyNumber_InPlaceAdd(__pyx_3, __pyx_2); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_1);
__Pyx_DECREF(__pyx_2); __pyx_2 = 0;
__Pyx_DECREF(__pyx_3); __pyx_3 = 0;
- if (__Pyx_SetItemInt(((PyObject *)__pyx_v_cur_ind), 2, __pyx_1, sizeof(long), PyInt_FromLong) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 155; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ if (__Pyx_SetItemInt(((PyObject *)__pyx_v_cur_ind), 2, __pyx_1, sizeof(long), PyInt_FromLong) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_DECREF(__pyx_1); __pyx_1 = 0;
}
- __pyx_L21:;
+ __pyx_L22:;
}
- __pyx_L19:;
+ __pyx_L20:;
}
__pyx_L17_break:;
- /* "yt/lagos/RTIntegrator.pyx":156
+ /* "yt/lagos/RTIntegrator.pyx":159
* tmax[2] += tdelta[2]
* cur_ind[2] += step[2]
* return # <<<<<<<<<<<<<<
More information about the yt-svn
mailing list