Changeset 7980 for trunk/anuga_core/source/anuga/structures/inlet.py

Timestamp:

Aug 30, 2010, 5:53:45 PM (14 years ago)

Author:

steve

Message:

Added new tests

File:

• trunk/anuga_core/source/anuga/structures/inlet.py (modified) (11 diffs)

trunk/anuga_core/source/anuga/structures/inlet.py

@@ -9 +9 @@
     """
 
-    def __init__(self, domain, polygon):
+    def __init__(self, domain, polygon, outward_culvert_vector=None):
 
         self.domain = domain
         self.domain_bounding_polygon = self.domain.get_boundary_polygon()
         self.polygon = polygon
+        self.outward_culvert_vector = outward_culvert_vector
 
         # FIXME (SR) Using get_triangle_containing_point which needs to be sped up
@@ -35 +36 @@
                 assert is_inside_polygon(point, bounding_polygon), msg
 
-        self.triangle_indices = inside_polygon(domain_centroids, self.inlet_polygon)
+
+        self.triangle_indices = inside_polygon(domain_centroids, self.inlet_polygon, verbose=True)
 
         if len(self.triangle_indices) == 0:
@@ -42 +44 @@
             msg += 'specified region: %s' % region
             raise Exception, msg
+
+
 
 
@@ -62 +66 @@
 
 
+    def get_area(self):
+
+        return self.area
+
+    
     def get_areas(self):
         
@@ -74 +83 @@
         
     def get_average_stage(self):
-        
-        return num.sum(self.get_stages())/self.triangle_indices.size
-       
+
+        return num.sum(self.get_stages()*self.get_areas())/self.area
         
     def get_elevations(self):    
@@ -84 +92 @@
     def get_average_elevation(self):
         
-        return num.sum(self.get_elevations())/self.triangle_indices.size
+
+        return num.sum(self.get_elevations()*self.get_areas())/self.area
     
     
@@ -93 +102 @@
         
     def get_average_xmom(self):
-        
-        return num.sum(self.get_xmoms())/self.triangle_indices.size
+
+        return num.sum(self.get_xmoms()*self.get_areas())/self.area
         
     
@@ -104 +113 @@
     def get_average_ymom(self):
         
-        return num.sum(self.get_ymoms())/self.triangle_indices.size
- 
+        return num.sum(self.get_ymoms()*self.get_areas())/self.area
     
     def get_heights(self):
@@ -115 +123 @@
        
        return num.sum(self.get_heights()*self.get_areas())
-    
-    
+  
+
     def get_average_height(self):
     
@@ -124 +132 @@
     def get_velocities(self):
         
-            depths = self.get_stages() - self.get_elevations()
-            u = self.get_xmoms()/(depths + velocity_protection/depths)
-            v = self.get_ymoms()/(depths + velocity_protection/depths)
+            heights = self.get_heights()
+            u = self.get_xmoms()/(heights + velocity_protection/heights)
+            v = self.get_ymoms()/(heights + velocity_protection/heights)
             
             return u, v
+
+
+    def get_xvelocities(self):
+
+            heights = self.get_heights()
+            return self.get_xmoms()/(heights + velocity_protection/heights)
+
+    def get_yvelocities(self):
+
+            heights = self.get_heights()
+            return self.get_ymoms()/(heights + velocity_protection/heights)
             
             
@@ -135 +154 @@
             u, v = self.get_velocities()
             
-            average_u = num.sum(u)/self.triangle_indices.size
-            average_v = num.sum(v)/self.triangle_indices.size
+            average_u = num.sum(u*self.get_areas())/self.area
+            average_v = num.sum(v*self.get_areas())/self.area
             
             return math.sqrt(average_u**2 + average_v**2)