Changeset 2852

Timestamp:

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

Author:

ole

Message:

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

Location:

inundation

Files:

• fit_interpolate/interpolate.py (modified) (1 diff)
• pyvolution/data_manager.py (modified) (2 diffs)
• pyvolution/domain.py (modified) (3 diffs)
• pyvolution/test_util.py (modified) (6 diffs)

inundation/fit_interpolate/interpolate.py

@@ -461 +461 @@
                     raise Exception(msg)
 
-
-        msg = 'Time interval [%s:%s]' %(self.T[0], self.T[1])
-        msg += ' does not match model time: %s\n' %t
+        msg = 'Time interval [%.16f:%.16f]' %(self.T[0], self.T[-1])
+        msg += ' does not match model time: %.16f\n' %t
         if t < self.T[0]: raise Exception(msg)
         if t > self.T[-1]: raise Exception(msg)

inundation/pyvolution/data_manager.py

@@ -239 +239 @@
         from Numeric import Int, Float, Float32
 
-        self.precision = Float32 #Use single precision
+        self.precision = Float32 #Use single precision for quantities
         if hasattr(domain, 'max_size'):
             self.max_size = domain.max_size #file size max is 2Gig
@@ -301 +301 @@
                                                 'number_of_vertices'))
 
-            fid.createVariable('time', self.precision,
+            fid.createVariable('time', Float,  # Always use full precision lest two timesteps 
+                                               # close to each other may appear as the same step 
                                ('number_of_timesteps',))
 

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):

inundation/pyvolution/test_util.py

@@ -104 +104 @@
 
         
-    def test_spatio_temporal_file_function(self):
+    def test_spatio_temporal_file_function_basic(self):
         """Test that spatio temporal file function performs the correct
         interpolations in both time and space
@@ -147 +147 @@
         t0 = -1
         for t in domain1.evolve(yieldstep = 0.1, finaltime = finaltime):
-            #print 'Timesteps: %f, %f' %(t0, t)
+            #print 'Timesteps: %.16f, %.16f' %(t0, t)
             #if t == t0:
             #    msg = 'Duplicate timestep found: %f, %f' %(t0, t)
@@ -171 +171 @@
         #Diagonal is identified by vertices: 0, 5, 10, 15
 
-        timestep = len(time)-1 #Last timestep
-        d_stage = reshape(take(stage[timestep, :], [0,5,10,15]), (4,1))
-        d_uh = reshape(take(xmomentum[timestep, :], [0,5,10,15]), (4,1))
-        d_vh = reshape(take(ymomentum[timestep, :], [0,5,10,15]), (4,1))
+        last_time_index = len(time)-1 #Last last_time_index
+        d_stage = reshape(take(stage[last_time_index, :], [0,5,10,15]), (4,1))
+        d_uh = reshape(take(xmomentum[last_time_index, :], [0,5,10,15]), (4,1))
+        d_vh = reshape(take(ymomentum[last_time_index, :], [0,5,10,15]), (4,1))
         D = concatenate( (d_stage, d_uh, d_vh), axis=1)
 
@@ -195 +195 @@
                           interpolation_points = d_midpoints)
 
-        q = f(timestep/10., point_id=0); assert allclose(r0, q)
-        q = f(timestep/10., point_id=1); assert allclose(r1, q)
-        q = f(timestep/10., point_id=2); assert allclose(r2, q)
+        msg = 'duplicate timesteps: %.16f and %.16f' %(f.T[-1], f.T[-2])
+        assert not f.T[-1] == f.T[-2], msg
+        t = time[last_time_index]
+        q = f(t, point_id=0); assert allclose(r0, q)
+        q = f(t, point_id=1); assert allclose(r1, q)
+        q = f(t, point_id=2); assert allclose(r2, q)
 
 
@@ -371 +374 @@
         #Diagonal is identified by vertices: 0, 5, 10, 15
 
-        timestep = len(time)-1 #Last timestep
-        d_stage = reshape(take(stage[timestep, :], [0,5,10,15]), (4,1))
-        d_uh = reshape(take(xmomentum[timestep, :], [0,5,10,15]), (4,1))
-        d_vh = reshape(take(ymomentum[timestep, :], [0,5,10,15]), (4,1))
+        last_time_index = len(time)-1 #Last last_time_index     
+        d_stage = reshape(take(stage[last_time_index, :], [0,5,10,15]), (4,1))
+        d_uh = reshape(take(xmomentum[last_time_index, :], [0,5,10,15]), (4,1))
+        d_vh = reshape(take(ymomentum[last_time_index, :], [0,5,10,15]), (4,1))
         D = concatenate( (d_stage, d_uh, d_vh), axis=1)
 
@@ -400 +403 @@
                           interpolation_points = d_midpoints)
 
-        q = f(timestep/10., point_id=0); assert allclose(r0, q)
-        q = f(timestep/10., point_id=1); assert allclose(r1, q)
-        q = f(timestep/10., point_id=2); assert allclose(r2, q)
+        t = time[last_time_index]                         
+        q = f(t, point_id=0); assert allclose(r0, q)
+        q = f(t, point_id=1); assert allclose(r1, q)
+        q = f(t, point_id=2); assert allclose(r2, q)