summarylogtreecommitdiffstats
path: root/r836.patch
diff options
context:
space:
mode:
Diffstat (limited to 'r836.patch')
-rw-r--r--r836.patch92
1 files changed, 0 insertions, 92 deletions
diff --git a/r836.patch b/r836.patch
deleted file mode 100644
index b3cc0a96ba5d..000000000000
--- a/r836.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-Index: src/lib/sundials_callbacks.pxi
-===================================================================
---- assimulo/lib/sundials_callbacks.pxi (revision 835)
-+++ assimulo/lib/sundials_callbacks.pxi (revision 836)
-@@ -103,7 +103,8 @@
- Sparse Jacobian function.
- """
- cdef ProblemData pData = <ProblemData>problem_data
-- cdef N.ndarray y = nv2arr(yv)
-+ #cdef N.ndarray y = nv2arr(yv)
-+ cdef N.ndarray y = pData.work_y
- cdef int i
- cdef int nnz = Jacobian.NNZ
- cdef int ret_nnz
-@@ -111,7 +112,8 @@
- cdef realtype* data = Jacobian.data
- cdef int* rowvals = Jacobian.rowvals
- cdef int* colptrs = Jacobian.colptrs
--
-+
-+ nv2arr_inplace(yv, y)
- """
- realtype *data;
- int *rowvals;
-@@ -160,8 +162,11 @@
- #cdef ndarray[realtype, ndim=2, mode='c'] jac #Used for return from the user function
- cdef realtype* col_i=DENSE_COL(Jacobian,0)
- #(<ndarray>pData.y).data = <realtype*>((<N_VectorContent_Serial>yv.content).data)
-- cdef N.ndarray y = nv2arr(yv)
-+ #cdef N.ndarray y = nv2arr(yv)
-+ cdef N.ndarray y = pData.work_y
- cdef int i,j
-+
-+ nv2arr_inplace(yv, y)
-
- if pData.dimSens>0: #Sensitivity activated
- p = realtype2arr(pData.p,pData.dimSens)
-@@ -358,11 +363,16 @@
- cdef N.ndarray[realtype, ndim=1, mode='c'] res #Used for return from the user function
- #(<ndarray>pData.y).data = <realtype*>((<N_VectorContent_Serial>yv.content).data)
- #(<ndarray>pData.yd).data = <realtype*>((<N_VectorContent_Serial>yvdot.content).data)
-- cdef N.ndarray y = nv2arr(yv)
-- cdef N.ndarray yd = nv2arr(yvdot)
-+ cdef N.ndarray y = pData.work_y
-+ cdef N.ndarray yd = pData.work_yd
-+ # cdef N.ndarray y = nv2arr(yv)
-+ # cdef N.ndarray yd = nv2arr(yvdot)
- cdef realtype* resptr=(<N_VectorContent_Serial>residual.content).data
- cdef int i
-
-+ nv2arr_inplace(yv, y)
-+ nv2arr_inplace(yvdot, yd)
-+
- if pData.dimSens!=0: #SENSITIVITY
- p = realtype2arr(pData.p,pData.dimSens)
- try:
-@@ -411,10 +421,15 @@
- cdef realtype* col_i=DENSE_COL(Jacobian,0)
- #(<ndarray>pData.y).data = <realtype*>((<N_VectorContent_Serial>yv.content).data)
- #(<ndarray>pData.yd).data = <realtype*>((<N_VectorContent_Serial>yvdot.content).data)
-- cdef N.ndarray y = nv2arr(yv)
-- cdef N.ndarray yd = nv2arr(yvdot)
-+ cdef N.ndarray y = pData.work_y
-+ cdef N.ndarray yd = pData.work_yd
-+ #cdef N.ndarray y = nv2arr(yv)
-+ #cdef N.ndarray yd = nv2arr(yvdot)
- cdef int i,j
-
-+ nv2arr_inplace(yv, y)
-+ nv2arr_inplace(yvdot, yd)
-+
- if pData.dimSens!=0: #SENSITIVITY
- p = realtype2arr(pData.p,pData.dimSens)
- try:
-@@ -461,10 +476,15 @@
- cdef N.ndarray[realtype, ndim=1, mode='c'] root #Used for return from the user function
- #(<ndarray>pData.y).data = <realtype*>((<N_VectorContent_Serial>yv.content).data)
- #(<ndarray>pData.yd).data = <realtype*>((<N_VectorContent_Serial>yvdot.content).data)
-- cdef N.ndarray y = nv2arr(yv)
-- cdef N.ndarray yd = nv2arr(yvdot)
-+ cdef N.ndarray y = pData.work_y
-+ cdef N.ndarray yd = pData.work_yd
-+ #cdef N.ndarray y = nv2arr(yv)
-+ #cdef N.ndarray yd = nv2arr(yvdot)
- cdef int i
-
-+ nv2arr_inplace(yv, y)
-+ nv2arr_inplace(yvdot, yd)
-+
- try:
- if pData.sw != NULL:
- root=(<object>pData.ROOT)(t,y,yd,<list>pData.sw) #Call to the Python root function