Changeset 8095

Timestamp:

Dec 7, 2010, 10:56:18 PM (13 years ago)

Author:

habili

Message:

changing of water height to depth
Fixes for instability

Location:

trunk/anuga_core/source/anuga/structures

Files:

• boyd_box_operator.py (modified) (2 diffs)
• structure_operator.py (modified) (2 diffs)
• testing_outlet_control.py (modified) (1 diff)
• testing_wide_bridge.py (modified) (2 diffs)

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

@@ -36 +36 @@
         anuga.Structure_operator.__init__(self,
                                           domain,
-                                          width,
-                                          height,
                                           end_points,
                                           exchange_lines,
                                           enquiry_points,
+                                          width,
+                                          height,
                                           apron,
                                           manning,
@@ -49 +49 @@
                                           logging,
                                           verbose)     
-        
         
         if type(losses) == types.DictType:

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

@@ -24 +24 @@
     def __init__(self,
                  domain,
-                 width,
-                 height,
                  end_points,
                  exchange_lines,
                  enquiry_points,
+                 width,
+                 height,
                  apron,
                  manning,
@@ -246 +246 @@
             self.culvert_vector = self.end_points[1] - end_points[0]
         
-        self.culvert_length = math.sqrt(num.sum(self.culvert_vector**2))   
+        self.culvert_length = math.sqrt(num.sum(self.culvert_vector**2))
         assert self.culvert_length > 0.0, 'The length of culvert is less than 0'
         

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

@@ -186 +186 @@
 
     Boyd_box_operator(domain,
-                            end_points=[ep0,ep1],
-                            losses=losses,
-                            width=culvert_width,
-                            depth=10.0,
-                            apron=6.0,
-                            use_momentum_jet=True,
-                            use_velocity_head=True,
-                            manning=0.013,
-                            logging=True,
-                            label='box_culvert',
-                            verbose=False)
-
-                       
+                      losses=losses,
+                      width=culvert_width,
+                      height=10.0,
+                      end_points=[ep0,ep1],
+                      apron=6.0,
+                      manning=0.013,
+                      label='box_culvert',
+                      logging=True,
+                      verbose=False)
 
 #losses = {'inlet':1, 'outlet':1, 'bend':1, 'grate':1, 'pier': 1, 'other': 1}

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

@@ -184 +184 @@
     culvert_width = 50.0/number_of_culverts
     y = 100-i*culvert_width - culvert_width/2.0
-    ep0 = [40.0, y]
-    ep1 = [50.0, y]
+    ep0 = num.array([40.0, y])
+    ep1 = num.array([50.0, y])
     culverts.append(anuga.Boyd_box_operator(domain,
-                            end_point0=ep0,
-                            end_point1=ep1,
-                            losses=1.5,
-                            width=3.658,
-                            depth=3.658,
-                            apron=5.0,
-                            use_momentum_jet=True,
-                            use_velocity_head=True,
-                            manning=0.013,
-                            description='bridge culvert',
-                            verbose=False))
-
-
-
+                                            losses=1.5,
+                                            width=3.658,
+                                            height=3.658,
+                                            end_points=[ep0, ep1],
+                                            apron=0.5,
+                                            manning=0.013,
+                                            enquiry_gap=1.0,
+                                            description='bridge culvert',
+                                            verbose=False))
 
 #culvert2 = Culvert_operator(domain,
@@ -260 +255 @@
     for i, culvert in enumerate(culverts):
         print 'culvert: ', i
-        print culvert.structure_statistics()
+        print culvert.statistics()