Changeset 4826 for anuga_core/source/anuga/shallow_water/shallow_water_ext.c

Timestamp:

Nov 17, 2007, 6:15:27 AM (17 years ago)

Author:

ole

Message:

Ooops forgot to recompute balanced vertex depths in previous version. It looks good now.

File:

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

anuga_core/source/anuga/shallow_water/shallow_water_ext.c

@@ -716 +716 @@
             vc = 0.0;
           }
+          
           // Vertex momenta guaranteed to be consistent with depth guaranteeing
           // controlled speed
+          hv[i] = wv[k3+i] - zv[k3+i]; // Recompute (balanced) vertex depth
           xmomv[k3+i] = uc*hv[i];
           ymomv[k3+i] = vc*hv[i];       
@@ -724 +726 @@
           // xmomc and ymomc (shallow) and momentum
           // from extrapolator xmomv and ymomv (deep).
-          // FIXME (Ole): Is this really needed?
+          // FIXME (Ole): Is this really needed? Could we use the above 
+          // instead?
           
           xmomv[k3+i] = (1-alpha)*xmomc[k] + alpha*xmomv[k3+i];
@@ -735 +738 @@
 
         
-    //if (0) {  // FIXME(Ole): Disabled while testing balancing of velocities above
-    if (tight_slope_limiters == 1) {                    
+    if (0) {  // FIXME(Ole): Disabled while testing balancing of velocities above
+      //if (tight_slope_limiters == 1) {                
     
       // Ensure that the Froude number is kept realistic at vertices