Changeset 4917

Timestamp:

Jan 9, 2008, 2:06:30 PM (17 years ago)

Author:

duncan

Message:

working on memory freeing in the mesh generator

File:

• anuga_core/source/anuga/mesh_engine/mesh_engine_c_layer.c (modified) (5 diffs)

anuga_core/source/anuga/mesh_engine/mesh_engine_c_layer.c

@@ -271 +271 @@
                                          (char*) out.pointlist);
                                            
-  /*                                             
-  (double*) genpointlist -> data = out.pointlist;                
-  ((double*) genpointlist -> data) = out.pointlist;
-  ( genpointlist -> data) = (double*) out.pointlist;
-   genpointlist -> data = (double) out.pointlist;
-  
-  */
-  
+ 
   /* Add point marker list */
   dimensions[0] = out.numberofpoints;
@@ -336 +329 @@
   }
   
-  /* Add triangle neighbor list */
-  /*if (out.neighborlist != NULL) {
-    listsize = out.numberoftriangles;
-    holderlist = PyList_New(listsize);
-    for(i=0; i<listsize;i++){
-      PyObject *mlist = Py_BuildValue((char *)"(i,i,i)", 
-                                      out.neighborlist[i*3  ],
-                                      out.neighborlist [i*3+1],
-                                      out.neighborlist [i*3+2]);    
-      PyList_SetItem(holderlist,i, mlist);
-    }    
-    ii=PyString_FromString("generatedtriangleneighborlist");
-    PyDict_SetItem(holder, ii, holderlist);
-    Py_DECREF(ii); Py_DECREF(holderlist);
-  }   
-   */
-  
-  
-  /* R = Py_BuildValue((char *)"O", holder); */
+  
   R = Py_BuildValue((char *)"OOOOOOOO"
                     ,PyArray_Return(gentrianglelist)
@@ -365 +340 @@
                     ,PyArray_Return(genneighborlist)
                     );
-   /*Py_DECREF(holder);* This fixed a  memory problem ticket#189 */
+                    
   Py_DECREF(gentrianglelist);
   Py_DECREF(genpointlist);
@@ -376 +351 @@
   
   
-  /* Free in/out structure memory */
-  /* OUT 
-
+  /* These memory blocks are passed into Numeric arrays 
+   so don't free them  */
+  /*
+  if(!out.trianglelist){    
+    free(out.trianglelist); out.trianglelist=NULL;
+    
+    
   if(!out.pointlist){
     free(out.pointlist);  out.pointlist=NULL;
-  }
+  }  
+  
   if(!out.pointmarkerlist){    
     free(out.pointmarkerlist); out.pointmarkerlist=NULL;
   }
+  
   if(!out.pointattributelist){    
     free(out.pointattributelist); out.pointattributelist=NULL;
   }   
-  if(!in.pointattributelist){    
-    free(out.pointattributelist); out.pointattributelist=NULL;
-  }   
-  if(!out.trianglelist){    
-    free(out.trianglelist); out.trianglelist=NULL;
-  }
+  
   if(!out.triangleattributelist){    
     free(out.triangleattributelist); out.triangleattributelist=NULL;
   }
+  if(!out.segmentlist){
+    free(out.segmentlist); out.segmentlist =NULL;
+  }
+  if(!out.segmentmarkerlist){
+    free(out.segmentmarkerlist); out.segmentmarkerlist  =NULL;
+  }
+  if(!out.neighborlist){    
+    free(out.neighborlist); out.neighborlist=NULL;
+  }
+   */
+
+    
+  
+  /* Free in/out structure memory */
+  
   if(!out.trianglearealist){    
     free(out.trianglearealist); out.trianglearealist=NULL;
   }
-  if(!out.neighborlist){    
-    free(out.neighborlist); out.neighborlist=NULL;
-  }
-  if(!out.segmentlist){
-    free(out.segmentlist); out.segmentlist =NULL;
-  }
-  if(!out.segmentmarkerlist){
-    free(out.segmentmarkerlist); out.segmentmarkerlist  =NULL;
-  }
   if(!out.edgelist){
     free(out.edgelist);  out.edgelist=NULL;
@@ -421 +403 @@
     free(out.regionlist); out.regionlist=NULL;
   }
-    */
   return R;
 }