Changeset 4727

Timestamp:

Sep 11, 2007, 4:21:48 PM (17 years ago)

Author:

ole

Message:

More minor optimisations of flux calculations.

File:

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

anuga_core/source/anuga/shallow_water/shallow_water_ext.c

@@ -37 +37 @@
   double q1, q2;
 
-  //Shorthands
-  q1 = q[1];  //uh momentum
-  q2 = q[2];  //vh momentum
-
-  //Rotate
+  // Shorthands
+  q1 = q[1];  // uh momentum
+  q2 = q[2];  // vh momentum
+
+  // Rotate
   q[1] =  n1*q1 + n2*q2;
   q[2] = -n2*q1 + n1*q2;
@@ -213 +213 @@
   double s_min, s_max, soundspeed_left, soundspeed_right;
   double denom, z;
-  
-  // FIXME (Ole): Try making these static
-  double q_left_rotated[3], q_right_rotated[3];
-  double flux_right[3], flux_left[3];
+
+  // Workspace (allocate once, use many)
+  static double q_left_rotated[3], q_right_rotated[3], flux_right[3], flux_left[3];
 
   double h0 = H0*H0; // This ensures a good balance when h approaches H0.
@@ -1402 +1401 @@
                                
   // Local variables
-  double max_speed, length, area;
-  
-  // FIXME (Ole): Try making arrays static  
-  double normal[2], ql[3], qr[3], zl, zr;
-  double edgeflux[3]; // Work array for summing up fluxes
-
+  double max_speed, length, area, zl, zr;
   int k, i, m, n;
-
   int ki, nm=0, ki2; // Index shorthands
+  
+  // Workspace (making them static actually made function slightly slower (Ole))  
+  double ql[3], qr[3], edgeflux[3]; // Work array for summing up fluxes
+
   static long call=1; // Static local variable flagging already computed flux
                                
@@ -1440 +1437 @@
       ql[1] = xmom_edge_values[ki];
       ql[2] = ymom_edge_values[ki];
-      zl =    bed_edge_values[ki];
+      zl = bed_edge_values[ki];
 
       // Quantities at neighbour on nearest face
@@ -1484 +1481 @@
       // Outward pointing normal vector (domain.normals[k, 2*i:2*i+2])
       ki2 = 2*ki; //k*6 + i*2
-      normal[0] = normals[ki2];
-      normal[1] = normals[ki2+1];
-      
 
       // Edge flux computation (triangle k, edge i)
       flux_function_central(ql, qr, zl, zr,
-                            normal[0], normal[1],
+                            normals[ki2], normals[ki2+1],
                             epsilon, H0, g,
                             edgeflux, &max_speed);