Changeset 6410 for branches/numpy/anuga/shallow_water/test_shallow_water_domain.py

Timestamp:

Feb 25, 2009, 9:37:22 AM (15 years ago)

Author:

rwilson

Message:

numpy changes.

File:

• branches/numpy/anuga/shallow_water/test_shallow_water_domain.py (modified) (8 diffs)

branches/numpy/anuga/shallow_water/test_shallow_water_domain.py

@@ -199 +199 @@
 
     return 17.7
+
+
+def scalar_func_list(t,x,y):
+    """Function that returns a scalar.
+    Used to test error message when numeric array is expected
+    """
+
+    return [17.7]
 
 
@@ -2462 +2470 @@
 
         try:
-            domain.forcing_terms.append(Wind_stress(s = scalar_func,
+            domain.forcing_terms.append(Wind_stress(s = scalar_func_list,
                                                     phi = angle))
         except AssertionError:
@@ -2474 +2482 @@
             domain.forcing_terms.append(Wind_stress(s = speed,
                                                     phi = scalar_func))
-        except AssertionError:
+        except Exception:
             pass
         else:
@@ -5582 +5590 @@
         #print take(cv2, (0,3,8))
 
-        assert num.allclose( num.take(cv1, (0,8,16)), num.take(cv2, (0,3,8))) #Diag
-        assert num.allclose( num.take(cv1, (0,6,12)), num.take(cv2, (0,1,4))) #Bottom
-        assert num.allclose( num.take(cv1, (12,14,16)), num.take(cv2, (4,6,8))) #RHS
+        assert num.allclose(num.take(cv1, (0,8,16), axis=0),
+                            num.take(cv2, (0,3,8), axis=0))    #Diag
+        assert num.allclose(num.take(cv1, (0,6,12), axis=0),
+                            num.take(cv2, (0,1,4), axis=0))    #Bottom
+        assert num.allclose(num.take(cv1, (12,14,16), axis=0),
+                            num.take(cv2, (4,6,8), axis=0))    #RHS
 
         #Cleanup
@@ -5690 +5701 @@
 
         #print points[0], points[5], points[10], points[15]
-        msg = ('value was %s,\nshould be [[0,0], [1.0/3, 1.0/3], '
-               '[2.0/3, 2.0/3], [1,1]]' % str(num.take(points, [0,5,10,15])))
-        assert num.allclose(num.take(points, [0,5,10,15]),
+        msg = ('value was\n%s\nshould be\n'
+               '[[0,0], [1.0/3, 1.0/3],\n'
+               '[2.0/3, 2.0/3], [1,1]]'
+               % str(num.take(points, [0,5,10,15], axis=0)))
+        assert num.allclose(num.take(points, [0,5,10,15], axis=0),
                             [[0,0], [1.0/3, 1.0/3], [2.0/3, 2.0/3], [1,1]]), msg
 
@@ -5873 +5886 @@
 
         #print points[0], points[5], points[10], points[15]
-        msg = ('values was %s,\nshould be [[0,0], [1.0/3, 1.0/3], '
-               '[2.0/3, 2.0/3], [1,1]]' % str(num.take(points, [0,5,10,15])))
-        assert num.allclose(num.take(points, [0,5,10,15]),
+        msg = ('values was\n%s\nshould be\n'
+               '[[0,0], [1.0/3, 1.0/3],\n'
+               '[2.0/3, 2.0/3], [1,1]]'
+               % str(num.take(points, [0,5,10,15], axis=0)))
+        assert num.allclose(num.take(points, [0,5,10,15], axis=0),
                             [[0,0], [1.0/3, 1.0/3], [2.0/3, 2.0/3], [1,1]]), msg
 
@@ -6048 +6063 @@
 
         #print points[0], points[5], points[10], points[15]
-        msg = ('value was %s,\nshould be [[0,0], [1.0/3, 1.0/3], '
-               '[2.0/3, 2.0/3], [1,1]]' % str(num.take(points, [0,5,10,15])))
-        assert num.allclose(num.take(points, [0,5,10,15]),
+        msg = ('value was\n%s\nshould be\n'
+               '[[0,0], [1.0/3, 1.0/3],\n'
+               '[2.0/3, 2.0/3], [1,1]]'
+               % str(num.take(points, [0,5,10,15], axis=0)))
+        assert num.allclose(num.take(points, [0,5,10,15], axis=0),
                             [[0,0], [1.0/3, 1.0/3], [2.0/3, 2.0/3], [1,1]]), msg
 
@@ -6626 +6643 @@
         
 if __name__ == "__main__":
-
-    suite = unittest.makeSuite(Test_Shallow_Water, 'test')
-    #suite = unittest.makeSuite(Test_Shallow_Water, 'test_rainfall_forcing_with_evolve')
-    #suite = unittest.makeSuite(Test_Shallow_Water,'test_get_energy_through_cross_section_with_g')    
-    #suite = unittest.makeSuite(Test_Shallow_Water,'test_fitting_using_shallow_water_domain')    
-    #suite = unittest.makeSuite(Test_Shallow_Water,'test_tight_slope_limiters')
-    #suite = unittest.makeSuite(Test_Shallow_Water,'test_inflow_outflow_conservation')
-    #suite = unittest.makeSuite(Test_Shallow_Water,'test_outflow_conservation_problem_temp')    
-    
-
-    
+    #suite = unittest.makeSuite(Test_Shallow_Water, 'test')
+    suite = unittest.makeSuite(Test_Shallow_Water, 'test_get_maximum_inundation_from_sww')
     runner = unittest.TextTestRunner(verbosity=1)    
     runner.run(suite)