Changeset 6246

Timestamp:

Jan 30, 2009, 1:45:37 PM (15 years ago)

Author:

rwilson

Message:

Changes to yieldtime to make runs on different architectures more similar.

File:

• anuga_core/source/anuga/abstract_2d_finite_volumes/domain.py (modified) (5 diffs)

anuga_core/source/anuga/abstract_2d_finite_volumes/domain.py

@@ -1280 +1280 @@
                 self.finaltime = self.starttime + float(duration)
 
-        N = len(self)            # Number of triangles
-        self.yieldtime = 0.0     # Track time between 'yields'
+        N = len(self)                             # Number of triangles
+        self.yieldtime = self.time + yieldstep    # set next yield time
 
         # Initialise interval of timestep sizes (for reporting only)
@@ -1320 +1320 @@
 
             # Update extrema if necessary (for reporting)
-            self.update_extrema()
-
-            self.yieldtime += self.timestep
+            self.update_extrema()            
+
             self.number_of_steps += 1
             if self._order_ == 1:
@@ -1342 +1341 @@
                 break
 
-            if self.yieldtime >= yieldstep:
+            # if we are at the next yield point
+            if self.time >= self.yieldtime:
                 # Yield (intermediate) time and allow inspection of domain
                 if self.checkpoint is True:
@@ -1352 +1352 @@
 
                 # Reinitialise
-                self.yieldtime = 0.0
+                self.yieldtime += yieldstep                 # move to next yield
                 self.min_timestep = max_timestep
                 self.max_timestep = min_timestep
@@ -1700 +1700 @@
 
         # Ensure that model time is aligned with yieldsteps
-        if self.yieldtime + timestep > yieldstep:
-            timestep = yieldstep-self.yieldtime
+        if self.time + timestep > self.yieldtime:
+            timestep = self.yieldtime - self.time
 
         self.timestep = timestep