Changeset 596

Timestamp:

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

Author:

steve

Message:

 

Location:

inundation/ga/storm_surge/pyvolution

Files:

• sparse_ext.c (modified) (7 diffs)
• test_cg_solve.py (modified) (2 diffs)
• test_sparse.py (modified) (2 diffs)

inundation/ga/storm_surge/pyvolution/sparse_ext.c

@@ -13 +13 @@
 #include "Numeric/arrayobject.h"
 #include "math.h"
+#include "stdio.h"
 
 int _csr_mv(int M,
@@ -23 +24 @@
   long i, j, ckey;
 
+  printf("test");
   for (i=0; i<M; i++ ) 
     for (ckey=row_ptr[i]; ckey<row_ptr[i+1]; ckey++) {
@@ -29 +31 @@
     }              
   
+  printf("end");
   return 0;
 }            
@@ -52 +55 @@
    
   int dimensions[1], M, err;
+  int xdim, i;
   
   // Convert Python arguments to C  
@@ -89 +93 @@
   
   M = (row_ptr -> dimensions[0])-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) 
@@ -94 +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(" colind[%i]=%i\n",i,(colind->data)[i]);
+  }
   err = _csr_mv(M,
                 (double*) data -> data, 
@@ -99 +113 @@
                 (long*)    row_ptr -> data,
                 (double*) x -> data,
-                (double*) y -> data);     
+                (double*) y -> data); 
+
+  for (i=0;i<25;i++){
+    printf(" data[%i]=%i\n",i,data->data[i]);
+  }
                            
   if (err != 0) {

inundation/ga/storm_surge/pyvolution/test_cg_solve.py

@@ -79 +79 @@
 
     def test_solve_large_2d_csr_matrix(self):
-        """Standard 2d laplacian"""
+        """Standard 2d laplacian with csr format
+        """
         
         n = 100
@@ -102 +103 @@
 
         # Convert to csr format
-        #print 'start covert'
+        print 'start covert'
         A = Sparse_CSR(A)
-        #print 'finish covert'
+        print 'finish covert'
         b = A*xe
         x = conjugate_gradient(A,b,b,iprint=20)

inundation/ga/storm_surge/pyvolution/test_sparse.py

@@ -150 +150 @@
 
     def test_sparse_addition(self):
+        """ Test sparse addition with dok format
+        """
         
         A = Sparse(3,3)
@@ -167 +169 @@
 
     def test_sparse_tocsr(self):
-
+        """ Test conversion to csr format
+        """
+        
         A = Sparse(4,3)