Changeset 8774 for trunk/anuga_work/development/gareth/experimental/balanced_dev/swb2_domain_ext.c

Timestamp:

Mar 22, 2013, 9:29:16 AM (12 years ago)

Author:

davies

Message:

Updated gd_experimental

File:

• trunk/anuga_work/development/gareth/experimental/balanced_dev/swb2_domain_ext.c (modified) (4 diffs)

trunk/anuga_work/development/gareth/experimental/balanced_dev/swb2_domain_ext.c

@@ -312 +312 @@
     memset((char*) ymom_explicit_update, 0, number_of_elements * sizeof (double));
 
+    local_timestep=timestep;
 
     // Compute minimum bed edge value on each triangle
@@ -444 +445 @@
 
                     // CFL for triangle k
-                    timestep = min(timestep, radii[k] / max_speed);
+                    local_timestep = min(local_timestep, radii[k] / max_speed);
 
                     if (n >= 0) {
                         // Apply CFL condition for neigbour n (which is on the ith edge of triangle k)
-                        timestep = min(timestep, radii[n] / max_speed);
+                        local_timestep = min(local_timestep, radii[n] / max_speed);
                     }
 
@@ -473 +474 @@
                         if(edgeflux_store[3*(3*k+useint)]< 0.){
                             //outgoing_mass_edges+=1.0;
-                            outgoing_mass_edges+=(edgeflux_store[3*(3*k+useint)]*timestep);
+                            outgoing_mass_edges+=(edgeflux_store[3*(3*k+useint)]*local_timestep);
                         }
                     }
@@ -563 +564 @@
     }  // end cell k
 
-    //if(call%2==0) timestep=local_timestep;
-
+    if(call%2==0) timestep=local_timestep;
     // Look for 'dry' edges, and set momentum (& component of momentum_update)
     // in that direction to zero. If we don't do this, then it is possible for