Changeset 2836

Timestamp:

May 8, 2006, 4:55:59 PM (19 years ago)

Author:

sexton

Message:

updates to sww2timeseries

File:

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

inundation/pyvolution/util.py

@@ -574 +574 @@
     - if title_on = False then output latex file will be generated
       in same directory as where script is run (usually production
-      scenario direcotry. Name = latex_output_label_id.tex
+      scenario direcotry. Name = latexoutpulabel_id.tex
 
     Other important information:
@@ -606 +606 @@
                     time_max = None,
                     title_on = None,
-                    verbose = False):
-
-    from pylab import * #FIXME (Ole): List actual functions used rather than *
-    
+                    verbose = False):   
 
     assert type(swwfile) == type(''),\
@@ -677 +674 @@
 
     if verbose: print 'Inputs OK - going to generate figures'
+
+    # could try different approach for file_loc:
+    # index = swwfile.find(basename.sww)
+    # file_loc = swwfile[:index-1]
     
     return generate_figures(plot_quantity, file_loc, f, gauges, locations,
@@ -739 +740 @@
 
     from math import sqrt, atan, degrees
-    from os import sep, altsep
+    from Numeric import ones
+    from os import sep, altsep, getcwd, mkdir, access, F_OK, environ
+    from os.path import expanduser
+    from pylab import ion, hold, plot, axis, figure, legend, savefig, xlabel, ylabel, title, close
 
     filename = file_loc.split(sep)
@@ -746 +750 @@
         #ext = '.eps'
         ext = ''
-        texfilename = 'latex_output_%s.tex' %(label_id.replace(sep,'_'))
+        label_id1 = label_id.replace(sep,'')
+        label_id2 = label_id1.replace('_','')
+        texfile = 'latexoutput%s' %(label_id2)
+        texfilename = texfile + '.tex' 
         if verbose: print '\n Latex output printed to %s \n' %texfilename
         fid = open(texfilename, 'w')
@@ -820 +827 @@
             figure(i+1, frameon = False)
             if which_quantity == 'depth':
-                plot(model_time, depths, 'g-')
+                plot(model_time, depths, '-')
                 units = 'm'
             if which_quantity == 'stage':
-                plot(model_time, stages, 'g-')
+                plot(model_time, stages, '-')
                 units = 'm'
             if which_quantity == 'momentum':
-                plot(model_time, momenta, 'g-')
+                plot(model_time, momenta, '-')
                 units = 'm^2 / sec'
             if which_quantity == 'xmomentum':
-                plot(model_time, xmom, 'g-')
+                plot(model_time, xmom, '-')
                 units = 'm^2 / sec'
             if which_quantity == 'ymomentum':
-                plot(model_time, ymom, 'g-')
+                plot(model_time, ymom, '-')
                 units = 'm^2 / sec'
             if which_quantity == 'velocity':
-                plot(model_time, velocity, 'g-')
+                plot(model_time, velocity, '-')
                 units = 'm / sec'
             if which_quantity == 'bearing':
                 due_east = 90.0*ones([len(model_time)])
                 due_west = 270.0*ones([len(model_time)])
-                plot(model_time, bearings, 'r-', model_time, due_west, '-.g',
-                     model_time, due_east, '-.b')
+                plot(model_time, bearings, '-', model_time, due_west, '-.',
+                     model_time, due_east, '-.')
                 units = 'degrees from North'
                 ax = axis([time_min, time_max, 0, 360])
@@ -849 +856 @@
             ylabel('%s (%s)' %(which_quantity, units))
 
-            gaugeloc1 = gaugeloc.replace(' ','_')
-            graphname = '%sgauge_%s_%s%s' %(file_loc, gaugeloc1, which_quantity, ext)
-            latex_file_loc = file_loc.replace(sep,altsep)
-            graphname_latex = '%sgauge_%s_%s_report%s' %(latex_file_loc, gaugeloc1, which_quantity, ext)
-
+            gaugeloc1 = gaugeloc.replace(' ','')
+            graphname = '%sgauge%s_%s%s' %(file_loc, gaugeloc1, which_quantity, ext)
+            figdir = getcwd()+sep+'report_figures'+sep
+            if access(figdir,F_OK) == 0 :
+                mkdir (figdir)
+            latex_file_loc = figdir.replace(sep,altsep)
+            
+            graphname_latex = '%sgauge%s%s%s%s' %(latex_file_loc, gaugeloc1, which_quantity, label_id2, ext)
+
+            p = getcwd().split(sep)    
+            scenario = p[len(p)-1]
+            home = expanduser('~')
+            report_fig_loc = '~'+altsep+'anuga'+altsep+'production'+altsep+scenario+altsep+'report_figures'+altsep
+            graphname_report = '%sgauge%s%s%s%s' %('report_figures'+altsep, gaugeloc1, which_quantity, label_id2, ext)
+            
             if title_on == True:
                 title('%s scenario: %s at %s gauge'
@@ -859 +876 @@
                 savefig(graphname)
             else:
-                label = '%s_%s_gauge_%s' %(label_id.replace(sep,'_'), which_quantity, gaugeloc1) 
-                caption = 'Time series for %s' %(which_quantity)
-                s = '\\begin{figure}[hbt] \n \\centerline{\includegraphics[width=75mm, height=75mm]{%s}} \n' %(graphname_latex)
+                label = '%s%sgauge%s' %(label_id2, which_quantity, gaugeloc1) 
+                caption = 'Time series for %s at %s gauge location' %(which_quantity, gaugeloc)
+                s = '\\begin{figure}[hbt] \n \\centerline{\includegraphics[width=100mm, height=75mm]{%s%s}} \n' %(graphname_report, '.png')
                 fid.write(s)
                 s = '\\caption{%s} \n \label{fig:%s} \n \end{figure} \n \n' %(caption, label)
@@ -879 +896 @@
     close('all')
     
-    return texfilename
+    return texfile