Changeset 279 for inundation/ga/storm_surge/pyvolution-1d/domain.py

Timestamp:

Sep 7, 2004, 5:24:43 PM (20 years ago)

Author:

steve

Message:

Working on Quantities

File:

• inundation/ga/storm_surge/pyvolution-1d/domain.py (modified) (3 diffs)

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

@@ -26 +26 @@
 
         #Allocate space for geometric quantities
-        self.vertex_coordinates   = zeros((N, 2), Float)
-        self.centroid_coordinates = zeros(N, Float)
-        self.areas                = zeros(N, Float)
+        self.vertices  = zeros((N, 2), Float)
+        self.centroids = zeros(N, Float)
+        self.areas     = zeros(N, Float)
         for i in range(N):
             xl = self.coordinates[i]
             xr = self.coordinates[i+1]
-            self.vertex_coordinates[i,0] = xl
-            self.vertex_coordinates[i,1] = xr
+            self.vertices[i,0] = xl
+            self.vertices[i,1] = xr
             
             centroid = (xl+xr)/2
-            self.centroid_coordinates[i] = centroid
+            self.centroids[i] = centroid
 
             msg = 'Coordinates should be ordered, smallest to largest'
@@ -43 +43 @@
             self.areas[i] = (xr-xl)
 
+##         print 'N', N
+##         print 'Centroid', self.centroids
+##         print 'Areas', self.areas
+##         print 'Vertex_Coordinates', self.vertices
+        
+    def get_centroids(self):
+        """Return all coordinates of centroids
+        Return x coordinate of centroid for each element as a N array
+        """
+        
+        return self.centroids
 
-        print 'N', N
-        print 'Coordinates', self.coordinates
-        print 'Centroid', self.centroid_coordinates
-        print 'Areas', self.areas
-        print 'Vertex_Coordinates', self.vertex_coordinates
-        
-    def get_centroid_coordinates(self):
+    def get_vertices(self):
         """Return all coordinates of centroids
         Return x coordinate of centroid for each element as a N array
         """
 
-        return self.centroid_coordinates
+        return self.vertices 
 
     def get_coordinate(self, elem_id, vertex=None):
@@ -64 +69 @@
 
         if vertex is None:
-            return self.centroid_coordinates[elem_id]
+            return self.centroids[elem_id]
         else:
-            return self.vertex_coordinates[elem_id,vertex]
-        
+            return self.vertices[elem_id,vertex]
+
+    def get_area(self, elem_id):
+        """Return area of element id
+        """
+
+        return self.areas[elem_id]
+    
 
 if __name__ == "__main__":