Changeset 353

Timestamp:

Oct 1, 2004, 1:51:12 PM (21 years ago)

Author:

duncan

Message:

added more least squares tests, investigating sww files

Location:

inundation/ga/storm_surge/pyvolution

Files:

• HUSK.txt (modified) (1 diff)
• a_triangle.tsh (deleted)
• least_squares.py (modified) (1 diff)
• test_data_manager.py (modified) (3 diffs)
• test_least_squares.py (modified) (2 diffs)

inundation/ga/storm_surge/pyvolution/HUSK.txt

@@ +1 @@
+Have the quantity label e.g. elevation, associated with the data in sww files.
 
 Do data manager for non-smooth data + tests. Smooth is OK (7/9)

inundation/ga/storm_surge/pyvolution/least_squares.py

@@ -379 +379 @@
         fit_to_mesh_file(mesh_file, point_file, mesh_output_file, alpha)
         
-
-
-
-
-
-
-
-
-
-
-

inundation/ga/storm_surge/pyvolution/test_data_manager.py

@@ -221 +221 @@
         assert V[4,2] == 3                      
       
-      
-      
+
         fid.close()
       
@@ -258 +257 @@
         time = fid.variables['time']
         stage = fid.variables['stage']
-
+      
 
         Q = self.domain.quantities['level']     
@@ -401 +400 @@
 
 
+    def test_sww_DSG(self):
+        """Not a test, rather a look at the sww format
+        """
+
+        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')
+
+        #Check contents
+        #Get NetCDF
+        fid = NetCDFFile(sww.filename, 'r')  
+      
+        # Get the variables
+        x = fid.variables['x']
+        y = fid.variables['y']
+        z = fid.variables['z']
+
+        volumes = fid.variables['volumes']   
+        time = fid.variables['time']
+
+        # 2D 
+        stage = fid.variables['stage']       
+
+        X = x[:]
+        Y = y[:]
+        Z = z[:]
+        V = volumes[:]
+        T = time[:]
+        S = stage[:,:]
+      
+#         print "****************************"
+#         print "X ",X
+#         print "****************************"
+#         print "Y ",Y
+#         print "****************************"
+#         print "Z ",Z
+#         print "****************************"
+#         print "V ",V
+#         print "****************************"
+#         print "Time ",T
+#         print "****************************"
+#         print "Stage ",S
+#         print "****************************"
+
+
+        
+        
+        fid.close()
+      
+        #Cleanup
+        os.remove(sww.filename)
+        
 #-------------------------------------------------------------
 if __name__ == "__main__":

inundation/ga/storm_surge/pyvolution/test_least_squares.py

@@ -5 +5 @@
 
 from least_squares import *
-from Numeric import allclose, array
+from Numeric import allclose, array, transpose
 
 def distance(x, y):
@@ -292 +292 @@
         #print "answer",answer
         assert allclose(z, answer)
-
-        
+    
+    def test_interpolate_attributes_to_pointsIII(self):
+        v0 = [0.0, 0.0]
+        v1 = [0.0, 5.0]
+        v2 = [5.0, 0.0]
+        
+        vertices = [v0, v1, v2]
+        triangles = [ [1,0,2] ]   #bac
+         
+        d0 = [1.0, 1.0]
+        d1 = [1.0, 2.0]
+        d2 = [3.0,1.0]
+        point_coords = [ d0, d1, d2]
+        
+        interp = Interpolation(vertices, triangles, point_coords)
+        f = [ [0., 0.],  [5., 10.],  [5., 10.]] #linear_function(vertices)
+        #print "f",f
+        
+        z = interp.interpolate(f)
+        answer = [ [2., 4.],  [3., 6.],  [4., 8.]]
+
+        #print "***********"
+        #print "z",z
+        #print "answer",answer
+        #print "***********"
+
+        assert allclose(z, answer)
+   
+    def test_interpolate_attributes_to_pointsIV(self):
+        a = [-1.0, 0.0]
+        b = [3.0, 4.0]
+        c = [4.0,1.0]
+        d = [-3.0, 2.0] #3
+        e = [-1.0,-2.0]
+        f = [1.0, -2.0] #5
+
+        vertices = [a, b, c, d,e,f]
+        triangles = [[0,1,3],[1,0,2],[0,4,5], [0,5,2]] #abd bac aef afc
+
+         
+        point_coords = [[-2.0, 2.0],
+                        [-1.0, 1.0],
+                        [0.0,2.0],
+                        [1.0, 1.0],
+                        [2.0, 1.0],
+                        [0.0,0.0],
+                        [1.0, 0.0],
+                        [0.0, -1.0],
+                        [-0.2,-0.5],
+                        [-0.9, -1.5],
+                        [0.5, -1.9],
+                        [3.0,1.0]]
+        
+        interp = Interpolation(vertices, triangles, point_coords)
+        f = array([linear_function(vertices),2*linear_function(vertices) ])
+        f = transpose(f)
+        #print "f",f
+        z = interp.interpolate(f)
+        answer = [linear_function(point_coords),
+             
+     2*linear_function(point_coords) ]
+        answer = transpose(answer)
+        #print "z",z
+        #print "answer",answer
+        assert allclose(z, answer)
         
     def test_smooth_attributes_to_mesh_function(self):