Changeset 2638

Timestamp:

Mar 30, 2006, 10:13:03 PM (17 years ago)

Author:

steve

Message:

 

Location:

inundation

Files:

• examples/island.py (modified) (4 diffs)
• log.ini (added)
• test_all.py (modified) (4 diffs)
• utilities/log.ini (added)
• utilities/test_cg_solve.py (modified) (4 diffs)
• zeus/pyvolution.zpi (modified) (1 diff)

inundation/examples/island.py

@@ -2 +2 @@
 
 Island surrounded by water.
-This example investigates onshore 'creep' 
+This example investigates onshore 'creep'
 
 """
@@ -37 +37 @@
                           , interior_regions=[ ([[50,25], [70,25], [70,75], [50,75]], 3)]
                           )
-                          
-                                                    
-                          
+
+
+
 #Create shallow water domain
 domain = Domain(mesh_filename = 'island.msh')
@@ -66 +66 @@
         z[i] = 8*exp( -((x[i]-50)**2 + (y[i]-50)**2)/100 )
 
-        #z[i] += 0.5*exp( -((x[i]-10)**2 + (y[i]-10)**2)/50 ) 
-    
+        #z[i] += 0.5*exp( -((x[i]-10)**2 + (y[i]-10)**2)/50 )
+
     return z
 
@@ -73 +73 @@
     z = 0*x
     for i in range(len(x)):
-        z[i] -= 0.7*exp( -((x[i]-10)**2 + (y[i]-10)**2)/200 ) 
-    
+        z[i] -= 0.7*exp( -((x[i]-10)**2 + (y[i]-10)**2)/200 )
+
     return z
 
-#domain.set_quantity('friction', 0.1)  #Honky dory 
-domain.set_quantity('friction', 2)     #Creep
+domain.set_quantity('friction', 0.1)  #Honky dory
+#domain.set_quantity('friction', 2)     #Creep
 domain.set_quantity('elevation', island)
 domain.set_quantity('stage', 1)

inundation/test_all.py

@@ -23 +23 @@
 exclude_dirs = ['pypar_dist', #Special requirements
                 'props', 'wcprops', 'prop-base', 'text-base', '.svn', #Svn
-                'tmp', 
-                'pmesh']     #Name conflict on my home machine (Ole)       
+                'tmp',
+                'pmesh']     #Name conflict on my home machine (Ole)
 
 
@@ -42 +42 @@
         #Exclude svn admin dirs
         if file in exclude_dirs: continue
-        
+
         absolute_filename = path + os.sep + file
 
@@ -60 +60 @@
     import os, unittest
     path = os.getcwd()
-    
+
     files = [x for x in  get_test_files(path) if not x == 'test_all.py']
-    
+
     print 'Testing path %s:' %('...'+path[-50:])
     for file in files:
@@ -80 +80 @@
 
 if __name__ == '__main__':
-    unittest.main(defaultTest='regressionTest')
+    #unittest.main(defaultTest='regressionTest')
+
+    suite = regressionTest()
+    runner = unittest.TextTestRunner() #verbosity=2
+    runner.run(suite)

inundation/utilities/test_cg_solve.py

@@ -12 +12 @@
 
     def test_sparse_solve(self):
-        """Small Sparse Matrix"""
+        """Solve Small Sparse Matrix"""
 
         A = [[2.0, -1.0, 0.0, 0.0 ],
@@ -30 +30 @@
 
     def test_max_iter(self):
-        """Small Sparse Matrix"""
+        """Test max iteration Small Sparse Matrix"""
 
         A = [[2.0, -1.0, 0.0, 0.0 ],
@@ -62 +62 @@
 
         b  = A*xe
-        x = conjugate_gradient(A,b,b,tol=1.0e-5,iprint=0)
+        x = conjugate_gradient(A,b,b,tol=1.0e-5,iprint=1)
 
         assert allclose(x,xe)
@@ -181 +181 @@
 if __name__ == "__main__":
      suite = unittest.makeSuite(Test_CG_Solve,'test')
-     runner = unittest.TextTestRunner() #(verbosity=2)
+     runner = unittest.TextTestRunner(verbosity=2)
      runner.run(suite)
 
 
-

inundation/zeus/pyvolution.zpi

@@ -87 +87 @@
     <file>..\pyvolution\generic_boundary_conditions.py</file>
     <file>..\pyvolution\interpolate_sww.py</file>
-    <file>..\pyvolution\island.py</file>
     <file>..\pyvolution\least_squares.py</file>
     <file>..\pyvolution\log.ini</file>