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

Timestamp:

Oct 29, 2010, 11:08:43 AM (13 years ago)

Author:

habili

Message:

The variables end_points, exchange_lines and enquiry_points are now all user defined. Either end_points or exchange_lines must be defined. Use example in test_boyd_box_operator.py

File:

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

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

@@ -1 @@
-from anuga.geometry.polygon import inside_polygon, is_inside_polygon, polyline_overlap
+from anuga.geometry.polygon import inside_polygon, is_inside_polygon, line_intersect
 from anuga.config import velocity_protection, g
 import math
@@ -9 +9 @@
     """
 
-    def __init__(self, domain, polyline, verbose=False):
+    def __init__(self, domain, line, verbose=False):
 
         self.domain = domain
         self.domain_bounding_polygon = self.domain.get_boundary_polygon()
-        self.polyline = polyline
+        self.line = line
         self.verbose = verbose
 
@@ -27 +27 @@
         vertex_coordinates = self.domain.get_vertex_coordinates(absolute=True)
 
-        # Check that polyline lies within the mesh.
-        for point in self.polyline:  
+        # Check that line lies within the mesh.
+        for point in self.line:  
                 msg = 'Point %s ' %  str(point)
                 msg += ' did not fall within the domain boundary.'
@@ -35 +35 @@
 
 
-        self.triangle_indices = polyline_overlap(vertex_coordinates, self.polyline)
+        self.triangle_indices = line_intersect(vertex_coordinates, self.line)
 
         if len(self.triangle_indices) == 0:
-            msg = 'Inlet polyline=%s ' % (self.polyline)
-            msg += 'No triangles intersecting polyline '
+            msg = 'Inlet line=%s ' % (self.line)
+            msg += 'No triangles intersecting line '
             raise Exception, msg
 
@@ -47 +47 @@
         
         # Compute inlet area as the sum of areas of triangles identified
-        # by polyline. Must be called after compute_inlet_triangle_indices().
+        # by line. Must be called after compute_inlet_triangle_indices().
         if len(self.triangle_indices) == 0:
-            region = 'Inlet polyline=%s' % (self.inlet_polyline)
+            region = 'Inlet line=%s' % (self.inlet_line)
             msg = 'No triangles have been identified in region '
             raise Exception, msg