Changeset 8007

Timestamp:

Sep 7, 2010, 10:17:56 AM (14 years ago)

Author:

habili

Message:

Code refactored into boyd_box_operator, boyd_pipe_operator and structure_operator.

Location:

trunk/anuga_core/source/anuga/structures

Files:

• boyd_box_culvert.py (deleted)
• boyd_box_culvert_routine.py (deleted)
• boyd_box_routine.py (deleted)
• boyd_circle_routine.py (deleted)
• boyd_irregular_routine.py (deleted)
• culvert.py (deleted)
• culvert_operator.py (deleted)
• culvert_polygons.py (deleted)
• culvert_routine.py (deleted)
• irregular_structure.py (deleted)
• structure.py (deleted)
• testing_culvert.py (modified) (3 diffs)

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

@@ -10 +10 @@
 import anuga
 
-from anuga.structures.culvert_operator import Culvert_operator
+from anuga.structures.boyd_pipe_operator import Boyd_pipe_operator
                             
 #from anuga.culvert_flows.culvert_routines import boyd_generalised_culvert_model
@@ -31 +31 @@
 
 length = 40.
-width = 5.
+width = 15.
 
 dx = dy = 0.5          # Resolution: Length of subdivisions on both axes
@@ -86 +86 @@
 
 filename=os.path.join(path, 'example_rating_curve.csv')
-culvert1 = Culvert_operator(domain,
-                            end_point0=[9.0, 2.5], 
+
+
+
+Boyd_pipe_operator(domain,
+                            end_point0=[9.0, 2.5],
                             end_point1=[13.0, 2.5],
-                            width=1.00,
+                            losses=1.5,
+                            diameter=1.5,
+                            apron=5.0,
+                            use_momentum_jet=True,
+                            use_velocity_head=False,
+                            manning=0.013,
                             verbose=False)
+
 
 #culvert2 = Generic_box_culvert(domain,