Changeset 4851

Timestamp:

Nov 22, 2007, 3:24:09 PM (17 years ago)

Author:

sexton

Message:

minor update

Location:

anuga_core/source/anuga

Files:

• abstract_2d_finite_volumes/test_neighbour_mesh.py (modified) (1 diff)
• fit_interpolate/interpolate.py (modified) (2 diffs)
• utilities/polygon.py (modified) (5 diffs)

anuga_core/source/anuga/abstract_2d_finite_volumes/test_neighbour_mesh.py

@@ -973 +973 @@
 
 
-        from anuga.utilities.polygon import plot_polygons
+        from anuga.utilities.polygon import plot_polygons_points
 
         # First do the continuous version of mesh

anuga_core/source/anuga/fit_interpolate/interpolate.py

@@ -555 +555 @@
                     msg += '%d: %s\n' %(i, interpolation_points[i])
 
+                #from anuga.utilities.polygon import plot_polygons_points
+                #in_interp_pts = 
+                #out_interp_pts = take(interpolation_points,[indices])
+                #title = 'Interpolation points fall outside specified mesh'
+                #plot_polygons_points([mesh_boundary_polygon,in_interp_pts,out_interp_pts],
+                #                     ['line','point','outside'],label=title,verbose=verbose)
+
                 # Joaquim Luis suggested this as an Exception, so
                 # that the user can now what the problem is rather than
@@ -564 +571 @@
 
             # Plot boundary and interpolation points
-            # FIXME (Jane): Here's a beginning towards plotting 
             if verbose is True:
                 from anuga.utilities.polygon import plot_polygons_points

anuga_core/source/anuga/utilities/polygon.py

@@ -341 +341 @@
     return abs(poly_area/2)
 
-def plot_polygons_points(polygons_points, style=None, figname=None, label=None, verbose=False):
+def plot_polygons_points(polygons_points, style=None, 
+                         figname=None, label=None, verbose=False):
     
     """ Take list of polygons and plot.
@@ -350 +351 @@
 
     style            - style list corresponding to each polygon
+                     - for a polygon, use 'line'
+                     - for points falling outside a polygon, use 'outside'
                         
     figname          - name to save figure to
@@ -377 +380 @@
     
     n = len(polygons_points)
+    colour = []
     if style is None:
         style_type = 'line' 
@@ -382 +386 @@
         for i in range(n):
             style.append(style_type)
-        
+            colour.append('b-')
+    else:
+        for s in style:
+            if s == 'line':
+                colour.append('b-')            
+            if s == 'outside':
+                colour.append('r.')
+            else:
+                colour.append('g.')
+            
     for i, item in enumerate(polygons_points):
         x, y = poly_xy(item)  
@@ -389 +402 @@
         if min(y) < miny: miny = min(y)
         if max(y) > maxy: maxy = max(y)
-        if style[i] is 'line':
-            plot(x,y,'b-')
-        else:
-            plot(x,y,'r.')
+        plot(x,y,colour[i])
         xlabel('x')
         ylabel('y')