Changeset 1108

Timestamp:

Mar 18, 2005, 4:21:58 PM (20 years ago)

Author:

duncan

Message:

add_quantities added

Location:

inundation/ga/storm_surge/pyvolution

Files:

• region.py (modified) (1 diff)
• test_region.py (modified) (2 diffs)

inundation/ga/storm_surge/pyvolution/region.py

@@ -91 +91 @@
                                 location=self.location)
 
+class Add_quantities(Region):
+    """
+    Will add a value to the current quantity value.
+    """
+    
+    def __init__(self, tag, quantity_answer, adding_quantity, location='vertices'):
+        #I have to get this going!
+        #Region.__init__(self)
+        self.tag = tag 
+        self.quantity_answer = quantity_answer
+        self.adding_quantity = adding_quantity
+        self.location = location
+
+    def __repr__(self):
+        pass
+    
+    def __call__(self, tag, elements, domain):
+        """
+        """    
+        if tag == self.tag:
+            
+            new_values = domain.get_quantity(self.quantity_answer,
+                          indexes=self.build_indexes(elements, domain),
+                          location=self.location) \
+                          + domain.get_quantity(self.adding_quantity,
+                          indexes=self.build_indexes(elements, domain),
+                          location=self.location)
+            domain.set_quantity(self.quantity_answer, new_values,
+                                indexes=self.build_indexes(elements, domain),
+                                location=self.location)
+
 
 class Stage_no_less_than_elevation(Region):

inundation/ga/storm_surge/pyvolution/test_region.py

@@ -12 +12 @@
 def add_x_y(x, y):
     return x+y
+
+def give_me_23(x, y):
+    return 23.0
 
 class Test_Region(unittest.TestCase):
@@ -90 +93 @@
                          [ 11.0,  11.0,  11.0]])
 
+        
+        domain.set_quantity('elevation', 10.0)
+        domain.set_quantity('stage', give_me_23)
+        domain.set_region(Add_quantities('top', 'elevation','stage'))
+        #print domain.quantities['elevation'].get_values()
+        assert allclose(domain.quantities['elevation'].get_values(),
+                        [[ 10., 10., 10.],
+                         [ 10., 10., 10.],
+                         [ 10., 10., 10.],
+                         [ 10., 10., 10.],
+                         [ 33.,  33.0,  33.],
+                         [ 33.0,  33.,  33.]])
+        
     def test_unique_vertices(self):
         """