Changeset 282

Timestamp:

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

Author:

ole

Message:

Storing of sww format OK and tested

Location:

inundation/ga/storm_surge/pyvolution

Files:

• quantity.py (modified) (1 diff)
• show_balanced_limiters.py (modified) (1 diff)
• test_data_manager.py (modified) (6 diffs)
• test_quantity.py (modified) (3 diffs)

inundation/ga/storm_surge/pyvolution/quantity.py

@@ -315 +315 @@
 
             #Create connectivity
-            tmp = reshape(array(range(m)).astype(Int), (m,1))
-            V = concatenate( (tmp, tmp+m, tmp+2*m), axis = 1 )
-
+            V = reshape(array(range(M)).astype(Int), (m,3))
+            
             #Do vertex coordinates    
             if xy is True:                
                 C = self.domain.get_vertex_coordinates()
 
-                #X = C[:,0:6:2].copy()
-                #Y = C[:,1:6:2].copy()                
-
-                X = concatenate((C[:,0], C[:,2], C[:,4]), 
-                                axis=0).astype(precision)
-                Y = concatenate((C[:,1], C[:,3], C[:,5]), 
-                                axis=0).astype(precision)
-                
-                
-                
+                X = C[:,0:6:2].copy()
+                Y = C[:,1:6:2].copy()                
+
                 return X.flat, Y.flat, A, V           
             else:

inundation/ga/storm_surge/pyvolution/show_balanced_limiters.py

@@ -35 +35 @@
 domain = Domain(points, vertices, boundary)
 domain.smooth = False
-#domain.visualise = False
+domain.visualise = False
 domain.visualise = True
 domain.default_order = 2

inundation/ga/storm_surge/pyvolution/test_data_manager.py

@@ -56 +56 @@
         self.domain = domain
 
-        self.X = domain.get_vertex_coordinates()
-        self.X0 = self.X[:,0]
-        self.Y0 = self.X[:,1]
-        self.X1 = self.X[:,2]
-        self.Y1 = self.X[:,3]
-        self.X2 = self.X[:,4]
-        self.Y2 = self.X[:,5]                
+        C = domain.get_vertex_coordinates()
+        self.X = C[:,0:6:2].copy()
+        self.Y = C[:,1:6:2].copy()
         
         self.F = bed
@@ -155 +151 @@
         volumes = fid.variables['volumes']        
 
-        #print z[:]
-        #print self.F.flat
-        #print concatenate( (self.X0, self.X1, self.X2))
-                        
-        assert allclose (x[:], concatenate( (self.X0, self.X1, self.X2) ))
-        assert allclose (y[:], concatenate( (self.Y0, self.Y1, self.Y2) ))
+
+        assert allclose (x[:], self.X.flat)
+        assert allclose (y[:], self.Y.flat)
         assert allclose (z[:], self.F.flat)
 
@@ -167 +160 @@
         P = len(self.domain)
         for k in range(P):
-             assert V[k,0] == V[k,1] - P
-             assert V[k,1] == V[k,2] - P
-      
-
-
+            assert V[k, 0] == 3*k
+            assert V[k, 1] == 3*k+1
+            assert V[k, 2] == 3*k+2            
+      
       
         fid.close()
@@ -184 +176 @@
         """
 
-
         import time, os
         from Numeric import array, zeros, allclose, Float, concatenate
@@ -231 +222 @@
       
       
-
-
       
         fid.close()
@@ -295 +284 @@
         
         
-#     def test_sww_variable2(self):
-#         """Test that sww information can be written correctly
-#         multiple timesteps. Use average as reduction operator
-#         """
-
-#         import time, os
-#         from Numeric import array, zeros, allclose, Float, concatenate
-#         from Scientific.IO.NetCDF import NetCDFFile
-
-#         self.domain.filename = 'datatest' + str(time.time())
-#         self.domain.format = 'sww'
-#         self.domain.smooth = True
-
-#         self.domain.reduction = mean     
-        
-#         sww = get_dataobject(self.domain)
-#         sww.store_all()
-#         sww.store_timestep()
-        
-#         self.domain.evolve_to_end(max_timestep = 0.01, finaltime = 0.01)
-#         sww.store_timestep()
-
-
-
-#         #Check contents
-#         #Get NetCDF
-#         fid = NetCDFFile(sww.filename, 'r')  #Open existing file for append
-        
-
-#         # Get the variables
-#         x = fid.variables['x']
-#         y = fid.variables['y']
-#         z = fid.variables['z']
-#         time = fid.variables['time']
-#         stage = fid.variables['stage']        
-
-#         #Check values
-
-#         Q0 = self.domain.volume_class.conserved_quantities_vertex0
-#         Q1 = self.domain.volume_class.conserved_quantities_vertex1
-#         Q2 = self.domain.volume_class.conserved_quantities_vertex2        
-
-#         A = stage[1,:]
-#         assert allclose(A[0], (Q2[0,0] + Q1[1,0])/2)  
-#         assert allclose(A[1], (Q0[1,0] + Q1[3,0] + Q2[2,0])/3)
-#         assert allclose(A[2], Q0[3,0])
-#         assert allclose(A[3], (Q0[0,0] + Q1[5,0] + Q2[4,0])/3)
-
-#         #Center point
-#         assert allclose(A[4], (Q1[0,0] + Q2[1,0] + Q0[2,0] +\
-#                                  Q0[5,0] + Q2[6,0] + Q1[7,0])/6)
-                                 
-        
-        
-            
-        
-#         fid.close()
-        
-#         #Cleanup
-#         os.remove(sww.filename)
-        
-#     def test_sww_variable3(self):
-#         """Test that sww information can be written correctly
-#         multiple timesteps using a different reduction operator (min)
-#         """
-
-#         import time, os
-#         from Numeric import array, zeros, allclose, Float, concatenate
-#         from Scientific.IO.NetCDF import NetCDFFile
-
-#         self.domain.filename = 'datatest' + str(time.time())
-#         self.domain.format = 'sww'
-#         self.domain.smooth = True
-#         self.domain.reduction = min
-        
-#         sww = get_dataobject(self.domain)
-#         sww.store_all()
-#         sww.store_timestep()
-        
-#         self.domain.evolve_to_end(max_timestep = 0.01, finaltime = 0.01)
-#         sww.store_timestep()
-
-
-
-#         #Check contents
-#         #Get NetCDF
-#         fid = NetCDFFile(sww.filename, 'r')  #Open existing file for append
-        
-
-#         # Get the variables
-#         x = fid.variables['x']
-#         y = fid.variables['y']
-#         z = fid.variables['z']
-#         time = fid.variables['time']
-#         stage = fid.variables['stage']        
-
-#         #Check values
-
-#         Q0 = self.domain.volume_class.conserved_quantities_vertex0
-#         Q1 = self.domain.volume_class.conserved_quantities_vertex1
-#         Q2 = self.domain.volume_class.conserved_quantities_vertex2        
-
-#         A = stage[1,:]
-#         assert allclose(A[0], min(Q2[0,0], Q1[1,0]) )  
-#         assert allclose(A[1], min(Q0[1,0], Q1[3,0], Q2[2,0]) )
-#         assert allclose(A[2], Q0[3,0])
-#         assert allclose(A[3], min(Q0[0,0], Q1[5,0], Q2[4,0]) )
-
-#         #Center point
-#         assert allclose(A[4], min(Q1[0,0], Q2[1,0], Q0[2,0],
-#                                   Q0[5,0], Q2[6,0], Q1[7,0]) )
-                                 
-        
-        
-            
-        
-#         fid.close()
-        
-#         #Cleanup
-#         os.remove(sww.filename)
-
-
-    def test_dummy(self):
-        pass
+    def test_sww_variable2(self):
+        """Test that sww information can be written correctly
+        multiple timesteps. Use average as reduction operator
+        """
+
+        import time, os
+        from Numeric import array, zeros, allclose, Float, concatenate
+        from Scientific.IO.NetCDF import NetCDFFile
+
+        self.domain.filename = 'datatest' + str(time.time())
+        self.domain.format = 'sww'
+        self.domain.smooth = True
+
+        self.domain.reduction = mean     
+      
+        sww = get_dataobject(self.domain)
+        sww.store_connectivity()
+        sww.store_timestep('level')      
+        self.domain.evolve_to_end(finaltime = 0.01)
+        sww.store_timestep('level')
+
+
+        #Check contents
+        #Get NetCDF
+        fid = NetCDFFile(sww.filename, 'r')  #Open existing file for append
+
+        # Get the variables
+        x = fid.variables['x']
+        y = fid.variables['y']
+        z = fid.variables['z']
+        time = fid.variables['time']
+        stage = fid.variables['stage']        
+
+        #Check values
+        Q = self.domain.quantities['level']     
+        Q0 = Q.vertex_values[:,0]
+        Q1 = Q.vertex_values[:,1]
+        Q2 = Q.vertex_values[:,2]
+
+        A = stage[1,:]
+        assert allclose(A[0], (Q2[0] + Q1[1])/2)  
+        assert allclose(A[1], (Q0[1] + Q1[3] + Q2[2])/3)
+        assert allclose(A[2], Q0[3])
+        assert allclose(A[3], (Q0[0] + Q1[5] + Q2[4])/3)
+
+        #Center point
+        assert allclose(A[4], (Q1[0] + Q2[1] + Q0[2] +\
+                                 Q0[5] + Q2[6] + Q1[7])/6)
+                               
+      
+      
+          
+      
+        fid.close()
+      
+        #Cleanup
+        os.remove(sww.filename)
+        
+    def test_sww_variable3(self):
+        """Test that sww information can be written correctly
+        multiple timesteps using a different reduction operator (min)
+        """
+
+        import time, os
+        from Numeric import array, zeros, allclose, Float, concatenate
+        from Scientific.IO.NetCDF import NetCDFFile
+
+        self.domain.filename = 'datatest' + str(time.time())
+        self.domain.format = 'sww'
+        self.domain.smooth = True
+        self.domain.reduction = min
+      
+        sww = get_dataobject(self.domain)
+        sww.store_connectivity()
+        sww.store_timestep('level')
+      
+        self.domain.evolve_to_end(finaltime = 0.01)
+        sww.store_timestep('level')
+
+
+
+        #Check contents
+        #Get NetCDF
+        fid = NetCDFFile(sww.filename, 'r')  #Open existing file for append
+      
+
+        # Get the variables
+        x = fid.variables['x']
+        y = fid.variables['y']
+        z = fid.variables['z']
+        time = fid.variables['time']
+        stage = fid.variables['stage']        
+
+        #Check values
+        #Check values
+        Q = self.domain.quantities['level']     
+        Q0 = Q.vertex_values[:,0]
+        Q1 = Q.vertex_values[:,1]
+        Q2 = Q.vertex_values[:,2]
+
+        A = stage[1,:]
+        assert allclose(A[0], min(Q2[0], Q1[1]))  
+        assert allclose(A[1], min(Q0[1], Q1[3], Q2[2]))
+        assert allclose(A[2], Q0[3])
+        assert allclose(A[3], min(Q0[0], Q1[5], Q2[4]))
+
+        #Center point
+        assert allclose(A[4], min(Q1[0], Q2[1], Q0[2],\
+                                  Q0[5], Q2[6], Q1[7]))
+                               
+      
+        fid.close()
+      
+        #Cleanup
+        os.remove(sww.filename)
+
 
 #-------------------------------------------------------------

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)