Changeset 836

Timestamp:

Feb 7, 2005, 2:56:07 PM (20 years ago)

Author:

ole

Message:

Moved NetCDF xya formt to pts format

Location:

inundation/ga/storm_surge/pyvolution

Files:

• data_manager.py (modified) (7 diffs)
• least_squares.py (modified) (2 diffs)
• test_data_manager.py (modified) (3 diffs)
• test_least_squares.py (modified) (2 diffs)
• util.py (modified) (1 diff)

inundation/ga/storm_surge/pyvolution/data_manager.py

@@ -8 +8 @@
 
 
-Formats used within GANUGA:
+Formats used within ANUGA:
 
 .sww: Netcdf format for storing model output
-.xya: Either ASCII or NetCDF format for storing arbitrary points and associated attributed
+
+.xya: ASCII format for storing arbitrary points and associated attributes
+.pts: NetCDF format for storing arbitrary points and associated attributes
+
+.asc: ASCII foramt of regular DEMs as output from ArcView
 .dem: NetCDF representation of regular DEM data
+
 .tsh: ASCII format for storing meshes and associated boundary and region info
+
+
+#Not yet implemented
+.nc: Native ferret NetCDF format
+
+
 FIXME: What else
 
@@ -799 +810 @@
     return cls(domain, mode)
 
-def dem2xya(filename, verbose=False):
+def dem2pts(filename, verbose=False):
     """Read Digitial Elevation model from the following NetCDF format (.dem)
 
@@ -812 +823 @@
     138.3698 137.4194 136.5062 135.5558 ..........
 
-    Convert to NetCDF xyz format (.xya)
+    Convert to NetCDF pts format
     """ 
 
@@ -835 +846 @@
 
     #Get output file                                
-    xyaname = root + '.xya'
+    xyaname = root + '.pts'
     if verbose: print 'Store to NetCDF file %s' %xyaname
     # NetCDF file definition
@@ -842 +853 @@
     #Create new file
     outfile.institution = 'Geoscience Australia'
-    outfile.description = 'NetCDF xya format for compact and portable storage ' +\
+    outfile.description = 'NetCDF pts format for compact and portable storage ' +\
                       'of spatial point data'
 
@@ -866 +877 @@
 
     #Store data
-    #FIXME: Could be faster using array operations
+    #FIXME: Could perhaps be faster using array operations
     for i in range(nrows):
         if verbose: print 'Processing row %d of %d' %(i, nrows)
@@ -880 +891 @@
     infile.close()            
     outfile.close()
-
-
-# def dem2xya(filename, verbose=False):
-#     """Read Digitial Elevation model from the following ASCII format (.asc)
-
-#     Example:
-
-#     ncols         3121
-#     nrows         1800
-#     xllcorner     722000
-#     yllcorner     5893000
-#     cellsize      25
-#     NODATA_value  -9999
-#     138.3698 137.4194 136.5062 135.5558 ..........
-
-#     Convert to NetCDF xyz format (.xya)
-#     """ 
-
-#     import os
-#     from Scientific.IO.NetCDF import NetCDFFile
-#     from Numeric import Float, arrayrange, concatenate    
-
-#     root, ext = os.path.splitext(filename)
-#     fid = open(filename)
-
-#     if verbose: print 'Reading DEM from %s' %filename
-#     lines = fid.readlines()
-#     fid.close()
-
-#     if verbose: print 'Got', len(lines), ' lines'
-    
-#     ncols = int(lines[0].split()[1].strip())
-#     nrows = int(lines[1].split()[1].strip())
-#     xllcorner = float(lines[2].split()[1].strip())
-#     yllcorner = float(lines[3].split()[1].strip())
-#     cellsize = float(lines[4].split()[1].strip())
-#     NODATA_value = int(lines[5].split()[1].strip())
-
-#     assert len(lines) == nrows + 6
-
-#     netcdfname = root + '.xya'
-#     if verbose: print 'Store to NetCDF file %s' %netcdfname
-#     # NetCDF file definition
-#     fid = NetCDFFile(netcdfname, 'w')
-        
-#     #Create new file
-#     fid.institution = 'Geoscience Australia'
-#     fid.description = 'NetCDF xya format for compact and portable storage ' +\
-#                       'of spatial point data'
-
-#     fid.ncols = ncols
-#     fid.nrows = nrows    
-
-
-#     # dimension definitions
-#     fid.createDimension('number_of_points', nrows*ncols)    
-#     fid.createDimension('number_of_attributes', 1) #Always 1 with the dem fmt
-#     fid.createDimension('number_of_dimensions', 2) #This is 2d data
-    
-
-#     # variable definitions
-#     fid.createVariable('points', Float, ('number_of_points',
-#                                          'number_of_dimensions'))
-#     fid.createVariable('attributes', Float, ('number_of_points',
-#                                              'number_of_attributes'))
-
-#     # Get handles to the variables
-#     points = fid.variables['points']
-#     attributes = fid.variables['attributes']
-
-#     #Store data
-#     #FIXME: Could be faster using array operations
-#     #FIXME: Perhaps the y dimension needs to be reversed
-#     #FIXME: x and y definitely needs to be swapped
-#     for i, line in enumerate(lines[6:]):
-#         fields = line.split()
-#         if verbose: print 'Processing row %d of %d' %(i, nrows)
-        
-#         x = i*cellsize            
-#         for j, field in enumerate(fields):
-#             index = i*ncols + j
-            
-#             y = j*cellsize
-#             points[index, :] = [x,y]
-
-#             z = float(field)                        
-#             attributes[index, 0] = z
-
-#     fid.close()
 
                                       

inundation/ga/storm_surge/pyvolution/least_squares.py

@@ -147 +147 @@
     
     
-def xya2rectangular(xya_name, M, N, alpha = DEFAULT_ALPHA,
+def pts2rectangular(pts_name, M, N, alpha = DEFAULT_ALPHA,
                     verbose = False, reduction = 1, format = 'netcdf'):
-    """Fits attributes from xya file to MxN rectangular mesh 
-    
-    Read xya file and create rectangular mesh of resolution MxN such that
-    it covers all points specified in xya file. 
+    """Fits attributes from pts file to MxN rectangular mesh 
+    
+    Read pts file and create rectangular mesh of resolution MxN such that
+    it covers all points specified in pts file. 
     
     FIXME: This may be a temporary function until we decide on 
@@ -160 +160 @@
     import util, mesh_factory
 
-    if verbose: print 'Read xya'
-    points, attributes, _ = util.read_xya(xya_name, format)
+    if verbose: print 'Read pts'
+    points, attributes, _ = util.read_xya(pts_name, format)
 
     #Reduce number of points a bit

inundation/ga/storm_surge/pyvolution/test_data_manager.py

@@ -498 +498 @@
 
 
-    def test_dem2xya(self):
+    def test_dem2pts(self):
         """Test conversion from dem in ascii format to native NetCDF xya format
         """
@@ -537 +537 @@
         #Convert to NetCDF xya
         convert_dem_from_ascii2netcdf(filename)
-        dem2xya(root + '.dem')
-
-        #Check contents
-        #Get NetCDF
-        fid = NetCDFFile(root+'.xya', 'r')
+        dem2pts(root + '.dem')
+
+        #Check contents
+        #Get NetCDF
+        fid = NetCDFFile(root+'.pts', 'r')
       
         # Get the variables
@@ -561 +561 @@
         
 
-        os.remove(root + '.xya')
+        os.remove(root + '.pts')
         os.remove(root + '.dem')                
         os.remove(root + '.asc')        

inundation/ga/storm_surge/pyvolution/test_least_squares.py

@@ -489 +489 @@
 
         
-    def test_xya2rectangular(self):
+    def test_pts2rectangular(self):
 
         import time, os
@@ -500 +500 @@
         
         points, triangles, boundary, attributes =\
-                xya2rectangular(FN, 4, 4, format = 'asc')
+                pts2rectangular(FN, 4, 4, format = 'asc')
         
         z1 = [2, 4]

inundation/ga/storm_surge/pyvolution/util.py

@@ -303 +303 @@
     attribute names if present otherwise None
     """
+    #FIXME: Probably obsoleted by similar function in load_ASCII
     
     from Scientific.IO.NetCDF import NetCDFFile