Changeset 7814 for trunk/anuga_core/source/anuga/file_conversion/dem2pts.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/dem2pts.py (modified) (6 diffs)

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

@@ -18 +18 @@
 # @param verbose 
 # @return 
-def dem2pts(basename_in, basename_out=None,
+def dem2pts(name_in, name_out=None,
             easting_min=None, easting_max=None,
             northing_min=None, northing_max=None,
@@ -40 +40 @@
     """
 
-    kwargs = {'basename_out': basename_out,
+    kwargs = {'name_out': name_out,
               'easting_min': easting_min,
               'easting_max': easting_max,
@@ -49 +49 @@
     if use_cache is True:
         from caching import cache
-        result = cache(_dem2pts, basename_in, kwargs,
-                       dependencies = [basename_in + '.dem'],
+        result = cache(_dem2pts, name_in, kwargs,
+                       dependencies = [name_in],
                        verbose = verbose)
 
     else:
-        result = apply(_dem2pts, [basename_in], kwargs)
+        result = apply(_dem2pts, [name_in], kwargs)
 
     return result
@@ -68 +68 @@
 # @param northing_min 
 # @param northing_max 
-def _dem2pts(basename_in, basename_out=None, verbose=False,
+def _dem2pts(name_in, name_out=None, verbose=False,
             easting_min=None, easting_max=None,
             northing_min=None, northing_max=None):
@@ -81 +81 @@
     from Scientific.IO.NetCDF import NetCDFFile
 
-    root = basename_in
+    if name_in[-4:] != '.dem':
+        raise IOError('Input file %s should be of type .dem.' % name_in)
+
+    if name_out != None and basename_out[-4:] != '.pts':
+        raise IOError('Input file %s should be of type .pts.' % name_out)
+
+    root = name_in[:-4]
 
     # Get NetCDF
-    infile = NetCDFFile(root + '.dem', netcdf_mode_r) 
-
-    if verbose: log.critical('Reading DEM from %s' % (root + '.dem'))
+    infile = NetCDFFile(name_in, netcdf_mode_r) 
+
+    if verbose: log.critical('Reading DEM from %s' % (name_in))
 
     ncols = infile.ncols[0]
@@ -106 +112 @@
 
     # Get output file
-    if basename_out == None:
+    if name_out == None:
         ptsname = root + '.pts'
     else:
-        ptsname = basename_out + '.pts'
+        ptsname = name_out
 
     if verbose: log.critical('Store to NetCDF file %s' % ptsname)