Changeset 479

Timestamp:

Nov 1, 2004, 9:22:46 PM (20 years ago)

Author:

steve

Message:

problem with netherland.py

Location:

inundation/ga/storm_surge/pyvolution

Files:

• compile.py (modified) (1 diff)
• data_manager.py (modified) (1 diff)
• least_squares.py (modified) (1 diff)
• netherlands.py (modified) (2 diffs)
• run_profile.py (modified) (1 diff)
• test_sparse.py (modified) (2 diffs)

inundation/ga/storm_surge/pyvolution/compile.py

@@ -114 +114 @@
       compiler = CC
     else:  
-      compiler = 'gcc'
+      compiler = 'gcc -O3'
     if LD:
       loader = LD

inundation/ga/storm_surge/pyvolution/data_manager.py

@@ -110 +110 @@
            
     FN = check_dir(data_dir) + filename + '_size%d' %size
-        
+
+    print FN
+    print filename
     if time is not None:
         FN += '_time%.2f' %time
         
     FN += '.' + format
-        
+
+    print FN
+    
     return FN
     

inundation/ga/storm_surge/pyvolution/least_squares.py

@@ -413 +413 @@
         #return sparse.solve(self.B,Atz)
 
-        return conjugate_gradient(self.B, Atz, Atz)
+        return conjugate_gradient(self.B, Atz, Atz,imax=2*len(Atz) )
         #FIXME: Should we store the result here for later use? (ON)        
     

inundation/ga/storm_surge/pyvolution/netherlands.py

@@ -95 +95 @@
 #N = 150
 N = 110
-#N = 60
+N = 60
 
 print 'Creating domain'
@@ -120 +120 @@
     domain.format = 'sww'   #Native netcdf visualisation format
     import sys, os
-    root, ext = os.path.splitext(sys.argv[0])
+    #FIXME: This was os.path.splitext but caused weird filenames based on root
+    base = os.path.basename(sys.argv[0])
     if domain.smooth is True:
         s = 'smooth'
     else:
         s = 'nonsmooth'        
-    domain.filename = root + '_py3_' + s
+    domain.filename = base + '_py3_' + s
 else:
     domain.visualise = True

inundation/ga/storm_surge/pyvolution/run_profile.py

@@ -20 +20 @@
 #
 
-N = 16
+N = 32
 
 print 'Creating domain'

inundation/ga/storm_surge/pyvolution/test_sparse.py

@@ -34 +34 @@
         """
         
-        A = Sparse(3,3)
+        A = Sparse(4,3)
         A[1,1] = 4
         A[2,0] = 6
@@ -49 +49 @@
                     
     def test_dense(self):
-        A = Sparse(3,3)
+        A = Sparse(4,3)
         A[1,1] = 4        
                      
-        assert allclose(A.todense(), [[0,0,0], [0,4,0], [0,0,0]])
+        assert allclose(A.todense(), [[0,0,0], [0,4,0], [0,0,0], [0,0,0]])