Changeset 3961

Timestamp:

Nov 9, 2006, 5:01:09 PM (18 years ago)

Author:

sexton

Message:

allow sww2dem to work on a given timestep (rather than maximise or minimise across all time)

File:

• anuga_core/source/anuga/shallow_water/data_manager.py (modified) (8 diffs)

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -1874 +1874 @@
     y = fid.variables['y'][:]
     volumes = fid.variables['volumes'][:]
+    times = fid.variables['time'][:]
+    if timestep is not None:
+        times = fid.variables['time'][timestep]
 
     number_of_timesteps = fid.dimensions['number_of_timesteps']
@@ -1899 +1902 @@
     #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:'
@@ -1908 +1908 @@
         print '    Lower left corner: [%f, %f]'\
               %(xllcorner, yllcorner)
-        print '    Start time: %f' %fid.starttime[0]
+        if timestep is not None:
+            print '    Time: %f' %(times)
+        else:
+            print '    Start time: %f' %fid.starttime[0]
         print '  Extent:'
         print '    x [m] in [%f, %f], len(x) == %d'\
@@ -1914 +1917 @@
         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))
+        if timestep is not None:
+            print '    t [s] = %f, len(t) == %d' %(times, 1)
+        else:
+            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']:
@@ -1922 +1928 @@
 
 
-
-
-
     # Get quantity and reduce if applicable
     if verbose: print 'Processing quantity %s' %quantity
@@ -1934 +1937 @@
 
 
-
     # Convert quantity expression to quantities found in sww file    
     q = apply_expression_to_dictionary(quantity, quantity_dict)
-
-
 
     if len(q.shape) == 2:
@@ -1996 +1996 @@
     x = x+xllcorner-newxllcorner
     y = y+yllcorner-newyllcorner
-
+    
     vertex_points = concatenate ((x[:, NewAxis] ,y[:, NewAxis]), axis = 1)
     assert len(vertex_points.shape) == 2
-
-
 
     grid_points = zeros ( (ncols*nrows, 2), Float )
@@ -2023 +2021 @@
     from anuga.fit_interpolate.interpolate import Interpolate
 
-
+    print 'hello', vertex_points.shape, volumes.shape
     interp = Interpolate(vertex_points, volumes, verbose = verbose)
-
-
 
     #Interpolate using quantity values