Changeset 3996

Timestamp:

Nov 16, 2006, 9:12:18 AM (18 years ago)

Author:

sexton

Message:

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

Files:

• anuga_core/source/anuga/abstract_2d_finite_volumes/util.py (modified) (4 diffs)
• anuga_work/production/dampier_2006/project.py (modified) (2 diffs)
• anuga_work/production/dampier_2006/report_figures/max_inundation_high_tide.jpg (modified) (previous)
• anuga_work/production/hobart_2006/make_report.py (modified) (1 diff)

anuga_core/source/anuga/abstract_2d_finite_volumes/util.py

@@ -944 +944 @@
             thisfile = file_loc[j]+sep+'gauges_time_series'+'_'+gaugeloc+'.csv'
             fid_out = open(thisfile, 'w')
-            s = 'Time, Stage, Momentum, Speed \n'
+            s = 'Time, Stage, Momentum, Speed, Elevation \n'
             fid_out.write(s)
             
@@ -972 +972 @@
                     thisgauge = gauges[k]
                     eastings[i,k,j] = thisgauge[0]
-                    s = '%.2f, %.2f, %.2f, %.2f\n' %(t, w, m, vel)
+                    s = '%.2f, %.2f, %.2f, %.2f, %.2f\n' %(t, w, m, vel, z)
                     fid_out.write(s)
                     if t/60.0 <= 13920: tindex = i
@@ -981 +981 @@
                     
                     
-            s = '%.2f, %.2f, %.2f, %s\n' %(max_stage, min_stage, z, leg_label[j])
+            s = '%.2f, %.2f, %.2f, %.2f, %s\n' %(max_stage, min_stage, z, thisgauge[0], leg_label[j])
             fid_compare.write(s)
             max_stages.append(max_stage)
@@ -1184 +1184 @@
                     north = thisgauge[1]
                     elev_output.append([locations[k],east,north,elevations[0,k,j]])
-            
+                    
             s = '\end{tabular} \n \\caption{%s} \n \label{fig:%s} \n \end{figure} \n \n' %(caption, label)
             fid.write(s)

anuga_work/production/dampier_2006/project.py

@@ -65 +65 @@
 combined_final_name ='dampier_combined_elevation_final'
 
-gauge_name = 'dampier_gauges.csv'
+gauge_name = 'dampier_gauges_up2.csv'
 
 #Derive subdirectories and filenames
@@ -97 +97 @@
 
 gauge_dir = home+sep+state+sep+scenario_datas_name+sep+'anuga'+sep+'gauges'+sep
-gauge_filename = gauge_dir + 'dampier_gauges.csv'
+gauge_filename = gauge_dir + 'dampier_gauges_up2.csv'
 
 gauges_dir_name = gauges_dir + gauge_name

anuga_work/production/hobart_2006/make_report.py

@@ -173 +173 @@
 s = """
   \maketitle
-\verb|\usepackage{draftcopy}|
+
     \section{Executive Summary}
     \label{sec:execsum}