Changeset 7914

Timestamp:

Aug 5, 2010, 5:41:58 PM (15 years ago)

Author:

mungkasi

Message:

Modifying debris avalanche codes using s-h-v reconstruction.

Location:

trunk/anuga_work/development/sudi/sw_1d/avalanche/A_velocity

Files:

• debris_avalanche_RUN.py (modified) (1 diff)
• domain.py (modified) (9 diffs)
• generic_boundary_conditions.py (modified) (7 diffs)
• parameters.py (modified) (1 diff)
• quantity.py (modified) (12 diffs)
• shallow_water_domain_avalanche.py (modified) (14 diffs)
• util.py (modified) (2 diffs)

trunk/anuga_work/development/sudi/sw_1d/avalanche/A_velocity/debris_avalanche_RUN.py

@@ -2 +2 @@
 import time
 from shallow_water_domain_avalanche import *
-from Numeric import array, zeros, Float, sqrt
+from Numeric import Float, sqrt
 from config import g, epsilon
-from numpy import sin, cos, tan
+from numpy import sin, cos, tan, array, zeros
 from scipy import linspace
 from parameters import *

trunk/anuga_work/development/sudi/sw_1d/avalanche/A_velocity/domain.py

@@ -24 +24 @@
         """
 
-        from Numeric import array, zeros, Float, Int
-
+        from Numeric import Float, Int
+        from numpy import array, zeros
         from config import timestepping_method
         from config import CFL
@@ -175 +175 @@
           self.vertexlist is built
         """
-        from Numeric import array
+        from numpy import array
 
         vertexlist = [None]*len(self.coordinates)
@@ -322 +322 @@
             self.element_tag is defined
         """
-        from Numeric import array, Int
+        from Numeric import Int
+        from numpy import array        
 
         if tagged_elements is None:
@@ -393 +394 @@
 
         if obj is True:
-            from Numeric import concatenate, reshape
+            from numpy import concatenate, reshape
             V = self.vertices
             N = V.shape[0]
@@ -412 +413 @@
         """
 
-        from Numeric import zeros, Float
+        from Numeric import Float
+        from numpy import zeros        
         q = zeros( len(self.conserved_quantities), Float)
         for i, name in enumerate(self.conserved_quantities):
@@ -436 +438 @@
         """
 
-        from Numeric import zeros, Float
+        from Numeric import Float
+        from numpy import zeros        
         q = zeros( len(self.evolved_quantities), Float)
 
@@ -1079 +1082 @@
         """
         import copy
-        from Numeric import zeros,Float
+        from Numeric import Float
+        from numpy import zeros       
 
         N = self.number_of_elements
@@ -1137 +1141 @@
         """
         import copy
-        from Numeric import zeros,Float
+        from Numeric import Float
+        from numpy import zeros       
 
         N = self.number_of_elements
@@ -1352 +1357 @@
         """
 
-        from Numeric import ones, sum, equal, Float
+        from Numeric import Float
+        from numpy import ones, sum, equal        
 
         N = self.number_of_elements

trunk/anuga_work/development/sudi/sw_1d/avalanche/A_velocity/generic_boundary_conditions.py

@@ -43 +43 @@
         self.velocity = domain.quantities['velocity'].vertex_values
 
-        from Numeric import zeros, Float
+        from Numeric import Float
+        from numpy import zeros        
         self.evolved_quantities = zeros(5, Float)
 
@@ -103 +104 @@
             raise msg
 
-        from Numeric import array, Float
+        from Numeric import Float
+        from numpy import array       
         self.conserved_quantities=array(conserved_quantities).astype(Float)
 
@@ -132 +134 @@
 
 
-        from Numeric import array, Float
+        from Numeric import Float
+        from numpy import array     
         try:
             q = array(q).astype(Float)
@@ -173 +176 @@
     def __init__(self, filename, domain):
         import time
-        from Numeric import array
+        from numpy import array
         from config import time_format
         from util import File_function
@@ -223 +226 @@
     def __init__(self, filename, domain, verbose = False):
         import time
-        from Numeric import array, zeros, Float
+        from Numeric import Float
+        from numpy import array, zeros       
         from config import time_format
         from util import file_function
@@ -421 +425 @@
     def __init__(self, domain = None, filename = None):
         import time
-        from Numeric import array
+        from numpy import array
         from config import time_format
 
@@ -479 +483 @@
 
     def read_time_boundary(self):
-        from Numeric import zeros, Float, alltrue
+        from Numeric import Float
+        from numpy import zeros, alltrue        
         from config import time_format
         import time

trunk/anuga_work/development/sudi/sw_1d/avalanche/A_velocity/parameters.py

@@ -1 @@
-from Numeric import zeros, Float, sqrt
+from Numeric import Float, sqrt
+from numpy import zeros
 from config import g
 from scipy import sin, cos, tan, arcsin, arccos, arctan, pi

trunk/anuga_work/development/sudi/sw_1d/avalanche/A_velocity/quantity.py

@@ -24 +24 @@
         
         from domain import Domain
-        from Numeric import array, zeros, Float
+        from Numeric import Float
+        from numpy import array, zeros       
 
         msg = 'First argument in Quantity.__init__ '
@@ -60 +61 @@
 
 
-        from Numeric import zeros, Float
+        from Numeric import Float
+        from numpy import zeros        
         
         #Allocate space for boundary values
@@ -194 +196 @@
         """
 
-        from Numeric import array, Float
+        from Numeric import Float
+        from numpy import array    
 
         values = array(values).astype(Float)
@@ -237 +240 @@
 
         """
-        from Numeric import take
+        from numpy import take
 
         if location not in ['vertices', 'centroids', 'unique vertices']:
@@ -310 +313 @@
         """
 
-        from Numeric import concatenate, zeros, Float, Int, array, reshape
+        from Numeric import Float, Int
+        from numpy import concatenate, zeros, array, reshape        
 
 
@@ -402 +406 @@
         """
 
-        from Numeric import sum, equal, ones, Float
+        from Numeric import Float
+        from numpy import sum, equal, ones        
 
         N = self.centroid_values.shape[0]
@@ -427 +432 @@
         #print 'compute_gradient'
 
-        from Numeric import array, zeros, Float
+        from Numeric import Float
+        from numpy import array, zeros        
 
         N = self.centroid_values.shape[0]
@@ -518 +524 @@
         #print 'compute_minmod_gradients'
         
-        from Numeric import array, zeros, Float,sign
+        from Numeric import Float,sign
+        from numpy import array, zeros        
         
         def xmin(a,b):
@@ -712 +719 @@
         vertex values are updated
         """
-        from Numeric import zeros, Float
+        from Numeric import Float
+        from numpy import zeros       
 
         N = self.domain.number_of_elements
@@ -763 +771 @@
     def limit_range(self):
         import sys
-        from Numeric import zeros, Float
+        from Numeric import Float
+        from numpy import zeros       
         from util import minmod, minmod_kurganov, maxmod, vanleer, vanalbada
         limiter = self.domain.limiter
@@ -825 +834 @@
 
         import sys
-        from Numeric import zeros, Float
+        from Numeric import Float
+        from numpy import zeros        
         from util import minmod, minmod_kurganov, maxmod, vanleer
 
@@ -950 +960 @@
     #from domain import Domain
     from shallow_water_domain import Domain     
-    from Numeric import arange
+    from numpy import arange
     
     points1 = [0.0, 1.0, 2.0, 3.0]

trunk/anuga_work/development/sudi/sw_1d/avalanche/A_velocity/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
 
@@ -662 +667 @@
 
     import sys
-    from Numeric import zeros, Float
+    from Numeric import Float
+    from numpy import zeros
     from config import epsilon, h0
 
@@ -766 +772 @@
     """
 
-    from Numeric import zeros, Float
+    from Numeric import Float
+    from numpy import zeros    
 
     N = domain.number_of_elements
@@ -933 +940 @@
 
     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
@@ -967 +975 @@
 
     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!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
@@ -1003 +1012 @@
 
     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!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
@@ -1103 +1113 @@
     """
 
-    from Numeric import ones, Float, array
+    from Numeric import Float
+    from numpy import ones, array    
 
 
@@ -1185 +1196 @@
 
         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:
@@ -1216 +1228 @@
 
         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

trunk/anuga_work/development/sudi/sw_1d/avalanche/A_velocity/util.py

@@ -4 +4 @@
 
 def mean(x):
-    from Numeric import sum
+    from numpy import sum
     return sum(x)/len(x)
 
@@ -142 +142 @@
 
 def analytic_cannal(C,t):
-    from Numeric import zeros, Float,sqrt,sin,cos
+    from Numeric import Float,sqrt,sin,cos
+    from numpy import zeros