Changeset 1091

Timestamp:

Mar 16, 2005, 6:56:12 PM (20 years ago)

Author:

ole

Message:

Diagnostic output (if verbose is requested)

Location:

inundation/ga/storm_surge/pyvolution

Files:

• least_squares.py (modified) (3 diffs)
• test_util.py (modified) (1 diff)
• util.py (modified) (2 diffs)
• util_ext.c (modified) (3 diffs)

inundation/ga/storm_surge/pyvolution/least_squares.py

@@ -24 +24 @@
 # solution was having the user increase the size of the mesh to
 #       cover all the desired points.
+#(Ole): Now we've got a pre-cropping facility.
 
 
@@ -105 +106 @@
     #FIXME (Ole): data_origin should be extracted here
     try:
-        point_dict = load_points_file(point_file,delimiter = ',')
+        point_dict = load_points_file(point_file,
+                                      delimiter = ',',
+                                      verbose=verbose)
     except SyntaxError,e:
-        point_dict = load_points_file(point_file,delimiter = ' ')
+        point_dict = load_points_file(point_file,
+                                      delimiter = ' ',
+                                      verbose=verbose)
+        
     point_coordinates = point_dict['pointlist']
     title_list,point_attributes = concatinate_attributelist(point_dict['attributelist'])  
@@ -427 +433 @@
             if verbose: print 'Getting indices inside mesh boundary'           
             indices = inside_polygon(point_coordinates, P, verbose = verbose)
-
+            
             if verbose:
+                print 'Done'
                 if len(indices) != point_coordinates.shape[0]:
                     print '%d points outside mesh have been cropped.'\

inundation/ga/storm_surge/pyvolution/test_util.py

@@ -915 +915 @@
         polygon = [[0,0], [1,0], [0.5,-1], [2, -1], [2,1], [0,1]]
         points = [ [0.5, 0.5], [1, -0.5], [1.5, 0], [0.5, 1.5], [0.5, -0.5]]
-        res = inside_polygon( points, polygon )
+        res = inside_polygon( points, polygon, verbose=False )
 
         assert allclose( res, [0,1,2] )

inundation/ga/storm_surge/pyvolution/util.py

@@ -1045 +1045 @@
     from Numeric import array, Float, reshape, zeros, Int
     
-    
+
+    if verbose: print 'Checking input to inside_polygon'    
     #Input checks
     try:
@@ -1076 +1077 @@
     from util_ext import inside_polygon
 
+    if verbose: print 'Allocating array for indices'
+
     indices = zeros( points.shape[0], Int )
 
+    if verbose: print 'Calling C-version of inside poly' 
     count = inside_polygon(points, polygon, indices,
                            int(closed), int(verbose))
-
-    #print 'O', point, count
 
     if one_point:
         return count == 1
     else:
+        if verbose: print 'Got %d points' %count
         return indices[:count]
 

inundation/ga/storm_surge/pyvolution/util_ext.c

@@ -77 +77 @@
   //are far away from polygon
 
-
   minpx = polygon[0]; maxpx = minpx;
   minpy = polygon[1]; maxpy = minpy;
@@ -94 +93 @@
   count = 0;
   for (k=0; k<M; k++) {
-    //FIXME: Do this later
-    //if (verbose){
-    //  if (k %((M+10)/10)==0: print 'Doing %d of %d' %(k, M)
-
+    if (verbose){
+      if (k %((M+10)/10)==0) printf("Doing %d of %d\n", k, M);
+    }
+    
     x = points[2*k];
     y = points[2*k + 1];
@@ -230 +229 @@
   N = polygon -> dimensions[0];  //Number of vertices in polygon
 
-  //printf("M=%d, N=%d\n", M, N);
+  if (verbose) printf("Got %d points and %d polygon vertices\n", M, N);
+  
   //Call underlying routine
   count = _inside_polygon(M, N,