Changeset 4900

Timestamp:

Dec 31, 2007, 9:37:12 AM (17 years ago)

Author:

duncan

Message:

removing list output from mesh_engine/mesh_engine_c_layer.c

Location:

anuga_core/source/anuga/mesh_engine

Files:

• mesh_engine.py (modified) (1 diff)
• mesh_engine_c_layer.c (modified) (13 diffs)

anuga_core/source/anuga/mesh_engine/mesh_engine.py

@@ -130 +130 @@
     #XSprint "mode", mode
     #print "yeah" 
-    mesh_dict, trianglelist, pointlist, pointmarkerlist, pointattributelist, triangleattributelist, segmentlist, segmentmarkerlist, neighborlist = triang.genMesh(points,segments,holes,regions,
+    trianglelist, pointlist, pointmarkerlist, pointattributelist, triangleattributelist, segmentlist, segmentmarkerlist, neighborlist = triang.genMesh(points,segments,holes,regions,
                           pointatts,segatts, mode, segments.flat)
+    mesh_dict = {}
     # the values as arrays
     mesh_dict['generatedtrianglelist'] = trianglelist

anuga_core/source/anuga/mesh_engine/mesh_engine_c_layer.c

@@ -115 +115 @@
      
   char *mod;
-  PyObject *holder, *holderlist, *attributelist;
-  int listsize,attsize ;
-  PyObject  *ii;
-  
-  /* used for testing numeric arrays*/
-  int n_test;     
+    
   if(!PyArg_ParseTuple(args,(char *)"OOOOOOOO",&pointlist,&seglist,&holelist,&regionlist,&pointattributelist,&segmarkerlist,&mode,&test)){
     return NULL;
@@ -234 +229 @@
     we send back a dictionary:                                               
     { index : [ coordinates, [connections], Attribute ] } 
-  */
-  holder = PyDict_New();    
+  */  
  
   /*
@@ -260 +254 @@
   gentrianglelist -> data = out.trianglelist;
     
-  /* Add triangle list */
-  listsize = out.numberoftriangles;
-  /* printf(" out.numberoftriangles %i\n", out.numberoftriangles ); */
-  holderlist = PyList_New(listsize);
-  for(i=0; i<listsize;i++){
-    PyObject *mlist = Py_BuildValue((char *)"(i,i,i)", 
-                                    out.trianglelist[i*3  ], out.trianglelist [i*3+1], out.trianglelist [i*3+2]);    
-    PyList_SetItem(holderlist,i, mlist);
-  }    
-  ii=PyString_FromString("generatedtrianglelist");
-  PyDict_SetItem(holder, ii, holderlist); Py_DECREF(ii); Py_DECREF(holderlist);
-  
-  
   /* Add pointlist */
   dimensions[0] = out.numberofpoints;
@@ -285 +266 @@
   
   */
-  genpointlist -> data = out.pointlist;
-     
-  /* Add pointlist */
-  listsize = out.numberofpoints;
-  holderlist = PyList_New(listsize);
-     
-  for(i=0; i<out.numberofpoints;i++){
-    PyObject *mlist = Py_BuildValue((char *)"(d,d)", 
-                                    out.pointlist[i*2  ], out.pointlist[i*2+1]);  
-    PyList_SetItem(holderlist,i, mlist);
-  }  
-  ii=PyString_FromString("generatedpointlist");
-  PyDict_SetItem(holder, ii, holderlist); Py_DECREF(ii); Py_DECREF(holderlist);
+   genpointlist -> data = out.pointlist;
   
   /* Add point marker list */
@@ -306 +275 @@
   genpointmarkerlist -> data = out.pointmarkerlist;
   
-  /* Add point marker list */
-  listsize = out.numberofpoints;
-  holderlist = PyList_New(listsize);
-  
-  for(i=0; i<listsize;i++){
-    PyObject *mlist = Py_BuildValue((char *)"i", 
-                                    out.pointmarkerlist[i]);     
-    PyList_SetItem(holderlist,i, mlist); 
-  }  
-  ii=PyString_FromString("generatedpointmarkerlist");
-  PyDict_SetItem(holder, ii, holderlist); Py_DECREF(ii); Py_DECREF(holderlist);
-    
   /* Add point attribute list */
   dimensions[0] = out.numberofpoints;
@@ -327 +284 @@
   
   
-  /* Add point attribute list */
-  listsize = out.numberofpoints;
-  holderlist = PyList_New(listsize);
-  
-  for(i=0; i<listsize;i++){
-    attsize = out.numberofpointattributes;
-    attributelist = PyList_New(attsize);
-    for(iatt=0; iatt<attsize;iatt++){
-      PyObject *mlist = Py_BuildValue((char *)"d", 
-                                      out.pointattributelist[i*attsize + iatt]);     
-      PyList_SetItem(attributelist,iatt, mlist);
-    }      
-    PyList_SetItem(holderlist,i, attributelist);
-  }  
-  ii=PyString_FromString("generatedpointattributelist");
-  PyDict_SetItem(holder, ii, holderlist); Py_DECREF(ii); Py_DECREF(holderlist);  
  
   /* Add triangle attribute list */
@@ -352 +293 @@
   gentriangleattributelist -> data = out.triangleattributelist;
   
-  /* Add triangle attribute list */
-  listsize = out.numberoftriangles;
-  holderlist = PyList_New(listsize);
-     
-  for(i=0; i<listsize; i++){
-    attsize = out.numberoftriangleattributes;
-    attributelist = PyList_New(attsize);       
-    for(iatt=0; iatt<attsize;iatt++){
-      PyObject *mlist = Py_BuildValue((char *)"d",out.triangleattributelist[i*attsize + iatt]);  
-      PyList_SetItem(attributelist,iatt, mlist);
-    }      
-    PyList_SetItem(holderlist,i, attributelist);
-  }  
-  ii=PyString_FromString("generatedtriangleattributelist");
-  PyDict_SetItem(holder, ii, holderlist); Py_DECREF(ii); Py_DECREF(holderlist);
-  
   /* Add segment list */
   dimensions[0] = out.numberofsegments;
@@ -377 +302 @@
   
   
-  /* Add segment list */
-  listsize = out.numberofsegments;
-  holderlist = PyList_New(listsize);
-  for(i=0; i<listsize;i++){
-    PyObject *mlist = Py_BuildValue((char *)"(i,i)", 
-                                    out.segmentlist[i*2  ],
-                                    out.segmentlist [i*2+1]);
-    PyList_SetItem(holderlist,i, mlist);
-  }    
-  ii=PyString_FromString("generatedsegmentlist");
-  PyDict_SetItem(holder, ii, holderlist); Py_DECREF(ii); Py_DECREF(holderlist);  
-  
   /* Add segment marker list */
   dimensions[0] = out.numberofsegments;
@@ -395 +308 @@
                                                     PyArray_INT);
   gensegmentmarkerlist -> data = out.segmentmarkerlist;
-  
-  
-  /* Add segment marker list */
-  listsize = out.numberofsegments;
-  holderlist = PyList_New(listsize);
-  for(i=0; i<listsize;i++){
-    PyObject *mlist = Py_BuildValue((char *)"i", 
-                                    out.segmentmarkerlist[i]);
-    PyList_SetItem(holderlist,i, mlist);
-  }    
-  ii=PyString_FromString("generatedsegmentmarkerlist");
-  PyDict_SetItem(holder, ii, holderlist); Py_DECREF(ii); 
-  Py_DECREF(holderlist);  
   
   /* Add triangle neighbor list */
@@ -419 +319 @@
   
   /* Add triangle neighbor list */
-  if (out.neighborlist != NULL) {
+  /*if (out.neighborlist != NULL) {
     listsize = out.numberoftriangles;
     holderlist = PyList_New(listsize);
@@ -433 +333 @@
     Py_DECREF(ii); Py_DECREF(holderlist);
   }   
-  
+   */
   
   
@@ -481 +381 @@
   
   /* R = Py_BuildValue((char *)"O", holder); */
-  R = Py_BuildValue((char *)"OOOOOOOOO", holder 
+  R = Py_BuildValue((char *)"OOOOOOOO"
                     ,PyArray_Return(gentrianglelist)
                     ,PyArray_Return(genpointlist)
@@ -491 +391 @@
                     ,PyArray_Return(genneighborlist)
                     );
-  Py_DECREF(holder); /** This fixed a  memory problem ticket#189 */
+   /*Py_DECREF(holder);* This fixed a  memory problem ticket#189 */
   Py_DECREF(gentrianglelist);
   Py_DECREF(genpointlist);