Changeset 840

Timestamp:

Feb 7, 2005, 5:15:03 PM (20 years ago)

Author:

ole

Message:

 

Location:

inundation/ga/storm_surge/pyvolution

Files:

• least_squares.py (modified) (3 diffs)
• util.py (modified) (2 diffs)

inundation/ga/storm_surge/pyvolution/least_squares.py

@@ -156 +156 @@
     FIXME: This may be a temporary function until we decide on 
     netcdf formats etc
+
+    FIXME: Uses elevation hardwired
     """   
     
@@ -161 +163 @@
 
     if verbose: print 'Read pts'
-    points, attributes, _ = util.read_xya(pts_name, format)
+    points, attributes = util.read_xya(pts_name, format)
 
     #Reduce number of points a bit
     points = points[::reduction]
-    attributes = attributes[::reduction]
+    elevation = attributes['elevation'][::reduction]
     
     if verbose: print 'Got %d data points' %len(points)
@@ -190 +192 @@
                         triangles,
                         points,
-                        attributes, alpha=alpha, verbose=verbose)
+                        elevation, alpha=alpha, verbose=verbose)
 
 

inundation/ga/storm_surge/pyvolution/util.py

@@ -314 +314 @@
         # Get the variables
         points = fid.variables['points']
-        attributes = fid.variables['attributes']
-        attribute_names = fid.variables['attribute_names']
+        keys = fid.variables.keys()
+        attributes = {}
+        for key in keys:
+            attributes[key] = variables[key]
         #Don't close - arrays are needed outside this function,
         #alternatively take a copy here
@@ -342 +344 @@
             attributes.append( [float(z) for z in fields[2:] ] )
         
-    return points, attributes, attribute_names
+    return points, attributes