Changeset 7921 for trunk/anuga_work/development/sudi/sw_1d/avalanche/B_momentum

Timestamp:

Aug 5, 2010, 7:16:33 PM (15 years ago)

Author:

mungkasi

Message:

 

File:

• trunk/anuga_work/development/sudi/sw_1d/avalanche/B_momentum/shallow_water_domain_avalanche.py (modified) (3 diffs)

trunk/anuga_work/development/sudi/sw_1d/avalanche/B_momentum/shallow_water_domain_avalanche.py

@@ -673 +673 @@
     import sys
     from Numeric import Float
-    from numpy import zeros
+    from numpy import array, zeros
     from config import epsilon, h0
 
@@ -691 +691 @@
     h_C   = Height.centroid_values
     u_C   = Velocity.centroid_values
-
-    #for i in range(N):
-    #   h_C[i] = w_C[i] - z_C[i]                                                
-    #    if h_C[i] <= epsilon :
-    #       uh_C[i] = 0.0
-    #       u_C[i] = 0.0
-    #       w_C[i] = z_C[i]
-    #u_C[:] = uh_C/(h_C + h0/h_C)
     
     for i in range(N):
@@ -727 +719 @@
 
     for i in range(N):                                          
-        if h_V[i] <= 0.0:
-            h_V[i] = 0.0
+        if min(h_V[i]) <= 0.0:
+            h_V[i] = array([0.0, 0.0])
             stage_V[i] = bed_V[i]
-            xmom_V[i] = 0.0
+            xmom_V[i] = array([0.0, 0.0])
     
     u_V[:]  = xmom_V/(h_V + h0/h_V)