Changeset 4833

Timestamp:

Nov 20, 2007, 2:15:58 PM (17 years ago)

Author:

ole

Message:

Suggestion towards ticket:217

Location:

anuga_core/source/anuga

Files:

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

anuga_core/source/anuga/fit_interpolate/interpolate.py

@@ -512 +512 @@
             
             try:
-                self.interpolation_points = ensure_numeric(interpolation_points)
+                self.interpolation_points = interpolation_points = ensure_numeric(interpolation_points)
             except:
                 msg = 'Interpolation points must be an N x 2 Numeric array '+\
@@ -525 +525 @@
             from anuga.abstract_2d_finite_volumes.neighbour_mesh import Mesh
             from anuga.utilities.polygon import outside_polygon            
-            
+
+            # Create temporary mesh object from mesh info passed
+            # into this function. 
             mesh = Mesh(vertex_coordinates, triangles)
+            mesh_boundary_polygon = mesh.get_boundary_polygon()
+
             
             indices = outside_polygon(interpolation_points,
-                                      mesh.get_boundary_polygon())
-
+                                      mesh_boundary_polygon)
 
             # Record result
+            #self.mesh_boundary_polygon = mesh_boundary_polygon
             self.indices_outside_mesh = indices
 
@@ -551 +555 @@
                 #raise Exception(msg)
 
-
+            # 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')
             
 

anuga_core/source/anuga/shallow_water/test_shallow_water_domain.py

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