Changeset 2852 for inundation/pyvolution/domain.py

Timestamp:

May 11, 2006, 5:17:22 PM (19 years ago)

Author:

ole

Message:

Nailed the problem with tests failing when fixing duplicate timestep issue.

File:

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

inundation/pyvolution/domain.py

@@ -697 +697 @@
                 if self.time > finaltime:
                     #FIXME (Ole, 30 April 2006): Do we need this check?
-                    print 'WARNING (domain.py): time overshot finaltime'
+                    print 'WARNING (domain.py): time overshot finaltime. Contact Ole.Nielsen@ga.gov.au'
                     self.time = finaltime
 
                 # Yield final time and stop
-                #print 'finaltime %.18f' %self.time
                 yield(self.time)
                 break
@@ -714 +713 @@
 
                 #Pass control on to outer loop for more specific actions
-                #print 'yieldtime %.18f' %self.time
                 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
-                    # duplicate final timesteps?
-                    # What we really need is to go back to conditions like
-                    # if finaltime is not None and self.time >= finaltime:
-                    # as above and then understand fully
-                    # the two tests that break as a consequence
-                    break
 
                 # Reinitialise
@@ -733 +721 @@
                 self.number_of_steps = 0
                 self.number_of_first_order_steps = 0
-
+                
 
     def evolve_to_end(self, finaltime = 1.0):