Changeset 5546

Timestamp:

Jul 22, 2008, 11:39:25 AM (16 years ago)

Author:

ole

Message:

Slight update of data_manager (file name in urs2sts)

File:

• anuga_core/source/anuga/shallow_water/data_manager.py (modified) (3 diffs)

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -5015 +5015 @@
     # Check output filename    
     if basename_out is None:
-        msg = 'STS filename must be specified'
+        msg = 'STS filename must be specified as basename_out'
+        msg += ' in function urs2sts'
         raise Exception, msg
-    stsname = basename_out + '.sts'
+    
+    if basename_out.endswith('.sts'):
+        stsname = basename_out
+    else:    
+        stsname = basename_out + '.sts'        
 
     # Create input filenames from basenames and check their existence
@@ -5158 +5163 @@
     geo_ref = write_NetCDF_georeference(origin, outfile)
 
-    z = elevation
+
     
     #print geo_ref.get_xllcorner()
     #print geo_ref.get_yllcorner()
 
-    z = resize(z,outfile.variables['z'][:].shape)
+    elevation = resize(elevation,outfile.variables['elevation'][:].shape)
     outfile.variables['x'][:] = x - geo_ref.get_xllcorner()
     outfile.variables['y'][:] = y - geo_ref.get_yllcorner()
-    outfile.variables['z'][:] = z             #FIXME HACK for bacwards compat.
-    outfile.variables['elevation'][:] = z
+    outfile.variables['elevation'][:] = elevation
 
     stage = outfile.variables['stage']
@@ -5680 +5684 @@
         outfile.variables[q+Write_sts.RANGE][1] = -max_float # Max
 
-        outfile.createVariable('z', sts_precision, ('number_of_points',))
         # Doing sts_precision instead of Float gives cast errors.
         outfile.createVariable('time', Float, ('number_of_timesteps',))