Changeset 6304 for branches/numpy/anuga/culvert_flows

Timestamp:

Feb 10, 2009, 11:11:04 AM (16 years ago)

Author:

rwilson

Message:

Initial commit of numpy changes. Still a long way to go.

Location:

branches/numpy

Files:

• . (copied) (copied from anuga_core/source)
• anuga/culvert_flows/Test_Culvert_Flat_Water_Lev.py (modified) (1 diff)
• anuga/culvert_flows/culvert_class.py (modified) (1 diff)
• anuga/culvert_flows/culvert_polygons.py (modified) (1 diff)
• anuga/culvert_flows/test_culvert_class.py (modified) (3 diffs)

branches/numpy/anuga/culvert_flows/Test_Culvert_Flat_Water_Lev.py

@@ -26 +26 @@
 from math import pi,pow,sqrt
 
-import Numeric as num
+import numpy as num
 
 

branches/numpy/anuga/culvert_flows/culvert_class.py

@@ -14 +14 @@
 from anuga.config import minimum_allowed_height, velocity_protection        
 
-import Numeric as num
+import numpy as num
 
 

branches/numpy/anuga/culvert_flows/culvert_polygons.py

@@ -6 +6 @@
 from anuga.utilities.polygon import inside_polygon, polygon_area
 
-import Numeric as num
+import numpy as num
 
 

branches/numpy/anuga/culvert_flows/test_culvert_class.py

@@ -21 +21 @@
 from math import pi,pow,sqrt
 
-import Numeric as num
+import numpy as num
 
 
@@ -470 +470 @@
         ref_volume = domain.get_quantity('stage').get_integral()
         for t in domain.evolve(yieldstep = 1, finaltime = 25):
+            
             #print domain.timestepping_statistics()
             new_volume = domain.get_quantity('stage').get_integral()
-            
+
             msg = 'Total volume has changed'
             assert num.allclose(new_volume, ref_volume), msg
@@ -564 +565 @@
 #-------------------------------------------------------------
 if __name__ == "__main__":
-    #suite = unittest.makeSuite(Test_Culvert, 'test_that_culvert_rating_limits_flow_in_shallow_inlet_condition')
     suite = unittest.makeSuite(Test_Culvert, 'test')
-    runner = unittest.TextTestRunner()
+    runner = unittest.TextTestRunner() #verbosity=2)
     runner.run(suite)