Changeset 5724

Timestamp:

Sep 3, 2008, 4:10:14 PM (17 years ago)

Author:

sudi

Message:

 

File:

• anuga_work/development/anuga_1d/comp_flux_ext.c (modified) (4 diffs)

anuga_work/development/anuga_1d/comp_flux_ext.c

@@ -19 +19 @@
 /*      z=(a<b)?a:b; */
 /*      return z;} */
-        
-
+
+<<<<<<< .mine
+
+
+
+
+=======
 
 
@@ -49 +54 @@
 
 
+>>>>>>> .r5723
 //Innermost flux function (using w=z+h)
 int _flux_function(double *q_left, double *q_right,
@@ -72 +78 @@
                 z = (z_left+z_right)/2.0;                  
                                    
-                w_left = ql[0];
-                h_left = w_left-z;
-                uh_left = ql[1];
+                //w_left = ql[0];
+                //h_left = w_left-z;
+                //uh_left = ql[1];
                 
 
@@ -202 +208 @@
                         max_speed_array[k]=max_speed;
                 }
-                return timestep;        }
+                return timestep;        
+        }