Changeset 4292

Timestamp:

Mar 5, 2007, 3:55:18 PM (18 years ago)

Author:

duncan

Message:

verbose fix

File:

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

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -3103 +3103 @@
         fields = line.split(',')
         realtime = calendar.timegm(time.strptime(fields[0], time_format))
-
         T[i] = realtime - starttime
 
@@ -3112 +3111 @@
     msg += 'increasing sequence'
     assert alltrue( T[1:] - T[:-1] > 0 ), msg
-
 
     #Create NetCDF file
@@ -4598 +4596 @@
     origin
     #mint=None, maxt=None,
-    """    
+    """ 
     from anuga.pmesh.mesh import Mesh
 
@@ -4637 +4635 @@
 
     #mesh.export_mesh_file(basename_in + '.tsh')
-    
     times = []
     for i in range(a_mux.time_step_count):
@@ -4661 +4658 @@
     write_sww_triangulation(outfile, points_utm, volumes,
                             elevation, zone,  origin=origin, verbose=verbose)
+    
+    if verbose: print 'Converting quantities'
     j = 0
     # Read in a time slice from each mux file and write it to the sww file
@@ -4748 +4747 @@
     # This will put the geo ref in the middle
     #geo_ref = Geo_reference(refzone,(max(x)+min(x))/2.0,(max(x)+min(y))/2.)
-
-
+    x =  points_utm[:,0]
+    y =  points_utm[:,1]
+    z = outfile.variables['z'][:]
+    #FIXME the w.r.t time is lost now..
     if verbose:
         print '------------------------------------------------'
@@ -4761 +4762 @@
                 len(y))
         print '    z in [%f, %f], len(z) == %d'\
-              %(min(z), max(z),
-                len(z))
+              %(min(elevation), max(elevation),
+                len(elevation))
         print 'geo_ref: ',geo_ref
         print '------------------------------------------------'
@@ -4784 +4785 @@
     ymomentum = outfile.variables['ymomentum']
 
-    if verbose: print 'Converting quantities'
     n = len(has)
     j=0
@@ -4805 +4805 @@
     ymomentum = outfile.variables['ymomentum']
 
-    if verbose: print 'Converting quantities'
     
     w = zscale*ha + mean_stage