Changeset 9343 for trunk/anuga_work

Timestamp:

Sep 22, 2014, 11:15:38 AM (11 years ago)

Author:

davies

Message:

Fixing bug in bounding polygon shapefile routine

Location:

trunk/anuga_work/development/gareth/template_scenarios/tsunami/tsunami3/scripts

Files:

• ANUGA_setup.xls (modified) (previous)
• user_functions.py (modified) (3 diffs)

trunk/anuga_work/development/gareth/template_scenarios/tsunami/tsunami3/scripts/user_functions.py

@@ -94 +94 @@
         {boundary_line_and_tags[0][1]: range(len(bounding_polygon) - 1)}
 
+    # Treat the case of a 'closed' polygon with first point == last point
+    # by dropping the last point
+    if bounding_polygon[0] == bounding_polygon[-1]:
+        bounding_polygon = [bounding_polygon[k] for k in range(len(bounding_polygon)-1)]
+
     for i in range(boundary_segnum - 1):
+        # Loop over all the 'other' boundary segments, and find the line which
+        # starts at the end point of bounding_polygon
 
-        # Find the line which starts at the end point of bounding_polygon
+        found_match = False # Flag for error if no matching segments found
 
         for j in range(boundary_segnum):
             blj = boundary_line_and_tags[j][0]
             if blj[0] == bounding_polygon[-1]:
+
+                found_match = True
 
                 # Append all but the first point of blj to bounding_polygon
@@ -112 +121 @@
 
                 if i == boundary_segnum - 2:
+                    # The first and last points should match
+                    if bounding_polygon[0] != bounding_polygon[-1]:
+                        msg = 'The first and last points of the bounding ' + \
+                              'polygon are not identical'
+                        raise ValueError(msg)
+                    
+                    # Remove the last point
                     bounding_polygon = [bounding_polygon[k] for k in
                                         range(len(bounding_polygon) - 1)]
@@ -127 +143 @@
                 else:
                     boundary_tags[key] = new_tags
+                # Finish the j loop
+                break
+        # Check that a 'match' was found for every 'i' iteration
+        if not found_match:
+            raise Exception, 'Did not find a match'
 
     return (bounding_polygon, boundary_tags)