Changeset 321 for inundation/ga/storm_surge/pyvolution/test_least_squares.py

Timestamp:

Sep 20, 2004, 9:19:01 AM (20 years ago)

Author:

duncan

Message:

adding a general mesh file, that pyvolution mesh inherits from

File:

• inundation/ga/storm_surge/pyvolution/test_least_squares.py (modified) (15 diffs)

inundation/ga/storm_surge/pyvolution/test_least_squares.py

@@ -5 +5 @@
 
 from least_squares import *
-from config import epsilon
+from least_squares import EPSILON
 from Numeric import allclose, array
 
@@ -28 +28 @@
         data = [ [2.0/3, 2.0/3] ] #Use centroid as one data point        
         
-        mesh = Interpolation(points, vertices, data)
-        assert allclose(mesh.A_m, [[1./3, 1./3, 1./3]]) 
+        interp = Interpolation(points, vertices, data)
+        assert allclose(interp.A_m, [[1./3, 1./3, 1./3]]) 
         
 
@@ -45 +45 @@
         data = points #Use data at vertices        
         
-        mesh = Interpolation(points, vertices, data)
-        assert allclose(mesh.A_m, [[1., 0., 0.],
+        interp = Interpolation(points, vertices, data)
+        assert allclose(interp.A_m, [[1., 0., 0.],
                                       [0., 1., 0.],
                                       [0., 0., 1.]]) 
@@ -65 +65 @@
         data = [ [0., 1.], [1., 0.], [1., 1.] ]
         
-        mesh = Interpolation(points, vertices, data)
-        
-        assert allclose(mesh.A_m, [[0.5, 0.5, 0.0],  #Affects vertex 1 and 0       
+        interp = Interpolation(points, vertices, data)
+        
+        assert allclose(interp.A_m, [[0.5, 0.5, 0.0],  #Affects vertex 1 and 0       
                                       [0.5, 0.0, 0.5],  #Affects vertex 0 and 2
                                       [0.0, 0.5, 0.5]]) #Affects vertex 1 and 2
@@ -85 +85 @@
         data = [ [0., 1.5], [1.5, 0.], [1.5, 0.5] ]
         
-        mesh = Interpolation(points, vertices, data)
-        
-        assert allclose(mesh.A_m, [[0.25, 0.75, 0.0],  #Affects vertex 1 and 0      
+        interp = Interpolation(points, vertices, data)
+        
+        assert allclose(interp.A_m, [[0.25, 0.75, 0.0],  #Affects vertex 1 and 0      
                                       [0.25, 0.0, 0.75],  #Affects vertex 0 and 2
                                       [0.0, 0.25, 0.75]]) #Affects vertex 1 and 2
@@ -105 +105 @@
         data = [ [0.2, 1.5], [0.123, 1.768], [1.43, 0.44] ]
         
-        mesh = Interpolation(points, vertices, data)
-
-        assert allclose(sum(mesh.A_m, axis=1), 1.0)
+        interp = Interpolation(points, vertices, data)
+
+        assert allclose(sum(interp.A_m, axis=1), 1.0)
         
 
@@ -125 +125 @@
         data = [ [-3., 2.0], [-2, 1], [0.0, 1], [0, 3], [2, 3], [-1.0/3,-4./3] ]
 
-        mesh = Interpolation(points, triangles, data) 
+        interp = Interpolation(points, triangles, data) 
         
         answer = [[0.0, 0.0, 0.0,  1.0, 0.0, 0.0],  #Affects point d     
@@ -133 +133 @@
                   [0.25, 0.75, 0.0, 0.0, 0.0, 0.0], #Affects points a and b
                   [1./3, 0.0, 0.0, 0.0, 1./3, 1./3]] #Affects points a,e and f       
-        #print mesh.A_m
+        #print interp.A_m
         #print answer
         
-        assert allclose(mesh.A_m, answer)
-
-    def test_smooth_to_mesh(self):
+        assert allclose(interp.A_m, answer)
+
+    def test_smooth_att_to_mesh(self):
         a = [0.0, 0.0]
         b = [0.0, 5.0]
@@ -153 +153 @@
         data_coords = [ d1, d2, d3] #Use centroid as one data point        
         
-        mesh = Interpolation(points, triangles, data_coords)
+        interp = Interpolation(points, triangles, data_coords)
         z = [z1, z2, z3]
-        f =  mesh.smooth_to_mesh(z)
+        f =  interp.smooth_att_to_mesh(z)
         answer = [0, 5., 5.]
         assert allclose(f, answer)
         
-    def test_smooth_to_meshII(self):
+    def test_smooth_att_to_meshII(self):
         a = [0.0, 0.0]
         b = [0.0, 5.0]
@@ -171 +171 @@
         data_coords = [ d1, d2, d3]       
         z = self.linear_function(data_coords)
-        mesh = Interpolation(points, triangles, data_coords)
-        f =  mesh.smooth_to_mesh(z)
+        interp = Interpolation(points, triangles, data_coords)
+        f =  interp.smooth_att_to_mesh(z)
         answer = self.linear_function(points)
         assert allclose(f, answer)
     
-    def test_smooth_to_meshIII(self):
+    def test_smooth_att_to_meshIII(self):
         a = [-1.0, 0.0]
         b = [3.0, 4.0]
@@ -202 +202 @@
         
         z = self.linear_function(point_coords)
-        mesh = Interpolation(vertices, triangles, point_coords)
-        f =  mesh.smooth_to_mesh(z)
+        interp = Interpolation(vertices, triangles, point_coords)
+        f =  interp.smooth_att_to_mesh(z)
         answer = self.linear_function(vertices)
         assert allclose(f, answer)
@@ -211 +211 @@
         return point[:,0]+point[:,1]
     
-    def test_smooth_to_points(self):
+    def test_smooth_att_to_points(self):
         v0 = [0.0, 0.0]
         v1 = [0.0, 5.0]
@@ -225 +225 @@
         point_coords = [ d0, d1, d2]
         
-        mesh = Interpolation(vertices, triangles, point_coords)
+        interp = Interpolation(vertices, triangles, point_coords)
         f = self.linear_function(vertices)
-        z =  mesh.smooth_to_points(f)
+        z =  interp.smooth_att_to_points(f)
         answer = self.linear_function(point_coords)
         #print "z",z
@@ -233 +233 @@
         assert allclose(z, answer)
        
-    def test_smooth_to_pointsII(self):
+    def test_smooth_att_to_pointsII(self):
         a = [-1.0, 0.0]
         b = [3.0, 4.0]
@@ -258 +258 @@
                         [3.0,1.0]]
         
-        mesh = Interpolation(vertices, triangles, point_coords)
+        interp = Interpolation(vertices, triangles, point_coords)
         f = self.linear_function(vertices)
-        z =  mesh.smooth_to_points(f)
+        z =  interp.smooth_att_to_points(f)
         answer = self.linear_function(point_coords)
         #print "z",z
         #print "answer",answer
-        assert allclose(z, answer) 
+        assert allclose(z, answer)
+
+        
+    def test_smooth_atts_to_mesh(self):
+        a = [0.0, 0.0]
+        b = [0.0, 5.0]
+        c = [5.0, 0.0]
+        points = [a, b, c]
+        triangles = [ [1,0,2] ]   #bac
+         
+        d1 = [1.0, 1.0]
+        d2 = [1.0, 3.0]
+        d3 = [3.0,1.0]
+        z1 = [2,4]
+        z2 = [4,8]
+        z3 = [4,8]
+        data_coords = [ d1, d2, d3] #Use centroid as one data point        
+        
+        interp = Interpolation(points, triangles, data_coords)
+        z = [z1, z2, z3]
+        f =  interp.smooth_att_to_mesh(z)
+        answer = [[0,0], [5., 10.], [5., 10.]]
+        assert allclose(f, answer)
+        
 #-------------------------------------------------------------
 if __name__ == "__main__":