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

Timestamp:

Aug 5, 2010, 8:20:47 PM (13 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/domain.py (modified) (9 diffs)

trunk/anuga_work/development/sudi/sw_1d/periodic_waves/cg/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)
 
@@ -1078 +1081 @@
         """
         import copy
-        from Numeric import zeros,Float
+        from Numeric import Float
+        from numpy import zeros
 
         N = self.number_of_elements
@@ -1136 +1140 @@
         """
         import copy
-        from Numeric import zeros,Float
+        from Numeric import Float
+        from numpy import zeros
 
         N = self.number_of_elements
@@ -1354 +1359 @@
         """
 
-        from Numeric import ones, sum, equal, Float
+        from Numeric import Float
+        from numpy import ones, sum, equal       
 
         N = self.number_of_elements