Changeset 3633

Timestamp:

Sep 20, 2006, 3:07:50 PM (18 years ago)

Author:

ole

Message:

Fixed diagnostic counting error and improved messages.

Location:

anuga_core/source/anuga

Files:

• fit_interpolate/fit.py (modified) (1 diff)
• fit_interpolate/interpolate.py (modified) (1 diff)
• utilities/polygon.py (modified) (3 diffs)
• utilities/polygon_ext.c (modified) (1 diff)

anuga_core/source/anuga/fit_interpolate/fit.py

@@ -259 +259 @@
         
         n = len(self.inside_poly_indices)
+        if verbose: print 'Building fitting matrix from %d points' %n        
         #Compute matrix elements for points inside the mesh
-        for i in self.inside_poly_indices:
+        for k, i in enumerate(self.inside_poly_indices):
             #For each data_coordinate point
-            if verbose and i%((n+10)/10)==0: print 'Doing %d of %d' %(i, n)
+            if verbose and k%((n+10)/10)==0: print 'Doing %d of %d' %(k, n)
             x = point_coordinates[i]
             element_found, sigma0, sigma1, sigma2, k = \

anuga_core/source/anuga/fit_interpolate/interpolate.py

@@ -254 +254 @@
         n = len(self.inside_poly_indices)
         #Compute matrix elements for points inside the mesh
-        for i in self.inside_poly_indices:
+        if verbose: print 'Building interpolation matrix fram %d points' %n
+        for k, i in enumerate(self.inside_poly_indices):
             #For each data_coordinate point
-            if verbose and i%((n+10)/10)==0: print 'Doing %d of %d' %(i, n)
+            if verbose and k%((n+10)/10)==0: print 'Doing %d of %d' %(k, n)
             x = point_coordinates[i]
             element_found, sigma0, sigma1, sigma2, k = \

anuga_core/source/anuga/utilities/polygon.py

@@ -300 +300 @@
     outside_index = M-1 #Keep track of points outside (starting from end)
 
+    if verbose: print 'Separating %d points' %M        
     for k in range(M):
 
@@ -374 +375 @@
         raise msg
 
-    if verbose: print 'check'
+    #if verbose: print 'check'
 
     assert len(polygon.shape) == 2,\
@@ -397 +398 @@
     indices = zeros( M, Int )
 
-    if verbose: print 'Calling C-version of inside poly'
+    #if verbose: print 'Calling C-version of inside poly'
 
     count = separate_points_by_polygon(points, polygon, indices,
                                        int(closed), int(verbose))
 
+    if verbose: print 'Found %d points (out of %d) inside polygon'\
+       %(count, M)
     return indices, count
 

anuga_core/source/anuga/utilities/polygon_ext.c

@@ -89 +89 @@
   inside_index = 0;    //Keep track of points inside
   outside_index = M-1; //Keep track of points outside (starting from end)   
+  if (verbose){
+     printf("Separating %d points\n", M);
+  }  
   for (k=0; k<M; k++) {
     if (verbose){