Changeset 839

Timestamp:

Feb 7, 2005, 5:04:54 PM (20 years ago)

Author:

ole

Message:

Slight change to pts format having attribute names as variables

Location:

inundation/ga/storm_surge/pyvolution

Files:

• data_manager.py (modified) (4 diffs)
• test_data_manager.py (modified) (4 diffs)

inundation/ga/storm_surge/pyvolution/data_manager.py

@@ -823 +823 @@
     138.3698 137.4194 136.5062 135.5558 ..........
 
-    Convert to NetCDF pts format
+    Convert to NetCDF pts format which is
+
+    points:  (Nx2) Float array
+    elevation: N Float array
     """ 
 
@@ -843 +846 @@
     cellsize = infile.cellsize[0]
     NODATA_value = infile.NODATA_value[0]
-    elevation = infile.variables['elevation']
+    dem_elevation = infile.variables['elevation']
 
     #Get output file                                
@@ -860 +863 @@
 
     
-    outfile.attribute_names = 'elevation' #This is the attribute always present in DEMs
-    #FIXME (Ole): We would really like this to be Python list,
-    #but I am not sure if
-    #that is possible in NetCDF???
-    
-
     # dimension definitions
     outfile.createDimension('number_of_points', nrows*ncols)    
-    outfile.createDimension('number_of_attributes', 1) #Always 1 with the dem fmt
     outfile.createDimension('number_of_dimensions', 2) #This is 2d data
     
-
     # variable definitions
     outfile.createVariable('points', Float, ('number_of_points',
                                              'number_of_dimensions'))
-    outfile.createVariable('attributes', Float, ('number_of_points',
-                                                 'number_of_attributes'))
+    outfile.createVariable('elevation', Float, ('number_of_points',))
 
     # Get handles to the variables
     points = outfile.variables['points']
-    attributes = outfile.variables['attributes']
+    elevation = outfile.variables['elevation']
 
     #Store data
@@ -893 +887 @@
             x = j*cellsize
             points[index, :] = [x,y]
-            attributes[index, 0] = elevation[i, j]            
+            elevation[index] = dem_elevation[i, j]            
 
     infile.close()            

inundation/ga/storm_surge/pyvolution/test_data_manager.py

@@ -521 +521 @@
 
         ref_points = []
-        ref_attributes = []
+        ref_elevation = []
         for i in range(6):
             y = (6-i)*25.0            
@@ -529 +529 @@
 
                 ref_points.append( [x,y] )
-                ref_attributes.append([z])
+                ref_elevation.append(z)
                 fid.write('%f ' %z)
             fid.write('\n')    
@@ -544 +544 @@
       
         # Get the variables
+        #print fid.variables.keys()
         points = fid.variables['points']
-        attributes = fid.variables['attributes']
-        attribute_names = fid.attribute_names
+        elevation = fid.variables['elevation']
 
         #Check values
@@ -555 +555 @@
 
         #print attributes[:]
-        #print ref_attributes
-        assert allclose(attributes, ref_attributes)        
+        #print ref_elevation
+        assert allclose(elevation, ref_elevation)        
       
         #Cleanup