Changeset 6780 for branches/numpy/anuga/shallow_water

Timestamp:

Apr 11, 2009, 3:42:49 PM (16 years ago)

Author:

rwilson

Message:

Changes to make legacy Numeric API work in numpy.

Location:

branches/numpy/anuga/shallow_water

Files:

• shallow_water_ext.c (modified) (2 diffs)
• urs_ext.c (modified) (2 diffs)

branches/numpy/anuga/shallow_water/shallow_water_ext.c

@@ -18 +18 @@
 #include "math.h"
 #include <stdio.h>
+
+#include "numpy_shim.h"
 
 // Shared code snippets
@@ -1626 +1628 @@
   // Allocate space for return vector r (don't DECREF)
   dimensions[0] = 3;
-  r = (PyArrayObject *) PyArray_ZEROS(1, (npy_intp*) dimensions, PyArray_DOUBLE, 0);
+  r = (PyArrayObject *) anuga_FromDims(1, dimensions, PyArray_DOUBLE);
 
   // Copy

branches/numpy/anuga/shallow_water/urs_ext.c

@@ -13 +13 @@
 #include <float.h>
 #include <time.h>
+
+#include "numpy_shim.h"
 
 #define MAX_FILE_NAME_LENGTH 128
@@ -788 +790 @@
     dimensions[1] = num_ts + POFFSET;
     
-    pydata = (PyArrayObject*) PyArray_ZEROS(2, (npy_intp*) dimensions, PyArray_DOUBLE, 0);
+    pydata = (PyArrayObject*) anuga_FromDims(2, dimensions, PyArray_DOUBLE);
     if(pydata == NULL)
     {