Changeset 8813

Timestamp:

Apr 5, 2013, 5:35:50 PM (12 years ago)

Author:

steve

Message:

Just excluding damage_modelling from unit test because they use scientific python for interpolation, should change to scipy.

Location:

trunk/anuga_core/source/anuga

Files:

• shallow_water/shallow_water_domain.py (modified) (3 diffs)
• shallow_water/shallow_water_ext.c (modified) (4 diffs)
• shallow_water/sw_domain.h (modified) (1 diff)
• test_all.py (modified) (1 diff)
• utilities/util_ext.h (modified) (5 diffs)

trunk/anuga_core/source/anuga/shallow_water/shallow_water_domain.py

@@ -1034 +1034 @@
         assert self.conserved_quantities[2] == 'ymomentum', msg
 
+        
+    #@profile
     def extrapolate_second_order_sw(self):
         """Fast version of extrapolation from centroids to edges"""
@@ -1040 +1042 @@
         extrapol2(self)
 
-
+    #@profile
     def compute_fluxes(self):
         """Compute fluxes and timestep suitable for all volumes in domain.
@@ -1082 +1084 @@
             # Use standard flux calculation, but calc gravity
             # as -g h grad(w) - sum midpoint edge pressure terms
+            import objgraph
+            #print 50*"="
+            #objgraph.show_most_common_types()
+            #print objgraph.typestats(objgraph.get_leaking_objects())
+            #objgraph.show_growth()
+
             from shallow_water_ext import compute_fluxes_ext_central_structure
             from shallow_water_ext import gravity_wb as gravity_wb_c
 
             self.flux_timestep = compute_fluxes_ext_central_structure(self)
+
+            #print 50*"-"
+            #objgraph.show_most_common_types()
             gravity_wb_c(self)
+
+            #print 50*"-"
+            #objgraph.show_most_common_types()
 
         elif self.compute_fluxes_method == 'wb_3':

trunk/anuga_core/source/anuga/shallow_water/shallow_water_ext.c

@@ -1926 +1926 @@
         D.ymom_explicit_update[k] += -g * zy*avg_h;
     }
+
 
     return Py_BuildValue("");
@@ -2770 +2771 @@
     beta_vh_dry            = D->beta_vh_dry;
     optimise_dry_cells     = D->optimise_dry_cells;
+
     extrapolate_velocity_second_order = D->extrapolate_velocity_second_order;
 
@@ -5482 +5484 @@
     timestep = _compute_fluxes_central_structure(&D);
 
-
+    
     return Py_BuildValue("d", timestep);
 }
@@ -5533 +5535 @@
     // the explicit update arrays
     timestep = _compute_fluxes_central_wb(&D);
+
 
 

trunk/anuga_core/source/anuga/shallow_water/sw_domain.h

@@ -253 +253 @@
     D->ymom_explicit_update  = get_python_array_data_from_dict(quantities, "ymomentum", "explicit_update");
 
+
+    Py_DECREF(quantities);
+
+    Py_DECREF(neighbours);
+    Py_DECREF(surrogate_neighbours);
+    Py_DECREF(neighbour_edges);
+    Py_DECREF(normals);
+    Py_DECREF(edgelengths);
+    Py_DECREF(radii);
+    Py_DECREF(areas);
+    Py_DECREF(tri_full_flag);
+    Py_DECREF(already_computed_flux);
+    Py_DECREF(vertex_coordinates);
+    Py_DECREF(edge_coordinates);
+    Py_DECREF(centroid_coordinates);
+    Py_DECREF(max_speed);
+    Py_DECREF(number_of_boundaries);
 
     return D;

trunk/anuga_core/source/anuga/test_all.py

@@ -33 +33 @@
 
 # Directories that should not be searched for test files.
-exclude_dirs = ['shallow_water_balanced' , # Special requirements
+exclude_dirs = ['shallow_water_balanced' , 'damage_modelling', # Special requirements
                 '.svn',          # subversion
                 'props', 'wcprops', 'prop-base', 'text-base', 'tmp']

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

@@ -293 +293 @@
   */
     
-  B = (PyArrayObject*) PyObject_GetAttrString(O, name);
+  B = (PyArrayObject*) PyObject_GetAttrString(O, name);  // New Reference
 
   //printf("B = %p\n",(void*)B);
@@ -306 +306 @@
   //Convert to consecutive array
   A = (PyArrayObject*) PyArray_ContiguousFromObject((PyObject*) B, 
-                                                    B -> descr -> type, 0, 0);
+                                                    B -> descr -> type, 0, 0);   // New Reference
   
   Py_DECREF(B); //FIXME: Is this really needed??
@@ -330 +330 @@
 
   //Get double from attribute
-  TObject = PyObject_GetAttrString(O, name);
+  TObject = PyObject_GetAttrString(O, name); //New Reference
   if (!TObject) {
         snprintf(buf, BUFFER_SIZE, "util_ext.h: get_python_double could not obtain double %s.\n", name);
@@ -377 +377 @@
   PyObject *Oout;
 
-  Oout = PyObject_GetAttrString(O, name);
+  Oout = PyObject_GetAttrString(O, name); // New Reference
   if (!Oout) {
     PyErr_SetString(PyExc_RuntimeError, "util_ext.h: get_python_object could not obtain object");
@@ -391 +391 @@
   PyObject *A;
   PyArrayObject *B;
-
-  A = PyDict_GetItemString(O, name);
-  B = get_consecutive_array(A, array);
-
-  return (double *) B->data;
+  double *data;
+
+  A = PyDict_GetItemString(O, name); // Borrowed Reference
+  if (!A) {
+    PyErr_SetString(PyExc_RuntimeError, "util_ext.h: get_python_array_from_object could not obtain object");
+    return NULL;
+  }
+  B = get_consecutive_array(A, array); // New Reference
+
+
+  data = (double *) B->data;
+
+  Py_DECREF(B);
+
+  return data;
 }