Changeset 9623

Timestamp:

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

Author:

davies

Message:

Debugging

Location:

trunk

Files:

• anuga_core/anuga/parallel/parallel_internal_boundary_operator.py (modified) (5 diffs)
• anuga_core/anuga/shallow_water/shallow_water_domain.py (modified) (3 diffs)
• anuga_work/development/gareth/tests/ras_bridge/channel_floodplain1.py (modified) (2 diffs)
• anuga_work/development/gareth/tests/ras_bridge/internal_boundary_functions.py (deleted)
• anuga_work/development/gareth/tests/ras_bridge/internal_boundary_operator.py (deleted)
• anuga_work/development/gareth/tests/ras_bridge/test_internal_boundary_functions.py (modified) (1 diff)

trunk/anuga_core/anuga/parallel/parallel_internal_boundary_operator.py

@@ -113 +113 @@
         if self.height <= 0.0:
             if self.myid == self.master_proc:
-                print 'debug_A'
                 Q = 0.0
                 barrel_velocity = 0.0
@@ -126 +125 @@
         #Send attributes of both enquiry points to the master proc
         if self.myid == self.master_proc:
-            print 'debug_B'
 
             if self.myid == self.enquiry_proc[0]:
@@ -155 +153 @@
         # Determine the direction of the flow
         if self.myid == self.master_proc:
-            print 'debug_C'
             if self.use_velocity_head:
                 self.delta_total_energy = enq_total_energy0 - enq_total_energy1
@@ -195 +192 @@
         # master proc orders reversal if applicable
         if self.myid == self.master_proc:
-            print 'debug_D'
 
             # Reverse the inflow and outflow direction?
@@ -219 +215 @@
         # Master proc computes return values
         if self.myid == self.master_proc:
-            print 'debug_E'
             return Q, barrel_velocity, outlet_culvert_depth
         else:

trunk/anuga_core/anuga/shallow_water/shallow_water_domain.py

@@ -1429 +1429 @@
             volume = Height.get_integral()
 
-        if numprocs ==1:
+        if numprocs == 1:
             self.volume_history.append(volume) 
             return volume
@@ -2244 +2244 @@
                 self.store_timestep()
 
-            
             if self.checkpoint:
                 
@@ -2576 +2575 @@
         If returnStats, return a list with the volume statistics
         """
-        from anuga_parallel import myid
+        from anuga import myid
 
         if(self.compute_fluxes_method is not 'DE'):

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)
+#hecras_discharge_function = hecras_internal_boundary_function(
+#    'hecras_bridge_table_high_deck.csv',
+#    allow_sign_reversal=True)
 
 #bridge = Internal_boundary_operator(
@@ -240 +240 @@
     if(myid==0):
         print domain.timestepping_statistics()
-        print domain.report_water_volume_statistics()
+
+    vol = domain.report_water_volume_statistics()
 
 barrier()

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

@@ -3 +3 @@
 
 import numpy
-import internal_boundary_functions
-from internal_boundary_functions import hecras_internal_boundary_function
+from anuga.structures import internal_boundary_functions
+from anuga.structures.internal_boundary_functions import hecras_internal_boundary_function