Changeset 3996


Ignore:
Timestamp:
Nov 16, 2006, 9:12:18 AM (16 years ago)
Author:
sexton
Message:

(i) dampier gauges update (ii) minor update to sww2timeseries

Files:
4 edited

Legend:

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

    r3994 r3996  
    944944            thisfile = file_loc[j]+sep+'gauges_time_series'+'_'+gaugeloc+'.csv'
    945945            fid_out = open(thisfile, 'w')
    946             s = 'Time, Stage, Momentum, Speed \n'
     946            s = 'Time, Stage, Momentum, Speed, Elevation \n'
    947947            fid_out.write(s)
    948948           
     
    972972                    thisgauge = gauges[k]
    973973                    eastings[i,k,j] = thisgauge[0]
    974                     s = '%.2f, %.2f, %.2f, %.2f\n' %(t, w, m, vel)
     974                    s = '%.2f, %.2f, %.2f, %.2f, %.2f\n' %(t, w, m, vel, z)
    975975                    fid_out.write(s)
    976976                    if t/60.0 <= 13920: tindex = i
     
    981981                   
    982982                   
    983             s = '%.2f, %.2f, %.2f, %s\n' %(max_stage, min_stage, z, leg_label[j])
     983            s = '%.2f, %.2f, %.2f, %.2f, %s\n' %(max_stage, min_stage, z, thisgauge[0], leg_label[j])
    984984            fid_compare.write(s)
    985985            max_stages.append(max_stage)
     
    11841184                    north = thisgauge[1]
    11851185                    elev_output.append([locations[k],east,north,elevations[0,k,j]])
    1186            
     1186                   
    11871187            s = '\end{tabular} \n \\caption{%s} \n \label{fig:%s} \n \end{figure} \n \n' %(caption, label)
    11881188            fid.write(s)
  • anuga_work/production/dampier_2006/project.py

    r3955 r3996  
    6565combined_final_name ='dampier_combined_elevation_final'
    6666
    67 gauge_name = 'dampier_gauges.csv'
     67gauge_name = 'dampier_gauges_up2.csv'
    6868
    6969#Derive subdirectories and filenames
     
    9797
    9898gauge_dir = home+sep+state+sep+scenario_datas_name+sep+'anuga'+sep+'gauges'+sep
    99 gauge_filename = gauge_dir + 'dampier_gauges.csv'
     99gauge_filename = gauge_dir + 'dampier_gauges_up2.csv'
    100100
    101101gauges_dir_name = gauges_dir + gauge_name
  • anuga_work/production/hobart_2006/make_report.py

    r3992 r3996  
    173173s = """
    174174  \maketitle
    175 \verb|\usepackage{draftcopy}|
     175
    176176    \section{Executive Summary}
    177177    \label{sec:execsum}
Note: See TracChangeset for help on using the changeset viewer.