Changeset 8079

Timestamp:

Nov 19, 2010, 11:18:07 PM (14 years ago)

Author:

steve

Message:

Inlet operator can now add water evenly over inlet. Should be provided as n inlet method!

Location:

trunk/anuga_core/source/anuga/structures

Files:

• inlet_operator.py (modified) (2 diffs)
• test_inlet_operator.py (modified) (3 diffs)

trunk/anuga_core/source/anuga/structures/inlet_operator.py

@@ -89 +89 @@
 
         for i,a in enumerate(areas[stages_order]):
-            print i,a, stages[stages_order[i]]
+            #print i,a, stages[stages_order[i]]
             if i == 0:
                 summed_areas[i] = a
@@ -102 +102 @@
                 diff_stage[i] = stages[stages_order[i]] - stages[stages_order[i-1]]
 
-        print summed_areas
-        print summed_amount
-        print diff_stage
+        #print 'amount ',amount
+        #print summed_areas
+        #print summed_amount
+        #print diff_stage
 
             
         #index = len(summed_amount)
         for i,a in enumerate(summed_amount):
+            #print 'a ',a
             if amount > a :
                 index = i
 
-        print index
-
-
-        print stages_order
-        print stages
-        print areas
-        print stages[stages_order]
-
-
-        new_inlet_depth = self.inlet.get_average_depth() + (amount/self.inlet.get_area())
-        self.inlet.set_depths(new_inlet_depth)
-
-            
+        #print index
+
+        #print stages_order
+        #print stages
+        
+        amount = (amount - summed_amount[index])/summed_areas[index]
+                
+        stages[stages_order[0:index+1]] = stages[stages_order[index]]+amount
+        
+        
+        #print stages
+        #print areas
+        #print stages[stages_order]
+
+
+        #new_inlet_depth = self.inlet.get_average_depth() + (amount/self.inlet.get_area())
+        #self.inlet.set_depths(new_inlet_depth)
+
+        self.inlet.set_stages(stages)   
 
     def statistics(self):

trunk/anuga_core/source/anuga/structures/test_inlet_operator.py

@@ -96 +96 @@
         domain_length = 200.0
         domain_width = 200.0
-
-        culvert_length = 20.0
-        culvert_width = 3.66
-        culvert_height = 3.66
-        culvert_losses = {'inlet':0.5, 'outlet':1.0, 'bend':0.0, 'grate':0.0, 'pier': 0.0, 'other': 0.0}
-        culvert_mannings = 0.013
-        
-        culvert_apron = 0.0
-        enquiry_gap = 10.0
-
-        
-        expected_Q = 6.23
-        expected_v = 2.55
-        expected_d = 0.66
         
 
         domain = self._create_domain(d_length=domain_length,
                                      d_width=domain_width,
-                                     dx = 5.0,
-                                     dy = 5.0,
+                                     dx = 10.0,
+                                     dy = 10.0,
                                      elevation_0 = elevation_0,
                                      elevation_1 = elevation_1,
@@ -121 +107 @@
                                      stage_1 = stage_1)
 
-
-
-
         vol0 = domain.compute_total_volume()
 
+        finaltime = 3.0
+        line1 = [[95.0, 10.0], [105.0, 10.0]]
+        Q1 = 5.00
+        
+        line2 = [[10.0, 90.0], [20.0, 90.0]]
+        Q2 = 10.0
+        
+        Inlet_operator(domain, line1, Q1)
+        Inlet_operator(domain, line2, Q2)
 
-        line = [[0.0, 5.0], [0.0, 10.0]]
-        Q = 5.0
-        Inlet_operator(domain, line, Q)
-
-
-        for t in domain.evolve(yieldstep = 1.0, finaltime = 1.0):
+        for t in domain.evolve(yieldstep = 1.0, finaltime = finaltime):
             #domain.write_time()
             #print domain.volumetric_balance_statistics()
@@ -139 +126 @@
 
         vol1 = domain.compute_total_volume()
-        
 
-        assert numpy.allclose(Q, vol1-vol0, rtol=1.0e-8) 
+        assert numpy.allclose((Q1+Q2)*finaltime, vol1-vol0, rtol=1.0e-8)