Changeset 4936 for anuga_core/source/anuga/abstract_2d_finite_volumes/util.py

Timestamp:

Jan 15, 2008, 12:20:54 PM (16 years ago)

Author:

nick

Message:

closed ticket 173, made sww2csv_gauges use domain.starttime when writing the time to file.

File:

• anuga_core/source/anuga/abstract_2d_finite_volumes/util.py (modified) (5 diffs)

anuga_core/source/anuga/abstract_2d_finite_volumes/util.py

@@ -9 +9 @@
 import os
 
-from os import remove, mkdir, access, F_OK, R_OK, W_OK, sep,mkdir
+from os import remove, mkdir, access, F_OK, R_OK, W_OK, sep,getcwd
 from os.path import exists, basename, split,join
 from warnings import warn
@@ -2201 +2201 @@
             attribute_dic, title_index_dic = csv2dict(dir_filename+
                                                        '.csv')
-
             directory_start_time = directories_dic[directory][1]
             directory_add_tide = directories_dic[directory][2]
 
+            if verbose: print 'reading: %s.csv' %dir_filename
 #            print 'keys',attribute_dic.keys()
             #add time to get values
@@ -2260 +2260 @@
                                quantities_axis[quantity][3],
                                quantities_label[quantity])
-        print  quantities_axis[quantity]
+        #print  quantities_axis[quantity]
 
     cstr = ['b', 'r', 'g', 'c', 'm', 'y', 'k']
@@ -2537 +2537 @@
 
     dir_name, base = os.path.split(sww_file)    
-#    print 'dirname',dir_name, base
+    #print 'dirname',dir_name, base
+    #need to get current directory so when path and file
+    #are "joined" below the directory is correct
+    if dir_name == '':
+        dir_name =getcwd()
+        
     if access(sww_file,R_OK):
         if verbose: print 'File %s exists' %(sww_file)
@@ -2574 +2579 @@
     heading.insert(0,'time')
 
-#    print heading, quantities
+#    print 'start time', callable_sww.starttime, heading, quantities
 
     #create a list of csv writers for all the points and write header
     points_writer = []
     for i,point in enumerate(points):
+        #print 'gauge file:',dir_name+sep+'gauge_'+point_name[i]+'.csv'
         points_writer.append(writer(file(dir_name+sep+'gauge_'+point_name[i]+'.csv', "wb")))
         points_writer[i].writerow(heading)
 
+    
+    if verbose: print 'Writing csv files'
+
     for time in callable_sww.get_time():
-       # points_list = []
 
         for point_i, point in enumerate(points_array):
-            points_list = [time]
+            #add domain starttime to relative time.
+            points_list = [time+callable_sww.starttime]
 #            print'time',time,'point_i',point_i,point, points_array
             point_quantities = callable_sww(time,point_i)
 #            print "quantities", point_quantities
             
-#            for i, quantity in enumerate(quantities):
-#                points_list.append(quantities)
             for quantity in quantities:
                 if quantity==NAN:
-                    if verbose: print 'quantity does not exist in' %callable_sww.get_name
+                    print 'quantity does not exist in' %callable_sww.get_name
                 else:
                     if quantity == 'stage':