Changeset 4024

Timestamp:

Nov 21, 2006, 4:50:59 PM (18 years ago)

Author:

duncan

Message:

fix bug reported in ticket#109, with ferret2sww

Location:

anuga_core/source/anuga/shallow_water

Files:

• data_manager.py (modified) (4 diffs)
• test_data_manager.py (modified) (2 diffs)

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -743 +743 @@
 
 
-#### NEED national exposure database
+#### NED is national exposure database
     
 LAT_TITLE = 'LATITUDE'
@@ -2680 +2680 @@
     else:
         jmin = searchsorted(times, mint)
-
+        
     if maxt == None:
         jmax=len(times)
@@ -2686 +2686 @@
         jmax = searchsorted(times, maxt)
 
-    if minlat == None:
-        kmin=0
-    else:
-        kmin = searchsorted(latitudes, minlat)
-
-    if maxlat == None:
-        kmax = len(latitudes)
-    else:
-        kmax = searchsorted(latitudes, maxlat)
-
-    if minlon == None:
-        lmin=0
-    else:
-        lmin = searchsorted(longitudes, minlon)
-
-    if maxlon == None:
-        lmax = len(longitudes)
-    else:
-        lmax = searchsorted(longitudes, maxlon)
+    kmin, kmax, lmin, lmax = _get_min_max_indexes(latitudes[:],
+                                                  longitudes[:],
+                                                 minlat, maxlat,
+                                                 minlon, maxlon)
+
 
 #    print' j', jmin, jmax
@@ -3921 +3907 @@
 
     # reverse order of lat, so it's in ascending order
+    try:
+        latitudes = latitudes.tolist()
+    except:
+        pass
+    
     latitudes.reverse()
+    
     largest_lat_index = len(latitudes)-1
     #Cut out a smaller extent.

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -2314 +2314 @@
 
 
+    def test_ferret2sww_lat_long(self):
+        # Test that min lat long works
+
+        #The test file has
+        # LON = 150.66667, 150.83334, 151, 151.16667
+        # LAT = -34.5, -34.33333, -34.16667, -34 ;
+        # TIME = 0, 0.1, 0.6, 1.1, 1.6, 2.1 ;
+        #
+        # First value (index=0) in small_ha.nc is 0.3400644 cm,
+        # Fourth value (index==3) is -6.50198 cm
+
+
+
+        #Read
+        from anuga.coordinate_transforms.redfearn import redfearn
+        fid = NetCDFFile(self.test_MOST_file + '_ha.nc')
+        first_value = fid.variables['HA'][:][0,0,0]
+        fourth_value = fid.variables['HA'][:][0,0,3]
+        fid.close()
+
+
+        #Call conversion (with zero origin)
+        #ferret2sww('small', verbose=False,
+        #           origin = (56, 0, 0))
+        ferret2sww(self.test_MOST_file, verbose=False,
+                   origin = (56, 0, 0), minlat=-34.5, maxlat=-34)
+
+        #Work out the UTM coordinates for first point
+        zone, e, n = redfearn(-34.5, 150.66667)
+        #print zone, e, n
+
+        #Read output file 'small.sww'
+        #fid = NetCDFFile('small.sww')
+        fid = NetCDFFile(self.test_MOST_file + '.sww')
+
+        x = fid.variables['x'][:]
+        y = fid.variables['y'][:]
+        #Check that first coordinate is correctly represented
+        assert 16 == len(x)
+
+        fid.close()
+
+        #Cleanup
+        import os
+        os.remove(self.test_MOST_file + '.sww')
+
 
     def test_ferret2sww3(self):
@@ -4847 +4893 @@
 if __name__ == "__main__":
     #suite = unittest.makeSuite(Test_Data_Manager,'test_lon')
-    #suite = unittest.makeSuite(Test_Data_Manager,'test_urs2sww')
+    #suite = unittest.makeSuite(Test_Data_Manager,'test_ferret2sww_lat_long')
     suite = unittest.makeSuite(Test_Data_Manager,'test')
     runner = unittest.TextTestRunner()