Changeset 6129

Timestamp:

Jan 9, 2009, 2:47:16 PM (16 years ago)

Author:

ole

Message:

Implemented add_quantity to address ticket:250 and tested.

Suite test_all.py pass on Ubuntu 32bit system.

Location:

anuga_core/source/anuga/abstract_2d_finite_volumes

Files:

• domain.py (modified) (3 diffs)
• test_domain.py (modified) (1 diff)

anuga_core/source/anuga/abstract_2d_finite_volumes/domain.py

@@ -30 +30 @@
 from anuga.utilities.polygon import inside_polygon
 from anuga.abstract_2d_finite_volumes.util import get_textual_float
+
+from Numeric import zeros, Float, Int, ones
+from quantity import Quantity
 
 import types
@@ -105 +108 @@
 
         if verbose: print 'Initialising Domain'
-        from Numeric import zeros, Float, Int, ones
-        from quantity import Quantity
 
         # List of quantity names entering
@@ -374 +375 @@
         # Assign values
         self.quantities[name].set_values(*args, **kwargs)
-
+        
+    def add_quantity(self, name, *args, **kwargs):
+        """Add values to a named quantity
+        
+        E.g add_quantity('elevation', X)
+        
+        Option are the same as in set_quantity.
+        """
+            
+        # Do the expression stuff
+        if kwargs.has_key('expression'):
+            expression = kwargs['expression']
+            Q2 = self.create_quantity_from_expression(expression)
+        else:    
+            # Create new temporary quantity
+            Q2 = Quantity(self)
+        
+            # Assign specified values to temporary quantity
+            Q2.set_values(*args, **kwargs)
+            
+        # Add temporary quantity to named quantity
+        Q1 = self.get_quantity(name)
+        self.set_quantity(name, Q1 + Q2)
+        
 
     def get_quantity_names(self):

anuga_core/source/anuga/abstract_2d_finite_volumes/test_domain.py

@@ -319 +319 @@
 
 
+                                      
+    def test_add_quantity(self):
+        """Test that quantities already set can be added to using
+        add_quantity
+
+        """
+
+
+        a = [0.0, 0.0]
+        b = [0.0, 2.0]
+        c = [2.0,0.0]
+        d = [0.0, 4.0]
+        e = [2.0, 2.0]
+        f = [4.0,0.0]
+
+        points = [a, b, c, d, e, f]
+        #bac, bce, ecf, dbe, daf, dae
+        vertices = [ [1,0,2], [1,2,4], [4,2,5], [3,1,4]]
+
+        domain = Domain(points, vertices, boundary=None,
+                        conserved_quantities =\
+                        ['stage', 'xmomentum', 'ymomentum'],
+                        other_quantities = ['elevation', 'friction', 'depth'])
+
+
+        A = array([[1,2,3], [5,5,-5], [0,0,9], [-6,3,3]], 'f')
+        B = array([[2,4,4], [3,2,1], [6,-3,4], [4,5,-1]], 'f')
+        
+        #print A
+        #print B
+        #print A+B
+        
+        # Shorthands
+        stage = domain.quantities['stage']
+        elevation = domain.quantities['elevation']
+        depth = domain.quantities['depth']
+        
+        # Go testing
+        domain.set_quantity('elevation', A)
+        domain.add_quantity('elevation', B)
+        assert allclose(elevation.vertex_values, A+B)
+        
+        domain.add_quantity('elevation', 4)
+        assert allclose(elevation.vertex_values, A+B+4)        
+        
+        
+        # Test using expression
+        domain.set_quantity('stage', [[1,2,3], [5,5,5],
+                                      [0,0,9], [-6, 3, 3]])        
+        domain.set_quantity('depth', 1.0)                                     
+        domain.add_quantity('depth', expression = 'stage - elevation')        
+        assert allclose(depth.vertex_values, stage.vertex_values-elevation.vertex_values+1)
+                
+        
+        # Check self referential expression
+        reference = 2*stage.vertex_values - depth.vertex_values 
+        domain.add_quantity('stage', expression = 'stage - depth')                
+        assert allclose(stage.vertex_values, reference)        
+                                      
+
+        # Test using a function
+        def f(x, y):
+            return x+y
+            
+        domain.set_quantity('elevation', f)            
+        domain.set_quantity('stage', 5.0)
+        domain.set_quantity('depth', expression = 'stage - elevation')
+        
+        domain.add_quantity('depth', f)
+        assert allclose(stage.vertex_values, depth.vertex_values)                
+         
+            
+        
+        
+                                      
+                                      
     def test_setting_timestepping_method(self):
         """test_set_quanitities_to_be_monitored