Changeset 7922 for trunk/anuga_work/development/sudi/sw_1d/periodic_waves/cg/generic_boundary_conditions.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/generic_boundary_conditions.py (modified) (7 diffs)

trunk/anuga_work/development/sudi/sw_1d/periodic_waves/cg/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