Changeset 1394 for inundation/ga/storm_surge/pmesh/load_mesh/loadASCII.py

Timestamp:

May 16, 2005, 11:06:22 AM (19 years ago)

Author:

duncan

Message:

refactoring dealing with point files

File:

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

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

@@ -5 +5 @@
 
 for example:
-elevation
-0.6 0.7 4.9
-1.9 2.8 5
-2.7 2.4 5.2
+elevation, friction
+0.6, 0.7, 4.9, 0.3
+1.9, 2.8, 5, 0.3
+2.7, 2.4, 5.2, 0.3
 
 The first two columns are always implicitly assumed to be x, y coordinates.
-
+Use the same delimiter for the attribute names and the data
 
 The format for a Points dictionary is:
@@ -97 +97 @@
     Note: This might throw a can't load file error
     """
-    
-    if ofile[-4:]== ".tsh":
-        dict = _read_tsh_file(ofile)
-    elif ofile[-4:]== ".msh":
-        dict = _read_msh_file(ofile)
-    else:      
-        msg = 'Extension %s is unknown' %ofile[-4:]
-        raise IOError, msg        
+    try:
+        if ofile[-4:]== ".tsh":
+            dict = _read_tsh_file(ofile)
+        elif ofile[-4:]== ".msh":
+            dict = _read_msh_file(ofile)
+        else:      
+            msg = 'Extension %s is unknown' %ofile[-4:]
+            raise IOError, msg
+    except SyntaxError:
+            msg = 'File could not be opened'
+            raise IOError, msg
+    except IndexError:
+            msg = 'File could not be opened'
+            raise IOError, msg
+        
     return dict
 
@@ -1052 +1059 @@
             msg = 'Could not open file %s ' %ofile
             raise IOError, msg
+        except SyntaxError:
+            msg = 'File could not be opened'
+            raise IOError, msg
+        except IndexError:
+            msg = 'File could not be opened'
+            raise IOError, msg
         
     elif ofile[-4:]== ".pts":
@@ -1260 +1273 @@
                 if len(att_names) != len(numbers):
                     fd.close()
-                    raise TitleAmountError
-                    
+                    # It might not be a problem with the title
+                    #raise TitleAmountError
+                    raise IOError
                 for i,num in enumerate(numbers):
                     num.strip()
@@ -1311 +1325 @@
     
 #FIXME (DSG) need an export_points_file method..                
-def export_xya_file( file_name, xya_dict, title, delimiter = ','):
+def _write_xya_file( file_name, xya_dict, delimiter = ','):
     """
     export a file, ofile, with the format
@@ -1324 +1338 @@
     #FIXME, move the test for this from meshharness to loadasciiharness
     points = xya_dict['pointlist'] 
-    pointattributes = xya_dict['pointattributelist']
+    pointattributes = xya_dict['attributelist']
     
     fd = open(file_name,'w')
-    
-    fd.write(title+"\n")
+ 
+    titlelist = ""
+    for title in pointattributes.keys():
+        titlelist = titlelist + title + delimiter
+    titlelist = titlelist[0:-len(delimiter)] # remove the last delimiter
+    fd.write(titlelist+"\n")
     #<vertex #> <x> <y> [attributes]
-    for vert, vertatts in map(None, points, pointattributes):
+    for i,vert in enumerate( points):
+        
         attlist = ""
-        for att in vertatts:
-            attlist = attlist + str(att)+ delimiter
+        for att in pointattributes.keys():
+            attlist = attlist + str(pointattributes[att][i])+ delimiter
         attlist = attlist[0:-len(delimiter)] # remove the last delimiter
         attlist.strip()