Changeset 3820 for anuga_core/source/anuga/shallow_water/data_manager.py

Timestamp:

Oct 18, 2006, 11:04:59 AM (17 years ago)

Author:

duncan

Message:

bug fix. takes into account mux has lat varying fastest, nc has long varying fastest

File:

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

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -64 +64 @@
 
 from Numeric import concatenate, array, Float, Int, Int32, resize, sometrue, \
-     searchsorted, zeros, allclose, around, reshape
+     searchsorted, zeros, allclose, around, reshape, transpose
 from Scientific.IO.NetCDF import NetCDFFile
 
@@ -4200 +4200 @@
                                            files_out,
                                            quantities):
-        lonlatdep, lon, lat = _binary_c2nc(file_in,
+        lonlatdep, lon, lat, depth = _binary_c2nc(file_in,
                                          file_out,
                                          quantity)
@@ -4210 +4210 @@
                                 lon,
                                 lat,
-                                lonlatdep[:,2])
+                                depth)
             hashed_elevation = myhash(lonlatdep)
         else:
@@ -4251 +4251 @@
     lonlatdep = reshape(lonlatdep, ( points_num, columns))
     
-    lon, lat = lon_lat2grid(lonlatdep)
+    #print "lonlatdep", lonlatdep
+    
+    lon, lat, depth = lon_lat2grid(lonlatdep)
     lon_sorted = lon[:]
     lon_sorted.sort()
@@ -4275 +4277 @@
         hz_p_array.read(f, points_num)
         hz_p = array(hz_p_array, typecode=Float)
-        hz_p = reshape(hz_p, ( len(lat), len(lon)))
+        hz_p = reshape(hz_p, (len(lon), len(lat)))
+        hz_p = transpose(hz_p) #mux has lat varying fastest, nc has long v.f. 
         
         nc_file.store_timestep(hz_p)
@@ -4281 +4284 @@
     nc_file.close()
 
-    return lonlatdep, lon, lat
+    return lonlatdep, lon, lat, depth
     
 
@@ -4336 +4339 @@
     The first column is longitudes.
     The second column is latitudes.
+
+    The latitude is the fastest varying dimension - in mux files
     """
     LONG = 0
     LAT = 1
+    QUANTITY = 2
     points_num = len(long_lat_dep)
     lat = [long_lat_dep[0][LAT]]
     this_rows_long = long_lat_dep[0][LONG]
-    i = 1 # Index of long_lat_dep 
-
+    i = 1 # Index of long_lat_dep
+    
     #Working out the lat's
     while long_lat_dep[i][LONG] == this_rows_long and i < points_num:
@@ -4362 +4368 @@
     for l in lat:assert -90 < l < 90 , msg
     for l in long:assert -180 < l < 180 , msg
-        
-    return long, lat
+
+    #changing quantity from lat being the fastest varying dimension to
+    # long being the fastest varying dimension
+    # FIXME - make this faster/do this a better way
+    # use numeric transpose, after reshaping the quantity vector
+    quantity = zeros(len(long_lat_dep), Float)
+    lenlong = len(long)
+    lenlat = len(lat)
+    for lat_i, _ in enumerate(lat):
+        for long_i, _ in enumerate(long):
+            q_index = lat_i*lenlong+long_i
+            lld_index = long_i*lenlat+lat_i
+            quantity[q_index] = long_lat_dep[lld_index][QUANTITY]
+            
+    return long, lat, quantity
 
     ####  END URS 2 SWW  ###