Changeset 1467

Timestamp:

May 26, 2005, 11:23:46 AM (19 years ago)

Author:

duncan

Message:

bug fix

File:

• inundation/ga/storm_surge/pmesh/load_mesh/loadASCII.py (modified) (3 diffs)

inundation/ga/storm_surge/pmesh/load_mesh/loadASCII.py

@@ -85 +85 @@
 NOMAXAREA=-999
 
-#FIXME (DSG-DSG) this is used by least_squares -
-#                   is this the best function for it to use?
-# (DSG-DSG) put an exception handler in import_triangulation/import_mesh_file
-# Think about exceptions before doing this!
-def mesh_file_to_mesh_dictionary(file_name):
-    """Load a pmesh file.  Returning the mesh dictionary.
-    """
-    try:
-        meshdic = import_mesh_file(file_name)
-    except IOError, e:        
-        msg = 'Could not open file %s ' %file_name
-        raise IOError, msg 
-    return meshdic
-
 # This is used by pmesh
 def import_mesh_file(ofile):
@@ -115 +101 @@
             msg = 'Extension %s is unknown' %ofile[-4:]
             raise IOError, msg
-    except (SyntaxError,IndexError):
+    except (SyntaxError,IndexError, ValueError): #FIXME No test for ValueError
             msg = 'File could not be opened'
-            raise IOError, msg       
+            raise IOError, msg  
     return dict
 
@@ -1009 +995 @@
         except (IndexError,ValueError,SyntaxError):
             fd.close()    
-            msg = 'File could not be opened'
+            msg = 'Could not open file %s ' %ofile
+            raise IOError, msg
+
+
+
+
+
+
+
+
+        except IOError:
+            # Catch this to add an error message
+            msg = 'Could not open file %s ' %ofile
             raise IOError, msg