Changeset 4852

Timestamp:

Nov 22, 2007, 5:51:01 PM (17 years ago)

Author:

sexton

Message:

more updates to plotting points inside and outside boundary polygon

Location:

anuga_core/source/anuga

Files:

• fit_interpolate/interpolate.py (modified) (2 diffs)
• shallow_water/test_shallow_water_domain.py (modified) (1 diff)
• utilities/polygon.py (modified) (3 diffs)

anuga_core/source/anuga/fit_interpolate/interpolate.py

@@ -552 +552 @@
                 msg += 'outside specified mesh. '
                 msg += 'Offending points:\n'
+                out_interp_pts = []
                 for i in indices:
                     msg += '%d: %s\n' %(i, interpolation_points[i])
-
-                #from anuga.utilities.polygon import plot_polygons_points
-                #in_interp_pts = 
+                    out_interp_pts.append(ensure_numeric(interpolation_points[i]))
+
+                from anuga.utilities.polygon import plot_polygons_points
                 #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)
+                title = 'Interpolation points fall outside specified mesh'
+                plot_polygons_points([mesh_boundary_polygon,interpolation_points,out_interp_pts],
+                                     ['line','point','outside'],figname='points_boundary_out',label=title,verbose=verbose)
 
                 # Joaquim Luis suggested this as an Exception, so
@@ -575 +576 @@
                 title = 'Interpolation function: Polygon and interpolation points'
                 plot_polygons_points([mesh_boundary_polygon,interpolation_points],
-                                     ['line','point'],label=title,verbose=verbose)
+                                     ['line','point'],figname='points_boundary',label=title,verbose=verbose)
 
             m = len(self.interpolation_points)

anuga_core/source/anuga/shallow_water/test_shallow_water_domain.py

@@ -5103 +5103 @@
         #                              domain2)
         Bf = Field_boundary(domain1.get_name() + '.' + domain1.format,
-                            domain2, mean_stage=1, verbose=True)
+                            domain2, mean_stage=1, verbose=False)
         
         domain2.set_boundary({'right':Br, 'bottom':Br, 'diagonal':Bf})

anuga_core/source/anuga/utilities/polygon.py

@@ -378 +378 @@
 
     if label is None: label = ''
-    
+
     n = len(polygons_points)
     colour = []
@@ -389 +389 @@
     else:
         for s in style:
-            if s == 'line':
-                colour.append('b-')            
-            if s == 'outside':
-                colour.append('r.')
-            else:
-                colour.append('g.')
+            if s == 'line': colour.append('b-')            
+            if s == 'outside': colour.append('r.')
+            if s <> 'line':
+                if s <> 'outside':
+                    colour.append('g.')
             
     for i, item in enumerate(polygons_points):
-        x, y = poly_xy(item)  
+        x, y = poly_xy(item)
         if min(x) < minx: minx = min(x)
         if max(x) > maxx: maxx = max(x)
@@ -406 +405 @@
         ylabel('y')
         title(label)
-
+        
+    if minx <> 0:
+        axis([minx*0.9,maxx*1.1,miny*0.9,maxy*1.1])
+    else:
+        if miny == 0:
+            axis([-maxx*.01,maxx*1.1,-maxy*0.01,maxy*1.1])
+        else:
+            axis([-maxx*.01,maxx*1.1,miny*0.9,maxy*1.1])
+    
     if figname is not None:
         savefig(figname)