Changeset 7976

Timestamp:

Aug 26, 2010, 10:50:36 AM (14 years ago)

Author:

habili

Message:

Clean up of code. Removed references to enquiry point.

Location:

trunk/anuga_core/source/anuga/structures

Files:

• culvert_operator.py (modified) (10 diffs)
• inlet.py (modified) (1 diff)

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

@@ -1 @@
-import sys
-
-from anuga.shallow_water.forcing import Inflow, General_forcing
-from anuga.utilities.system_tools import log_to_file
-from anuga.geometry.polygon import inside_polygon, is_inside_polygon
-from anuga.geometry.polygon import plot_polygons, polygon_area
-
-from anuga.utilities.numerical_tools import mean
-from anuga.utilities.numerical_tools import ensure_numeric, sign
-        
-from anuga.config import g, epsilon
-from anuga.config import minimum_allowed_height, velocity_protection        
+from anuga.geometry.polygon import inside_polygon, polygon_area
+from anuga.config import g
 import anuga.utilities.log as log
-
 import inlet
-
 import numpy as num
 import math
@@ -37 +25 @@
                  end_point0=None, 
                  end_point1=None,
-                 enquiry_gap_factor=0.2,
                  width=None,
                  height=None,
@@ -49 +36 @@
 
         self.end_points = [end_point0, end_point1]
-        self.enquiry_gap_factor = enquiry_gap_factor
         
         if height is None:
@@ -58 +44 @@
         
         self.verbose=verbose
-        self.filename = None
        
         # Create the fundamental culvert polygons and create inlet objects
@@ -66 +51 @@
         self.inlets = []
         polygon0 = self.inlet_polygons[0]
-        enquiry_pt0 = self.enquiry_points[0]
         inlet0_vector = self.culvert_vector
-        self.inlets.append(inlet.Inlet(self.domain, polygon0, enquiry_pt0, inlet0_vector))
+        self.inlets.append(inlet.Inlet(self.domain, polygon0))
 
         polygon1 = self.inlet_polygons[1]
-        enquiry_pt1 = self.enquiry_points[1]
         inlet1_vector = - self.culvert_vector
-        self.inlets.append(inlet.Inlet(self.domain, polygon1, enquiry_pt1, inlet1_vector))
- 
-
+        self.inlets.append(inlet.Inlet(self.domain, polygon1))
    
         self.print_stats()
@@ -146 +127 @@
         print 'Generic Culvert Operator'
         print '====================================='
-        print "enquiry_gap_factor"
-        print self.enquiry_gap_factor
         
         for i, inlet in enumerate(self.inlets):
@@ -161 +140 @@
             print inlet.polygon
 
-            print 'enquiry_point'
-            print inlet.enquiry_point
-
         print '====================================='
 
@@ -196 +172 @@
         h = self.height*self.culvert_vector    # Vector of length=height in the
                              # direction of the culvert
-        gap = (1 + self.enquiry_gap_factor)*h
 
         self.inlet_polygons = []
-        self.enquiry_points = []
 
         # Build exchange polygon and enquiry points 0 and 1
@@ -209 +183 @@
             p3 = p0 + i0*h
             self.inlet_polygons.append(num.array([p0, p1, p2, p3]))
-            self.enquiry_points.append(self.end_points[i] + i0*gap)
 
         # Check that enquiry points are outside inlet polygons
@@ -219 +192 @@
             area = polygon_area(polygon)
             
-
             msg = 'Polygon %s ' %(polygon)
             msg += ' has area = %f' % area
             assert area > 0.0, msg
-
-            for j in [0,1]:
-                point = self.enquiry_points[j]
-                msg = 'Enquiry point falls inside a culvert polygon.'
-
-                assert not inside_polygon(point, polygon), msg
-
     
 

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

@@ -10 +10 @@
     """
 
-    def __init__(self, domain, polygon, enquiry_point, inlet_vector):
+    def __init__(self, domain, polygon):
 
         self.domain = domain
         self.domain_bounding_polygon = self.domain.get_boundary_polygon()
         self.polygon = polygon
-        self.enquiry_point = enquiry_point
-        self.inlet_vector = inlet_vector
 
         # FIXME (SR) Using get_triangle_containing_point which needs to be sped up
-        self.enquiry_index = self.domain.get_triangle_containing_point(self.enquiry_point)
 
         self.compute_triangle_indices()