Changeset 4898 for anuga_core/source/anuga/mesh_engine/mesh_engine_c_layer.c

Timestamp:

Dec 31, 2007, 7:37:59 AM (16 years ago)

Author:

duncan

Message:

Outputting numeric arrays from mesh_engine. they aren't used yet though.

File:

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

anuga_core/source/anuga/mesh_engine/mesh_engine_c_layer.c

@@ -36 +36 @@
      shape and mesh_engine.
 
-     to return numeric arrays, check how it is done in 
-     quantity_ext.c compute_gradients
           
      Precondition
@@ -92 +90 @@
   
   
-  PyArrayObject *r_test;
+  PyArrayObject *gentrianglelist;
+  PyArrayObject *genpointlist;
+  PyArrayObject *genseglist;
+  PyArrayObject *genpointmarkerlist;
+  PyArrayObject *genpointattributelist;
+  PyArrayObject *gentriangleattributelist;
+  PyArrayObject *gensegmentlist;
+  PyArrayObject *gensegmentmarkerlist;
+  PyArrayObject *genneighborlist;
   PyObject *R;
 
-  int dimensions[1];
+  int dimensions[2];
     
   REAL Attr;
@@ -149 +155 @@
   
   /* Point attribute list */
+   /*printf ("in.pointattributelist -> dimensions[0] %i\n", pointattributelist -> dimensions[0]);
+  printf ("in.pointattributelist -> dimensions[1] %i\n", pointattributelist -> dimensions[1]); */
   if (0 == pointattributelist -> dimensions[0]) {
     in.numberofpointattributes = 0;
@@ -220 +228 @@
   
   
+ 
+  /* printf(" ***  back from triangulate\n" );    */
   /*
+    ------- Pass point numbers,coordinates and neighbors back to Python ------
+    we send back a dictionary:                                               
+    { index : [ coordinates, [connections], Attribute ] } 
+  */
+  holder = PyDict_New();    
+ 
+  /*
+  
+     to return numeric arrays, check how it is done in 
+     abs quantity_ext.c compute_gradients
+     
   PyArray_FromDims allolws you to create a Numeric array with unitialized data.
    The first argument is the size of the second argument (
@@ -230 +251 @@
   */
   
-  //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" );    */
-  /*
-    ------- Pass point numbers,coordinates and neighbors back to Python ------
-    we send back a dictionary:                                               
-    { index : [ coordinates, [connections], Attribute ] } 
-  */
-  holder = PyDict_New();    
-  
+  
+  /* Add triangle list */
+  dimensions[0] = out.numberoftriangles;
+  dimensions[1] = 3;   
+  gentrianglelist = (PyArrayObject *) PyArray_FromDims(2, 
+                                                    dimensions, 
+                                                    PyArray_INT);
+  gentrianglelist -> data = out.trianglelist;
+    
   /* Add triangle list */
   listsize = out.numberoftriangles;
@@ -255 +271 @@
   ii=PyString_FromString("generatedtrianglelist");
   PyDict_SetItem(holder, ii, holderlist); Py_DECREF(ii); Py_DECREF(holderlist);
+  
+  
+  /* Add pointlist */
+  dimensions[0] = out.numberofpoints;
+  dimensions[1] = 2;   
+  genpointlist = (PyArrayObject *) PyArray_FromDims(2, 
+                                                 dimensions, 
+                                                 PyArray_DOUBLE);
+  /*                                             
+  (double*) genpointlist -> data = out.pointlist;                
+  ((double*) genpointlist -> data) = out.pointlist;
+  ( genpointlist -> data) = (double*) out.pointlist;
+  
+  */
+  genpointlist -> data = out.pointlist;
      
   /* Add pointlist */
@@ -269 +300 @@
   
   /* Add point marker list */
+  dimensions[0] = out.numberofpoints;
+  genpointmarkerlist = (PyArrayObject *) PyArray_FromDims(1, 
+                                                    dimensions, 
+                                                    PyArray_INT);
+  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 *)"d", 
+    PyObject *mlist = Py_BuildValue((char *)"i", 
                                     out.pointmarkerlist[i]);     
     PyList_SetItem(holderlist,i, mlist); 
@@ -280 +318 @@
   PyDict_SetItem(holder, ii, holderlist); Py_DECREF(ii); Py_DECREF(holderlist);
     
+  /* Add point attribute list */
+  dimensions[0] = out.numberofpoints;
+  dimensions[1] = out.numberofpointattributes;   
+  genpointattributelist = (PyArrayObject *) PyArray_FromDims(2, 
+                                                 dimensions, 
+                                                 PyArray_DOUBLE);
+  genpointattributelist -> data = out.pointattributelist;       
+  
+  
   /* Add point attribute list */
   listsize = out.numberofpoints;
@@ -297 +344 @@
   PyDict_SetItem(holder, ii, holderlist); Py_DECREF(ii); Py_DECREF(holderlist);  
  
+  /* Add triangle attribute list */
+  dimensions[0] = out.numberoftriangles;
+  dimensions[1] = out.numberoftriangleattributes;   
+  gentriangleattributelist = (PyArrayObject *) PyArray_FromDims(2, 
+                                                 dimensions, 
+                                                 PyArray_DOUBLE);
+  gentriangleattributelist -> data = out.triangleattributelist;
   
   /* Add triangle attribute list */
@@ -315 +369 @@
   
   /* Add segment list */
+  dimensions[0] = out.numberofsegments;
+  dimensions[1] = 2;   
+  gensegmentlist = (PyArrayObject *) PyArray_FromDims(2, 
+                                                    dimensions, 
+                                                    PyArray_INT);
+  gensegmentlist -> data = out.segmentlist;
+  
+  
+  /* Add segment list */
   listsize = out.numberofsegments;
   holderlist = PyList_New(listsize);
@@ -327 +390 @@
   
   /* Add segment marker list */
+  dimensions[0] = out.numberofsegments;
+  gensegmentmarkerlist = (PyArrayObject *) PyArray_FromDims(1, 
+                                                    dimensions, 
+                                                    PyArray_INT);
+  gensegmentmarkerlist -> data = out.segmentmarkerlist;
+  
+  
+  /* Add segment marker list */
   listsize = out.numberofsegments;
   holderlist = PyList_New(listsize);
@@ -335 +406 @@
   }    
   ii=PyString_FromString("generatedsegmentmarkerlist");
-  PyDict_SetItem(holder, ii, holderlist); Py_DECREF(ii); Py_DECREF(holderlist);  
+  PyDict_SetItem(holder, ii, holderlist); Py_DECREF(ii); 
+  Py_DECREF(holderlist);  
+  
+  /* Add triangle neighbor list */
+  dimensions[0] = out.numberoftriangles;
+  dimensions[1] = 3;   
+  genneighborlist = (PyArrayObject *) PyArray_FromDims(2, 
+                                                    dimensions, 
+                                                    PyArray_INT);
+  genneighborlist -> data = out.neighborlist;
+  
+  
   /* Add triangle neighbor list */
   if (out.neighborlist != NULL) {
@@ -399 +481 @@
   
   /* R = Py_BuildValue((char *)"O", holder); */
-  R = Py_BuildValue((char *)"OO", holder, PyArray_Return(r_test));
+  R = Py_BuildValue((char *)"OOOOOOOOO", holder 
+                    ,PyArray_Return(gentrianglelist)
+                    ,PyArray_Return(genpointlist)
+                    ,PyArray_Return(genpointmarkerlist)
+                    ,PyArray_Return(genpointattributelist)
+                    ,PyArray_Return(gentriangleattributelist)
+                    ,PyArray_Return(gensegmentlist)
+                    ,PyArray_Return(gensegmentmarkerlist)
+                    ,PyArray_Return(genneighborlist)
+                    );
   Py_DECREF(holder); /** This fixed a  memory problem ticket#189 */
-  Py_DECREF(r_test);
+  Py_DECREF(gentrianglelist);
+  Py_DECREF(genpointlist);
+  Py_DECREF(genpointmarkerlist);
+  Py_DECREF(genpointattributelist);
+  Py_DECREF(gentriangleattributelist);
+  Py_DECREF(gensegmentlist);
+  Py_DECREF(gensegmentmarkerlist);
+  Py_DECREF(genneighborlist);
   return R;
 }