Changeset 6472

Timestamp:

Mar 5, 2009, 2:48:11 PM (16 years ago)

Author:

rwilson

Message:

Took Ole's changes to the test_get_maximum_inundation code and made it numpy.

Location:

branches/numpy/anuga/shallow_water

Files:

• test_data_manager.py (modified) (2 diffs)
• tsunami_okada.py (modified) (1 diff)

branches/numpy/anuga/shallow_water/test_data_manager.py

@@ -10590 +10590 @@
         ymomentum = fid.variables['ymomentum'][:]        
 
-        h = stage-z
-        for i in range(len(stage)):
-            if num.alltrue(h[i] == 0.0):
-                assert num.alltrue(xmomentum[i] == 0.0)
-                assert num.alltrue(ymomentum[i] == 0.0)
-            else:
-                msg = ('h[i]=\n%s\ndomain.minimum_storable_height=%s'
-                       % (str(h[i]), str(domain.minimum_storable_height)))
-                assert num.alltrue(h[i] >= domain.minimum_storable_height), msg
+        for i in range(stage.shape[0]):
+            h = stage[i]-z # depth vector at time step i
+            
+            # Check every node location
+            for j in range(stage.shape[1]):
+                # Depth being either exactly zero implies
+                # momentum being zero.
+                # Or else depth must be greater than or equal to
+                # the minimal storable height
+                if h[j] == 0.0:
+                    assert xmomentum[i,j] == 0.0
+                    assert ymomentum[i,j] == 0.0                
+                else:
+                    assert h[j] >= domain.minimum_storable_height
         
         fid.close()
@@ -10635 +10640 @@
 
         # Check runup restricted to a polygon
-        p = num.array([[50,1], [99,1], [99,49], [50,49]]) + num.array([E, N])
+        p = num.array([[50,1], [99,1], [99,49], [50,49]], num.int) + \
+                num.array([E, N], num.int)      #array default#
 
         runup = get_maximum_inundation_elevation(swwfile, polygon=p)

branches/numpy/anuga/shallow_water/tsunami_okada.py

@@ -215 +215 @@
             yrec=x
             for i in range(0,len(zrec[0])):
-                if (num.alltrue(zrec[0][i]==yrec) and
-                    num.alltrue(zrec[1][i]==xrec)):
+                if (num.any(zrec[0][i]==yrec) and num.any(zrec[1][i]==xrec)):
                     Z=zrec[2][i]
                     Z=0.001*Z