Changeset 597

Timestamp:

Nov 19, 2004, 11:11:48 AM (20 years ago)

Author:

steve

Message:

Cleared conflicts with home and work sparse code

File:

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

inundation/ga/storm_surge/pyvolution/sparse_ext.c

@@ -24 +24 @@
   long i, j, ckey;
 
-  printf("test");
+  //printf("test");
   for (i=0; i<M; i++ ) 
     for (ckey=row_ptr[i]; ckey<row_ptr[i+1]; ckey++) {
@@ -31 +31 @@
     }              
   
-  printf("end");
+  //printf("end");
   return 0;
 }            
@@ -95 +95 @@
 
 
-  printf(" x.dim[0] = %i  x.dim[1] = %i \n", x -> dimensions[0], x -> dimensions[1]);
+  //printf(" x.dim[0] = %i  x.dim[1] = %i \n", x -> dimensions[0], x -> dimensions[1]);
     
   //Allocate space for return vectors y (don't DECREF) 
@@ -101 +101 @@
   y = (PyArrayObject *) PyArray_FromDims(1, dimensions, PyArray_DOUBLE);
   
-  for (i=0;i<25;i++){
-    printf(" data[%i]=%i\n",i,(data->data)[i]);
-  }
+/*   for (i=0;i<25;i++){ */
+/*     printf(" data[%i]=%i\n",i,(data->data)[i]); */
+/*   } */
 
-  for (i=0;i<25;i++){
-    printf(" colind[%i]=%i\n",i,(colind->data)[i]);
-  }
+/*   for (i=0;i<25;i++){ */
+/*     printf(" colind[%i]=%i\n",i,(colind->data)[i]); */
+/*   } */
+
   err = _csr_mv(M,
                 (double*) data -> data, 
@@ -115 +116 @@
                 (double*) y -> data); 
 
-  for (i=0;i<25;i++){
-    printf(" data[%i]=%i\n",i,data->data[i]);
-  }
+/*   for (i=0;i<25;i++){ */
+/*     printf(" data[%i]=%i\n",i,data->data[i]); */
+/*   } */
                            
   if (err != 0) {