Changeset 7997

Timestamp:

Sep 3, 2010, 11:02:27 AM (14 years ago)

Author:

habili

Message:

added losses

Location:

trunk/anuga_core/source/anuga/structures

Files:

• boyd_box_operator.py (modified) (4 diffs)
• test_Outlet_Ctrl.py (added)

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

@@ -3 +3 @@
 import anuga.utilities.log as log
 import math
+import types
 
 import structure_operator
@@ -21 +22 @@
                  end_point0, 
                  end_point1,
+                 losses,
                  width,
                  height=None,
@@ -39 +41 @@
                                                        apron,
                                                        manning,
-                                                       enquiry_gap,
+                                                       enquiry_gap,                                                       
                                                        description,
                                                        verbose)            
+        
+        
+        if type(losses) == types.DictType:
+            self.sum_loss = sum(losses.values())
+        elif type(losses) == types.ListType:
+            self.sum_losses = sum(losses)
+        else:
+            self.sum_losses = losses
         
         self.use_momentum_jet = use_momentum_jet
@@ -50 +60 @@
         self.culvert_height = self.get_culvert_height()
 
-
-        self.sum_loss = 0.0
         self.max_velocity = 10.0
         self.log_filename = None