Changeset 6162

Timestamp:

Jan 14, 2009, 3:22:08 PM (15 years ago)

Author:

rwilson

Message:

Changed num.array() calls that should have a defined type.

Location:

anuga_core/source/anuga

Files:

• geospatial_data/geospatial_data.py (modified) (1 diff)
• load_mesh/loadASCII.py (modified) (6 diffs)
• shallow_water/benchmark_sww2dem.py (modified) (1 diff)
• shallow_water/data_manager.py (modified) (2 diffs)
• shallow_water/eq_test.py (modified) (2 diffs)
• utilities/sparse.py (modified) (1 diff)

anuga_core/source/anuga/geospatial_data/geospatial_data.py

@@ -707 +707 @@
         if verbose: print "make unique random number list and get indices"
 
-        total=num.array(range(self_size))
+        total=num.array(range(self_size), num.Int)     #array default#
         total_list = total.tolist()
 

anuga_core/source/anuga/load_mesh/loadASCII.py

@@ -853 +853 @@
         mesh['vertices'] = fid.variables['vertices'][:]
     except KeyError:
-        mesh['vertices'] = num.array([])
+        mesh['vertices'] = num.array([], num.Int)      #array default#
 
     try:
@@ -873 +873 @@
         mesh['segments'] = fid.variables['segments'][:]
     except KeyError:
-        mesh['segments'] = num.array([])
+        mesh['segments'] = num.array([], num.Int)      #array default#
 
     mesh['segment_tags'] =[]
@@ -888 +888 @@
         mesh['triangle_neighbors'] = fid.variables['triangle_neighbors'][:]
     except KeyError:
-        mesh['triangles'] = num.array([])
-        mesh['triangle_neighbors'] = num.array([])
+        mesh['triangles'] = num.array([], num.Int)      #array default#
+        mesh['triangle_neighbors'] = num.array([], num.Int)      #array default#
 
     mesh['triangle_tags'] =[]
@@ -916 +916 @@
         mesh['outline_segments'] = fid.variables['outline_segments'][:]
     except KeyError:
-        mesh['outline_segments'] = num.array([])
+        mesh['outline_segments'] = num.array([], num.Int)      #array default#
 
     mesh['outline_segment_tags'] =[]
@@ -930 +930 @@
         mesh['holes'] = fid.variables['holes'][:]
     except KeyError:
-        mesh['holes'] = num.array([])
+        mesh['holes'] = num.array([], num.Int)      #array default#
 
     try:
         mesh['regions'] = fid.variables['regions'][:]
     except KeyError:
-        mesh['regions'] = num.array([])
+        mesh['regions'] = num.array([], num.Int)      #array default#
 
     mesh['region_tags'] =[]
@@ -949 +949 @@
         mesh['region_max_areas'] = fid.variables['region_max_areas'][:]
     except KeyError:
-        mesh['region_max_areas'] = num.array([])
+        mesh['region_max_areas'] = num.array([], num.Int)      #array default#
     #mesh[''] = fid.variables[''][:]
 

anuga_core/source/anuga/shallow_water/benchmark_sww2dem.py

@@ -101 +101 @@
     sww_fileName = tempfile.mktemp(".sww" )
     # sww_fileName = "aa.sww" 
-    elevation = num.array(range(len(mesh_dict["vertices"])))
+    elevation = num.array(range(len(mesh_dict["vertices"])), num.Int)      #array default#
     stage = elevation
     ymomentum = elevation

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -3205 +3205 @@
             volumes.append([v4,v3,v2]) #Lower element
 
-    volumes = num.array(volumes)
+    volumes = num.array(volumes, num.Int)      #array default#
 
     if origin is None:
@@ -4121 +4121 @@
             volumes.append([v4,v2,v3]) #Lower element
 
-    volumes = num.array(volumes)
+    volumes = num.array(volumes, num.Int)      #array default#
 
     geo_ref = Geo_reference(refzone, min(x), min(y))

anuga_core/source/anuga/shallow_water/eq_test.py

@@ -75 +75 @@
 
 y = 10000
-points=num.array([[0]*2]*max)
+points=num.array([[0]*2]*max, num.Int)      #array default#
 print points
 half_max_skip=(max*skip)/2
@@ -87 +87 @@
 number_points = profile_lenght/interval
 y = 10000
-points=num.array([[0]*2]*number_points)
+points=num.array([[0]*2]*number_points, num.Int)      #array default#
 print points
 half_profile=profile_lenght/2

anuga_core/source/anuga/utilities/sparse.py

@@ -355 +355 @@
 
     #Right hand side column
-    v = num.array([[2,4],[3,4],[4,4]])
+    v = num.array([[2,4],[3,4],[4,4]], num.Int)      #array default#
 
     u = A*v[:,0]