Changeset 9208

Timestamp:

Jun 22, 2014, 10:17:08 AM (10 years ago)

Author:

steve

Message:

Updated cairns demo

Location:

trunk/anuga_core

Files:

• demos/cairns/get_timeseries.py (modified) (2 diffs)
• source/anuga/__init__.py (modified) (1 diff)

trunk/anuga_core/demos/cairns/get_timeseries.py

@@ -13 +13 @@
 import anuga
 
-anuga.sww2csv_gauges('cairns_slide.sww',
+try:
+    anuga.sww2csv_gauges('cairns_slide.sww',
                 project.gauge_filename,
                 quantities=['stage','speed','depth','elevation'],
                 verbose=True)
-                
-anuga.sww2csv_gauges('cairns_fixed_wave.sww',
+except:
+    print 'Failed to process cairns_slide'
+
+try:                
+    anuga.sww2csv_gauges('cairns_fixed_wave.sww',
                project.gauge_filename,
                quantities=['stage', 'speed','depth','elevation'],
                verbose=True)
+except:
+    print 'Failed to process cairns_fixed_wave'
 
 try: 
     import pylab
-    anuga.csv2timeseries_graphs(directories_dic={'slide'+sep: ['Slide',0, 0],
-                                           'fixed_wave'+sep: ['Fixed Wave',0,0]},
+    anuga.csv2timeseries_graphs(directories_dic={'fixed_wave'+sep: ['Fixed Wave',0,0]},
                           output_dir='fixed_wave'+sep,
                           base_name='gauge_',
@@ -38 +43 @@
     #ANUGA does not rely on pylab to work 
     print 'must have pylab installed to generate plots'
+
+
+try: 
+    import pylab
+    anuga.csv2timeseries_graphs(directories_dic={'slide'+sep: ['Slide',0, 0]},
+                          output_dir='slide'+sep,
+                          base_name='gauge_',
+                          plot_numbers='',
+                          quantities=['stage','speed','depth'],
+                          extra_plot_name='',
+                          assess_all_csv_files=True,                            
+                          create_latex=False,
+                          verbose=True)
+except ImportError:
+    #ANUGA does not rely on pylab to work 
+    print 'must have pylab installed to generate plots'

trunk/anuga_core/source/anuga/__init__.py

@@ -41 +41 @@
 
 from anuga.abstract_2d_finite_volumes.util import file_function, \
-                                        sww2timeseries, sww2csv_gauges
+                                        sww2timeseries, sww2csv_gauges, \
+                                        csv2timeseries_graphs
 
 from anuga.abstract_2d_finite_volumes.mesh_factory import rectangular_cross, \