Changeset 2649

Timestamp:

Apr 2, 2006, 8:07:36 PM (19 years ago)

Author:

steve

Message:

 

Location:

inundation

Files:

• examples/island.py (modified) (2 diffs)
• pyvolution/shallow_water_ext.c (modified) (1 diff)

inundation/examples/island.py

@@ -34 +34 @@
                                            'left': [3]},
                           maximum_triangle_area = 5,
-                          filename = 'island.msh'
-              , interior_regions=[ ([[50,25], [70,25], [70,75], [50,75]], 3)]
+                          filename = 'island.msh' ,
+                          interior_regions=[ ([[50,25], [70,25], [70,75], [50,75]], 3)]
                           )
 
@@ -78 +78 @@
 
 #domain.set_quantity('friction', 0.1)  #Honky dory
-domain.set_quantity('friction', 1000)     #Creep
+domain.set_quantity('friction', 2)     #Creep
 domain.set_quantity('elevation', island)
 domain.set_quantity('stage', 1)

inundation/pyvolution/shallow_water_ext.c

@@ -245 +245 @@
       h = w[k]-z[k];
       if (h >= eps) {
-        S = -g * eta[k]*eta[k] * sqrt((uh[k]*uh[k] + vh[k]*vh[k]));
-        S /= pow(h, 7.0/3);      //Expensive (on Ole's home computer)
-        //S /= exp(7.0/3.0*log(h));      //seems to save about 15% over manning_friction
-        //S /= h*h*(1 + h/3.0 - h*h/9.0); //FIXME: Could use a Taylor expansion
-
-
-        //Update momentum
-        xmom[k] += S*uh[k];
-        ymom[k] += S*vh[k];
+        S = -g * eta[k]*eta[k] * sqrt((uh[k]*uh[k] + vh[k]*vh[k]));
+        S /= pow(h, 7.0/3);      //Expensive (on Ole's home computer)
+        //S /= exp(7.0/3.0*log(h));      //seems to save about 15% over manning_friction
+        //S /= h*h*(1 + h/3.0 - h*h/9.0); //FIXME: Could use a Taylor expansion
+
+
+        //Update momentum
+        xmom[k] += S*uh[k];
+        ymom[k] += S*vh[k];
       }
     }