Changeset 282 for inundation/ga/storm_surge/pyvolution/test_quantity.py

Timestamp:

Sep 8, 2004, 3:13:52 PM (21 years ago)

Author:

ole

Message:

Storing of sww format OK and tested

File:

• inundation/ga/storm_surge/pyvolution/test_quantity.py (modified) (3 diffs)

inundation/ga/storm_surge/pyvolution/test_quantity.py

@@ -458 +458 @@
         Q = level.vertex_values
 
+        
         assert A.shape[0] == 9  
         assert V.shape[0] == 8  
@@ -520 +521 @@
         domain.set_quantity('friction', 0.03)
 
+
+        ###################### 
+        #Initial condition - with jumps
+
+        bed = domain.quantities['elevation'].vertex_values
+        level = zeros(bed.shape, Float)
+
+        h = 0.03
+        for i in range(level.shape[0]):
+            if i % 2 == 0:            
+                level[i,:] = bed[i,:] + h
+            else:
+                level[i,:] = bed[i,:]
+                
+        domain.set_quantity('level', level)
+
         #Get level
         level = domain.quantities['level']        
         A, V = level.get_vertex_values(xy=False, smooth=False)
-        Q = level.vertex_values
+        Q = level.vertex_values.flat
 
         for k in range(8):
             assert allclose(A[k], Q[k])
 
+            
+        for k in range(8):
+            assert V[k, 0] == 3*k
+            assert V[k, 1] == 3*k+1
+            assert V[k, 2] == 3*k+2            
+            
+
+
         X, Y, A1, V1 = level.get_vertex_values(xy=True, smooth=False)
 
@@ -535 +560 @@
 
         #Check XY
-        
-        #FIXME: Do this test
-        print X
-        
-        #assert allclose(X[1], 0.5)
-        #assert allclose(Y[1], 0.5)
-        #assert allclose(X[4], 0.0)
-        #assert allclose(Y[4], 0.0)
-        #assert allclose(X[12], 1.0)
-        #assert allclose(Y[12], 0.0)                
+        assert allclose(X[1], 0.5)
+        assert allclose(Y[1], 0.5)
+        assert allclose(X[4], 0.0)
+        assert allclose(Y[4], 0.0)
+        assert allclose(X[12], 1.0)
+        assert allclose(Y[12], 0.0)