Changeset 6175

Timestamp:

Jan 15, 2009, 2:54:19 PM (16 years ago)

Author:

ole

Message:

Start time adjustment and better diagnostics for time_limit

Files:

• anuga_core/source/anuga/abstract_2d_finite_volumes/test_util.py (modified) (1 diff)
• anuga_core/source/anuga/abstract_2d_finite_volumes/util.py (modified) (3 diffs)
• anuga_core/source/anuga/shallow_water/test_data_manager.py (modified) (4 diffs)
• anuga_work/production/patong/run_patong.py (modified) (1 diff)

anuga_core/source/anuga/abstract_2d_finite_volumes/test_util.py

@@ -1133 +1133 @@
         delta = 23
         domain.starttime = start + delta
+        time_limit = domain.starttime + 600
         F = file_function(filename + '.tms', domain,
-                          time_limit=600,
+                          time_limit=time_limit,
                           quantities=['Attribute0', 'Attribute1', 'Attribute2'])        
         assert num.allclose(domain.starttime, start+delta)

anuga_core/source/anuga/abstract_2d_finite_volumes/util.py

@@ -340 +340 @@
     # if verbose: print 'Get variables'    
     time = fid.variables['time'][:]    
-
     # FIXME(Ole): Is time monotoneous?
-    
+
     # Apply time limit if requested
     upper_time_index = len(time)    
@@ -349 +348 @@
     
     if time_limit is not None:
+        # Adjust given time limit to given start time
+        time_limit = time_limit - starttime
+
+        # Find limit point
         for i, t in enumerate(time):
             if t > time_limit:
@@ -355 +358 @@
                 
         msg = 'Time vector is zero. Requested time limit is %f' % time_limit
-        assert upper_time_index > 0, msg                
+        assert upper_time_index > 0, msg
+
+        if time_limit < time[-1] and verbose is True:
+            print 'Limited time vector from %.2fs to %.2fs'\
+                  % (time[-1], time_limit)
 
     time = time[:upper_time_index]

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -9102 +9102 @@
         # Check the time vector
         times = fid.variables['time'][:]
-        
+        starttime = fid.starttime[0]
         #print times
+        #print starttime
 
         # Check sts quantities
@@ -9156 +9157 @@
                            boundary_polygon=boundary_polygon)
         time_vec = Bf.F.get_time()
+        assert num.allclose(Bf.F.starttime, starttime)
         assert num.allclose(time_vec, times_ref)                                   
         
@@ -9161 +9163 @@
             Bf = File_boundary(sts_file+'.sts', 
                                domain_fbound, 
-                               time_limit=time_limit,
+                               time_limit=time_limit+starttime,
                                boundary_polygon=boundary_polygon)
         
             time_vec = Bf.F.get_time()
+            assert num.allclose(Bf.F.starttime, starttime)            
             assert num.alltrue(time_vec < time_limit)
             
@@ -9171 +9174 @@
             Bf = File_boundary(sts_file+'.sts', 
                                domain_fbound, 
-                               time_limit=-1,
+                               time_limit=-1+starttime,
                                boundary_polygon=boundary_polygon)            
             time_vec = Bf.F.get_time()    

anuga_work/production/patong/run_patong.py

@@ -190 +190 @@
                    domain, mean_stage= project.tide,
                    time_thinning=1,
+                   time_limit=project.finaltime,
                    default_boundary=Bd,
                    use_cache=True,
-                   verbose = True,
+                   verbose=True,
                    boundary_polygon=bounding_polygon)