Changeset 5831

Timestamp:

Oct 10, 2008, 4:50:04 PM (17 years ago)

Author:

steve

Message:

Added cfl condition to compute fluxes in comp_flux_ext.c

File:

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

anuga_work/development/anuga_1d/comp_flux_ext.c

@@ -131 +131 @@
         
 // Computational function for flux computation
-double _compute_fluxes_ext(double timestep,
+double _compute_fluxes_ext(
+                           double cfl,
+                           double timestep,
                            double epsilon,
                            double g,
@@ -152 +154 @@
                 double zl, zr, max_speed, normal;
                 int k, i, ki, n, m, nm=0;
+                
                 
                 for (k=0; k<number_of_elements; k++) {
@@ -187 +190 @@
                         // Original CFL calculation
                                         
-                                        timestep = min(timestep, 0.5*areas[k]/max_speed); //Here, CFL=1.0 is assumed. ?????????????????????????????????????????????
+                                        timestep = min(timestep, 0.5*cfl*areas[k]/max_speed); //Here, CFL=1.0 is assumed. ?????????????????????????????????????????????
                                         if (n>=0) {
-                                                timestep = min(timestep, 0.5*areas[n]/max_speed); //Here, CFL=1.0 is assumed. ?????????????????????????????????????????????
+                                                timestep = min(timestep, 0.5*cfl*areas[n]/max_speed); //Here, CFL=1.0 is assumed. ?????????????????????????????????????????????
                                         }
                                 }
@@ -230 +233 @@
         *max_speed_array;
     
-  double timestep, epsilon, g, h0;
+  double timestep, epsilon, g, h0, cfl;
   int number_of_elements;
     
   // Convert Python arguments to C
-  if (!PyArg_ParseTuple(args, "ddddOOOOOOOOOOOiO",
+  if (!PyArg_ParseTuple(args, "dddddOOOOOOOOOOOiO",
+                        &cfl,
                         &timestep,
                         &epsilon,
@@ -259 +263 @@
   // Call underlying flux computation routine and update 
   // the explicit update arrays 
-  timestep = _compute_fluxes_ext(timestep,
+  timestep = _compute_fluxes_ext(
+                 cfl,
+                                 timestep,
                                  epsilon,
                                  g,
@@ -304 +310 @@
         *max_speed_array;
     
-  double timestep, epsilon, g, h0;
+  double timestep, epsilon, g, h0, cfl;
   int number_of_elements;
 
@@ -323 +329 @@
     g                 = get_python_double(domain,"g");
     h0                = get_python_double(domain,"h0");
+        cfl                = get_python_double(domain,"cfl");
  
     
@@ -350 +357 @@
     // Call underlying flux computation routine and update 
     // the explicit update arrays 
-    timestep = _compute_fluxes_ext(timestep,
+    timestep = _compute_fluxes_ext(
+                       cfl,
+                                   timestep,
                                    epsilon,
                                    g,