Changeset 5069


Ignore:
Timestamp:
Feb 21, 2008, 4:30:01 PM (15 years ago)
Author:
nick
Message:

smaller changes to csv2timeseries_graphs

File:
1 edited

Legend:

Unmodified
Added
Removed
  • anuga_core/source/anuga/abstract_2d_finite_volumes/util.py

    r5016 r5069  
    17291729    min_start_time = 100000
    17301730   
     1731   
    17311732    if verbose: print 'Determining uniform axes \n'
    17321733    #this entire loop is to determine the min and max range for the
     
    17361737    quantities.insert(0,'time')
    17371738
    1738     quantity_value={}
     1739    directory_quantity_value={}
     1740#    quantity_value={}
    17391741    min_quantity_value={}
    17401742    max_quantity_value={}
     
    17421744   
    17431745    for i, directory in enumerate(directories_dic.keys()):
    1744        
     1746        filename_quantity_value={}
    17451747        if assess_all_csv_files==False:
    17461748            which_csv_to_assess = list_filenames[i]
     
    17481750            #gets list of filenames for directory "i"
    17491751            which_csv_to_assess = all_csv_filenames[i]
     1752#        print'IN DIR', list_filenames[i]
     1753       
     1754
    17501755
    17511756       
    17521757        for j, filename in enumerate(which_csv_to_assess):
     1758            quantity_value={}
    17531759
    17541760            dir_filename=join(directory,filename)
     
    17901796                    # than the max and mins so the plots look good.
    17911797
    1792                     increase_axis = 0.05
     1798                    increase_axis = (max-min)*0.05
     1799#                    print quantity, "MIN MAX", max, min
    17931800                    if min<=min_quantity_value[quantity]:
    17941801                        if quantity == 'time':
    17951802                            min_quantity_value[quantity]=min
    17961803                        else:
    1797                             if round(min,1) == 0.0:
    1798                                 min_quantity_value[quantity]=-2.
     1804                            if round(min,2) == 0.00:
     1805                                min_quantity_value[quantity]=-increase_axis
     1806#                                min_quantity_value[quantity]=-2.
    17991807                                #min_quantity_value[quantity]= -max_quantity_value[quantity]*increase_axis
    18001808                            else:
    1801                                 min_quantity_value[quantity]=min*(1+increase_axis)
     1809#                                min_quantity_value[quantity]=min*(1+increase_axis)
     1810                                min_quantity_value[quantity]=min-increase_axis
     1811#                        print quantity, min_quantity_value[quantity]
    18021812                   
    18031813                    if max>max_quantity_value[quantity]:
     
    18051815                            max_quantity_value[quantity]=max
    18061816                        else:
    1807                             max_quantity_value[quantity]=max*(1+increase_axis)
     1817                            max_quantity_value[quantity]=max+increase_axis
     1818#                            max_quantity_value[quantity]=max*(1+increase_axis)
     1819#                        print quantity, max_quantity_value[quantity],increase_axis
    18081820               
    18091821#                print 'min,maj',quantity, min_quantity_value[quantity],max_quantity_value[quantity]
     
    18181830                max_start_time = directory_start_time
    18191831            #print 'start_time' , max_start_time, min_start_time
    1820    
    1821 
     1832           
     1833            filename_quantity_value[filename]=quantity_value
     1834           
     1835        directory_quantity_value[directory]=filename_quantity_value
     1836   
    18221837    #final step to unifrom axis for the graphs
    18231838    quantities_axis={}
     
    18481863        if verbose: print'Plotting in %s %s' %(directory, new_plot_numbers)
    18491864#        print 'LIST',list_filenames
     1865        #FIXME THIS SORT IS VERY IMPORTANT, without it the assigned plot numbers may not work correctly
     1866        #there must be a better way
     1867        list_filenames[i].sort()
    18501868        for j, filename in enumerate(list_filenames[i]):
     1869#            print'IN plot', list_filenames[i]
    18511870           
    18521871            if verbose: print'Starting %s' %filename 
     
    18601879            attribute_dic, title_index_dic = csv2dict(directory+filename+'.csv')
    18611880            #get data from dict in to list
    1862             t = [float(x) for x in attribute_dic["time"]]
     1881#            t = [float(x) for x in attribute_dic["time"]]
    18631882
    18641883            #do maths to list by changing to array
    1865             t=(array(t)+directory_start_time)/seconds_in_minutes
     1884#            t=(array(t)+directory_start_time)/seconds_in_minutes
     1885            t=(array(directory_quantity_value[directory][filename]['time'])+directory_start_time)/seconds_in_minutes
    18661886
    18671887            #finds the maximum elevation, used only as a test
     
    18781898            #populates the legend_list_dic with dir_name and the elevation
    18791899            if i==0:
    1880                 legend_list_dic.append({directory_name:round(max_ele,2)})
     1900                legend_list_dic.append({directory_name:round(max_ele,3)})
    18811901            else:
    18821902                #print j,max_ele, directory_name, legend_list_dic
    1883                 legend_list_dic[j][directory_name]=round(max_ele,2)
     1903                legend_list_dic[j][directory_name]=round(max_ele,3)
    18841904
    18851905            # creates a list for the legend after at "legend_dic" has been fully populated
     
    18961916            for k, quantity in enumerate(quantities):
    18971917                if quantity != 'time' and quantity != 'elevation':
    1898                     quantity_value[quantity] = [float(x) for x in attribute_dic[quantity]]
    1899        
     1918                    #quantity_value[quantity] = [float(x) for x in attribute_dic[quantity]]
     1919                   
     1920                    #add tide to stage if provided
     1921#                    if quantity == 'stage':
     1922#                        quantity_value[quantity]=array(quantity_value[quantity])+directory_add_tide
     1923                   
    19001924                    num=int(k*100+j)
    19011925                    pylab.figure(num)
    1902 
     1926#                    print directory,len(t),'LENgth',len(directory_quantity_value[directory]),directory_quantity_value[directory][filename][quantity][1:10]
    19031927                    pylab.ylabel(quantities_label[quantity])
    1904                     pylab.plot(t, quantity_value[quantity], c = cstr[i], linewidth=1)
     1928                    pylab.plot(t, directory_quantity_value[directory][filename][quantity], c = cstr[i], linewidth=1)
    19051929                    pylab.xlabel(quantities_label['time'])
    19061930                    pylab.axis(quantities_axis[quantity])
Note: See TracChangeset for help on using the changeset viewer.