Changeset 7855 for anuga_work/development/2010-projects/anuga_1d/channel/channel_domain.py

Timestamp:

Jun 17, 2010, 5:34:13 PM (14 years ago)

Author:

steve

Message:

Changing for loop to numpy.where

File:

• anuga_work/development/2010-projects/anuga_1d/channel/channel_domain.py (modified) (4 diffs)

anuga_work/development/2010-projects/anuga_1d/channel/channel_domain.py

@@ -202 +202 @@
 
     if domain.discontinousb:
-        domain.quantities['width'].extrapolate_second_order()
-        
-
-    # FIXME (SGR): Replace with numpy.where to speed up code
+        width.extrapolate_second_order()
+        
+
     h0 = 1.0e-12
 
@@ -217 +216 @@
     w_C[:] = h_C + z_C
     
-#    for i in range(N):
-#
-#        if a_C[i] <= h0:
-#           a_C[i] = 0.0
-#           h_C[i] = 0.0
-#            d_C[i] = 0.0
-#            u_C[i] = 0.0
-#            w_C[i] = z_C[i]
-#        else:
-#
-#            if b_C[i]<=h0:
-#                a_C[i] = 0.0
-#                h_C[i] = 0.0
-#                d_C[i] = 0.0
-#                u_C[i] = 0.0
-#                w_C[i] = z_C[i]
-#
-#            else:
-#                h_C[i] = a_C[i]/(b_C[i]+h0/b_C[i])
-#                w_C[i] = h_C[i]+z_C[i]
-#                u_C[i] = d_C[i]/(a_C[i]+h0/a_C[i])
                 
 
@@ -260 +238 @@
     b_V  = width.vertex_values
 
-   
-    #FIXME (SGR): replace with numpy.where
-
 
     h_V[:] = w_V-z_V
@@ -271 +246 @@
     d_V[:] = u_V*a_V
 
-#    for i in range(len(h_C)):
-#        for j in range(2):
-#            h_V[i,j] = w_V[i,j]-z_V[i,j]
-#            if h_V[i,j]<h0:
-#                h_V[i,j]=0
-#                w_V[i,j]=z_V[i,j]
-#            a_V[i,j] = b_V[i,j]*h_V[i,j]
-#            d_V[i,j]=u_V[i,j]*a_V[i,j]
     
     return