Changeset 256

Timestamp:

Aug 31, 2004, 5:51:05 PM (20 years ago)

Author:

steve

Message:

 

Location:

inundation/ga/storm_surge/pyvolution-1d

Files:

• domain.py (modified) (2 diffs)
• quantity.py (added)
• test_domain.py (modified) (3 diffs)
• test_quantity.py (added)

inundation/ga/storm_surge/pyvolution-1d/domain.py

@@ -10 +10 @@
 class Domain:
 
-    def __init__(self, coordinates):
+    def __init__(self, coordinates, conserved_quantities = None,
+                 other_quantities = None):
         """
         Build 1D elements from x coordinates
@@ -25 +26 @@
 
         #Allocate space for geometric quantities
-        self.edge_coordinates = zeros((N, 2), Float)
-        self.centroids = zeros(N, Float)
-        self.areas = zeros(N, Float)
+        self.vertex_coordinates   = zeros((N, 2), Float)
+        self.centroid_coordinates = zeros(N, Float)
+        self.areas                = zeros(N, Float)
         for i in range(N):
             xl = self.coordinates[i]
             xr = self.coordinates[i+1]
-            self.edge_coordinates[i,0] = xl
-            self.edge_coordinates[i,1] = xr
+            self.vertex_coordinates[i,0] = xl
+            self.vertex_coordinates[i,1] = xr
             
             centroid = (xl+xr)/2
-            self.centroids[i] = centroid
+            self.centroid_coordinates[i] = centroid
 
             msg = 'Coordinates should be ordered, smallest to largest'
             assert xr>xl, msg
+
             self.areas[i] = (xr-xl)
-
 
 
         print 'N', N
         print 'Coordinates', self.coordinates
-        print 'Centroid', self.centroids
+        print 'Centroid', self.centroid_coordinates
         print 'Areas', self.areas
-        print 'Edge_Coordinates', self.edge_coordinates
+        print 'Vertex_Coordinates', self.vertex_coordinates
         
+    def get_centroid_coordinates(self):
+        """Return all coordinates of centroids
+        Return x coordinate of centroid for each element as a N array
+        """
+
+        return self.centroid_coordinates
+
+    def get_coordinate(self, elem_id, vertex=None):
+        """Return coordinate of centroid,
+        or left or right vertex. 
+        Left vertex (vertex=0). Right vertex (vertex=1)
+        """
+
+        if vertex is None:
+            return self.centroid_coordinates[elem_id]
+        else:
+            return self.vertex_coordinates[elem_id,vertex]
         
-    def get_centroids()
 
 if __name__ == "__main__":
+
     points1 = [0.0, 1.0, 2.0, 3.0]
     D1 = Domain(points1)
 
-    points2 = [0.0, 1.0, 2.0, 3.0, 2.5]
-    D2 = Domain(points2)
+    print D1.get_coordinate(0)
+    print D1.get_coordinate(0,1)
+
+    try:
+        print D1.get_coordinate(3)
+    except:
+        pass
+    else:
+        msg =  'Should have raised an out of bounds exception'
+    raise msg
+    
+    #points2 = [0.0, 1.0, 2.0, 3.0, 2.5]
+    #D2 = Domain(points2)
+
+    
 
 

inundation/ga/storm_surge/pyvolution-1d/test_domain.py

@@ -10 +10 @@
 class TestCase(unittest.TestCase):
     def setUp(self):
-        pass
-
         
-    def tearDown(self):
-        pass
-
-    def test_construct(self):
         a = 0.0
         b = 2.0
@@ -26 +20 @@
         points = [a, b, c, d, e, f]
 
-        domain = Domain(points)
+        self.points = [a, b, c, d, e, f]
+        self.domain = Domain(self.points)
 
+        
+    def tearDown(self):
+        pass
+
+
+    def test_construct(self):
+
+        domain = self.domain
         centroids = domain.get_centroids()
         assert allclose(centroids, [1.0, 2.25, 2.75, 6.5, 11.0])
@@ -48 +51 @@
             msg = 'Should have raised exception'
             raise msg
+
+    def test_point(self):
+        a = 0.0
+        b = 2.0
+        c = 2.5
+        d = 3.0
+
+        points = [a, b, c, d]
+
+        domain = Domain(points)
+
+        assert allclose(domain.get_point(0), 0.5*(a+b))
+        assert allclose(domain.get_point(1), 0.5*(b+c))
+        assert allclose(domain.get_point(2), 0.5*(c+d))
         
+        try:
+            allclose(domain.get_point(3), 0.5*(a+b))
+        except:
+            pass
+        else:
+            msg = 'Should have raised exception'
+            raise msg
+        
+        assert allclose(domain.get_point(0,0), a)
+        assert allclose(domain.get_point(1,0), b)
+        assert allclose(domain.get_point(2,0), c)
+
+        assert allclose(domain.get_point(0,1), b)
+        assert allclose(domain.get_point(1,1), c)
+        assert allclose(domain.get_point(2,1), d)
+
+