Changeset 1919 for inundation/pyvolution/domain.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/domain.py (modified) (1 diff)

inundation/pyvolution/domain.py

@@ -745 +745 @@
     """
 
-    #Replace quantity names with actual quantities
-    quantities = domain.quantities
-    for quantity_name in quantities.keys():
-        expression = expression.replace(quantity_name,
-                                        'quantities["%s"]' %quantity_name)
-
-    #Evaluate and return
-    return eval(expression)   
+    from util import apply_expression_to_dictionary
+    return apply_expression_to_dictionary(expression, domain.quantities)