Changeset 629

Timestamp:

Nov 24, 2004, 6:55:52 PM (20 years ago)

Author:

ole

Message:

Added support for file starttime being earlier than model starttime

Location:

inundation/ga/storm_surge/pyvolution

Files:

• test_util.py (modified) (2 diffs)
• util.py (modified) (3 diffs)

inundation/ga/storm_surge/pyvolution/test_util.py

@@ -234 +234 @@
 
         #Check that domain.starttime isn't updated if later
-        domain.starttime = start + 1                
-        F = File_function(filename, domain)
-        assert allclose(domain.starttime, start+1)                
+        #domain.starttime = start + 1                
+        #F = File_function(filename, domain)
+        #assert allclose(domain.starttime, start+1)                
 
         
@@ -264 +264 @@
         assert allclose( 2*sin(120*pi/600)/3 + sin(60*pi/600)/3, q[2] )
         
-      
+
+
+    def test_file_function_time_with_domain_different_start(self):
+        """Test that File function interpolates correctly
+        between given times. No x,y dependency here.
+        Use domain with a starttime later than that of file
+        """
+
+        #Write file
+        import os, time, calendar
+        from config import time_format
+        from math import sin, pi
+        from domain import Domain
+
+        finaltime = 1200
+        filename = 'test_file_function.txt'
+        fid = open(filename, 'w')
+        start = time.mktime(time.strptime('2000', '%Y'))
+        dt = 60  #One minute intervals
+        t = 0.0
+        while t <= finaltime:
+            t_string = time.strftime(time_format, time.gmtime(t+start))
+            fid.write('%s, %f %f %f\n' %(t_string, 2*t, t**2, sin(t*pi/600)))
+            t += dt
+   
+        fid.close()
+
+        a = [0.0, 0.0]
+        b = [4.0, 0.0]
+        c = [0.0, 3.0]
+       
+        points = [a, b, c]
+        vertices = [[0,1,2]]
+        domain = Domain(points, vertices) 
+
+        #Check that domain.starttime isn't updated if later
+        delta = 23
+        domain.starttime = start + delta                
+        F = File_function(filename, domain)
+        assert allclose(domain.starttime, start+delta)                
+
+        
+        
+       
+        #Now try interpolation with delta offset 
+        for i in range(20):
+            t = i*10
+            q = F(t-delta)
+
+            #Exact linear intpolation
+            assert allclose(q[0], 2*t) 
+            if i%6 == 0:
+                assert allclose(q[1], t**2)
+                assert allclose(q[2], sin(t*pi/600))                
+
+        #Check non-exact
+
+        t = 90 #Halfway between 60 and 120
+        q = F(t-delta) 
+        assert allclose( (120**2 + 60**2)/2, q[1] )
+        assert allclose( (sin(120*pi/600) + sin(60*pi/600))/2, q[2] )
+
+
+        t = 100 #Two thirds of the way between between 60 and 120
+        q = F(t-delta) 
+        assert allclose( 2*120**2/3 + 60**2/3, q[1] )
+        assert allclose( 2*sin(120*pi/600)/3 + sin(60*pi/600)/3, q[2] )
+        
+        
+              
 #-------------------------------------------------------------
 if __name__ == "__main__":

inundation/ga/storm_surge/pyvolution/util.py

@@ -48 +48 @@
 
 
-
-#FIXME: Maybe move to util as this is quite general
 class File_function:
     """Read time series from file and return a callable object:
@@ -139 +137 @@
         self.filename = filename
         self.starttime = starttime
-
+        self.domain = domain
 
         if domain is not None:
             if domain.starttime is None:
-                domain.starttime = starttime
+                domain.starttime = self.starttime
             else:
                 msg = 'WARNING: Start time as specified in domain (%s)'\
@@ -209 +207 @@
         from math import pi, cos, sin, sqrt
         
-        
+
+        #Find time tau such that
+        #
+        # domain.starttime + t == self.starttime + tau
+        
+        #FIXME: This hasn't been unit tested yet
+        if self.domain is not None:
+            tau = self.domain.starttime-self.starttime+t
+        else:
+            tau = t
+        
+                
         msg = 'Time interval derived from file %s (%s:%s) does not match model time: %s'\
-              %(self.filename, self.T[0], self.T[1], t)
-        if t < self.T[0]: raise msg
-        if t > self.T[-1]: raise msg        
+              %(self.filename, self.T[0], self.T[1], tau)
+        if tau < self.T[0]: raise msg
+        if tau > self.T[-1]: raise msg        
 
         oldindex = self.index
 
         #Find slot
-        while t > self.T[self.index]: self.index += 1
-        while t < self.T[self.index]: self.index -= 1
+        while tau > self.T[self.index]: self.index += 1
+        while tau < self.T[self.index]: self.index -= 1
 
         #t is now between index and index+1
-        ratio = (t - self.T[self.index])/\
+        ratio = (tau - self.T[self.index])/\
                 (self.T[self.index+1] - self.T[self.index])