Changeset 8847 for trunk/anuga_core/source/anuga/file_conversion/sww2array.py

Timestamp:

Apr 22, 2013, 2:59:58 PM (12 years ago)

Author:

steve

Message:

Small changes to sww2array looking for memory leak

File:

• trunk/anuga_core/source/anuga/file_conversion/sww2array.py (modified) (3 diffs)

trunk/anuga_core/source/anuga/file_conversion/sww2array.py

@@ -27 +27 @@
 
 # Default block size for sww2dem()
-DEFAULT_BLOCK_SIZE = 10000
+DEFAULT_BLOCK_SIZE = 100000
 
 def sww2array(name_in,
@@ -197 +197 @@
         
         # Get slices of all required variables
-        q_dict = {}
-        for name in var_list:
-            # check if variable has time axis
-            if len(fid.variables[name].shape) == 2:
-                q_dict[name] = fid.variables[name][:,start_slice:end_slice]
-            else:       # no time axis
-                q_dict[name] = fid.variables[name][start_slice:end_slice]
-
-        # Evaluate expression with quantities found in SWW file
-        res = apply_expression_to_dictionary(quantity, q_dict)
-
-        if len(res.shape) == 2:
-            new_res = num.zeros(res.shape[1], num.float)
-            for k in xrange(res.shape[1]):
-                if type(reduction) is not types.BuiltinFunctionType:
-                    new_res[k] = res[reduction,k]
-                else:
-                    new_res[k] = reduction(res[:,k])
-            res = new_res
+        if type(reduction) is not types.BuiltinFunctionType:
+            q_dict = {}
+            for name in var_list:
+                # check if variable has time axis
+                if len(fid.variables[name].shape) == 2:
+                    print 'avoiding large array'
+                    q_dict[name] = fid.variables[name][reduction,start_slice:end_slice]
+                else:       # no time axis
+                    q_dict[name] = fid.variables[name][start_slice:end_slice]
+
+            # Evaluate expression with quantities found in SWW file
+            res = apply_expression_to_dictionary(quantity, q_dict)
+
+#            if len(res.shape) == 2:
+#                new_res = num.zeros(res.shape[1], num.float)
+#                for k in xrange(res.shape[1]):
+#                    if type(reduction) is not types.BuiltinFunctionType:
+#                        new_res[k] = res[k]
+#                    else:
+#                        new_res[k] = reduction(res[:,k])
+#                res = new_res
+        else:
+            q_dict = {}
+            for name in var_list:
+                # check if variable has time axis
+                if len(fid.variables[name].shape) == 2:
+                    q_dict[name] = fid.variables[name][:,start_slice:end_slice]
+                else:       # no time axis
+                    q_dict[name] = fid.variables[name][start_slice:end_slice]
+
+            # Evaluate expression with quantities found in SWW file
+            res = apply_expression_to_dictionary(quantity, q_dict)
+
+            if len(res.shape) == 2:
+                new_res = num.zeros(res.shape[1], num.float)
+                for k in xrange(res.shape[1]):
+                    if type(reduction) is not types.BuiltinFunctionType:
+                        new_res[k] = res[reduction,k]
+                    else:
+                        new_res[k] = reduction(res[:,k])
+                res = new_res
 
         result[start_slice:end_slice] = res
@@ -282 +304 @@
 
 
-
+    fid.close()
+    
     #print outside_indices