Changeset 599

Timestamp:

Nov 19, 2004, 12:13:15 PM (20 years ago)

Author:

ole

Message:

Removed old print statements polluting the output from
unit testing

Location:

inundation/ga/storm_surge/pyvolution

Files:

• cg_solve.py (modified) (1 diff)
• sparse_ext.c (modified) (1 diff)
• test_cg_solve.py (modified) (1 diff)
• test_sparse.py (modified) (2 diffs)

inundation/ga/storm_surge/pyvolution/cg_solve.py

@@ -58 +58 @@
        i = i+1
        if i%iprint == 0 :
-          print 'i = %g rTr = %20.15e'% (i,rTr)
+          pass
+          #FIXME: Should depend on verbosity 
+          #print 'i = %g rTr = %20.15e'% (i,rTr)
 
    #FIXME: Should this raise an exception?       

inundation/ga/storm_surge/pyvolution/sparse_ext.c

@@ -52 +52 @@
     *y;               //Return vector array
 
-  double *xdata;
-   
+  
   int dimensions[1], M, err;
-  int xdim, i;
   
   // Convert Python arguments to C  

inundation/ga/storm_surge/pyvolution/test_cg_solve.py

@@ -103 +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

@@ -181 +181 @@
         A[2,0] = 5
 
-        print ' ' 
-        print A.todense()
+        #print ' ' 
+        #print A.todense()
 
         B = Sparse_CSR(A)
 
-        print B.todense()
+        #print B.todense()
 
         C = [1, 2, 3]
@@ -194 +194 @@
         C2 = [[1,2],[2,4],[3,6]]
 
-        print B*C2
+        #print B*C2
 
         assert allclose(B*C2, [[15.0, 30.0],[10.0, 20.0],[8.0, 16.0],[0.0, 0.0]])