Changeset 8968 for trunk/anuga_core/source/anuga/utilities/util_ext.h

Timestamp:

Sep 9, 2013, 9:01:13 PM (11 years ago)

Author:

steve

Message:

Changes to util_ext for contiguous tests

File:

• trunk/anuga_core/source/anuga/utilities/util_ext.h (modified) (3 diffs)

trunk/anuga_core/source/anuga/utilities/util_ext.h

@@ -28 +28 @@
 #define P_ERROR_BUFFER_SIZE 65
 
+
+// check that numpy array objects are C contiguous memory
+#define CHECK_C_CONTIG(varname) if (!PyArray_ISCONTIGUOUS(varname)) { \
+                                    char msg[1024]; \
+                                    sprintf(msg, \
+                                            "%s(): file %s, line %d: " \
+                                            "'%s' object is not C contiguous memory", \
+                                             __func__, __FILE__, __LINE__, #varname); \
+                                    PyErr_SetString(PyExc_RuntimeError, msg); \
+                                    return NULL; \
+                                }
+
+
+
+
+
+
+
 void report_python_error(const char *location, const char *msg)
 {
@@ -303 +321 @@
     return NULL;
   }     
-  
+
+
+  CHECK_C_CONTIG(B);
+  A = B;
   //Convert to consecutive array
-  A = (PyArrayObject*) PyArray_ContiguousFromObject((PyObject*) B, 
-                                                    B -> descr -> type, 0, 0);   // New Reference
-  
-  Py_DECREF(B); //FIXME: Is this really needed??
+  //A = (PyArrayObject*) PyArray_ContiguousFromObject((PyObject*) B,
+  //                                                B -> descr -> type, 0, 0);   // New Reference
+  
+  //Py_DECREF(B); //FIXME: Is this really needed??
   
   if (!A) {
@@ -409 +430 @@
 
 
-// check that numpy array objects are C contiguous memory
-#define CHECK_C_CONTIG(varname) if (!PyArray_ISCONTIGUOUS(varname)) { \
-                                    char msg[1024]; \
-                                    sprintf(msg, \
-                                            "%s(): file %s, line %d: " \
-                                            "'%s' object is not C contiguous memory", \
-                                             __func__, __FILE__, __LINE__, #varname); \
-                                    PyErr_SetString(PyExc_RuntimeError, msg); \
-                                    return NULL; \
-                                }
-
-
-#endif
+#endif /* ANUGA_UTIL_EXT_H */