Changeset 4623

Timestamp:

Jul 12, 2007, 3:31:51 PM (17 years ago)

Author:

ole

Message:

Allowed create_mesh_from_regions to (optionally) allow interior polygons
to fall outside the bounding polygon. In such cases they can now be ignored
by setting the keyword argument fail_if_polygons_outside to False.

File:

• anuga_core/source/anuga/pmesh/mesh_interface.py (modified) (6 diffs)

anuga_core/source/anuga/pmesh/mesh_interface.py

@@ -29 +29 @@
                              mesh_geo_reference=None,
                              minimum_triangle_angle=28.0,
+                             fail_if_polygons_outside=True,
                              use_cache=False,
                              verbose=True):
@@ -68 +69 @@
     Note, interior regions should be fully nested, as overlaps may cause
     unintended resolutions. 
+
+    fail_if_polygons_outside: If True (the default) Exception in thrown
+    where interior polygons fall outside bounding polygon. If False, these
+    will be ignored and execution continued.
+        
     
     """
@@ -82 +88 @@
               'mesh_geo_reference': mesh_geo_reference,
               'minimum_triangle_angle': minimum_triangle_angle,
+              'fail_if_polygons_outside': fail_if_polygons_outside,
               'verbose': verbose}   # FIXME (Ole): Should be bypassed one day
                                     # What should be bypassed? Verbose?
@@ -118 +125 @@
                               mesh_geo_reference=None,
                               minimum_triangle_angle=28.0,
+                              fail_if_polygons_outside=True,
                               verbose=True):
     """_create_mesh_from_regions - internal function.
@@ -145 +153 @@
     if interior_regions is not None:        
         # Test that all the interior polygons are inside the bounding_poly
+        # and throw out those that aren't fully included.
+
+        polygons_inside_boundary = []
         for interior_polygon, res in interior_regions:
             indices = inside_polygon(interior_polygon, bounding_polygon,
@@ -150 +161 @@
     
             if len(indices) <> len(interior_polygon): 
-                msg = 'Interior polygon %s is outside bounding polygon: %s'\
-                      %(str(interior_polygon), str(bounding_polygon))
-                raise PolygonError, msg
+                msg = 'Interior polygon %s is not fully inside'\
+                      %(str(interior_polygon))
+                msg += ' bounding polygon: %s.' %(str(bounding_polygon))
+
+                if fail_if_polygons_outside is True:
+                    raise PolygonError, msg                    
+                else:
+                    msg += ' I will ignore it.'
+                    print msg
+
+            else:
+                polygons_inside_boundary.append([interior_polygon, res])
+                
+        # Record only those that were fully contained        
+        interior_regions = polygons_inside_boundary
+
+            
     
 # the following segment of code could be used to Test that all the