Changeset 9624 for trunk

Timestamp:

Feb 6, 2015, 9:49:22 AM (10 years ago)

Author:

davies

Message:

bugfix

Location:

trunk

Files:

• anuga_core/anuga/parallel/parallel_structure_operator.py (modified) (4 diffs)
• anuga_work/development/gareth/tests/ras_bridge/channel_floodplain1.py (modified) (1 diff)

trunk/anuga_core/anuga/parallel/parallel_structure_operator.py

@@ -278 +278 @@
                 dt_Q_on_d = 0.0
 
-            factor = 1.0/(1.0 + dt_Q_on_d/self.inflow.get_area())
+            factor = 1.0/(1.0 + dt_Q_on_d/inflow_area)
             new_inflow_depth = old_inflow_depth*factor
 
@@ -306 +306 @@
                 # replaced with old_inflow_mom
                 #
-                factor2 = 1.0/(1.0 + dt_Q_on_d*new_inflow_depth/self.inflow.get_area())
+                factor2 = 1.0/(1.0 + dt_Q_on_d*new_inflow_depth/inflow_area)
                 new_inflow_xmom = old_inflow_xmom*factor2
                 new_inflow_ymom = old_inflow_ymom*factor2
@@ -349 +349 @@
         if self.myid == self.master_proc:
             loss = (old_inflow_depth - new_inflow_depth)*inflow_area
-            xmom_loss = (old_inflow_xmom - new_inflow_xmom)*self.inflow.get_area()
-            ymom_loss = (old_inflow_ymom - new_inflow_ymom)*self.inflow.get_area()
+            xmom_loss = (old_inflow_xmom - new_inflow_xmom)*inflow_area
+            ymom_loss = (old_inflow_ymom - new_inflow_ymom)*inflow_area
 
             # set outflow
@@ -404 +404 @@
                 # structures where barrel_speed is unknown + direction doesn't
                 # change from inflow to outflow
-                new_outflow_xmom = self.outflow.get_average_xmom() + xmom_loss/self.outflow.get_area()
-                new_outflow_ymom = self.outflow.get_average_ymom() + ymom_loss/self.outflow.get_area()
+                new_outflow_xmom = self.outflow.get_average_xmom() + xmom_loss/outflow_area
+                new_outflow_ymom = self.outflow.get_average_ymom() + ymom_loss/outflow_area
 
             # master proc of structure sends outflow attributes to all outflow procs

trunk/anuga_work/development/gareth/tests/ras_bridge/channel_floodplain1.py

@@ -182 +182 @@
                [floodplain_width/2. + chan_width/2.-0.01, bridge_us+0.01] ]
 
-#hecras_discharge_function = hecras_internal_boundary_function(
-#    'hecras_bridge_table_high_deck.csv',
-#    allow_sign_reversal=True)
-
-#bridge = Internal_boundary_operator(
-#    domain,
-#    hecras_discharge_function,
-#    width=chan_width,
-#    height=1.3,
-#    end_points=None,
-#    exchange_lines=[bridge_in, bridge_out],
-#    invert_elevation=-3.5,
-#    enquiry_gap=0.01,
-#    use_velocity_head=False,
-#    smoothing_timescale=30.0,
-#    logging=True)
+hecras_discharge_function = hecras_internal_boundary_function(
+    'hecras_bridge_table_high_deck.csv',
+    allow_sign_reversal=True)
+
+bridge = Internal_boundary_operator(
+    domain,
+    hecras_discharge_function,
+    width=chan_width,
+    height=1.3,
+    end_points=None,
+    exchange_lines=[bridge_in, bridge_out],
+    invert_elevation=-3.5,
+    enquiry_gap=0.01,
+    use_velocity_head=False,
+    smoothing_timescale=30.0,
+    logging=True)
     
 #------------------------------------------------------------------------------