Changeset 7814 for trunk/anuga_core/source/anuga/file_conversion/sww2dem.py

Timestamp:

Jun 9, 2010, 12:28:24 PM (13 years ago)

Author:

hudson

Message:

New filename conventions for file conversion. Filenames must always be passed in with the correct extension.

File:

• trunk/anuga_core/source/anuga/file_conversion/sww2dem.py (modified) (13 diffs)

trunk/anuga_core/source/anuga/file_conversion/sww2dem.py

@@ -29 +29 @@
 DEFAULT_BLOCK_SIZE = 10000
 
-def sww2dem(basename_in, basename_out=None,
+def sww2dem(name_in, name_out,
             quantity=None, # defaults to elevation
             reduction=None,
@@ -42 +42 @@
             origin=None,
             datum='WGS84',
-            format='ers',
             block_size=None):
     """Read SWW file and convert to Digitial Elevation model format
@@ -98 +97 @@
          apply_expression_to_dictionary
 
-    msg = 'Format must be either asc or ers'
-    assert format.lower() in ['asc', 'ers'], msg
+    basename_in, in_ext = os.path.splitext(name_in)
+    basename_out, out_ext = os.path.splitext(name_out)
+    out_ext = out_ext.lower()
+
+    if in_ext != '.sww':
+        raise IOError('Input format for %s must be .sww' % name_in)
+
+    if out_ext not in ['.asc', '.ers']:
+        raise IOError('Format for %s must be either asc or ers.' % name_out)
 
     false_easting = 500000
@@ -110 +116 @@
         reduction = max
 
-    if basename_out is None:
-        basename_out = basename_in + '_%s' % quantity
-
     if quantity_formula.has_key(quantity):
         quantity = quantity_formula[quantity]
@@ -122 +125 @@
         block_size = DEFAULT_BLOCK_SIZE
 
-    # Read SWW file
-    swwfile = basename_in + '.sww'
-    demfile = basename_out + '.' + format
-
     # Read sww file
     if verbose:
-        log.critical('Reading from %s' % swwfile)
-        log.critical('Output directory is %s' % basename_out)
+        log.critical('Reading from %s' % name_in)
+        log.critical('Output directory is %s' % name_out)
 
     from Scientific.IO.NetCDF import NetCDFFile
-    fid = NetCDFFile(swwfile)
+    fid = NetCDFFile(name_in)
 
     #Get extent and reference
@@ -168 +167 @@
         log.critical('------------------------------------------------')
         log.critical('Statistics of SWW file:')
-        log.critical('  Name: %s' % swwfile)
+        log.critical('  Name: %s' % name_in)
         log.critical('  Reference:')
         log.critical('    Lower left corner: [%f, %f]' % (xllcorner, yllcorner))
@@ -212 +211 @@
     if missing_vars:
         msg = ("In expression '%s', variables %s are not in the SWW file '%s'"
-               % (quantity, swwfile))
+               % (quantity, name_in))
         raise Exception, msg
 
@@ -300 +299 @@
 
     for i in xrange(nrows):
-        if format.lower() == 'asc':
+        if out_ext == '.asc':
             yg = i * cellsize
         else:
@@ -336 +335 @@
         grid_values[i] = NODATA_value
 
-    if format.lower() == 'ers':
+    if out_ext == '.ers':
         # setup ERS header information
         grid_values = num.reshape(grid_values, (nrows, ncols))
@@ -362 +361 @@
         import ermapper_grids
 
-        ermapper_grids.write_ermapper_grid(demfile, grid_values, header)
+        ermapper_grids.write_ermapper_grid(name_out, grid_values, header)
 
         fid.close()
@@ -383 +382 @@
         prjid.close()
 
-        if verbose: log.critical('Writing %s' % demfile)
-
-        ascid = open(demfile, 'w')
+        if verbose: log.critical('Writing %s' % name_out)
+
+        ascid = open(name_out, 'w')
 
         ascid.write('ncols         %d\n' %ncols)
@@ -440 +439 @@
     See sww2dem to find out what most of the parameters do.
 
+    basename_in is a path to sww file/s, without the .sww extension.
+
     Quantities is a list of quantities.  Each quantity will be
     calculated for each sww file.
@@ -473 +474 @@
                 basename_out = sww_file + '_' + quantity + '_' + extra_name_out
 
-            file_out = sww2dem(dir+os.sep+sww_file, dir+os.sep+basename_out,
+            file_out = sww2dem(dir+os.sep+sww_file+'.sww',
+                               dir+os.sep+basename_out,
                                quantity,
                                reduction,