Changeset 5314

Timestamp:

May 13, 2008, 5:17:03 PM (17 years ago)

Author:

ole

Message:

Work on culverts

File:

• anuga_work/development/Rudy_vandrie_2007/culvert_development.py (modified) (4 diffs)

anuga_work/development/Rudy_vandrie_2007/culvert_development.py

@@ -388 +388 @@
         if openings[0].depth < epsilon:
             # Do nothing because No water over Opening  That is Set Flow to Zero!!
-            self.openings[0].flow = 0
-            self.openings[1].flow = 0
+            self.openings[0].rate = 0
+            self.openings[1].rate = 0
   
         elif openings[0].depth > 0:
@@ -401 +401 @@
                 # Flow will go from opening 0 to opening 1
                 #- that is abstract from [0] and add to [1]
-                self.openings[0].flow = -flow_rate_control
-                self.openings[1].flow = flow_rate_control
+                self.openings[0].rate = -flow_rate_control
+                self.openings[1].rate = flow_rate_control
 
                 # Add jet in the form of absolute momentum to opening 1
@@ -456 +456 @@
                     s = 'T=%.2f, Culvert Discharge = %.3f  Culv. Vel. %0.3f'\
                         %(time, flow_rate_control, outlet_vel)
-                    s += ' Depth= %0.3f  Momentum = %0.3f' %(outlet_dep, outlet_mom)
+                    s += ' Depth= %0.3f  Momentum = (%0.3f, %0.3f)'\
+                         %(outlet_dep, outlet_mom_x,outlet_mom_y)
+                    s += ' Momentum rate: (%.4f, %.4f)'\
+                         %(xmomentum_rate, ymomentum_rate)                    
                     fid.write(s)
                     print s
-                    
-
             else:
                 # Opening 1 has the greatest depth. Therefore Reverse the Flow !!!
                 # Flow will go from opening 1 to opening 0, That is Abstract from [1] and add to [0]
-                self.openings[0].flow = flow_rate_control        # Else it will be Orifice Flow (Going US)
-                self.openings[1].flow = -flow_rate_control
+                self.openings[0].rate = flow_rate_control        # Else it will be Orifice Flow (Going US)
+                self.openings[1].rate = -flow_rate_control
 
         # Second Else.... if water at outlet before at inlet !!!
 
 
-       
+        self.openings[1].rate = 10
         # Execute flow term for each opening
         # This is where Inflow objects are evaluated and update the domain
@@ -561 +562 @@
     #    domain.write_time()
     
-    #if domain.get_time() >= 4 and tap.flow != 0.0:
+    #if domain.get_time() >= 4 and tap.rate != 0.0:
     #    print 'Turning tap off'
-    #    tap.flow = 0.0
+    #    tap.rate = 0.0
         
-    #if domain.get_time() >= 3 and sink.flow < 0.0:
+    #if domain.get_time() >= 3 and sink.rate < 0.0:
     #    print 'Turning drain on'
-    #    sink.flow = -0.8       
+    #    sink.rate = -0.8       
     # Close