Changeset 3830

Timestamp:

Oct 19, 2006, 6:35:45 PM (18 years ago)

Author:

ole

Message:

Fixed broken tests

File:

• anuga_core/source/anuga/shallow_water/data_manager.py (modified) (3 diffs)

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -4250 +4250 @@
     
     lonlatdep = p_array.array('f')
-    points_num = 2914
+    ####points_num = 2914
     lonlatdep.read(f, columns * points_num)
     lonlatdep = array(lonlatdep, typecode=Float)    
@@ -4258 +4258 @@
     
     lon, lat, depth = lon_lat2grid(lonlatdep)
-    lon_sorted = lon[:]
+    lon_sorted = list(lon)
     lon_sorted.sort()
-    
-#    if not lon == lon_sorted:
+
     if not allclose(lon, lon_sorted):
         msg = "Longitudes in mux file are not in ascending order"
         raise IOError, msg
-    lat_sorted = lat[:]
-    lat_sorted.sort()   
-#    if not lat == lat_sorted:
+    lat_sorted = list(lat)
+    lat_sorted.sort()
+
     if not allclose(lat, lat_sorted):
         msg = "Latitudes in mux file are not in ascending order"
@@ -4353 +4352 @@
     LAT = 1
     QUANTITY = 2
-    
-#    print 'long_lat_dep', type(long_lat_dep), long_lat_dep.shape
-#    print 'long_lat_dep', long_lat_dep
+
+    long_lat_dep = ensure_numeric(long_lat_dep, Float)
     
     num_points = long_lat_dep.shape[0]