Changeset 9573 for trunk/anuga_core/source/anuga/shallow_water

Timestamp:

Feb 1, 2015, 2:17:11 PM (10 years ago)

Author:

steve

Message:

Getting anuga.test() ti work (one error)

File:

• trunk/anuga_core/source/anuga/shallow_water/shallow_water_domain.py (modified) (5 diffs)

trunk/anuga_core/source/anuga/shallow_water/shallow_water_domain.py

@@ -1406 +1406 @@
     def get_water_volume(self):
     
-        from anuga import myid, numprocs, send, receive, barrier
+        from anuga import numprocs
 
         #print self.evolved_called
@@ -1428 +1428 @@
             Height = Stage-Elev
             volume = Height.get_integral()
+
+        if numprocs ==1:
+            self.volume_history.append(volume) 
+            return volume
+
+        # isolated parallel code
+        from anuga import myid, send, receive, barrier
             
         if myid == 0:
@@ -1454 +1461 @@
         """
     
-        from anuga import myid, numprocs, send, receive, barrier
+        from anuga import numprocs
 
         if not self.compute_fluxes_method=='DE':
@@ -1462 +1469 @@
             
         flux_integral = self.boundary_flux_integral.boundary_flux_integral
-            
+
+        if numprocs == 1:
+            return flux_integral
+
+        # isolate parallel code
+        from anuga import myid, send, receive, barrier
+        
         if myid == 0:
             for i in range(1,numprocs):
@@ -1488 +1501 @@
         """
     
-        from anuga import myid, numprocs, send, receive, barrier
+        from anuga import numprocs
 
         flux_integral = self.fractional_step_volume_integral
-            
+
+        if numprocs == 1:
+            return flux_integral
+
+        # isolate parallel code
+        from anuga import myid, send, receive, barrier
+                
         if myid == 0:
             for i in range(1,numprocs):