Changeset 2038 for inundation/pyvolution/data_manager.py

Timestamp:

Nov 18, 2005, 2:39:35 PM (19 years ago)

Author:

duncan

Message:

remove bug in gippsland converter

File:

• inundation/pyvolution/data_manager.py (modified) (7 diffs)

inundation/pyvolution/data_manager.py

@@ -3355 +3355 @@
     latitudes = [bath_metadata['yllcorner']+y*bath_metadata['cellsize'] \
                  for y in range(number_of_latitudes)]
-
+    
+     # reverse order of lat, so the fist lat represents the first grid row
+    latitudes.reverse()
+    
+    #print "latitudes - before get_min_max_indexes",latitudes 
     kmin, kmax, lmin, lmax = get_min_max_indexes(latitudes,longitudes,
                                                  minlat=minlat, maxlat=maxlat,
                                                  minlon=minlon, maxlon=maxlon)
-    #print "latitudes", latitudes
-    #print "********************"
-    #print "kmin",kmin
-    #print "kmax",kmax
-    #print "lmin",lmin
-    #print "lmax",lmax
-    #print "bath_grid",bath_grid 
+    
+
     bath_grid = bath_grid[kmin:kmax,lmin:lmax]
     #print "bath_grid",bath_grid
@@ -3377 +3376 @@
     latitudes = latitudes[kmin:kmax]
     longitudes = longitudes[lmin:lmax]
-
-     # reverse order of lat, so the fist lat represents the first grid row
-    latitudes.reverse()
-   
+    number_of_latitudes = len(latitudes)
+    number_of_longitudes = len(longitudes)
+
+
     #Work out the times
     if len(elevation_files) > 1:
@@ -3530 +3529 @@
         _, v_momentum_grid =  _read_asc(vcur_dir + os.sep + vcur_files[j])
 
+        #print "elevation_grid",elevation_grid 
         #cut matrix to desired size
         elevation_grid = elevation_grid[kmin:kmax,lmin:lmax]
         u_momentum_grid = u_momentum_grid[kmin:kmax,lmin:lmax]
         v_momentum_grid = v_momentum_grid[kmin:kmax,lmin:lmax]
+        #print "elevation_grid",elevation_grid 
         # handle missing values
         missing = (elevation_grid == elevation_meta['NODATA_value'])
@@ -3550 +3551 @@
         for k in range(number_of_latitudes):      #Y direction
             for l in range(number_of_longitudes): #X direction
-                #w = zscale*amplitudes[j,k,l]/100 + mean_stage
                 w = zscale*elevation_grid[k,l] + mean_stage
                 stage[j,i] = w
@@ -3563 +3563 @@
                         minlon=None, maxlon=None):
     """
-    return max, min indexes of the lat and long arrays to cover the area
+    return max, min indexes (for slicing) of the lat and long arrays to cover the area
     specified with min/max lat/long
 
@@ -3571 +3571 @@
     has a section outside of the latitudes/longitudes area.)
 
-    assume latitudess & longitudes are sorted, from low to high
-    """
-
-    
-  #Cut out a smaller extent.
+    assume latitudess & longitudes are sorted,
+    long - from low to high (west to east, eg 148 - 151)
+    lat - from high to low (north to south, eg -35 - -38)
+    """
+
+    # reverse order of lat, so it's in ascending order
+    latitudes.reverse()
+    largest_lat_index = len(latitudes)-1
+    #Cut out a smaller extent.
     if minlat == None:
-        lat_min_index =0
+        lat_min_index = 0
     else:
         lat_min_index = searchsorted(latitudes, minlat)-1
         if lat_min_index <0:
-            lat_min_index =0
+            lat_min_index = 0
             
 
     if maxlat == None:
-        lat_max_index = len(latitudes)
+        lat_max_index = largest_lat_index #len(latitudes)
     else:
-        lat_max_index = searchsorted(latitudes, maxlat)+1
+        lat_max_index = searchsorted(latitudes, maxlat)
+        if lat_max_index > largest_lat_index:
+            lat_max_index = largest_lat_index
+        
     if minlon == None:
         lon_min_index = 0
@@ -3598 +3605 @@
         lon_max_index = len(longitudes)
     else:
-        lon_max_index = searchsorted(longitudes, maxlon)+1
-
+        lon_max_index = searchsorted(longitudes, maxlon)
+
+    #Take into account that the latitude list was reversed 
+    latitudes.reverse() # Python passes by reference, need to swap back
+    lat_min_index, lat_max_index = largest_lat_index - lat_max_index , \
+                                   largest_lat_index - lat_min_index
+    lat_max_index = lat_max_index + 1 # taking into account how slicing works
+    lon_max_index = lon_max_index + 1 # taking into account how slicing works
+    
     return lat_min_index, lat_max_index, lon_min_index, lon_max_index