Changeset 7814 for trunk/anuga_core/source/anuga/file_conversion/dem2pts.py
- Timestamp:
- Jun 9, 2010, 12:28:24 PM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/anuga_core/source/anuga/file_conversion/dem2pts.py
r7804 r7814 18 18 # @param verbose 19 19 # @return 20 def dem2pts( basename_in, basename_out=None,20 def dem2pts(name_in, name_out=None, 21 21 easting_min=None, easting_max=None, 22 22 northing_min=None, northing_max=None, … … 40 40 """ 41 41 42 kwargs = {' basename_out': basename_out,42 kwargs = {'name_out': name_out, 43 43 'easting_min': easting_min, 44 44 'easting_max': easting_max, … … 49 49 if use_cache is True: 50 50 from caching import cache 51 result = cache(_dem2pts, basename_in, kwargs,52 dependencies = [ basename_in + '.dem'],51 result = cache(_dem2pts, name_in, kwargs, 52 dependencies = [name_in], 53 53 verbose = verbose) 54 54 55 55 else: 56 result = apply(_dem2pts, [ basename_in], kwargs)56 result = apply(_dem2pts, [name_in], kwargs) 57 57 58 58 return result … … 68 68 # @param northing_min 69 69 # @param northing_max 70 def _dem2pts( basename_in, basename_out=None, verbose=False,70 def _dem2pts(name_in, name_out=None, verbose=False, 71 71 easting_min=None, easting_max=None, 72 72 northing_min=None, northing_max=None): … … 81 81 from Scientific.IO.NetCDF import NetCDFFile 82 82 83 root = basename_in 83 if name_in[-4:] != '.dem': 84 raise IOError('Input file %s should be of type .dem.' % name_in) 85 86 if name_out != None and basename_out[-4:] != '.pts': 87 raise IOError('Input file %s should be of type .pts.' % name_out) 88 89 root = name_in[:-4] 84 90 85 91 # Get NetCDF 86 infile = NetCDFFile( root + '.dem', netcdf_mode_r)87 88 if verbose: log.critical('Reading DEM from %s' % ( root + '.dem'))92 infile = NetCDFFile(name_in, netcdf_mode_r) 93 94 if verbose: log.critical('Reading DEM from %s' % (name_in)) 89 95 90 96 ncols = infile.ncols[0] … … 106 112 107 113 # Get output file 108 if basename_out == None:114 if name_out == None: 109 115 ptsname = root + '.pts' 110 116 else: 111 ptsname = basename_out + '.pts'117 ptsname = name_out 112 118 113 119 if verbose: log.critical('Store to NetCDF file %s' % ptsname)
Note: See TracChangeset
for help on using the changeset viewer.