Changeset 4894

Timestamp:

Dec 21, 2007, 12:44:10 PM (16 years ago)

Author:

duncan

Message:

Good fix for the memory leak found in ticket#189

Location:

anuga_core/source/anuga

Files:

• alpha_shape/alpha_shape.py (modified) (1 diff)
• mesh_engine/mesh_engine.py (modified) (1 diff)
• mesh_engine/mesh_engine_c_layer.c (modified) (5 diffs)
• pmesh/mesh.py (modified) (1 diff)
• shallow_water/benchmark_sww2dem.py (modified) (3 diffs)

anuga_core/source/anuga/alpha_shape/alpha_shape.py

@@ -227 +227 @@
         self._init_boundary_triangles()
         
-        del tridata['generatedtriangleneighborlist']
-        del tridata['generatedpointmarkerlist']
-        del tridata['generatedpointlist']
-        #del tridata['generatedpointattributetitlelist']
-        del tridata['generatedsegmentlist']
-        del tridata['generatedsegmentmarkerlist']
-        del tridata['generatedtrianglelist']
-        del tridata['generatedtriangleattributelist']
-        del tridata['generatedpointattributelist']
         return
 

anuga_core/source/anuga/mesh_engine/mesh_engine.py

@@ -123 +123 @@
     #print "mode", mode
     #print "yeah" 
-    mesh_dict = triang.genMesh(points,segments,holes,regions,
+    mesh_dict, r_test = triang.genMesh(points,segments,holes,regions,
                           pointatts,segatts, mode, segments.flat)
     mesh_dict['qaz'] = 1 #debugging
+    ##print "r_test", r_test
     return mesh_dict
 

anuga_core/source/anuga/mesh_engine/mesh_engine_c_layer.c

@@ -62 +62 @@
 #include "Python.h" 
 
+//#define PY_ARRAY_UNIQUE_SYMBOL API_YEAH 
+
+#define PY_ARRAY_UNIQUE_SYMBOL API_YEAH
+//#define NO_IMPORT_ARRAY
 #include "Numeric/arrayobject.h"
-
+#include <sys/types.h>
 
  static PyObject *triang_genMesh(PyObject *self, PyObject *args){
@@ -214 +218 @@
   /*printf("\n\nTriangulate input args: %s \n\n", mod); */
   triangulate(mod, &in, &out, (struct triangulateio *)NULL );
-
+  
+  
+  /*
+  PyArray_FromDims allolws you to create a Numeric array with unitialized data.
+   The first argument is the size of the second argument (
+   the dimensions array).
+    The dimension array argument is just a 1D C array where each element of
+     the array is the size of that dimension. 
+     (int dimensions[2] = { 4, 3 }; defines a 4 by 3 array.) 
+     The third argument is just the desired type.
+  */
+  
+  //Py_Initialize();
+  // Testing passing a numeric array out
+  dimensions[0] = 4;
+  // Allocate space for return vectors a and b (don't DECREF)
+  r_test = (PyArrayObject *) PyArray_FromDims(1, dimensions, PyArray_DOUBLE);
+  
   /* printf(" ***  back from triangulate\n" );    */
   /*
@@ -330 +351 @@
     Py_DECREF(ii); Py_DECREF(holderlist);
   }   
-  /*
-  // Testing passing a numeric array out
-  dimensions[0] = 4;
-  // Allocate space for return vectors a and b (don't DECREF)
-  // This is crashing - don't know why
-  r_test = (PyArrayObject *) PyArray_FromDims(1, dimensions, PyArray_DOUBLE);
-  */ 
+  
+  
   
   /* Free in/out structure memory */
@@ -382 +398 @@
   }
   
-  /*Py_DECREF(holder);*/
-  R = Py_BuildValue((char *)"O", holder);
-  /*Py_DECREF(holder);* Try this to fix memory problems */
+  /* R = Py_BuildValue((char *)"O", holder); */
+  R = Py_BuildValue((char *)"OO", holder, PyArray_Return(r_test));
+  Py_DECREF(holder); /** This fixed a  memory problem ticket#189 */
+  Py_DECREF(r_test);
   return R;
 }
@@ -397 +414 @@
 void initmesh_engine_c_layer(){
   Py_InitModule((char *)"mesh_engine_c_layer",triang_methods);
+  
+  import_array(); // Necessary for handling of NumPY structures
 }    

anuga_core/source/anuga/pmesh/mesh.py

@@ -1581 +1581 @@
                                                    ObjectNeighbor[2])
             index += 1
-        #genDict['lonepointlist'].sort() 
-        #genDict['lonepointlist'].reverse()       
-        #for loner in genDict['lonepointlist']:
-            # Remove the loner vertex
-            #print "Removing the loner", loner
-            #self.meshVertices.pop(loner)
-        # delete the info from this data structure
-        del genDict['generatedtriangleneighborlist']
-        del genDict['generatedpointmarkerlist']
-        del genDict['generatedpointlist']
-        del genDict['generatedpointattributetitlelist']
-        del genDict['generatedsegmentlist']
-        del genDict['generatedsegmentmarkerlist']
-        del genDict['generatedtrianglelist']
-        del genDict['generatedtriangleattributelist']
-        del genDict['generatedpointattributelist']
-        genDict['zpp'] = 1 # just an identifier
             
     def setMesh(self, genDict):

anuga_core/source/anuga/shallow_water/benchmark_sww2dem.py

@@ -1 @@
-"""Least squares smooting and interpolation.
+"""Least squares smoothing and interpolation.
 
    measure the speed of least squares.
@@ -25 +25 @@
 
 from Scientific.IO.NetCDF import NetCDFFile
-from Numeric import array
+from Numeric import array, Float
 
 from anuga.fit_interpolate.interpolate import Interpolate
@@ -107 +107 @@
     fid = NetCDFFile(sww_fileName, 'w')
     sww = Write_sww()
-    sww.header(fid, 0,
+    sww.store_header(fid, 0,
                len(mesh_dict['triangles']),
-               len(mesh_dict["vertices"]))
-    sww.triangulation(fid,
+               len(mesh_dict["vertices"]),sww_precision=Float)
+    sww.store_triangulation(fid,
                       mesh_dict["vertices"], mesh_dict['triangles'],
                       elevation)
         
     for time_step in range(10):
-        sww.quantities(fid, 
+        sww.store_quantities(fid, 
                        time=time_step,
                        stage=stage,