Changeset 8077

Timestamp:

Nov 19, 2010, 5:48:05 PM (14 years ago)

Author:

steve

Message:

end of day

File:

• trunk/anuga_core/source/anuga/structures/inlet_operator.py (modified) (4 diffs)

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

@@ -69 +69 @@
         Q = self.Q
 
+        amount = Q*timestep
+
         assert Q >= 0.0, 'removing water from an inlet!'
 
@@ -83 +85 @@
 
         summed_areas = numpy.zeros_like(areas)
-        summed_Q = numpy.zeros_like(areas)
+        summed_amount = numpy.zeros_like(areas)
+        diff_stage = numpy.zeros_like(areas)
 
         for i,a in enumerate(areas[stages_order]):
@@ -89 +92 @@
             if i == 0:
                 summed_areas[i] = a
-                summed_Q[i] = stages[stages_order[i]] - stages[stages_order[i]]
+                summed_amount[i] = 0.0
+                diff_stage[i] = 0.0
             else:
                 summed_areas[i] = summed_areas[i-1] + a
-                summed_Q[i] = summed_Q[i-1]
+
+                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 summed_areas
-
+        print summed_amount
+        print diff_stage
 
             
-
+        #index = len(summed_amount)
+        for i,a in enumerate(summed_amount):
+            if amount > a :
+                index = i
+
+        print index
 
 
@@ -107 +121 @@
 
 
-        new_inlet_depth = self.inlet.get_average_depth() + (Q*timestep/self.inlet.get_area())
+        new_inlet_depth = self.inlet.get_average_depth() + (amount/self.inlet.get_area())
         self.inlet.set_depths(new_inlet_depth)