Changeset 2884 for inundation/pyvolution/least_squares.py

Timestamp:

May 16, 2006, 2:42:12 PM (19 years ago)

Author:

ole

Message:

Replaced reference to f.T with f.get_time() and retested

File:

• inundation/pyvolution/least_squares.py (modified) (9 diffs)

inundation/pyvolution/least_squares.py

@@ -1132 +1132 @@
         self.vertex_coordinates = vertex_coordinates 
         self.interpolation_points = interpolation_points
-        self.T = time[:]  # Time assumed to be relative to starttime
+        self.time = time[:]  # Time assumed to be relative to starttime
         self.index = 0    # Initial time index
         self.precomputed_values = {}
@@ -1154 +1154 @@
 
             m = len(self.interpolation_points)
-            p = len(self.T)
+            p = len(self.time)
             
             for name in quantity_names:
@@ -1169 +1169 @@
 
             if verbose: print 'Interpolate'
-            for i, t in enumerate(self.T):
+            for i, t in enumerate(self.time):
                 #Interpolate quantities at this timestep
                 if verbose and i%((p+10)/10)==0:
@@ -1199 +1199 @@
         #    #Return an average, making this a time series
         #    for name in quantity_names:
-        #        self.values[name] = zeros(len(self.T), Float)
+        #        self.values[name] = zeros(len(self.time), Float)
         #
         #    if verbose: print 'Compute mean values'
-        #    for i, t in enumerate(self.T):
-        #        if verbose: print ' time step %d of %d' %(i, len(self.T))
+        #    for i, t in enumerate(self.time):
+        #        if verbose: print ' time step %d of %d' %(i, len(self.time))
         #        for name in quantity_names:
         #           self.values[name][i] = mean(quantities[name][i,:])
@@ -1252 +1252 @@
 
 
-        msg = 'Time interval [%s:%s]' %(self.T[0], self.T[1])
+        msg = 'Time interval [%s:%s]' %(self.time[0], self.time[-1])
         msg += ' does not match model time: %s\n' %t
-        if t < self.T[0]: raise Exception(msg)
-        if t > self.T[-1]: raise Exception(msg)
+        if t < self.time[0]: raise Exception(msg)
+        if t > self.time[-1]: raise Exception(msg)
 
         oldindex = self.index #Time index
 
         #Find current time slot
-        while t > self.T[self.index]: self.index += 1
-        while t < self.T[self.index]: self.index -= 1
-
-        if t == self.T[self.index]:
+        while t > self.time[self.index]: self.index += 1
+        while t < self.time[self.index]: self.index -= 1
+
+        if t == self.time[self.index]:
             #Protect against case where t == T[-1] (last time)
             # - also works in general when t == T[i]
@@ -1269 +1269 @@
         else:
             #t is now between index and index+1
-            ratio = (t - self.T[self.index])/\
-                    (self.T[self.index+1] - self.T[self.index])
+            ratio = (t - self.time[self.index])/\
+                    (self.time[self.index+1] - self.time[self.index])
 
         #Compute interpolated values
@@ -1333 +1333 @@
                         
                 return res
+            
+    def get_time(self):
+        """Return model time as a vector of timesteps
+        """
+        return self.time
 
 
@@ -1356 +1361 @@
                %(min(y), max(y), len(y))
         str += '    t in [%f, %f], len(t) == %d\n'\
-               %(min(self.T), max(self.T), len(self.T))
+               %(min(self.time), max(self.time), len(self.time))
         str += '  Quantities:\n'
         for name in quantity_names:
@@ -1388 +1393 @@
         #      %(min(y), max(y), len(y))
         #print '    t in [%f, %f], len(t) == %d'\
-        #      %(min(self.T), max(self.T), len(self.T))
+        #      %(min(self.time), max(self.time), len(self.time))
         #print '  Quantities:'
         #for name in quantity_names: