Changeset 5115

Timestamp:

Mar 4, 2008, 4:20:10 PM (16 years ago)

Author:

duncan

Message:

removing debug print statements. Reducing memory use of sww2dem

File:

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

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -1958 +1958 @@
 
     # Turn NetCDF objects into Numeric arrays
-    quantity_dict = {}
-    for name in fid.variables.keys():
-        quantity_dict[name] = fid.variables[name][:] 
-
-
-    # Convert quantity expression to quantities found in sww file    
-    q = apply_expression_to_dictionary(quantity, quantity_dict)
+    try:
+        q = fid.variables[quantity][:] 
+    except:
+        quantity_dict = {}
+        for name in fid.variables.keys():
+            quantity_dict[name] = fid.variables[name][:] 
+        #Convert quantity expression to quantities found in sww file    
+        q = apply_expression_to_dictionary(quantity, quantity_dict)
 
     if len(q.shape) == 2:
@@ -1985 +1986 @@
     assert q.shape[0] == number_of_points
 
-
     if verbose:
         print 'Processed values for %s are in [%f, %f]' %(quantity, min(q), max(q))
@@ -2018 +2018 @@
     ncols = int((xmax-xmin)/cellsize)+1
     nrows = int((ymax-ymin)/cellsize)+1
+    
 
 
@@ -4169 +4170 @@
 
     #if os.access(files_in[0]+'.mux', os.F_OK) == 0 :
-    print "dfdfds"
     for i, file_name in enumerate(files_in):
         if os.access(file_name, os.F_OK) == 0:
@@ -4178 +4178 @@
                files_in[i] += '.mux'
                print "file_name", file_name
-    print "files_in",   files_in
     hashed_elevation = None
     for file_in, file_out, quantity in map(None, files_in,