Changeset 9199

Timestamp:

Jun 18, 2014, 11:42:23 PM (10 years ago)

Author:

steve

Message:

Small changes to plot_utils

File:

• trunk/anuga_core/source/anuga/utilities/plot_utils.py (modified) (5 diffs)

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

@@ -789 +789 @@
         raise Exception, 'No spatial reference information given'
 
+
     ds.SetProjection(srs.ExportToWkt())
 
@@ -797 +798 @@
     #import pdb
     #pdb.set_trace()
+    import scipy
 
     outband = ds.GetRasterBand(1)
+    outband.SetNoDataValue(numpy.nan)
     outband.WriteArray(data)
 
@@ -942 +945 @@
     #index_qFun=scipy.interpolate.LinearNDInterpolator(swwXY,scipy.arange(len(swwX),dtype='int64').transpose())
 
-    gridXY_array=scipy.ascontiguousarray([scipy.concatenate(gridX),scipy.concatenate(gridY)]).transpose()
+    #print 'index_qFun', index_qFun
+    
+    gridXY_array=scipy.array([scipy.concatenate(gridX),scipy.concatenate(gridY)]).transpose()
+    #gridXY_array=scipy.concatenate((gridX,gridY)).transpose()
+    
+    gridXY_array=scipy.ascontiguousarray(gridXY_array)
+    #print gridXY_array.flags['C_CONTIGUOUS']
+    #print 'GRIDXY_ARRAY', gridXY_array.shape
+
     gridqInd=index_qFun(gridXY_array)
 
@@ -949 +960 @@
         from anuga.geometry.polygon import outside_polygon
         cut_points = outside_polygon(gridXY_array, bounding_polygon)
+        
+        #print cut_points.shape
         #cut_points=(nxutils.points_inside_poly(gridXY_array, bounding_polygon)==False).nonzero()[0]
        
@@ -991 +1004 @@
             if(bounding_polygon is not None):
                 # Cut the points outside the bounding polygon
-                gridq[cut_points]=scipy.nan 
+                gridq[cut_points]= numpy.nan
 
             # Make name for output file