Changeset 8968 for trunk/anuga_core/source/anuga

Timestamp:

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

Author:

steve

Message:

Changes to util_ext for contiguous tests

Location:

trunk/anuga_core/source/anuga

Files:

• abstract_2d_finite_volumes/neighbour_mesh.py (modified) (3 diffs)
• operators/run_collect_max_stage_operator.py (modified) (1 diff)
• utilities/util_ext.h (modified) (3 diffs)

trunk/anuga_core/source/anuga/abstract_2d_finite_volumes/neighbour_mesh.py

@@ -1038 +1038 @@
 
 
-    def statistics(self):
+    def statistics(self, nbins=10):
         """Output statistics about mesh
         """
@@ -1051 +1051 @@
 
         #Setup 10 bins for area histogram
+        #print "nbins",nbins
         bins = create_bins(areas, 10)
+        #print "size bins",bins
         #m = max(areas)
         #bins = arange(0., m, m/10)
@@ -1081 +1083 @@
         N = len(areas)
         if N > 10:
-            str += '    Percentiles (10%):\n'
+            str += '    Percentiles (%g percent):\n' % (100/nbins)
             areas = areas.tolist()
             areas.sort()

trunk/anuga_core/source/anuga/operators/run_collect_max_stage_operator.py

@@ -32 +32 @@
 
 domain.set_name() # based on script name
+
+print domain.mesh.statistics(nbins=50)
 
 #------------------------------------------------------------------------------

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 */