Changeset 1919 for inundation/pyvolution/data_manager.py

Timestamp:

Oct 14, 2005, 11:26:21 AM (19 years ago)

Author:

ole

Message:

Implemented arbitrary expressions for sww2dem using code from changeset:1916

File:

• inundation/pyvolution/data_manager.py (modified) (3 diffs)

inundation/pyvolution/data_manager.py

@@ -1248 +1248 @@
 
 
-    if quantity is given, out values from quantity otherwise default to
-    elevation
+    The parameter quantity must be the name of an existing quantity or
+    an expression involving existing quantities. The default is
+    'elevation'. 
 
     if timestep (an index) is given, output quantity at that timestep
@@ -1262 +1263 @@
     from Numeric import array, Float, concatenate, NewAxis, zeros, reshape, sometrue 
     from utilities.polygon import inside_polygon
+    from util import apply_expression_to_dictionary
     
     msg = 'Format must be either asc or ers'
@@ -1315 +1317 @@
 
     #Get quantity and reduce if applicable
-    if verbose: print 'Reading quantity %s' %quantity
-
-    if quantity.lower() == 'depth':
-        q = fid.variables['stage'][:] - fid.variables['elevation'][:]
-    else:
-        q = fid.variables[quantity][:]
+    if verbose: print 'Processing quantity %s' %quantity
+
+    #Turn NetCDF objects into Numeric arrays
+    quantity_dict = {}
+    for name in fid.variables.keys():
+
+        if name not in ['x', 'y', 'volumes', 'time']:
+            quantity_dict[name] = fid.variables[name][:]
+
+    #print quantity_dict     
+   
+
+    q = apply_expression_to_dictionary(quantity, quantity_dict)