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

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

@@ -17 +17 @@
 
 
-def ferret2sww(basename_in, basename_out=None,
+def ferret2sww(basename_in, name_out=None,
                verbose=False,
                minlat=None, maxlat=None,
@@ -64 +64 @@
     _assert_lat_long(minlat, maxlat, minlon, maxlon)
 
+    if name_out != None and name_out[-4:] != '.sww':
+        raise IOError('Output file %s should be of type .sww.' % name_out)
+
     # Get NetCDF data
     if verbose: log.critical('Reading files %s_*.nc' % basename_in)
@@ -79 +82 @@
     file_e = NetCDFFile(basename_in + '_e.nc', netcdf_mode_r)  
 
-    if basename_out is None:
+    if name_out is None:
         swwname = basename_in + '.sww'
     else:
-        swwname = basename_out + '.sww'
+        swwname = name_out
 
     # Get dimensions of file_h