Changeset 7922 for trunk/anuga_work/development/sudi/sw_1d/periodic_waves/cg/quantity.py

Timestamp:

Aug 5, 2010, 8:20:47 PM (15 years ago)

Author:

mungkasi

Message:

Modifying codes so that arrays are compatible with numpy instead of Numeric.

File:

• trunk/anuga_work/development/sudi/sw_1d/periodic_waves/cg/quantity.py (modified) (12 diffs)

trunk/anuga_work/development/sudi/sw_1d/periodic_waves/cg/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 zeros
 
         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
@@ -822 +831 @@
 
         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 domain_cg import Domain    
-    from Numeric import arange
+    from numpy import arange
     
     points1 = [0.0, 1.0, 2.0, 3.0]