Changeset 3793

Timestamp:

Oct 16, 2006, 2:36:26 PM (18 years ago)

Author:

ole

Message:

One more file untabified

File:

• anuga_core/source/anuga/shallow_water/shallow_water_domain.py (modified) (8 diffs)

anuga_core/source/anuga/shallow_water/shallow_water_domain.py

@@ -164 +164 @@
         self.minimum_storable_height = minimum_storable_height
         self.quantities_to_be_stored = ['stage','xmomentum','ymomentum']
-                
+                
 
 
@@ -1112 +1112 @@
             alpha = 1.0
 
-        #Let
-        #
-        #  wvi be the w-limited stage (wvi = zvi + hvi)
-        #  wvi- be the h-limited state (wvi- = zvi + hvi-)
-        #
-        #
-        #where i=0,1,2 denotes the vertex ids
-        #
+        #Let
+        #
+        #  wvi be the w-limited stage (wvi = zvi + hvi)
+        #  wvi- be the h-limited state (wvi- = zvi + hvi-)
+        #
+        #
+        #where i=0,1,2 denotes the vertex ids
+        #
         #Weighted balance between w-limited and h-limited stage is
         #
-        #  wvi := (1-alpha)*(zvi+hvi-) + alpha*(zvi+hvi)
-        #
+        #  wvi := (1-alpha)*(zvi+hvi-) + alpha*(zvi+hvi)
+        #
         #It follows that the updated wvi is
         #  wvi := zvi + (1-alpha)*hvi- + alpha*hvi
         #
-        # Momentum is balanced between constant and limited
+        # Momentum is balanced between constant and limited
 
 
@@ -1133 +1133 @@
         #    wv[k,i] = zv[k,i] + hvbar[k,i]
 
-        #return
-
-        if alpha < 1:
+        #return
+
+        if alpha < 1:
 
             for i in range(3):
@@ -1444 +1444 @@
         if eta[k] >= eps:
             if h[k] >= eps:
-                S = -g * eta[k]**2 * sqrt((uh[k]**2 + vh[k]**2))
-                S /= h[k]**(7.0/3)
-
-                #Update momentum
-                xmom_update[k] += S*uh[k]
-                ymom_update[k] += S*vh[k]
+                S = -g * eta[k]**2 * sqrt((uh[k]**2 + vh[k]**2))
+                S /= h[k]**(7.0/3)
+
+                #Update momentum
+                xmom_update[k] += S*uh[k]
+                ymom_update[k] += S*vh[k]
 
 
@@ -1533 +1533 @@
         if tau[k] >= eps:
             if h[k] >= eps:
-                S = -tau[k]/h[k]
-
-                #Update momentum
-                xmom_update[k] += S*uh[k]
-                ymom_update[k] += S*vh[k]
+                S = -tau[k]/h[k]
+
+                #Update momentum
+                xmom_update[k] += S*uh[k]
+                ymom_update[k] += S*vh[k]
 
 
@@ -1557 +1557 @@
         except Exception, e:
             msg = 'Function %s could not be executed:\n%s' %(f, e)
-            #FIXME: Reconsider this semantics
+            #FIXME: Reconsider this semantics
             raise msg
 
@@ -1780 +1780 @@
         #Weighted balance between stage parallel to bed elevation
         #(wvi = zvi + hc) and stage as computed by 1st or 2nd
-        #order gradient limiter
+        #order gradient limiter
         #(wvi = zvi + hvi) where i=0,1,2 denotes the vertex ids
         #
@@ -1789 +1789 @@
         #Note that hvi = zc+hc-zvi in the first order case (constant).
 
-        if alpha < 1:
+        if alpha < 1:
             for i in range(3):
                 wv[k,i] = zv[k,i] + hc[k] + alpha*(hv[k,i]-hc[k])