Changeset 6738 for branches/numpy/anuga/mesh_engine

Timestamp:

Apr 7, 2009, 1:21:39 PM (16 years ago)

Author:

rwilson

Message:

Changes required because of numpy API changes.

File:

• branches/numpy/anuga/mesh_engine/mesh_engine_c_layer.c (modified) (9 diffs)

branches/numpy/anuga/mesh_engine/mesh_engine_c_layer.c

@@ -269 +269 @@
   dimensions[0] = out.numberoftriangles;
   dimensions[1] = 3;   
-  gentrianglelist = (PyArrayObject *) PyArray_FromDimsAndData(2,
-                                            dimensions,
+  gentrianglelist = (PyArrayObject *) PyArray_SimpleNewFromData(2,
+                                            (npy_intp*) dimensions,
                                             PyArray_INT, 
                                             (char*) out.trianglelist); 
@@ -277 +277 @@
   dimensions[0] = out.numberofpoints;
   dimensions[1] = 2;   
-  genpointlist = (PyArrayObject *) PyArray_FromDimsAndData(2,
-                                         dimensions,
+  genpointlist = (PyArrayObject *) PyArray_SimpleNewFromData(2,
+                                         (npy_intp*) dimensions,
                                          PyArray_DOUBLE, 
                                          (char*) out.pointlist);
@@ -285 +285 @@
   /* Add point marker list */
   dimensions[0] = out.numberofpoints;
-  genpointmarkerlist = (PyArrayObject *) PyArray_FromDimsAndData(1, 
-                                         dimensions, 
+  genpointmarkerlist = (PyArrayObject *) PyArray_SimpleNewFromData(1, 
+                                         (npy_intp*) dimensions, 
                                          PyArray_INT,
                                         (char*) out.pointmarkerlist);
@@ -293 +293 @@
   dimensions[0] = out.numberofpoints;
   dimensions[1] = out.numberofpointattributes;   
-  genpointattributelist = (PyArrayObject *) PyArray_FromDimsAndData(2, 
-                                          dimensions, 
+  genpointattributelist = (PyArrayObject *) PyArray_SimpleNewFromData(2, 
+                                          (npy_intp*) dimensions, 
                                           PyArray_DOUBLE,
                                           (char*) out.pointattributelist);
@@ -303 +303 @@
   dimensions[0] = out.numberoftriangles;
   dimensions[1] = out.numberoftriangleattributes;   
-  gentriangleattributelist = (PyArrayObject *) PyArray_FromDimsAndData(2, 
-                                           dimensions, 
+  gentriangleattributelist = (PyArrayObject *) PyArray_SimpleNewFromData(2, 
+                                           (npy_intp*) dimensions, 
                                            PyArray_DOUBLE,
                                           (char*)out.triangleattributelist);
@@ -311 +311 @@
   dimensions[0] = out.numberofsegments;
   dimensions[1] = 2;   
-  gensegmentlist = (PyArrayObject *) PyArray_FromDimsAndData(2, 
-                                                    dimensions, 
+  gensegmentlist = (PyArrayObject *) PyArray_SimpleNewFromData(2, 
+                                                    (npy_intp*) dimensions, 
                                                     PyArray_INT,
                                                     (char*)out.segmentlist);
@@ -319 +319 @@
   /* Add segment marker list */
   dimensions[0] = out.numberofsegments;
-  gensegmentmarkerlist = (PyArrayObject *) PyArray_FromDimsAndData(1, 
-                                            dimensions, 
+  gensegmentmarkerlist = (PyArrayObject *) PyArray_SimpleNewFromData(1, 
+                                            (npy_intp*) dimensions, 
                                             PyArray_INT,
                                            (char*)out.segmentmarkerlist);
@@ -328 +328 @@
     dimensions[0] = out.numberoftriangles;
     dimensions[1] = 3;   
-    genneighborlist = (PyArrayObject *) PyArray_FromDimsAndData(2, 
-                                                 dimensions, 
+    genneighborlist = (PyArrayObject *) PyArray_SimpleNewFromData(2, 
+                                                 (npy_intp*) dimensions, 
                                                  PyArray_INT,
                                                  (char*)out.neighborlist);
@@ -335 +335 @@
     dimensions[0] = 0;
     dimensions[1] = 0;   
-    genneighborlist = (PyArrayObject *) PyArray_FromDims(2, 
-                                                         dimensions, 
-                                                         PyArray_INT);
+    genneighborlist = (PyArrayObject *) PyArray_ZEROS(2, 
+                                                 (npy_intp*) dimensions, 
+                                                 PyArray_INT,
+                                                 0);
   }