Changeset 3750 for anuga_core/source/anuga/shallow_water

Timestamp:

Oct 11, 2006, 2:22:34 PM (18 years ago)

Author:

duncan

Message:

more error handling

Location:

anuga_core/source/anuga/shallow_water

Files:

• data_manager.py (modified) (2 diffs)
• test_data_manager.py (modified) (1 diff)

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -4191 +4191 @@
     quantities = ['HA','UA','VA']
 
+    for file_name in files_in:
+        if os.access(file_name, os.F_OK) == 0 :
+            msg = 'File %s does not exist or is not accessible' %file_name
+            raise IOError, msg
+        
     hashed_elevation = None
     for file_in, file_out, quantity in map(None, files_in,
@@ -4247 +4252 @@
     
     lon, lat = lon_lat2grid(lonlatdep)
+    lon_sorted = lon[:]
+    lon_sorted.sort()
+    
+    if not 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:
+        msg = "Latitudes in mux file are not in ascending order"
+    
     nc_file = Write_nc(quantity,
                        file_out,

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -5075 +5075 @@
         self.delete_mux(files)
         
+    def test_urs2sww_test_fail2(self):
+        base_name = 'Harry-high-pants'
+        try:
+            urs2sww(base_name)        
+        except IOError:
+            pass
+        else:
+            self.delete_mux(files)
+            msg = 'Should have raised exception'
+            raise msg
+           
     def test_urs2sww(self):
         tide = 1
         base_name, files = self.create_mux()
-        urs2sww(base_name, remove_nc_files=True, mean_stage=tide)
+        urs2sww(base_name, mean_stage=tide)
         sww_file = base_name + '.sww'