Changeset 6149 for anuga_core/source/anuga/coordinate_transforms/geo_reference.py

Timestamp:

Jan 13, 2009, 1:17:54 PM (15 years ago)

Author:

rwilson

Message:

Change Numeric imports to general form - ready to change to NumPy?.

File:

• anuga_core/source/anuga/coordinate_transforms/geo_reference.py (modified) (8 diffs)

anuga_core/source/anuga/coordinate_transforms/geo_reference.py

@@ -8 +8 @@
 
 import types, sys
-from Numeric import array, Float, ArrayType, reshape, allclose
 from anuga.utilities.numerical_tools import ensure_numeric
 from anuga.utilities.anuga_exceptions import ANUGAError, TitleError, ParsingError, \
      ShapeError
+
+import Numeric as num
 
 
@@ -98 +99 @@
         
         # Fix some assertion failures
-        if type(self.zone) == ArrayType and self.zone.shape == ():
+        if type(self.zone) == num.ArrayType and self.zone.shape == ():
             self.zone = self.zone[0]
-        if type(self.xllcorner) == ArrayType and self.xllcorner.shape == ():
+        if type(self.xllcorner) == num.ArrayType and self.xllcorner.shape == ():
             self.xllcorner = self.xllcorner[0]
-        if type(self.yllcorner) == ArrayType and self.yllcorner.shape == ():
+        if type(self.yllcorner) == num.ArrayType and self.yllcorner.shape == ():
             self.yllcorner = self.yllcorner[0]
 
@@ -172 +173 @@
             
         # Fix some assertion failures
-        if(type(self.zone) == ArrayType and self.zone.shape == ()):
+        if(type(self.zone) == num.ArrayType and self.zone.shape == ()):
             self.zone = self.zone[0]
-        if type(self.xllcorner) == ArrayType and self.xllcorner.shape == ():
+        if type(self.xllcorner) == num.ArrayType and self.xllcorner.shape == ():
             self.xllcorner = self.xllcorner[0]
-        if type(self.yllcorner) == ArrayType and self.yllcorner.shape == ():
+        if type(self.yllcorner) == num.ArrayType and self.yllcorner.shape == ():
             self.yllcorner = self.yllcorner[0]
     
@@ -196 +197 @@
             is_list = True
 
-        points = ensure_numeric(points, Float)
+        points = ensure_numeric(points, num.Float)
         
         if len(points.shape) == 1:
@@ -202 +203 @@
             msg = 'Single point must have two elements'
             assert len(points) == 2, msg
-            points = reshape(points, (1,2))
+            points = num.reshape(points, (1,2))
 
         msg = 'Points array must be two dimensional.\n'
@@ -239 +240 @@
         """
 
-        return allclose([self.xllcorner, self.yllcorner], 0) 
+        return num.allclose([self.xllcorner, self.yllcorner], 0) 
 
         
@@ -255 +256 @@
             is_list = True
 
-        points = ensure_numeric(points, Float)
+        points = ensure_numeric(points, num.Float)
         if len(points.shape) == 1:
             #One point has been passed
@@ -295 +296 @@
             is_list = True
 
-        points = ensure_numeric(points, Float)
+        points = ensure_numeric(points, num.Float)
         if len(points.shape) == 1:
             #One point has been passed