Changeset 9190

Timestamp:

Jun 18, 2014, 5:49:27 PM (11 years ago)

Author:

steve

Message:

Pullin out some more data files

Location:

trunk/anuga_core

Files:

• demos/cairns/export_results_to_qgis.py (modified) (2 diffs)
• source/anuga/utilities/plot_utils.py (modified) (2 diffs)

trunk/anuga_core/demos/cairns/export_results_to_qgis.py

@@ -62 +62 @@
 from anuga.utilities.plot_utils import Make_Geotif
 Make_Geotif(swwFile=name+'.sww', 
-             output_quantities=['depth', 'velocity'],
+             output_quantities=['stage', 'depth', 'velocity', 'elevation'],
              myTimeStep='max', CellSize=50.0, 
              lower_left=None, upper_right=None,
@@ -72 +72 @@
              bounding_polygon=project.bounding_polygon,
              verbose=True)
+
+Make_Geotif(swwFile=name+'.sww', 
+             output_quantities=['stage'],
+             myTimeStep=0, CellSize=50.0, 
+             lower_left=None, upper_right=None,
+             EPSG_CODE=32355, 
+             proj4string=None,
+             velocity_extrapolation=True,
+             min_allowed_height=1.0e-05,
+             output_dir='.',
+             bounding_polygon=project.bounding_polygon,
+             verbose=True)

trunk/anuga_core/source/anuga/utilities/plot_utils.py

@@ -943 +943 @@
             print myTSi
         for output_quantity in output_quantities:
+            if (verbose): print output_quantity
 
             if(myTSi is not 'max'):
@@ -953 +954 @@
             if(type(myTS)==int):
                 if(output_quantity=='stage'):
-                    if verbose: print 'calculating stage'
                     gridq=p2.stage[myTS,:][gridqInd]
                 if(output_quantity=='depth'):
-                    if verbose: print 'calculating depth'
                     gridq=p2.height[myTS,:][gridqInd]
                     gridq=gridq*(gridq>=0.) # Force positive depth (tsunami alg)
                 if(output_quantity=='velocity'):
-                    if verbose: print 'calculating velocity'
                     gridq=p2.vel[myTS,:][gridqInd]
                 if(output_quantity=='friction'):
-                    if verbose: print 'calculating friction'
                     gridq=p2.friction[gridqInd]
                 if(output_quantity=='depthIntegratedVelocity'):
-                    if verbose: print 'calculating depthIntegratedVelocity'
                     swwDIVel=(p2.xmom[myTS,:]**2+p2.ymom[myTS,:]**2)**0.5
                     gridq=swwDIVel[gridqInd]
                 if(output_quantity=='elevation'):
-                    if verbose: print 'calculating elevation'
                     gridq=p2.elev[gridqInd]