Changeset 1171

Timestamp:

Mar 31, 2005, 11:51:37 AM (20 years ago)

Author:

ole

Message:

Added keyword 'depth' to sww2domain, changed output filenames and modified test

Location:

inundation/ga/storm_surge/pyvolution

Files:

• data_manager.py (modified) (3 diffs)
• test_data_manager.py (modified) (5 diffs)

inundation/ga/storm_surge/pyvolution/data_manager.py

@@ -1087 +1087 @@
 
     if basename_out is None:
-        basename_out = basename_in
+        basename_out = basename_in + '_%s' %quantity
         
     swwfile = basename_in + '.sww'
@@ -1120 +1120 @@
 
     #Get quantity and reduce if applicable
-    if verbose: print 'Reading quantity %s' %quantity    
-    q = fid.variables[quantity][:]
+    if verbose: print 'Reading quantity %s' %quantity
+
+    if quantity.lower() == 'depth':
+        q = fid.variables['stage'][:] - fid.variables['elevation'][:]
+    else:  
+        q = fid.variables[quantity][:]
 
     
@@ -1214 +1218 @@
     
     for i in range(nrows):
-        if verbose and i%((nrows+1)/10)==0:
+        if verbose and i%((nrows+10)/10)==0:
             print 'Doing row %d of %d' %(i, nrows)
             

inundation/ga/storm_surge/pyvolution/test_data_manager.py

@@ -595 +595 @@
         self.domain.filename = 'datatest'
         
-        prjfile = self.domain.filename + '.prj'
-        ascfile = self.domain.filename + '.asc'        
+        prjfile = self.domain.filename + '_elevation.prj'
+        ascfile = self.domain.filename + '_elevation.asc'        
         swwfile = self.domain.filename + '.sww'
         
@@ -633 +633 @@
         sww2asc(self.domain.filename, 
                 quantity = 'elevation',                         
-                cellsize = cellsize)
+                cellsize = cellsize,
+                verbose = False)
 
 
         #Check prj (meta data)
         prjid = open(prjfile)
-
         lines = prjid.readlines()
         prjid.close()
@@ -737 +737 @@
         self.domain.filename = 'datatest'
         
-        prjfile = self.domain.filename + '.prj'
-        ascfile = self.domain.filename + '.asc'        
+        prjfile = self.domain.filename + '_stage.prj'
+        ascfile = self.domain.filename + '_stage.asc'                
         swwfile = self.domain.filename + '.sww'
         
@@ -889 +889 @@
         domain.filename = 'datatest'
         
-        prjfile = domain.filename + '.prj'
-        ascfile = domain.filename + '.asc'        
+        prjfile = domain.filename + '_elevation.prj'
+        ascfile = domain.filename + '_elevation.asc'                
         swwfile = domain.filename + '.sww'
         
@@ -922 +922 @@
         sww2asc(domain.filename, 
                 quantity = 'elevation',                         
-                cellsize = cellsize)
+                cellsize = cellsize,
+                verbose = False)