Changeset 7193 for branches/numpy/anuga

Timestamp:

Jun 12, 2009, 10:28:57 AM (16 years ago)

Author:

rwilson

Message:

Back-merge from Numeric trunk.

Location:

branches/numpy/anuga

Files:

• config.py (modified) (1 diff)
• coordinate_transforms/geo_reference.py (modified) (1 diff)
• culvert_flows/test_culvert_routines_pipe_1pct.py (modified) (1 diff)
• mesh_engine/test_generate_mesh.py (modified) (1 diff)
• shallow_water/shallow_water_domain.py (modified) (1 diff)
• utilities/polygon.py (modified) (1 diff)

branches/numpy/anuga/config.py

@@ -4 +4 @@
 import os
 import sys
-import numpy as num
 
 

branches/numpy/anuga/coordinate_transforms/geo_reference.py

@@ -232 +232 @@
     # @note If 'points' is a list then a changed list is returned.
     def change_points_geo_ref(self, points, points_geo_ref=None):
-        """Change the geo reference of a list or Numeric array of points to
+        """Change the geo reference of a list or numeric array of points to
         be this reference.(The reference used for this object)
         If the points do not have a geo ref, assume 'absolute' values

branches/numpy/anuga/culvert_flows/test_culvert_routines_pipe_1pct.py

@@ -8 +8 @@
 from anuga.utilities.system_tools import get_pathname_from_package
 from anuga.culvert_flows.culvert_routines import boyd_generalised_culvert_model
-import Numeric as num
+import numpy as num
 
 

branches/numpy/anuga/mesh_engine/test_generate_mesh.py

@@ -412 +412 @@
                         'Failed!')
         
-        correct = num.array(segattlist, num.Int)
+        correct = num.array(segattlist, num.int)
         self.failUnless(num.allclose(data['generatedsegmentmarkerlist'].flat, 
                                      correct.flat),

branches/numpy/anuga/shallow_water/shallow_water_domain.py

@@ -1801 +1801 @@
     """
 
-    import Numeric as num
+    import numpy as num
     
     # Create a temp array to store updated depth dependent friction for wet elements
     # EHR this is outwardly inneficient but not obvious how to avoid recreating each call??????
     N=len(domain)
-    wet_friction    = num.zeros(N, num.Float)
+    wet_friction    = num.zeros(N, num.float)
     wet_friction[:] = default_n0   # Initially assign default_n0 to all array so sure have no zeros values
     

branches/numpy/anuga/utilities/polygon.py

@@ -388 +388 @@
         # If this fails it is going to be because the points can't be
         # converted to a numeric array.
-        msg = 'Points could not be converted to Numeric array' 
+        msg = 'Points could not be converted to numeric array' 
         raise Exception, msg