Changeset 826 for inundation/ga/storm_surge/pyvolution/util.py

Timestamp:

Feb 1, 2005, 5:18:44 PM (20 years ago)

Author:

ole

Message:

Played with DEM's and NetCDF

File:

• inundation/ga/storm_surge/pyvolution/util.py (modified) (2 diffs)

inundation/ga/storm_surge/pyvolution/util.py

@@ -1 @@
-
+"""This modul contains various auxiliary function used by pyvolution.
+
+It is also a clearing house for function tat may later earn a module
+of their own.
+"""
 
 def angle(v):
@@ -286 +290 @@
             return res
 
-def read_xya(file_name):
+def read_xya(filename):
     """Read simple xya file, no header, just
     x y [attributes]
     separated by whitespace
+
+    If xya is a NetCDF file it will be read otherwise attemot to read as ASCII
     
     Return list of points and list of attributes
     """
-    
-    fid = open(file_name)
-    lines = fid.readlines()
-    
-    points = [] 
-    attributes = []
-    for line in lines:
-        fields = line.strip().split()
-        
-        points.append( (float(fields[0]),  float(fields[1])) )
-        attributes.append( [float(z) for z in fields[2:] ] )
-        
-    return points, attributes
+
+
+    from Scientific.IO.NetCDF import NetCDFFile
+
+
+    try:
+        #Get NetCDF        
+        fid = NetCDFFile(filename, 'r')
+      
+        # Get the variables
+        points = fid.variables['points']
+        attributes = fid.variables['attributes']
+        ncols = fid.ncols
+        nrows = fid.nrows
+        #fid.close()  #Don't close - arrays are needed outside this function
+    except:
+        #Read as ASCII
+        fid = open(filename)
+        lines = fid.readlines()
+    
+        points = []     
+        attributes = []
+        for line in lines:
+            fields = line.strip().split()
+            points.append( (float(fields[0]),  float(fields[1])) )
+            attributes.append( [float(z) for z in fields[2:] ] )
+        nrows = ncols = None #FIXME: HACK    
+        
+    return points, attributes #, nrows[0], ncols[0]
     
 
 #####################################
-#POLYFON STUFF
+#POLYGON STUFF
 #
 #FIXME: ALl these should be put into new module polygon.py