Changeset 2851

Timestamp:

May 11, 2006, 4:38:06 PM (18 years ago)

Author:

ole

Message:

Another stab at removing potential for duplicate timesteps

File:

• inundation/pyvolution/domain.py (modified) (3 diffs)

inundation/pyvolution/domain.py

@@ -693 +693 @@
 
             #Yield results
-            if finaltime is not None and abs(self.time - finaltime) < epsilon:
-            #FIXME (Ole): I don't like the the epsilon test, finaltime may not
-            #be reached, as evolve will stop within one epsilon from finaltime
-            #if finaltime is not None and self.time >= finaltime:
-
-                #FIXME: There is a rare situation where the
-                #final time step is stored twice. Can we make a test?
-                #FIXME (Ole, 30 April 2006): This is an attempt to fix that
-
-                #if self.time > finaltime:
-                #    #FIXME (Ole, 30 April 2006): Do we need this check?
-                #    print 'WARNING (domain.py): time overshot finaltime'
-                #    self.time = finaltime
+            if finaltime is not None and self.time >= finaltime:
+
+                if self.time > finaltime:
+                    #FIXME (Ole, 30 April 2006): Do we need this check?
+                    print 'WARNING (domain.py): time overshot finaltime'
+                    self.time = finaltime
 
                 # Yield final time and stop
@@ -713 +706 @@
 
 
-            if abs(self.yieldtime - yieldstep) < epsilon:
-            #if self.yieldtime >= yieldstep:
+            if self.yieldtime >= yieldstep:
                 # Yield (intermediate) time and allow inspection of domain
-
-                #if self.yieldtime > yieldstep:
-                #    #FIXME (Ole, 30 April 2006): Do we need this check?
-                #    print 'WARNING (domain.py): yieldtime overshot yielstep'
-                #    self.yieldtime = yieldstep
 
                 if self.checkpoint is True:
@@ -730 +717 @@
                 yield(self.time)
 
+                #if finaltime is not None and self.time >= finaltime: 
                 if finaltime is not None and abs(self.time - finaltime) < epsilon:
                     # FIXME (Ole, 30 April 2006): Maybe this will remove