Changeset 594 for inundation/ga/storm_surge/pyvolution/sparse_ext.c

Timestamp:

Nov 18, 2004, 10:53:59 PM (20 years ago)

Author:

steve

Message:

Working on sparse. Sparse_CSR * vertor works, Sparse_CSR * matrix doesn't.

File:

• inundation/ga/storm_surge/pyvolution/sparse_ext.c (modified) (5 diffs)

inundation/ga/storm_surge/pyvolution/sparse_ext.c

@@ -16 +16 @@
 int _csr_mv(int M,
             double* data, 
-            int* colind,
-            int* row_ptr,
+            long* colind,
+            long* row_ptr,
             double* x,
             double* y) {
                 
-  int i, j, ckey;
+  long i, j, ckey;
 
   for (i=0; i<M; i++ ) 
@@ -40 +40 @@
   
   PyObject *csr_sparse, // input sparse matrix
-    *R;                 // output wrapped vector
+    *xin, *R;                 // output wrapped vector
   
   PyArrayObject 
@@ -48 +48 @@
     *x,               //Input vector array
     *y;               //Return vector array
+
+  double *xdata;
    
   int dimensions[1], M, err;
   
   // Convert Python arguments to C  
-  if (!PyArg_ParseTuple(args, "OO", &csr_sparse, &x)) 
+  if (!PyArg_ParseTuple(args, "OO", &csr_sparse, &xin)) 
     return NULL;
+
+  x = (PyArrayObject*) PyArray_ContiguousFromObject(xin,PyArray_DOUBLE,1,2);
+  if (!x)
+    return NULL;
+
+/*   printf("x.nd = %i\n",x->nd); */
+/*   printf("x.descr->type_num = %i %i\n",x->descr->type_num,PyArray_LONG); */
+/*   printf("x.dimensions[0] = %i\n",x->dimensions[0]); */
+/*   printf("x.data[0] = %g\n",((double*) x->data)[0]); */
+/*   printf("x.data[1] = %g\n",((double*) x->data)[1]); */
+/*   printf("x.data[2] = %g\n",((double*) x->data)[2]); */
+/*   printf("x.data[3] = %g\n",((double*) x->data)[3]); */
+/*   printf("x.data[4] = %g\n",((double*) x->data)[4]); */
+/*   printf("x.data[5] = %g\n",((double*) x->data)[5]); */
+
+  
 
 
@@ -61 +79 @@
     return NULL;  
 
+
   colind = (PyArrayObject*)
     PyObject_GetAttrString(csr_sparse, "colind"); 
   if (!colind) return NULL;    
-  
+
   row_ptr = (PyArrayObject*) 
     PyObject_GetAttrString(csr_sparse, "row_ptr");   
@@ -77 +96 @@
   err = _csr_mv(M,
                 (double*) data -> data, 
-                (int*)    colind -> data,
-                (int*)    row_ptr -> data,
+                (long*)    colind -> data,
+                (long*)    row_ptr -> data,
                 (double*) x -> data,
                 (double*) y -> data);