Changeset 7954

Timestamp:

Aug 19, 2010, 10:15:38 AM (14 years ago)

Author:

habili

Message:

Minor refactoring

File:

• trunk/anuga_core/source/anuga/structures/culvert_polygons.py (modified) (6 diffs)

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

@@ -11 +11 @@
 def create_culvert_polygons(end_point0,
                             end_point1, 
-                            width, height=None,
+                            width, 
+                            height=None,
                             enquiry_gap_factor=0.2,
                             number_of_barrels=1):
@@ -56 +57 @@
     dy = y1-y0
 
-    vector = num.array([dx, dy])
-    length = sqrt(num.sum(vector**2))
+    dxdy = num.array([dx, dy])
+    length = sqrt(num.sum(dxdy**2))
 
     # Adjust polygon width to number of barrels in this culvert
@@ -64 +65 @@
     
     # Unit direction vector and normal 
-    vector /= length                 # Unit vector in culvert direction
+    dxdy /= length                 # Unit vector in culvert direction
     normal = num.array([-dy, dx])/length # Normal vector
     
-    culvert_polygons['vector'] = vector
+    culvert_polygons['vector'] = dxdy
     culvert_polygons['length'] = length
     culvert_polygons['normal'] = normal    
@@ -73 +74 @@
     # Short hands
     w = 0.5*width*normal # Perpendicular vector of 1/2 width 
-    h = height*vector    # Vector of length=height in the
-                         # direction of the culvert
+    h = height*dxdy # Vector of length=height in the
+                    # direction of the culvert
     gap = (1 + enquiry_gap_factor)*h 
                          
@@ -96 +97 @@
 
     # Check that enquiry polygons are outside exchange polygons
-    for key1 in ['exchange_polygon0',
-                 'exchange_polygon1']:
+    for key1 in ['exchange_polygon0', 'exchange_polygon1']:
         polygon = culvert_polygons[key1]
         area = polygon_area(polygon)
@@ -108 +108 @@
             point = culvert_polygons[key2]
             msg = 'Enquiry point falls inside an enquiry point.'
-            msg += 'Email Ole.Nielsen@ga.gov.au'
             assert not inside_polygon(point, polygon), msg