Changeset 3141 for inundation/pyvolution/util.py

Timestamp:

Jun 13, 2006, 1:44:17 PM (19 years ago)

Author:

sexton

Message:

update sww2timeseries to have a reportname as an input

File:

• inundation/pyvolution/util.py (modified) (7 diffs)

inundation/pyvolution/util.py

@@ -546 +546 @@
                    production_dirs,
                    report = None,
+                   reportname = None,
                    plot_quantity = None,
                    time_min = None,
@@ -576 +577 @@
                     - if False, figures are already stored with sww file
                     - default to False
+
+    reportname      - name for report if wishing to generate report
     
     plot_quantity   - list containing quantities to plot, they must
@@ -626 +629 @@
                         production_dirs,
                         report,
+                        reportname,
                         plot_quantity,
                         time_min,
@@ -638 +642 @@
                     production_dirs,
                     report = None,
+                    reportname = None,
                     plot_quantity = None,
                     time_min = None,
@@ -722 +727 @@
     if verbose: print 'Inputs OK - going to generate figures'
 
-    return generate_figures(plot_quantity, file_loc, report, leg_label,
+    return generate_figures(plot_quantity, file_loc, report, reportname, leg_label,
                             f_list, gauges, locations, elev, production_dirs,
                             time_min, time_max, title_on, label_id, verbose)
@@ -784 +789 @@
     return bearing
 
-def generate_figures(plot_quantity, file_loc, report, leg_label, f_list, gauges,
+def generate_figures(plot_quantity, file_loc, report, reportname, leg_label, f_list, gauges,
                      locations, elev, production_dirs, time_min, time_max,
                      title_on, label_id, verbose):
@@ -801 +806 @@
             label_id1 = label_id[0].replace(sep,'')
             label_id2 = label_id1.replace('_','')
-            texfile = texdir+'latexoutput%s' %(label_id2)
-            texfile2 = 'latexoutput%s' %(label_id2)
-            texfilename = texfile + '.tex' 
+            texfile = texdir+reportname+'%s' %(label_id2)
+            texfile2 = reportname+'%s' %(label_id2)
+            texfilename = texfile + '.tex'
             if verbose: print '\n Latex output printed to %s \n' %texfilename
             fid = open(texfilename, 'w')
         else:
-            texfile = texdir+'latexoutput' 
-            texfile2 = 'latexoutput'
+            texfile = texdir+reportname 
+            texfile2 = reportname
             texfilename = texfile + '.tex' 
             if verbose: print '\n Latex output printed to %s \n' %texfilename