Changeset 7915 for trunk/anuga_work/development/sudi/sw_1d/avalanche/B_momentum/shallow_water_domain_avalanche.py

Timestamp:

Aug 5, 2010, 6:50:49 PM (14 years ago)

Author:

mungkasi

Message:

 

File:

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

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

@@ -218 +218 @@
     """
 
-    from Numeric import zeros, Float
+    from Numeric import Float
+    from numpy import zeros
 
     assert len(q) == 3,\
@@ -266 +267 @@
     from config import g, epsilon, h0
     from math import sqrt
-    from Numeric import array
+    from numpy import array
 
     #Align momentums with x-axis
@@ -336 +337 @@
 def compute_timestep(domain):
     import sys
-    from Numeric import zeros, Float
+    from Numeric import Float
+    from numpy import zeros
 
     N = domain.number_of_elements
@@ -398 +400 @@
 def compute_fluxes_C_wellbalanced(domain):
     import sys
-    from Numeric import zeros, Float
+    from Numeric import Float
+    from numpy import zeros
     
     N = domain.number_of_elements
@@ -475 +478 @@
 def compute_fluxes_C_nonwellbalanced2(domain):
     import sys
-    from Numeric import zeros, Float
+    from Numeric import Float
+    from numpy import zeros
     
     N = domain.number_of_elements
@@ -582 +586 @@
 
     import sys
-    from Numeric import zeros, Float
+    from Numeric import Float
+    from numpy import zeros
     from config import epsilon, h0, h_min
 
@@ -667 +672 @@
 
     import sys
-    from Numeric import zeros, Float
+    from Numeric import Float
+    from numpy import zeros
     from config import epsilon, h0
 
@@ -774 +780 @@
     """
 
-    from Numeric import zeros, Float
+    from Numeric import Float
+    from numpy import zeros
 
     N = domain.number_of_elements
@@ -941 +948 @@
 
     from util import gradient
-    from Numeric import zeros, Float, array, sum
+    from Numeric import Float
+    from numpy import zeros, array, sum    
 
     xmom = domain.quantities['xmomentum'].explicit_update
@@ -975 +983 @@
 
     from util import gradient
-    from Numeric import zeros, Float, array, sum
+    from Numeric import Float
+    from numpy import zeros, array, sum  
     from parameters import F1#This is an additional friction!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
@@ -1011 +1020 @@
 
     from util import gradient
-    from Numeric import zeros, Float, array, sum
+    from Numeric import Float
+    from numpy import zeros, array, sum  
     from parameters import F2#This is an additional friction!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
@@ -1111 +1121 @@
     """
 
-    from Numeric import ones, Float, array
+    from Numeric import Float
+    from numpy import ones, array    
 
 
@@ -1193 +1204 @@
 
         from config import rho_a, rho_w, eta_w
-        from Numeric import array, Float
+        from Numeric import Float
+        from numpy import array       
 
         if len(args) == 2:
@@ -1224 +1236 @@
 
         from math import pi, cos, sin, sqrt
-        from Numeric import Float, ones, ArrayType
+        from Numeric import Float, ArrayType
+        from numpy import ones        
 
         xmom_update = domain.quantities['xmomentum'].explicit_update