Changeset 6002

Timestamp:

Nov 26, 2008, 3:39:12 PM (15 years ago)

Author:

ole

Message:

Added test for Rainfall and thus also General forcing to make sure
it works with geo_referencing.

Location:

anuga_core/source/anuga/shallow_water

Files:

• shallow_water_domain.py (modified) (3 diffs)
• test_shallow_water_domain.py (modified) (5 diffs)

anuga_core/source/anuga/shallow_water/shallow_water_domain.py

@@ -1645 +1645 @@
     center [m]: Coordinates at center of flow point
     radius [m]: Size of circular area
-    polygon:    Arbitrary polygon.
+    polygon:    Arbitrary polygon
     default_rate: Rate to be used if rate fails (e.g. if model time exceeds its data)
                   Admissible types: None, constant number or function of t
@@ -1652 +1652 @@
     Either center, radius or polygon can be specified but not both.
     If neither are specified the entire domain gets updated.
+    All coordinates to be specified in absolute UTM coordinates (x, y) assuming the zone of domain.    
     
-    See Inflow or Rainfall for examples of use
+    Inflow or Rainfall for examples of use
     """
 
@@ -1690 +1691 @@
                          # previous timestep in order to obtain rate
 
-                         
-        bounding_polygon = domain.get_boundary_polygon()
+        bounding_polygon = domain.get_boundary_polygon() # Returns absolute coordinates
 
 

anuga_core/source/anuga/shallow_water/test_shallow_water_domain.py

@@ -2545 +2545 @@
 
     def test_time_dependent_rainfall_using_starttime(self):
+    
+        rainfall_poly = ensure_numeric([[1,1], [2,1], [2,2], [1,2]], Float)    
 
         a = [0.0, 0.0]
@@ -2572 +2574 @@
         R = Rainfall(domain,
                      rate=lambda t: 3*t + 7,
-                     polygon = [[1,1], [2,1], [2,2], [1,2]])
+                     polygon=rainfall_poly)                     
 
         assert allclose(R.exchange_area, 1)
@@ -2602 +2604 @@
 
 
+        
+    def test_time_dependent_rainfall_using_georef(self):
+        """test_time_dependent_rainfall_using_georef
+        
+        This will also test the General forcing term using georef
+        """
+        
+        #Mesh in zone 56 (absolute coords)
+
+        x0 = 314036.58727982
+        y0 = 6224951.2960092
+
+        
+        rainfall_poly = ensure_numeric([[1,1], [2,1], [2,2], [1,2]], Float)
+        rainfall_poly += [x0, y0]
+
+        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
+        vertices = [ [1,0,2], [1,2,4], [4,2,5], [3,1,4]]
+
+
+        domain = Domain(points, vertices,
+                        geo_reference = Geo_reference(56, x0, y0))
+
+        #Flat surface with 1m of water
+        domain.set_quantity('elevation', 0)
+        domain.set_quantity('stage', 1.0)
+        domain.set_quantity('friction', 0)
+
+        Br = Reflective_boundary(domain)
+        domain.set_boundary({'exterior': Br})
+
+        # Setup only one forcing term, time dependent rainfall restricted to a polygon enclosing triangle #1 (bce)
+        domain.forcing_terms = []
+        R = Rainfall(domain,
+                     rate=lambda t: 3*t + 7,
+                     polygon=rainfall_poly)
+
+        assert allclose(R.exchange_area, 1)
+        
+        domain.forcing_terms.append(R)
+
+        # This will test that time used in the forcing function takes
+        # startime into account.
+        domain.starttime = 5.0
+
+        domain.time = 7.
+
+        domain.compute_forcing_terms()
+        #print domain.quantities['stage'].explicit_update
+
+        #print domain.get_time()
+        assert allclose(domain.quantities['stage'].explicit_update[1],
+                        (3*domain.get_time()+7)/1000)
+        assert allclose(domain.quantities['stage'].explicit_update[1],
+                        (3*(domain.time + domain.starttime)+7)/1000)
+
+        # Using internal time her should fail
+        assert not allclose(domain.quantities['stage'].explicit_update[1],
+                        (3*domain.time+7)/1000)                
+
+        assert allclose(domain.quantities['stage'].explicit_update[0], 0)
+        assert allclose(domain.quantities['stage'].explicit_update[2:], 0)        
+        
+
+        
+        
 
 
@@ -6190 +6266 @@
 
         data_geo_spatial = Geospatial_data(data_points_rel,
-                         geo_reference = Geo_reference(56, x0, y0))
+                                           geo_reference = Geo_reference(56, x0, y0))
         data_points_absolute = data_geo_spatial.get_data_points(absolute=True)
         attributes = linear_function(data_points_absolute)
@@ -6232 +6308 @@
 
     suite = unittest.makeSuite(Test_Shallow_Water,'test')
-
     #suite = unittest.makeSuite(Test_Shallow_Water,'test_get_energy_through_cross_section_with_g')    
     #suite = unittest.makeSuite(Test_Shallow_Water,'test_fitting_using_shallow_water_domain')    
     #suite = unittest.makeSuite(Test_Shallow_Water,'test_tight_slope_limiters')
     #suite = unittest.makeSuite(Test_Shallow_Water,'test_get_maximum_inundation_from_sww')
-    #suite = unittest.makeSuite(Test_Shallow_Water,'test_time_dependent_rainfall_using_starttime')    
+    #suite = unittest.makeSuite(Test_Shallow_Water,'test_time_dependent_rainfall')