Changeset 4915

Timestamp:

Jan 9, 2008, 11:38:57 AM (17 years ago)

Author:

ole

Message:

Work on compiler warnings in regard to conversion of arrays to Numeric Structures.

File:

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

anuga_core/source/anuga/mesh_engine/mesh_engine_c_layer.c

@@ -62 +62 @@
 //#define PY_ARRAY_UNIQUE_SYMBOL API_YEAH 
 
-#define PY_ARRAY_UNIQUE_SYMBOL API_YEAH
+//#define PY_ARRAY_UNIQUE_SYMBOL API_YEAH
+
 //#define NO_IMPORT_ARRAY
 #include "Numeric/arrayobject.h"
@@ -250 +251 @@
   dimensions[1] = 3;   
   gentrianglelist = (PyArrayObject *) PyArray_FromDims(2, 
-                                                    dimensions, 
-                                                    PyArray_INT);
+                                                       dimensions, 
+                                                       PyArray_INT);
   gentrianglelist -> data = out.trianglelist;
-    
+  
+  /*gentrianglelist = PyArray_ContiguousFromObject(out.trianglelist, 
+                                                 PyArray_DOUBLE, 
+                                                 0, 
+  */                                               
+  
+  /*gentrianglelist = PyArray_FromDimsAndData(2,
+                                            dimensions,
+                                            PyArray_INT, 
+                                            (int*) out.trianglelist);    
+  */  
   /* Add pointlist */
   dimensions[0] = out.numberofpoints;
   dimensions[1] = 2;   
-  genpointlist = (PyArrayObject *) PyArray_FromDims(2, 
-                                                 dimensions, 
-                                                 PyArray_DOUBLE);
+  
+  /*genpointlist = (PyArrayObject *) PyArray_FromDims(2, 
+                                                    dimensions, 
+                                                    PyArray_DOUBLE);
+  */
   /*                                             
   (double*) genpointlist -> data = out.pointlist;                
@@ -266 +279 @@
   
   */
-   genpointlist -> data = out.pointlist;
+  //genpointlist -> data = out.pointlist;
+  
+  
+  genpointlist = PyArray_FromDimsAndData(2,
+                                         dimensions,
+                                         PyArray_DOUBLE, 
+                                         (char*) out.pointlist);  
+  
+  
   
   /* Add point marker list */
   dimensions[0] = out.numberofpoints;
   genpointmarkerlist = (PyArrayObject *) PyArray_FromDims(1, 
-                                                    dimensions, 
-                                                    PyArray_INT);
+                                                          dimensions, 
+                                                          PyArray_INT);
   genpointmarkerlist -> data = out.pointmarkerlist;