Changeset 3150 for production

Timestamp:

Jun 13, 2006, 4:37:58 PM (19 years ago)

Author:

sexton

Message:

updates to comparison report

Location:

production/onslow_2006

Files:

• compare_timeseries.py (modified) (6 diffs)
• plot_data_extent.py (modified) (5 diffs)
• project.py (modified) (1 diff)

production/onslow_2006/compare_timeseries.py

@@ -27 +27 @@
 gauge_map = 'onslow_boundary_gauges.png'
 
+plot_quantity = ['stage', 'speed']
+
 # Create sections and graphs for each designated production directory
 latex_output = []
@@ -36 +38 @@
     swwfiles[swwfile] = label_id
 
-texname = sww2timeseries(swwfiles,
-                         project.gauges50,
-                         production_dirs,
-                         report = True,
-                         plot_quantity = ['stage', 'speed'],
-                         time_min = None,
-                         time_max = None,
-                         title_on = False,
-                         verbose = True)
+texname, vec = sww2timeseries(swwfiles,
+                              project.gauges50,
+                              production_dirs,
+                              report = True,
+                              reportname = 'latexoutput_compare',
+                              plot_quantity = plot_quantity,
+                              time_min = None,
+                              time_max = None,
+                              title_on = False,
+                              verbose = True)
 
-texname = texname + '_compare'
 latex_output.append(texname)
 
-from shutil import copy
-copy (texname, project.comparereportdir + 'latex_input.tex')
+from shutil import copy, move
+copy ('report' + sep + texname + '.tex', project.comparereportdir + sep + texname + '.tex')
+
 
 # Start report generation
@@ -57 +60 @@
 
 # Generate latex output for location points
-s = '\\begin{table} \label{table:locations} \n'
+s = '\\begin{table} \label{table:locationsonslow} \n'
 fid.write(s)
 s = '\caption{Defined point locations for comparison study for Onslow region.}' 
@@ -64 +67 @@
 \\begin{center}
 \\begin{tabular}{|l|l|l|l|}\hline
-\\bf{Point Name} & \\bf{Easting} & \\bf{Northing} & \\bf{Elevation}\\\\ \hline
+\\bf{Point Name} & \\bf{Easting} & \\bf{Northing} & \\bf{Elevation (m)}\\\\ \hline
 """
 fid.write(s)
 
-gauges, locations, elevation = get_gauges_from_file(project.gauges50)
-
-for name, gauges, elev in zip(locations, gauges, elevation):
-    east = gauges[0]
-    north = gauges[1]
-    s = '%s & %.2f & %.2f & %.2f \\\\ \hline \n' %(name.replace('_',' '), east, north, elev)
+for i, thisvec in enumerate(vec):
+    name = thisvec[0]
+    east = thisvec[1]
+    north = thisvec[2]
+    elev = thisvec[3]
+    s = '%s & %.2f & %.2f & %.2f \\\\ \hline \n' %(name, east, north, elev)
     fid.write(s)
+    for which_one in plot_quantity:
+        move ('report_figures' + sep + 'gauge'+name.replace(' ','')+which_one+'.png', project.comparereportfigdir)
 
 s = '\\end{tabular} \n  \end{center} \n \end{table} \n \n'
@@ -83 +88 @@
 
 s  = """
-\caption{Point locations used for Onslow study.}  
+\caption{Point locations used for comparison between boundary at 50m and 100m contour for Onslow region.}  
 \label{fig:points}
 \end{figure}
@@ -91 +96 @@
 s = '\input{%s} \n \clearpage \n \n' %latex_output[0]
 fid.write(s)
-     
-s = '\end{document}'
-fid.write(s)

production/onslow_2006/plot_data_extent.py

@@ -59 +59 @@
     x = []
     y = []
+    name = []
     line1 = lines[0]
     for line in lines[1:]:
@@ -64 +65 @@
         x.append(float(fields[0]))
         y.append(float(fields[1]))
+        if len(line) > 2: name.append(fields[2])
     
-    return x, y
+    return x, y, name
 
 if plot_data == True:
@@ -119 +121 @@
     figure(4)
     figname = 'onslow_gauges'
-    x, y = read_file(project.gauge_filename)
+    x, y, name = read_file(project.gauge_filename)
     plot(x1,y1,'r-',x,y,'r+')
     savefig(figname)
@@ -125 +127 @@
     figure(5)
     figname = 'onslow_new_boundary_test'
-    gaugex, gaugey = read_file(project.gauges50)
+    gaugex, gaugey, name = read_file(project.gauges50)
     x50, y50 = poly_xy(project.bounding_poly50)
     x_onslow, y_onslow = poly_xy(project.poly_onslow)
@@ -132 +134 @@
     #plot(x50,y50,'r-',x25,y25,'r-',x1,y1,'g-')
     plot(x50,y50,'r-',x1,y1,'g-', gaugex, gaugey, 'b+', x_onslow, y_onslow,'r-', x_coast, y_coast,'r-')
+    for i, string in enumerate(name):
+        text(gaugex[i],gaugey[i],string,fontsize=7)
     savefig(figname)
 close('all')

production/onslow_2006/project.py

@@ -52 +52 @@
 outputdir = home+sep+scenario_dir_name+sep+'output'+sep
 tidedir = home+sep+scenario_dir_name+sep+'tide_data'+sep
-comparereportdir = comparehome+sep+'documentation'+sep+'experimentation'+'boundary_ANUGA_MOST'
+comparereportdir = comparehome+sep+'documentation'+sep+'experimentation'+sep+'boundary_ANUGA_MOST'+sep+'report'
+comparereportfigdir = comparehome+sep+'documentation'+sep+'experimentation'+sep+'boundary_ANUGA_MOST'+sep+'report_figures'
 print'bound', boundarydir