Changeset 586 for inundation/ga/storm_surge/pyvolution/test_cg_solve.py

Timestamp:

Nov 17, 2004, 5:48:23 PM (20 years ago)

Author:

steve

Message:

Added csr sparse matrix vector mult

File:

• inundation/ga/storm_surge/pyvolution/test_cg_solve.py (modified) (2 diffs)

inundation/ga/storm_surge/pyvolution/test_cg_solve.py

@@ -6 +6 @@
 from Numeric import dot, allclose, array, transpose, arange, ones, Float
 from cg_solve import *
-from sparse import Sparse
+from sparse import Sparse, Sparse_CSR
 
 
@@ -78 +78 @@
         assert allclose(x,xe)
 
+    def test_solve_large_2d_csr_matrix(self):
+        """Standard 2d laplacian"""
+        
+        n = 50
+        m = 50
+
+        A = Sparse(m*n, m*n)
+
+        for i in arange(0,n):
+            for j in arange(0,m):
+                I = j+m*i
+                A[I,I] = 4.0
+                if i > 0  :
+                    A[I,I-m] = -1.0
+                if i < n-1 :
+                    A[I,I+m] = -1.0
+                if j > 0  :
+                    A[I,I-1] = -1.0
+                if j < m-1 :
+                    A[I,I+1] = -1.0
+                
+        xe = ones( (n*m,), Float)
+
+        # Convert to csr format
+        #print 'start covert'
+        A = Sparse_CSR(A)
+        #print 'finish covert'
+        b = A*xe
+        x = conjugate_gradient(A,b,b,iprint=10)
+
+        assert allclose(x,xe)
+
 
     def test_solve_large_2d_with_default_guess(self):