Changeset 3967

Timestamp:

Nov 13, 2006, 10:23:07 AM (18 years ago)

Author:

sexton

Message:

update sww2dem so that export can occur at given timestep

File:

• anuga_core/source/anuga/shallow_water/data_manager.py (modified) (4 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]
+    else:
+        times = fid.variables['time'][:]
 
     number_of_timesteps = fid.dimensions['number_of_timesteps']
     number_of_points = fid.dimensions['number_of_points']
+    
     if origin is None:
 
@@ -1921 +1923 @@
         else:
             print '    t [s] in [%f, %f], len(t) == %d'\
-                  %(min(times), max(times), len(times))
+              %(min(times), max(times), len(times))
         print '  Quantities [SI units]:'
-        for name in ['stage', 'xmomentum', 'ymomentum', 'elevation']:
+        for name in ['stage', 'xmomentum', 'ymomentum']:
             q = fid.variables[name][:].flat
-            print '    %s in [%f, %f]' %(name, min(q), max(q))
-
-
+            if timestep is not None:
+                q = q[timestep*len(x):(timestep+1)*len(x)]
+            if verbose: print '    %s in [%f, %f]' %(name, min(q), max(q))
+        for name in ['elevation']:
+            q = fid.variables[name][:].flat
+            if verbose: print '    %s in [%f, %f]' %(name, min(q), max(q))
+            
     # Get quantity and reduce if applicable
     if verbose: print 'Processing quantity %s' %quantity
@@ -1934 +1940 @@
     quantity_dict = {}
     for name in fid.variables.keys():
-        quantity_dict[name] = fid.variables[name][:]
+        quantity_dict[name] = fid.variables[name][:] 
 
 
@@ -1945 +1951 @@
         if verbose: print 'Reducing quantity %s' %quantity
         q_reduced = zeros( number_of_points, Float )
-
-        for k in range(number_of_points):
-            q_reduced[k] = reduction( q[:,k] )
+        
+        if timestep is not None:
+            for k in range(number_of_points):
+                q_reduced[k] = q[timestep,k] 
+        else:
+            for k in range(number_of_points):
+                q_reduced[k] = reduction( q[:,k] )
 
         q = q_reduced