Changeset 1114

Timestamp:

Mar 22, 2005, 11:06:52 AM (20 years ago)

Author:

prow

Message:

 

File:

• inundation/ga/storm_surge/pyvolution/data_manager.py (modified) (5 diffs)

inundation/ga/storm_surge/pyvolution/data_manager.py

@@ -1186 +1186 @@
                fail_on_NaN = True,
                NaN_filler = 0,
-               elevation = -100): #FIXME: Bathymetry should be obtained
+               elevation = -100
+               ): #FIXME: Bathymetry should be obtained
                                   #from MOST somehow.
                                   #Alternatively from elsewhere
@@ -1495 +1496 @@
 
 
-    if elevations is not None:
-        z = elevations
+    if elevation is not None:
+        z = elevation
     else:
-        pass
+        if inverted_bathymetry:
+            z = -1*elevations
+        else:
+            z = elevations
         #FIXME: z should be obtained from MOST and passed in here
         
@@ -1513 +1517 @@
     stage = outfile.variables['stage']
     xmomentum = outfile.variables['xmomentum']
-    ymomentum = outfile.variables['ymomentum']        
+    ymomentum = outfile.variables['ymomentum'] 
+    z = outfile.variables['elevation']         
 
 
@@ -1525 +1530 @@
                 w = zscale*amplitudes[j,k,l]/100 + mean_stage
                 stage[j,i] = w
-                h = w - z
+                h = w - z[j,i]
                 xmomentum[j,i] = uspeed[j,k,l]/100*h
                 ymomentum[j,i] = vspeed[j,k,l]/100*h
@@ -1534 +1539 @@
         x = outfile.variables['x'][:]
         y = outfile.variables['y'][:]        
-        
         print '------------------------------------------------'
         print 'Statistics of output file:'