Changeset 3185 for inundation/parallel/parallel_shallow_water.py

Timestamp:

Jun 20, 2006, 1:54:04 PM (18 years ago)

Author:

linda

Message:

Updated shallow water equation to broadcast timestep after flux
calculation

File:

• inundation/parallel/parallel_shallow_water.py (modified) (5 diffs)

inundation/parallel/parallel_shallow_water.py

@@ -29 +29 @@
 from pyvolution.shallow_water import *
 from Numeric import zeros, Float, Int, ones, allclose, array
-from pypar_dist import pypar
-
+#from pypar_dist import pypar
+import pypar
 
 class Parallel_Domain(Domain):
@@ -98 +98 @@
         """
 
-
-        Domain.update_timestep(self, yieldstep, finaltime)
+        #LINDA:
+        # Moved below so timestep is found before doing update
+        
+        #Domain.update_timestep(self, yieldstep, finaltime)
 
         import time
@@ -118 +120 @@
         self.communication_broadcast_time += time.time()-t0
 
-
+        # LINDA:
+        # Moved timestep to here
+        
+        Domain.update_timestep(self, yieldstep, finaltime)
 
 
@@ -124 +129 @@
         """Calculate local timestep
         """
+
+        # LINDA: Moved below so timestep is updated before
+        # calculating statistic
         
         #Compute minimal timestep on local process
-        Domain.update_timestep(self, yieldstep, finaltime)
+        #Domain.update_timestep(self, yieldstep, finaltime)
 
         pypar.barrier()
@@ -170 +178 @@
 
         self.timestep = self.global_timestep[0]
-
+        
+        # LINDA:
+        # update local stats now
+        
+        #Compute minimal timestep on local process
+        Domain.update_timestep(self, yieldstep, finaltime)
 
     #update_timestep = update_timestep_1