Changeset 7986

Timestamp:

Sep 2, 2010, 9:51:54 AM (14 years ago)

Author:

habili

Message:

deal with manning

Location:

trunk/anuga_core/source/anuga/structures

Files:

• boyd_box_culvert.py (modified) (1 diff)
• boyd_box_routine.py (modified) (2 diffs)
• culvert.py (modified) (2 diffs)

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

@@ -18 +18 @@
                  height,
                  apron,
+                 manning,
                  enquiry_gap,
                  verbose=False):
 
-        culvert.Culvert.__init__(self, domain, end_points, width, height, apron, enquiry_gap, verbose)
-
+        culvert.Culvert.__init__(self, domain, end_points, width, height, apron, manning, enquiry_gap, verbose)
+        
         self.routine = boyd_box_routine.Boyd_box_routine(self)
 

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

@@ -58 +58 @@
         """
 
-    def __init__(self, culvert, manning=0.0):
+    def __init__(self, culvert):
 
-        culvert_routine.Culvert_routine.__init__(self, culvert, manning)
+        culvert_routine.Culvert_routine.__init__(self, culvert)
+        
+        self.manning = culvert.manning
 
 
@@ -69 +71 @@
 
         local_debug ='false'
+        
+        import pdb
+        pdb.set_trace()
+
         
         if self.inflow.get_enquiry_height() > 0.01: #this value was 0.01:

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

@@ -23 +23 @@
                  height,
                  apron,
+                 manning,
                  enquiry_gap,
                  verbose):
@@ -33 +34 @@
         self.height = height
         self.apron  = apron
+        self.manning = manning
+        
         self.enquiry_gap = enquiry_gap
         self.verbose=verbose