Changeset 8847

Timestamp:

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

Author:

steve

Message:

Small changes to sww2array looking for memory leak

Location:

trunk/anuga_core/source/anuga

Files:

• abstract_2d_finite_volumes/quantity_ext.c (modified) (1 diff)
• file_conversion/calc_grid_values_ext.c (modified) (4 diffs)
• file_conversion/sww2array.py (modified) (3 diffs)

trunk/anuga_core/source/anuga/abstract_2d_finite_volumes/quantity_ext.c

@@ -1531 +1531 @@
 
   // Release
+  Py_DECREF(domain);
   Py_DECREF(domain_centroids);
   Py_DECREF(domain_surrogate_neighbours);

trunk/anuga_core/source/anuga/file_conversion/calc_grid_values_ext.c

@@ -412 +412 @@
         long *volumes; 
         double nodata_val;
-        double cell_size;
+    double cell_size;
         double *x, *y;
-        double *norms;
+    double *norms;
         double *result;
         double *grid_val;
         PyObject *pyobj_x;
-        PyObject *pyobj_y;
-        PyObject *pyobj_norms;
+    PyObject *pyobj_y;
+    PyObject *pyobj_norms;
         PyObject *pyobj_volumes;
         PyObject *pyobj_result;
@@ -427 +427 @@
                                 &nrow,
                                 &ncol,
-                                &cell_size,
+                &cell_size,
                                 &nodata_val, 
                                 &pyobj_x,
-                                &pyobj_y,
-                                &pyobj_norms,
+                &pyobj_y,
+                &pyobj_norms,
                                 &pyobj_volumes, 
                                 &pyobj_result,
@@ -446 +446 @@
         // get data from python objects
         x = DDATA( pyobj_x );
-        y = DDATA( pyobj_y );
-        norms    = DDATA( pyobj_norms );
+    y = DDATA( pyobj_y );
+    norms    = DDATA( pyobj_norms );
         result   = DDATA( pyobj_result );
         grid_val = DDATA( pyobj_grid_val );
@@ -455 +455 @@
         num_tri  = ((PyArrayObject*)pyobj_volumes)->dimensions[0];
         num_vert = ((PyArrayObject*)pyobj_x)->dimensions[0];
-        num_norms = ((PyArrayObject*)pyobj_norms)->dimensions[0];
-        num_grid_val = ((PyArrayObject*)pyobj_grid_val)->dimensions[0];
-
-        //printf("==== %d %d %d %d %d \n",num_norms,num_tri,num_vert,nrow,ncol);
+    num_norms = ((PyArrayObject*)pyobj_norms)->dimensions[0];
+    num_grid_val = ((PyArrayObject*)pyobj_grid_val)->dimensions[0];
+
+    //printf("==== %d %d %d %d %d \n",num_norms,num_tri,num_vert,nrow,ncol);
 
         // init triangle array

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