Changeset 8049

Timestamp:

Oct 22, 2010, 10:36:57 AM (14 years ago)

Author:

habili

Message:

Changed from using polygons to polylines. The inlets are now represented by triangles that intersect or contain a polyline - The enquiry gap is now computed as: gap = (self.apron + self.enquiry_gap)*self.culvert_vector

Location:

trunk/anuga_core/source/anuga/structures

Files:

• inlet.py (modified) (3 diffs)
• structure_operator.py (modified) (4 diffs)

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

@@ -1 @@
-from anuga.geometry.polygon import inside_polygon, is_inside_polygon, polygon_overlap, polyline_overlap
+from anuga.geometry.polygon import inside_polygon, is_inside_polygon, polyline_overlap
 from anuga.config import velocity_protection, g
 import math
@@ -43 +43 @@
 
         if len(self.triangle_indices) == 0:
-            region = 'Inlet polyline=%s' % (self.polyline)
-            msg = 'No triangles have been identified in region '
+            msg = 'Inlet polyline=%s ' % (self.polyline)
+            msg += 'No triangles intersecting polyline '
             raise Exception, msg
-
+            
         self.enquiry_index = self.domain.get_triangle_containing_point(self.enquiry_pt)
 
+        if self.enquiry_index in self.triangle_indices:
+            msg = 'Enquiry point %s' % (self.enquiry_pt)
+            msg += 'is in an inlet triangle'
+            raise Exception, msg
 
     def compute_area(self):
@@ -92 +96 @@
         
     def get_average_elevation(self):
-        
 
         return num.sum(self.get_elevations()*self.get_areas())/self.area

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

@@ -83 +83 @@
         self.driving_energy = 0.0
         
-        self.__create_exchange_polygons()
+        self.__create_exchange_polylines()
 
         self.inlets = []
@@ -194 +194 @@
 
 
-    def __create_exchange_polygons(self):
+    def __create_exchange_polylines(self):
 
         """Create polylines at the end of a culvert inlet and outlet.
@@ -222 +222 @@
 
         #gap = 1.5*h + self.enquiry_gap
-        gap = 1.5*self.culvert_vector + self.enquiry_gap
+        gap = (self.apron+ self.enquiry_gap)*self.culvert_vector
 
         self.inlet_polylines = []
         self.inlet_equiry_points = []
 
-        # Build exchange polygon and enquiry point
+        # Build exchange polyline and enquiry point
         for i in [0, 1]:
             i0 = (2*i-1) #i0 determines the sign of the points
@@ -267 +267 @@
             message += '\n'
 
-            message += 'polygon\n'
+            message += 'polyline\n'
             message += '%s' % inlet.polyline
             message += '\n'