Changeset 4845

Timestamp:

Nov 22, 2007, 1:54:53 PM (16 years ago)

Author:

sexton

Message:

generate plot to show interpolation points (which could be the model domain) with polygon of boundary file

Location:

anuga_core/source/anuga

Files:

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

anuga_core/source/anuga/fit_interpolate/interpolate.py

@@ -565 +565 @@
             # Plot boundary and interpolation points
             # FIXME (Jane): Here's a beginning towards plotting 
-            #if verbose is True:
-            #    from anuga.utilities.polygon import plot_polygons
-            #    from pylab import ion, hold, plot, axis, figure, legend, savefig, xlabel, ylabel, title, close                
-            #    plot_polygons([mesh_boundary_polygon],
-            #                  verbose=verbose)
-
-                # Add cloud of interpolation points to polygon plot
-            #    x = interpolation_points[:,0]
-            #    y = interpolation_points[:,1]                
-            #    plot(x, y, 'b.')
-            #    title('Interpolation function: Polygon and interpolation points')
-            
+            if verbose is True:
+                from anuga.utilities.polygon import plot_polygons_points
+                title = 'Interpolation function: Polygon and interpolation points'
+                plot_polygons_points([mesh_boundary_polygon,interpolation_points],
+                                     ['line','point'],label=title,verbose=verbose)
 
             m = len(self.interpolation_points)

anuga_core/source/anuga/shallow_water/test_shallow_water_domain.py

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

anuga_core/source/anuga/utilities/polygon.py

@@ -341 +341 @@
     return abs(poly_area/2)
 
-def plot_polygons(polygons, figname=None, verbose=False):
+def plot_polygons_points(polygons_points, style=None, figname=None, label=None, verbose=False):
     
     """ Take list of polygons and plot.
@@ -348 +348 @@
 
     polygons         - list of polygons
+
+    style            - style list corresponding to each polygon
                         
     figname          - name to save figure to
+
+    label            - title for plot
 
     Outputs:
@@ -357 +361 @@
     """ 
 
-    from pylab import ion, hold, plot, axis, figure, legend, savefig, xlabel, ylabel, title, close
-
-    assert type(polygons) == list,\
-               'input must be a list of polygons'
+    from pylab import ion, hold, plot, axis, figure, legend, savefig, xlabel, ylabel, title, close, title
+
+    assert type(polygons_points) == list,\
+               'input must be a list of polygons and/or points'
                
     ion()
@@ -369 +373 @@
     miny = 1e10
     maxy = 0.0
-    
-    for polygon in polygons:
-        x, y = poly_xy(polygon)  
+
+    if label is None: label = ''
+    
+    n = len(polygons_points)
+    if style is None:
+        style_type = 'line' 
+        style = []
+        for i in range(n):
+            style.append(style_type)
+        
+    for i, item in enumerate(polygons_points):
+        x, y = poly_xy(item)  
         if min(x) < minx: minx = min(x)
         if max(x) > maxx: maxx = max(x)
         if min(y) < miny: miny = min(y)
         if max(y) > maxy: maxy = max(y)
-        plot(x,y,'r-')
+        if style[i] is 'line':
+            plot(x,y,'b-')
+        else:
+            plot(x,y,'r.')
         xlabel('x')
         ylabel('y')
-
-    if figname is not None:    
+        title(label)
+
+    if figname is not None:
         savefig(figname)
     else:
-        raw_input('Press a key to continue')
+        savefig('test_image')
 
     close('all')