Changeset 6166

Timestamp:

Jan 14, 2009, 4:07:10 PM (16 years ago)

Author:

rwilson

Message:

Changes: array(A).astype(X) -> array(A, X).

Location:

anuga_core/source/anuga

Files:

• abstract_2d_finite_volumes/general_mesh.py (modified) (1 diff)
• abstract_2d_finite_volumes/generic_boundary_conditions.py (modified) (2 diffs)
• abstract_2d_finite_volumes/neighbour_mesh.py (modified) (1 diff)
• abstract_2d_finite_volumes/quantity.py (modified) (2 diffs)
• alpha_shape/alpha_shape.py (modified) (1 diff)
• geospatial_data/geospatial_data.py (modified) (2 diffs)
• load_mesh/loadASCII.py (modified) (4 diffs)
• shallow_water/shallow_water_domain.py (modified) (1 diff)
• utilities/polygon.py (modified) (1 diff)

anuga_core/source/anuga/abstract_2d_finite_volumes/general_mesh.py

@@ -406 +406 @@
         K = 3*M       # Total number of unique vertices
         
-        T = num.reshape(num.arange(K).astype(num.Int), (M,3))
+        T = num.reshape(num.arange(K, typecode=num.Int), (M,3))
         
         return T     

anuga_core/source/anuga/abstract_2d_finite_volumes/generic_boundary_conditions.py

@@ -69 +69 @@
             raise Exception, msg
 
-        self.conserved_quantities=num.array(conserved_quantities).astype(num.Float)
+        self.conserved_quantities=num.array(conserved_quantities, num.Float)
 
     def __repr__(self):
@@ -99 +99 @@
 
         try:
-            q = num.array(q).astype(num.Float)
+            q = num.array(q, num.Float)
         except:
             msg = 'Return value from time boundary function could '

anuga_core/source/anuga/abstract_2d_finite_volumes/neighbour_mesh.py

@@ -394 +394 @@
             #Check that all keys in given boundary exist
             for tag in tagged_elements.keys():
-                tagged_elements[tag] = num.array(tagged_elements[tag]).astype(num.Int)
+                tagged_elements[tag] = num.array(tagged_elements[tag], num.Int)
 
                 msg = 'Not all elements exist. '

anuga_core/source/anuga/abstract_2d_finite_volumes/quantity.py

@@ -40 +40 @@
             self.vertex_values = num.zeros((N, 3), num.Float)
         else:
-            self.vertex_values = num.array(vertex_values).astype(num.Float)
+            self.vertex_values = num.array(vertex_values, num.Float)
 
             N, V = self.vertex_values.shape
@@ -611 +611 @@
         """
 
-        values = num.array(values).astype(num.Float)
+        values = num.array(values, num.Float)
 
         if indices is not None:
-            indices = num.array(indices).astype(num.Int)
+            indices = num.array(indices, num.Int)
             msg = 'Number of values must match number of indices:'
             msg += ' You specified %d values and %d indices'\

anuga_core/source/anuga/alpha_shape/alpha_shape.py

@@ -89 +89 @@
         
         #Convert input to Numeric arrays
-        self.points = num.array(points).astype(num.Float)
+        self.points = num.array(points, num.Float)
 
     

anuga_core/source/anuga/geospatial_data/geospatial_data.py

@@ -1150 +1150 @@
         raise StopIteration
 
-    pointlist = num.array(points).astype(num.Float)
+    pointlist = num.array(points, num.Float)
     for key in att_dict.keys():
-        att_dict[key] = num.array(att_dict[key]).astype(num.Float)
+        att_dict[key] = num.array(att_dict[key], num.Float)
 
     # Do stuff here so the info is in lat's and longs
@@ -1361 +1361 @@
 # @return ??
 def _point_atts2array(point_atts):
-    point_atts['pointlist'] = num.array(point_atts['pointlist']).astype(num.Float)
+    point_atts['pointlist'] = num.array(point_atts['pointlist'], num.Float)
 
     for key in point_atts['attributelist'].keys():
         point_atts['attributelist'][key] = \
-                num.array(point_atts['attributelist'][key]).astype(num.Float)
+                num.array(point_atts['attributelist'][key], num.Float)
 
     return point_atts

anuga_core/source/anuga/load_mesh/loadASCII.py

@@ -653 +653 @@
 
     #the triangulation
-    mesh['vertices'] = num.array(mesh['vertices']).astype(num.Float)
+    mesh['vertices'] = num.array(mesh['vertices'], num.Float)
     if mesh['vertex_attributes'] != None:
         mesh['vertex_attributes'] = \
-            num.array(mesh['vertex_attributes']).astype(num.Float)
+            num.array(mesh['vertex_attributes'], num.Float)
     mesh['vertex_attribute_titles'] = \
-        num.array(mesh['vertex_attribute_titles']).astype(num.Character)
-    mesh['segments'] = num.array(mesh['segments']).astype(IntType)
-    mesh['segment_tags'] = num.array(mesh['segment_tags']).astype(num.Character)
-    mesh['triangles'] = num.array(mesh['triangles']).astype(IntType)
+        num.array(mesh['vertex_attribute_titles'], num.Character)
+    mesh['segments'] = num.array(mesh['segments'], IntType)
+    mesh['segment_tags'] = num.array(mesh['segment_tags'], num.Character)
+    mesh['triangles'] = num.array(mesh['triangles'], IntType)
     mesh['triangle_tags'] = num.array(mesh['triangle_tags']) #.astype(Character)
     mesh['triangle_neighbors'] = \
-        num.array(mesh['triangle_neighbors']).astype(IntType)
+        num.array(mesh['triangle_neighbors'], IntType)
 
     #the outline
-    mesh['points'] = num.array(mesh['points']).astype(num.Float)
-    mesh['point_attributes'] = num.array(mesh['point_attributes']).astype(num.Float)
-    mesh['outline_segments'] = num.array(mesh['outline_segments']).astype(IntType)
+    mesh['points'] = num.array(mesh['points'], num.Float)
+    mesh['point_attributes'] = num.array(mesh['point_attributes'], num.Float)
+    mesh['outline_segments'] = num.array(mesh['outline_segments'], IntType)
     mesh['outline_segment_tags'] = \
-        num.array(mesh['outline_segment_tags']).astype(num.Character)
-    mesh['holes'] = num.array(mesh['holes']).astype(num.Float)
-    mesh['regions'] = num.array(mesh['regions']).astype(num.Float)
-    mesh['region_tags'] = num.array(mesh['region_tags']).astype(num.Character)
-    mesh['region_max_areas'] = num.array(mesh['region_max_areas']).astype(num.Float)
+        num.array(mesh['outline_segment_tags'], num.Character)
+    mesh['holes'] = num.array(mesh['holes'], num.Float)
+    mesh['regions'] = num.array(mesh['regions'], num.Float)
+    mesh['region_tags'] = num.array(mesh['region_tags'], num.Character)
+    mesh['region_max_areas'] = num.array(mesh['region_max_areas'], num.Float)
 
     #mesh = mesh_dict2array(mesh)
@@ -1018 +1018 @@
 #                                  [max_x, max_y], [min_x, max_y]]
 def extent(points):
-    points = num.array(points).astype(num.Float)
+    points = num.array(points, num.Float)
 
     max_x = min_x = points[0][0]
@@ -1095 +1095 @@
 def point_atts2array(point_atts):
     # convert attribute list to array of floats
-    point_atts['pointlist'] = num.array(point_atts['pointlist']).astype(num.Float)
+    point_atts['pointlist'] = num.array(point_atts['pointlist'], num.Float)
 
     for key in point_atts['attributelist'].keys():
         point_atts['attributelist'][key] = \
-            num.array(point_atts['attributelist'][key]).astype(num.Float)
+            num.array(point_atts['attributelist'][key], num.Float)
 
     return point_atts
@@ -1127 +1127 @@
     """
 
-    point_attributes = num.array([]).astype(num.Float)
+    point_attributes = num.array([], num.Float)
     keys = dic.keys()
     key = keys.pop(0)

anuga_core/source/anuga/shallow_water/shallow_water_domain.py

@@ -1508 +1508 @@
 
         try:
-            q = num.array(q).astype(num.Float)
+            q = num.array(q, num.Float)
         except:
             msg = 'Return value from vector function %s could ' %f

anuga_core/source/anuga/utilities/polygon.py

@@ -708 +708 @@
 
     def __call__(self, x, y):
-        x = num.array(x).astype(num.Float)
-        y = num.array(y).astype(num.Float)
+        x = num.array(x, num.Float)
+        y = num.array(y, num.Float)
 
         N = len(x)