Changeset 4730

Timestamp:

Sep 12, 2007, 10:59:02 AM (18 years ago)

Author:

ole

Message:

Cosmetics

File:

• anuga_core/source/anuga/shallow_water/shallow_water_ext.c (modified) (9 diffs)

anuga_core/source/anuga/shallow_water/shallow_water_ext.c

@@ -1259 +1259 @@
 
 PyObject *extrapolate_second_order_sw(PyObject *self, PyObject *args) {
-  /*Compute the vertex values based on a linear reconstruction on each triangle
+  /*Compute the vertex values based on a linear reconstruction 
+    on each triangle
+    
     These values are calculated as follows:
-    1) For each triangle not adjacent to a boundary, we consider the auxiliary triangle
-    formed by the centroids of its three neighbours.
-    2) For each conserved quantity, we integrate around the auxiliary triangle's boundary the product
-    of the quantity and the outward normal vector. Dividing by the triangle area gives (a,b), the average
-    of the vector (q_x,q_y) on the auxiliary triangle. We suppose that the linear reconstruction on the
-    original triangle has gradient (a,b).
-    3) Provisional vertex jumps dqv[0,1,2] are computed and these are then limited by calling the functions
-    find_qmin_and_qmax and limit_gradient
+    1) For each triangle not adjacent to a boundary, we consider the 
+       auxiliary triangle formed by the centroids of its three 
+       neighbours.
+    2) For each conserved quantity, we integrate around the auxiliary 
+       triangle's boundary the product of the quantity and the outward 
+       normal vector. Dividing by the triangle area gives (a,b), the 
+       average of the vector (q_x,q_y) on the auxiliary triangle. 
+       We suppose that the linear reconstruction on the original 
+       triangle has gradient (a,b).
+    3) Provisional vertex jumps dqv[0,1,2] are computed and these are 
+       then limited by calling the functions find_qmin_and_qmax and 
+       limit_gradient
 
     Python call:
@@ -1283 +1289 @@
 
     Post conditions:
-            The vertices of each triangle have values from a limited linear reconstruction
+            The vertices of each triangle have values from a 
+            limited linear reconstruction
             based on centroid values
 
@@ -1325 +1332 @@
                         &optimise_dry_cells)) {                 
                         
-    PyErr_SetString(PyExc_RuntimeError, "Input arguments to extrapolate_second_order_sw failed");
+    PyErr_SetString(PyExc_RuntimeError, 
+                    "Input arguments to extrapolate_second_order_sw failed");
     return NULL;
   }
 
-  // FIXME (Ole): Investigate if it is quicker to obtain all input arguments using GetAttrString rather than ParseTuple.
-  // It certainly looked as if passing domain.epsilon is slowed things down
-  
-  // Get the safety factor beta_w, set in the config.py file. This is used in the limiting process
+  // Get the safety factor beta_w, set in the config.py file. 
+  // This is used in the limiting process
+  
+  
   Tmp = PyObject_GetAttrString(domain, "beta_w");
   if (!Tmp) {
@@ -1396 +1404 @@
   epsilon = PyFloat_AsDouble(Tmp);
   Py_DECREF(Tmp);  
-
+  
+  
   // Call underlying computational routine
   number_of_elements = stage_centroid_values -> dimensions[0];  
@@ -1511 +1520 @@
   }
 
-  // FIXME (Ole): Investigate if it is quicker to obtain all input arguments using GetAttrString rather than ParseTuple.
-  // It certainly looked as if passing domain.epsilon is slowed things down
   
   // Get the safety factor beta_w, set in the config.py file. This is used in the limiting process
@@ -2253 +2260 @@
                                      H0,
                                      g,
-                                     (long*) neighbours -> data,                                 
+                                     (long*) neighbours -> data,
                                      (long*) neighbour_edges -> data,
                                      (double*) normals -> data,
                                      (double*) edgelengths -> data, 
-                                     (double*) radii  -> data, 
-                                     (double*) areas  -> data,
+                                     (double*) radii -> data, 
+                                     (double*) areas -> data,
                                      (long*) tri_full_flag -> data,
                                      (double*) stage_edge_values -> data,
@@ -2267 +2274 @@
                                      (double*) xmom_boundary_values -> data,
                                      (double*) ymom_boundary_values -> data,
-                                     (double*) stage_explicit_update -> data,                          
+                                     (double*) stage_explicit_update -> data,
                                      (double*) xmom_explicit_update -> data,
                                      (double*) ymom_explicit_update -> data,
@@ -2782 +2789 @@
   }  
           
+          
+  // FIXME (Ole): I tested this without GetAttrString and got time down
+  // marginally from 4.0s to 3.8s. Consider passing everything in 
+  // through ParseTuple and profile.
+  
   // Pull out parameters
   Tmp = PyObject_GetAttrString(domain, "alpha_balance");
@@ -2808 +2820 @@
   tight_slope_limiters = PyInt_AsLong(Tmp);
   Py_DECREF(Tmp);
-    
-
-  
+  
+  
+      
+  //alpha_balance = 2.0; 
+  //H0 = 0.001;
+  //tight_slope_limiters = 1;
   
   N = wc -> dimensions[0];