Changeset 4558

Timestamp:

Jun 25, 2007, 1:38:05 PM (17 years ago)

Author:

duncan

Message:

removing stuff that made the sww files absolute. see ticket#173

Location:

anuga_core/source/anuga/shallow_water

Files:

• data_manager.py (modified) (4 diffs)
• test_data_manager.py (modified) (2 diffs)

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -426 +426 @@
         #Close
         fid.close()
-        
-### FIXME Where are the tests for this object?
+
     def store_timestep(self, names):
         """Store time and named quantities to file
@@ -542 +541 @@
                                           precision = self.precision)
                 self.writer.quantities(fid, 
-                                       time=self.domain.time +domain.starttime
-                                       ,
-                                       precision=self.precision,
-                                       stage=stage,
-                                       xmomentum=xmomentum,
-                                       ymomentum=ymomentum)
+                                                 time=self.domain.time,
+                                                 precision=self.precision,
+                                                 stage=stage,
+                                                 xmomentum=xmomentum,
+                                                 ymomentum=ymomentum)
             else:
                 # This is producing a sww that is not standard.
                 #Store time
-                time[i] = self.domain.time + domain.starttime
+                time[i] = self.domain.time
                 
                 for name in names:
@@ -4754 +4752 @@
         """
         outfile - the name of the file that will be written
-        times - A list of the time slice times 
+        times - A list of the time slice times OR a start time
+        Note, if a list is given the info will be made relative.
         number_of_volumes - the number of triangles
         """
@@ -4782 +4781 @@
         #Start time in seconds since the epoch (midnight 1/1/1970)
 
-        # Values used to be relative, so a start time was important
-        # It may not be needed anymore.
-        # though there is probably code that reads it.
-        outfile.starttime = 0
-        
         # this is being used to seperate one number from a list.
         # what it is actually doing is sorting lists from numeric arrays.
         if type(times) is list or type(times) is ArrayType:  
             number_of_times = len(times)
-            times = ensure_numeric(times)
+            times = ensure_numeric(times)  
+            if number_of_times == 0:
+                starttime = 0
+            else:
+                starttime = times[0]
+                times = times - starttime  #Store relative times
         else:
             number_of_times = 0
-            
+            starttime = times
+            #times = ensure_numeric([])
+        outfile.starttime = starttime
         # dimension definitions
         outfile.createDimension('number_of_volumes', number_of_volumes)

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -5749 +5749 @@
         
         time = fid.variables['time'][:]
-        assert allclose(time, [0.5]) # the time is absolute
-        assert fid.starttime == 0.0
+        assert allclose(time, [0.0]) # the time is relative
+        assert fid.starttime == 0.5
         
         fid.close()
         self.delete_mux(files)
-        ### print "sww_file", sww_file
+        #print "sww_file", sww_file
         os.remove(sww_file)
         
@@ -6355 +6355 @@
         times = fid.variables['time'][:]
         
-        times_actual = [0,100,200,300] # times used to be relative
-        times_actual = [200,300,400,500] # now they are actual
+        times_actual = [0,100,200,300]
        
         assert allclose(ensure_numeric(times),