Changeset 8080

Timestamp:

Nov 20, 2010, 10:18:51 AM (14 years ago)

Author:

steve

Message:

Added water level in inlet_operator

Location:

trunk/anuga_core/source/anuga/structures

Files:

• inlet.py (modified) (1 diff)
• inlet_operator.py (modified) (1 diff)

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

@@ -216 +216 @@
 
         self.domain.quantities['elevation'].centroid_values.put(self.triangle_indices, elevation)
+
+    def set_stages_evenly(self,volume):
+        """ Distribute volume of water over
+        inlet exchange region so that stage is level
+        """
+
+        areas = self.get_areas()
+        stages = self.get_stages()
+
+        stages_order = stages.argsort()
+
+        summed_areas = num.zeros_like(areas)
+        summed_volume = num.zeros_like(areas)
+        #diff_stage = num.zeros_like(areas)
+
+        for i,a in enumerate(areas[stages_order]):
+            #print i,a, stages[stages_order[i]]
+            if i == 0:
+                summed_areas[i] = a
+                summed_volume[i] = 0.0
+                #diff_stage[i] = 0.0
+            else:
+                summed_areas[i] = summed_areas[i-1] + a
+
+                summed_volume[i] = summed_volume[i-1] + summed_areas[i-1]*\
+                    (stages[stages_order[i]] - stages[stages_order[i-1]])
+
+                #diff_stage[i] = stages[stages_order[i]] - stages[stages_order[i-1]]
+
+        #print 'amount ',amount
+        #print summed_areas
+        #print summed_amount
+        #print diff_stage
+
+            
+        #index = len(summed_amount)
+        for i,a in enumerate(summed_volume):
+            #print 'a ',a
+            if volume > a :
+                index = i
+
+        #print index
+
+        #print stages_order
+        #print stages
+        
+        depth = (volume - summed_volume[index])/summed_areas[index]
+                
+        stages[stages_order[0:index+1]] = stages[stages_order[index]]+depth
+
+        self.set_stages(stages) 
+
+    def set_depths_evenly(self,volume):
+        """ Distribute volume over all exchange
+        cells with equal depth of water
+        """
+            
+        new_depth = self.get_average_depth() + (volume/self.get_area())
+        self.set_depths(new_depth)
+

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

@@ -69 +69 @@
         Q = self.Q
 
-        amount = Q*timestep
+        volume = Q*timestep
 
-        assert Q >= 0.0, 'removing water from an inlet!'
+        assert Q >= 0.0, 'Q < 0: Water to be removed from an inlet!'
 
 
-        # FIXME (SR): Might be nice to spread the over the inlet so that it is flat
-
-
-        # Spread Q*timestep amount of water evenly over the inlet region
-
-        areas = self.inlet.get_areas()
-        stages = self.inlet.get_stages()
-
-        stages_order = stages.argsort()
-
-        summed_areas = numpy.zeros_like(areas)
-        summed_amount = numpy.zeros_like(areas)
-        diff_stage = numpy.zeros_like(areas)
-
-        for i,a in enumerate(areas[stages_order]):
-            #print i,a, stages[stages_order[i]]
-            if i == 0:
-                summed_areas[i] = a
-                summed_amount[i] = 0.0
-                diff_stage[i] = 0.0
-            else:
-                summed_areas[i] = summed_areas[i-1] + a
-
-                summed_amount[i] = summed_amount[i-1] + summed_areas[i-1]*\
-                    (stages[stages_order[i]] - stages[stages_order[i-1]])
-
-                diff_stage[i] = stages[stages_order[i]] - stages[stages_order[i-1]]
-
-        #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
+        # Distribute volume so as to obtain flat surface
+        self.inlet.set_stages_evenly(volume)
         
-        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)   
+        # Distribute volume evenly over all cells
+        #self.inlet.set_depths_evenly(volume)
+  
 
     def statistics(self):