Changeset 2045

Timestamp:

Nov 21, 2005, 1:49:50 PM (19 years ago)

Author:

ole

Message:

Changed expand_search back to True.

File:

• inundation/pyvolution/data_manager.py (modified) (8 diffs)

inundation/pyvolution/data_manager.py

@@ -1427 +1427 @@
             easting_max = None,
             northing_min = None,
-            northing_max = None,          
+            northing_max = None,
+            expand_search = False, #To avoid intractable situations (This will be fixed when least_squares gets redesigned)           
             verbose = False,
             origin = None,
@@ -1529 +1530 @@
 
 
+    #FIXME: Refactor using code from file_function.statistics
+    #Something like print swwstats(swwname)
+    if verbose:
+        x = fid.variables['x'][:]
+        y = fid.variables['y'][:]
+        times = fid.variables['time'][:]
+        print '------------------------------------------------'
+        print 'Statistics of SWW file:'
+        print '  Name: %s' %swwfile
+        print '  Reference:'
+        print '    Lower left corner: [%f, %f]'\
+              %(xllcorner, yllcorner)
+        print '    Start time: %f' %fid.starttime[0]
+        print '  Extent:'
+        print '    x [m] in [%f, %f], len(x) == %d'\
+              %(min(x.flat), max(x.flat), len(x.flat))
+        print '    y [m] in [%f, %f], len(y) == %d'\
+              %(min(y.flat), max(y.flat), len(y.flat))
+        print '    t [s] in [%f, %f], len(t) == %d'\
+              %(min(times), max(times), len(times))
+        print '  Quantities [SI units]:'
+        for name in ['stage', 'xmomentum', 'ymomentum', 'elevation']:
+            q = fid.variables[name][:].flat
+            print '    %s in [%f, %f]' %(name, min(q), max(q))
+
+
+
+
+
     #Get quantity and reduce if applicable
     if verbose: print 'Processing quantity %s' %quantity
@@ -1539 +1569 @@
 
     q = apply_expression_to_dictionary(quantity, quantity_dict)
+
 
 
@@ -1555 +1586 @@
     assert len(q.shape) == 1
     assert q.shape[0] == number_of_points    
+    
+
+    if verbose:
+        print 'Processed values for %s are in [%f, %f]' %(quantity, min(q), max(q))
     
 
@@ -1625 +1660 @@
 
     interp = Interpolation(vertex_points, volumes, grid_points, alpha=0.0,
-                           precrop = False, expand_search = True,
+                           precrop = False,
+                           expand_search = expand_search,
                            verbose = verbose)
+
+    
 
     #Interpolate using quantity values
     if verbose: print 'Interpolating'
     grid_values = interp.interpolate(q).flat
+
+    if verbose:
+        print 'Interpolated values are in [%f, %f]' %(min(grid_values),
+                                                      max(grid_values))
 
     if format.lower() == 'ers':
@@ -2297 +2339 @@
     outfile.variables['x'][:] = x - xllcorner
     outfile.variables['y'][:] = y - yllcorner
-    outfile.variables['z'][:] = z
-    outfile.variables['elevation'][:] = z  #FIXME HACK
+    outfile.variables['z'][:] = z             #FIXME HACK
+    outfile.variables['elevation'][:] = z  
     outfile.variables['time'][:] = times   #Store time relative
     outfile.variables['volumes'][:] = volumes.astype(Int32) #On Opteron 64
@@ -2323 +2365 @@
                 i += 1
 
-
+    #outfile.close()                
+
+    #FIXME: Refactor using code from file_function.statistics
+    #Something like print swwstats(swwname)
     if verbose:
         x = outfile.variables['x'][:]
         y = outfile.variables['y'][:]
+        times = outfile.variables['time'][:]
         print '------------------------------------------------'
         print 'Statistics of output file:'
@@ -2348 +2394 @@
 
 
-
-    outfile.close()
+    outfile.close()                
+