Changeset 1814

Timestamp:

Sep 9, 2005, 10:07:22 AM (20 years ago)

Author:

duncan

Message:

added more error checking to files loaded

Location:

inundation/pyvolution

Files:

• interpolate_sww.py (modified) (3 diffs)
• least_squares.py (modified) (4 diffs)
• test_interpolate_sww.py (modified) (1 diff)
• test_least_squares.py (modified) (1 diff)

inundation/pyvolution/interpolate_sww.py

@@ -26 +26 @@
 
 DEFAULT_QUANTITY = "depth"
+
+def  interpolate_sww2xya(sww_file, quantity_name,point_file_in,
+                         point_file_out, display_errors = True):
+    """
+    This function catches exceptions.
+    """
+    try:
+        interp = Interpolate_sww(sww_file, quantity_name)
+        interp.interpolate_xya(point_file_in)
+        interp.write_depth_xya(point_file_out)
+    except IOError,e: #need to convert key error to ioerror
+        if display_errors:
+            print "Could not load bad file. ", e
+        import sys; sys.exit()
+
+        # FIXME (DSG-DSG): how are bad quantities caught?
+        #try:
+        #    interp = Interpolate_sww(sww_file, quantity_name)
+        #except KeyError:
+        #    print "Error: Unknown quantity"
+        #    sys.exit(1)
+
+        interp.interpolate_xya(point_file_in)
+        interp.write_depth_xya(point_file_out)
+
+
 
 class Interpolate_sww:
@@ -103 +129 @@
         #FIXME Have this reader as part of data_manager?
 
-        from Scientific.IO.NetCDF import NetCDFFile             
+        from Scientific.IO.NetCDF import NetCDFFile     
+        import tempfile
+        import sys
+        import os
             
         #Check contents
         #Get NetCDF
+    
+        # see if the file is there.  Throw a QUIET IO error if it isn't
+        fd = open(file_name,'r')
+        fd.close()
+
+        #throws prints to screen if file not present
+        
+        junk = tempfile.mktemp(".txt")
+        fd = open(junk,'w')
+        stdout = sys.stdout
+        sys.stdout = fd
         fid = NetCDFFile(file_name, 'r') 
+        sys.stdout = stdout
+        fd.close()
+        #clean up
+        os.remove(junk)         
       
         # Get the variables
@@ -162 +206 @@
             quantity_name = DEFAULT_QUANTITY   
         #print "quantity",quantity
-        try:
-            interp = Interpolate_sww(sww_file, quantity_name)
-        except KeyError:
-            print "Error: Unknown quantity"
-            sys.exit(1)
-
-        interp.interpolate_xya(point_file_in)
-        interp.write_depth_xya(point_file_out)
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+

inundation/pyvolution/least_squares.py

@@ -60 +60 @@
                      data_origin = None,
                      mesh_origin = None,
-                     precrop = False):
+                     precrop = False,
+                     display_errors = True):
     """
     Given a mesh file (tsh) and a point attribute file (xya), fit
@@ -80 +81 @@
                  concatinate_attributelist
 
-    mesh_dict = import_mesh_file(mesh_file)
+    
+    try:
+        mesh_dict = import_mesh_file(mesh_file)
+    except IOError,e:
+        if display_errors:
+            print "Could not load bad file. ", e
+        import sys; sys.exit()
     vertex_coordinates = mesh_dict['vertices']
     triangles = mesh_dict['triangles']
@@ -97 +104 @@
     # load in the .pts file
     try:
-        point_dict = import_points_file(point_file,
-                                      delimiter = ',',
-                                      verbose=verbose)
-    except SyntaxError,e:
-        point_dict = import_points_file(point_file,
-                                      delimiter = ' ',
-                                      verbose=verbose)
+        point_dict = import_points_file(point_file, verbose=verbose)
+    except IOError,e:
+        if display_errors:
+            print "Could not load bad file. ", e
+        import sys; sys.exit()
 
     point_coordinates = point_dict['pointlist']
@@ -149 +154 @@
     #FIXME (Ole): Remember to output mesh_origin as well
     if verbose: print "exporting to file ",mesh_output_file
-    export_mesh_file(mesh_output_file, mesh_dict)
-
+
+    try:
+        export_mesh_file(mesh_output_file, mesh_dict)
+    except IOError,e:
+        if display_errors:
+            print "Could not write file. ", e
+        import sys; sys.exit()
 
 def fit_to_mesh(vertex_coordinates,

inundation/pyvolution/test_interpolate_sww.py

@@ -226 +226 @@
         os.remove(point_file)
 
+    def test_Interpolate_sww_errors(self):
+        import tempfile
+        import os
+        try:
+            interpolate_sww2xya('??ffd??', 'stage','yeah','yeah.x',
+                                display_errors = False)
+        except SystemExit:  pass
+        else:
+            self.failUnless(0 ==1,  'Bad file did not raise error!') 
+        
+    def DISABLED_TEST_test_Interpolate_sww_errorsII(self):
+        """
+        THIS TEST HAS BEEN DISABLED, SINCE IT PRINTS TO SCREEN,
+        but is should still work.  test it sometimes!
+        """
+        import tempfile
+        import os
+        import sys
+       
+        sww_file = tempfile.mktemp(".sww")
+        fd = open(sww_file,'w')
+        fd.write("unit testing a bad .sww file \n")
+        fd.close()
+        
+        try:
+            interpolate_sww2xya(sww_file, 'stage','yeah','yeah.x',
+                                display_errors = False)
+            
+        except SystemExit:  pass
+        else:
+            self.failUnless(0 ==1,  'Bad file did not raise error!')        
+        #clean up
+        os.remove(sww_file)
+        
+    def test_Interpolate_sww_errorsIII(self):
+        import time, os
+        from Numeric import array, zeros, allclose, Float, concatenate, \
+             transpose
+        from Scientific.IO.NetCDF import NetCDFFile
+        from load_mesh.loadASCII import  import_points_file, \
+             concatinate_attributelist
+
+        self.domain.filename = 'datatest' + str(time.time())
+        self.domain.format = 'sww'
+        self.domain.smooth = True
+        self.domain.reduction = mean
+
+        sww = get_dataobject(self.domain)
+        sww.store_connectivity()
+        sww.store_timestep('stage')
+        self.domain.time = 2.
+        sww.store_timestep('stage')
+        
+        try:
+            interpolate_sww2xya(self.domain.filename,
+                                'stage','yeah','yeah.x',
+                                display_errors = False)
+        except SystemExit:  pass
+        else:
+            self.failUnless(0 ==1,  'Bad file did not raise error!')        
+        #clean up
+        os.remove(sww.filename)
 #-------------------------------------------------------------
 if __name__ == "__main__":
     suite = unittest.makeSuite(Test_Interpolate_sww,'test')
-    runner = unittest.TextTestRunner()
+    runner = unittest.TextTestRunner(verbosity=1)
     runner.run(suite)

inundation/pyvolution/test_least_squares.py

@@ -1435 +1435 @@
         os.remove(point_file)
 
+    def test_fit_to_mesh_file_errors(self):
+        from load_mesh.loadASCII import import_mesh_file, export_mesh_file
+        import tempfile
+        import os
+
+        # create a .tsh file, no user outline
+        mesh_dic = {}
+        mesh_dic['vertices'] = [[0.0, 0.0],[0.0, 5.0],[5.0, 0.0]]
+        mesh_dic['triangles'] =  [[0, 2, 1]]
+        mesh_dic['segments'] = [[0, 1], [2, 0], [1, 2]]
+        mesh_dic['triangle_tags'] = ['']
+        mesh_dic['vertex_attributes'] = [[1,2], [1,2], [1,2]]
+        mesh_dic['vertex_attribute_titles'] = ['density', 'temp']
+        mesh_dic['triangle_neighbors'] = [[-1, -1, -1]]
+        mesh_dic['segment_tags'] = ['external', 'external','external']
+        mesh_file = tempfile.mktemp(".tsh")
+        export_mesh_file(mesh_file,mesh_dic)
+
+        # create an .xya file
+        point_file = tempfile.mktemp(".xya")
+        fd = open(point_file,'w')
+        fd.write("elevation stage \n 1.0, 1.0,2.,4 \n 1.0, 3.0,4,8 \n 3.0,1.0,4.,8 \n")
+        fd.close()
+
+        mesh_output_file = "new_triangle.tsh"
+        try:
+            fit_to_mesh_file(mesh_file, point_file,
+                             mesh_output_file, display_errors = False)
+        except SystemExit:  pass
+        else:
+            self.failUnless(0 ==1,  'Bad file did not raise error!')        
+        #clean up
+        os.remove(mesh_file)
+        os.remove(point_file)
+
+    def test_fit_to_mesh_file_errorsII(self):
+        from load_mesh.loadASCII import import_mesh_file, export_mesh_file
+        import tempfile
+        import os
+
+        # create a .tsh file, no user outline
+        mesh_file = tempfile.mktemp(".tsh")
+        fd = open(mesh_file,'w')
+        fd.write("unit testing a bad .tsh file \n")
+        fd.close()
+
+        # create an .xya file
+        point_file = tempfile.mktemp(".xya")
+        fd = open(point_file,'w')
+        fd.write("elevation, stage \n 1.0, 1.0,2.,4 \n 1.0, 3.0,4,8 \n 3.0,1.0,4.,8 \n")
+        fd.close()
+
+        mesh_output_file = "new_triangle.tsh"
+        try:
+            fit_to_mesh_file(mesh_file, point_file,
+                             mesh_output_file, display_errors = False)
+        except SystemExit:  pass
+        else:
+            self.failUnless(0 ==1,  'Bad file did not raise error!')        
+        #clean up
+        os.remove(mesh_file)
+        os.remove(point_file)
+
+    def test_fit_to_mesh_file_errorsIII(self):
+        from load_mesh.loadASCII import import_mesh_file, export_mesh_file
+        import tempfile
+        import os
+
+        # create a .tsh file, no user outline
+        mesh_dic = {}
+        mesh_dic['vertices'] = [[0.0, 0.0],[0.0, 5.0],[5.0, 0.0]]
+        mesh_dic['triangles'] =  [[0, 2, 1]]
+        mesh_dic['segments'] = [[0, 1], [2, 0], [1, 2]]
+        mesh_dic['triangle_tags'] = ['']
+        mesh_dic['vertex_attributes'] = [[1,2], [1,2], [1,2]]
+        mesh_dic['vertex_attribute_titles'] = ['density', 'temp']
+        mesh_dic['triangle_neighbors'] = [[-1, -1, -1]]
+        mesh_dic['segment_tags'] = ['external', 'external','external']
+        mesh_file = tempfile.mktemp(".tsh")
+        export_mesh_file(mesh_file,mesh_dic)
+
+        # create an .xya file
+        point_file = tempfile.mktemp(".xya")
+        fd = open(point_file,'w')
+        fd.write("elevation, stage \n 1.0, 1.0,2.,4 \n 1.0, 3.0,4,8 \n 3.0,1.0,4.,8 \n")
+        fd.close()
+
+        mesh_output_file = "e:/new_triangle.tsh"
+        try:
+            fit_to_mesh_file(mesh_file, point_file,
+                             mesh_output_file, display_errors = False)
+        except SystemExit:  pass
+        else:
+            self.failUnless(0 ==1,  'Bad file did not raise error!')        
+        #clean up
+        os.remove(mesh_file)
+        os.remove(point_file)
+        
     def test_fit_to_msh_netcdf_fileII(self):
         from load_mesh.loadASCII import import_mesh_file, export_mesh_file