Changeset 6653

Timestamp:

Mar 28, 2009, 1:26:15 PM (15 years ago)

Author:

ole

Message:

Started work on volumetric check as per ticket:324 - then visitors arrived.
Will try to continue later.

Location:

anuga_core/source/anuga/shallow_water

Files:

• shallow_water_domain.py (modified) (1 diff)
• test_shallow_water_domain.py (modified) (3 diffs)

anuga_core/source/anuga/shallow_water/shallow_water_domain.py

@@ -796 +796 @@
         # Run through boundary array and compute for each segment
         # the normal momentum ((uh, vh) dot normal) times segment length.
-        # Based on sign accumulate this into total_boundary_inflow and total_boundary_outflow.
+        # Based on sign accumulate this into boundary_inflow and boundary_outflow.
         # The go through explicit forcing update and record the rate of change for stage and 
-        # record into total_forcing_inflow and total_forcing_outflow. Finally compute integral 
+        # record into forcing_inflow and forcing_outflow. Finally compute integral 
         # of depth to obtain total volume of domain.
                         
                         
-                        
-        pass
+        # Compute flows along boundary
+        
+        uh = self.get_quantity('xmomentum').get_values()
+        vh = self.get_quantity('ymomentum').get_values()        
+        
+        # Loop through edges that lie on the boundary and calculate 
+        # flows
+        inflow = 0.0
+        outflow = 0.0
+        for vol_id, edge_id in self.boundary:
+            print vol_id, edge_id, self.boundary[(vol_id, edge_id)]
+
+            # Pick edge and compute normal flow
+            print uh[vol_id, :]
+            print vh[vol_id, :]            
+         
+        
+        
                 
                 

anuga_core/source/anuga/shallow_water/test_shallow_water_domain.py

@@ -6734 +6734 @@
         else:
             os.remove(meshname)
-                    
+
+            
+            
+            
+    def Xtest_volumetric_balance_computation(self):
+        """test_volumetric_balance_computation
+        
+        Test that total in and out flows are computed correctly
+        """
+
+        verbose = True
+        
+
+        #------------------------------------------------------------------------------
+        # Import necessary modules
+        #------------------------------------------------------------------------------
+        from anuga.abstract_2d_finite_volumes.mesh_factory import rectangular_cross
+        from anuga.shallow_water import Domain
+        from anuga.shallow_water.shallow_water_domain import Reflective_boundary
+        from anuga.shallow_water.shallow_water_domain import Dirichlet_boundary
+        from anuga.shallow_water.shallow_water_domain import Inflow
+        from anuga.shallow_water.data_manager import get_flow_through_cross_section
+
+        #------------------------------------------------------------------------------
+        # Setup computational domain
+        #------------------------------------------------------------------------------
+        finaltime = 300.0
+
+        length = 300.
+        width  = 20.
+        dx = dy = 5       # Resolution: of grid on both axes
+        
+        # Input parameters
+        uh = 1.0
+        vh = 0.0
+        d = 1.0
+        
+        ref_flow = uh*d*width # 20 m^3/s in the x direction across entire domain
+
+        points, vertices, boundary = rectangular_cross(int(length/dx), int(width/dy),
+                                                       len1=length, len2=width)
+
+
+        domain = Domain(points, vertices, boundary)   
+        domain.set_name('Inflow_flowline_test')              # Output name
+                
+
+        #------------------------------------------------------------------------------
+        # Setup initial conditions
+        #------------------------------------------------------------------------------
+        slope = 0.0
+        def topography(x, y):
+            z=-x * slope
+            return z
+
+        domain.set_quantity('elevation', topography)  # Use function for elevation
+        domain.set_quantity('friction', 0.0)   # Constant friction
+                
+        domain.set_quantity('stage',
+                            expression='elevation')
+
+        #------------------------------------------------------------------------------
+        # Setup boundary conditions
+        #------------------------------------------------------------------------------
+
+        Br = Reflective_boundary(domain)      # Solid reflective wall
+                
+        # Constant flow into domain
+        # Depth = 1m, uh=1 m/s, i.e. a flow of 20 m^3/s 
+        
+        Bi = Dirichlet_boundary([d, uh, vh]) 
+        Bo = Dirichlet_boundary([0, 0, 0])
+
+        domain.set_boundary({'left': Bi, 'right': Bo, 'top': Br, 'bottom': Br})
+
+        
+        #------------------------------------------------------------------------------
+        # Evolve system through time
+        #------------------------------------------------------------------------------
+        for t in domain.evolve(yieldstep=100.0, finaltime=finaltime):
+            if verbose :
+                print domain.timestepping_statistics()
+                                    
+            print domain.compute_volumetric_balance()
+            
+            
+                                
         
     def Xtest_inflow_using_flowline(self):
@@ -6876 +6962 @@
         
         
-    def Xtest_friction_dependent_flow_using_flowline(self):
+    def test_friction_dependent_flow_using_flowline(self):
         """test_friction_dependent_flow_using_flowline
         
@@ -7011 +7097 @@
                     if verbose:
                         print 'Depth: ANUGA = %f, Mannings = %f' % (domain_depth, normal_depth)                    
-        
+
+                        
+                        
+                                
 if __name__ == "__main__":
     #suite = unittest.makeSuite(Test_Shallow_Water, 'test_friction_dependent_flow_using_flowline')
-    suite = unittest.makeSuite(Test_Shallow_Water, 'test')    
+    #suite = unittest.makeSuite(Test_Shallow_Water, 'test_volumetric_balance_computation') 
+    suite = unittest.makeSuite(Test_Shallow_Water, 'test')        
+
     runner = unittest.TextTestRunner(verbosity=1)    
     runner.run(suite)