Changeset 967

Timestamp:

Feb 28, 2005, 1:38:35 PM (19 years ago)

Author:

ole

Message:

Changed calling syntax of some of the conversion functions

Location:

inundation/ga/storm_surge/pyvolution

Files:

• data_manager.py (modified) (12 diffs)
• test_data_manager.py (modified) (2 diffs)

inundation/ga/storm_surge/pyvolution/data_manager.py

@@ -840 +840 @@
     return cls(domain, mode)
 
-def dem2pts(filename, verbose=False):
+def dem2pts(basename_in, basename_out=None, verbose=False):
     """Read Digitial Elevation model from the following NetCDF format (.dem)
 
@@ -863 +863 @@
     from Numeric import Float, arrayrange, concatenate    
 
-    root, ext = os.path.splitext(filename)
+    root = basename_in
 
     #Get NetCDF
-    infile = NetCDFFile(filename, 'r')  #Open existing netcdf file for read
-
-    if verbose: print 'Reading DEM from %s' %filename
+    infile = NetCDFFile(root + '.dem', 'r')  #Open existing netcdf file for read
+
+    if verbose: print 'Reading DEM from %s' %(root + '.dem')
     
     ncols = infile.ncols[0]
@@ -888 +888 @@
     
 
-    #Get output file                                
-    xyaname = root + '.pts'
-    if verbose: print 'Store to NetCDF file %s' %xyaname
+    #Get output file
+    if basename_out == None:
+        ptsname = root + '.pts'
+    else:
+        ptsname = basename_out + '.pts'
+        
+    if verbose: print 'Store to NetCDF file %s' %ptsname
     # NetCDF file definition
-    outfile = NetCDFFile(xyaname, 'w')
+    outfile = NetCDFFile(ptsname, 'w')
         
     #Create new file
@@ -946 +950 @@
 
                                       
-def convert_dem_from_ascii2netcdf(filename, verbose=False):
+def convert_dem_from_ascii2netcdf(basename_in, basename_out = None,
+                                  verbose=False):
     """Read Digitial Elevation model from the following ASCII format (.asc)
 
@@ -959 +964 @@
     138.3698 137.4194 136.5062 135.5558 ..........
 
-    Convert to NetCDF format (.dem) mimcing the ASCII format closely.
-
-
-    An accompanying file with same basename but extension .prj must exist
+    Convert basename_in + '.asc' to NetCDF format (.dem)
+    mimicking the ASCII format closely.
+
+
+    An accompanying file with same basename_in but extension .prj must exist
     and is used to fix the UTM zone, datum, false northings and eastings.
 
@@ -982 +988 @@
     from Numeric import Float, array
 
-    root, ext = os.path.splitext(filename)
+    #root, ext = os.path.splitext(basename_in)
+    root = basename_in
 
     ###########################################
@@ -1028 +1035 @@
     ###########################################
     #Read DEM data
-    datafile = open(filename)
-
-    if verbose: print 'Reading DEM from %s' %filename
+    
+    datafile = open(basename_in + '.asc')
+
+    if verbose: print 'Reading DEM from %s' %(basename_in + '.asc')
     lines = datafile.readlines()
     datafile.close()
@@ -1048 +1056 @@
     ##########################################
 
-    
-    netcdfname = root + '.dem'
+
+    if basename_out == None:
+        netcdfname = root + '.dem'
+    else:
+        netcdfname = basename_out + '.dem'        
+        
     if verbose: print 'Store to NetCDF file %s' %netcdfname
     # NetCDF file definition
@@ -1096 +1108 @@
     
 
-
-
-def ferret2sww(basefilename, verbose=False,
-               minlat = None, maxlat =None,
-               minlon = None, maxlon =None,
+def ferret2sww(basename_in, basename_out = None,
+               verbose = False,
+               minlat = None, maxlat = None,
+               minlon = None, maxlon = None,
                mint = None, maxt = None, mean_stage = 0,
                origin = None, zscale = 1):
@@ -1106 +1117 @@
     sww format native to pyvolution.
 
-    Specify only basefilename and read files of the form
+    Specify only basename_in and read files of the form
     basefilename_ha.nc, basefilename_ua.nc, basefilename_va.nc containing
     relative height, x-velocity and y-velocity, respectively.
@@ -1135 +1146 @@
 
     #Get NetCDF data
-    if verbose: print 'Reading files %s_*.nc' %basefilename
-    file_h = NetCDFFile(basefilename + '_ha.nc', 'r') #Wave amplitude (cm)
-    file_u = NetCDFFile(basefilename + '_ua.nc', 'r') #Velocity (x) (cm/s)
-    file_v = NetCDFFile(basefilename + '_va.nc', 'r') #Velocity (y) (cm/s)   
-
-    swwname = basefilename + '.sww'
+    if verbose: print 'Reading files %s_*.nc' %basename_in
+    file_h = NetCDFFile(basename_in + '_ha.nc', 'r') #Wave amplitude (cm)
+    file_u = NetCDFFile(basename_in + '_ua.nc', 'r') #Velocity (x) (cm/s)
+    file_v = NetCDFFile(basename_in + '_va.nc', 'r') #Velocity (y) (cm/s)   
+
+    if basename_out is None:
+        swwname = basename_in + '.sww'
+    else:
+        swwname = basename_out + '.sww'        
 
     times = file_h.variables['TIME']
@@ -1215 +1229 @@
     outfile.institution = 'Geoscience Australia'
     outfile.description = 'Converted from Ferret files: %s, %s, %s'\
-                          %(basefilename + '_ha.nc',
-                            basefilename + '_ua.nc',
-                            basefilename + '_va.nc')
+                          %(basename_in + '_ha.nc',
+                            basename_in + '_ua.nc',
+                            basename_in + '_va.nc')
 
 

inundation/ga/storm_surge/pyvolution/test_data_manager.py

@@ -508 +508 @@
 
         #Write test asc file
-        root = 'demtest'+str(time.time())
+        root = 'demtest'
 
         filename = root+'.asc'
@@ -554 +554 @@
         
         #Convert to NetCDF xya
-        convert_dem_from_ascii2netcdf(filename)
-        dem2pts(root + '.dem')
+        convert_dem_from_ascii2netcdf(root)
+        dem2pts(root)
 
         #Check contents