Changeset 5891 for anuga_core/source/anuga/utilities/polygon_ext.c

Timestamp:

Nov 5, 2008, 4:19:05 PM (15 years ago)

Author:

rwilson

Message:

Converted to full numpy.

File:

• anuga_core/source/anuga/utilities/polygon_ext.c (modified) (4 diffs)

anuga_core/source/anuga/utilities/polygon_ext.c

@@ -15 +15 @@
 
 #include "Python.h"
-#include "Numeric/arrayobject.h"
+#include "numpy/arrayobject.h"
 #include "math.h"
 
@@ -222 +222 @@
   }  
   for (k=0; k<M; k++) {
+    x = points[2*k];
+    y = points[2*k + 1];
+
     if (verbose){
-      if (k %((M+10)/10)==0) printf("Doing %d of %d\n", k, M);
+      if (k %((M+10)/10)==0) printf("Doing %d of %d, x=%f, y=%f\n", k, M, x, y);
     }
     
-    x = points[2*k];
-    y = points[2*k + 1];
-
     inside = 0;
 
@@ -376 +376 @@
     *polygon,
     *indices;
+//  PyObject *xxxx;
 
   int closed, verbose; //Flags
@@ -393 +394 @@
     return NULL;
   }
+  
+//  points = (PyArrayObject *) PyArray_ContiguousFromObject(xxxx, PyArray_DOUBLE, 1, 1);
 
   M = points -> dimensions[0];   //Number of points