Changeset 4526

Timestamp:

Jun 1, 2007, 4:39:17 PM (17 years ago)

Author:

duncan

Message:

ticket#169

Location:

anuga_core/source/anuga

Files:

• damage_modelling/inundation_damage.py (modified) (1 diff)
• shallow_water/data_manager.py (modified) (1 diff)
• shallow_water/test_data_manager.py (modified) (1 diff)

anuga_core/source/anuga/damage_modelling/inundation_damage.py

@@ -140 +140 @@
     dir_ls = os.listdir(dir)
     interate_over = [x for x in dir_ls if base in x and x[-4:] == '.sww']
+    if len(interate_over) == 0:
+        msg = 'No files of the base name %s.'\
+              %(sww_base_name)
+        raise IOError, msg
     #print "interate_over", interate_over
     from os import sep

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -1649 +1649 @@
     #print "base",base
     
-    if dir == "": dir = "." # Unix compatibility
+    if dir == "":
+        dir = "." # Unix compatibility
     dir_ls = os.listdir(dir)
     interate_over = [x[:-4] for x in dir_ls if base in x and x[-4:] == '.sww']
-    #print "interate_over", interate_over
+
+    if len(interate_over) == 0:
+        msg = 'No files of the base name %s.'\
+              %(basename_in)
+        raise IOError, msg
     
     files_out = []

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -1633 +1633 @@
         os.remove(ascfile)
         os.remove(swwfile)
+
+    def test_export_grid_bad(self):
+        """Test that sww information can be converted correctly to asc/prj
+        format readable by e.g. ArcView
+        """
+
+        try:
+            export_grid('a_small_round-egg',
+                        quantities = ['elevation', 'depth'],
+                        cellsize = 99,
+                        verbose = self.verbose,
+                        format = 'asc')
+        except IOError:
+            pass
+        else:
+            self.failUnless(0 ==1,  'Bad input did not throw exception error!')
 
     def test_export_grid_parallel(self):