Changeset 668 in lmdz_wrf

Timestamp:

Jan 15, 2016, 11:19:46 AM (9 years ago)

Author:

lfita

Message:

Adding new variables to `draw_points_lonlat'

Location:

trunk/tools

Files:

• drawing.py (modified) (8 diffs)
• drawing_tools.py (modified) (4 diffs)

trunk/tools/drawing.py

@@ -25 +25 @@
 ## e.g. # drawing.py -o draw_points -S 'tslist.dat,#,3,2,1:SuperStorm|sfc|stations:cyl,i:labelled,8,black:auto:None:0:png:stations_loc' -f $HOME'/etudes/domains/WRFdynamicoSENS_SuperStorm/geo_em_west_east_B25-E180-I1_south_north_B160-E262-I1.nc,XLONG_M,XLAT_M,HGT_M,Time|0,height,0.,1500.,terrain,m'
 ## e.g. # drawing.py -o draw_ptZvals -f geo_v2_2012102123_RR1.nc -S 'pracc:lon,lat:o:80:2,42,7,47,:values!of!values:Blues:cyl,l:pdf' -v pr
-## e.g. # drawing.py -f carteveg5km.nc -o draw_points_lonlat -S 'longitude:latitude:pdf:points!veget|type:green:.:None:0:legend'
+## e.g. # drawing.py -f carteveg5km.nc -o draw_points_lonlat -S 'longitude:latitude:pdf:points!veget|type:green:.:0.5:None:0:legend'
 
 main = 'drawing.py'
@@ -2440 +2440 @@
     """ Function to plot a series of lon/lat points
      filen= name of the file
-     values= [lonvarname]:[latvarname]:[gkind]:[gtit]:[ptcolor]:[pttype]:[labels]:[locleg]:[figureK]
+     values= [lonvarname]:[latvarname]:[gkind]:[gtit]:[ptcolor]:[pttype]:[ptsize]:[labels]:[locleg]:[figureK]
        [lonvarname]: name of the variable longitude
        [latvarname]: name of the variable latitude
@@ -2447 +2447 @@
        [ptcolor]: color of the points ('auto', for "red")
        [pttype]: type of point
+       [ptsize]: size of point
        [labels]: ',' list of labels to use
        [locleg]: location of the legend (0, automatic)
@@ -2464 +2465 @@
 
     expectargs = '[lonvarname]:[latvarname]:[gkind]:[gtit]:[ptcolor]:[pttype]:' +    \
-      '[labels]:[locleg]:[figureK]'
+      '[ptsize]:[labels]:[locleg]:[figureK]'
  
     drw.check_arguments(fname,len(expectargs.split(':')),values,':',                 \
@@ -2475 +2476 @@
     pointcolor = values.split(':')[4]
     pointtype = values.split(':')[5]
-    labelsv = values.split(':')[6]
-    loclegend = values.split(':')[7]
-    figureK = values.split(':')[8]
+    pointsize = np.float(values.split(':')[6])
+    labelsv = values.split(':')[7]
+    loclegend = values.split(':')[8]
+    figureK = values.split(':')[9]
 
     fname = 'points_lonlat'
@@ -2483 +2485 @@
     onc = NetCDFFile(filen, 'r')
     if not onc.variables.has_key(lonname):
-        print errmsg
+        print errormsg
         print fname + ": file '" + filen + "' does not have longitudes '" + lonname +\
           "' !!"
         quit(-1)
     if not onc.variables.has_key(lonname):
-        print errmsg
+        print errormsg
         print fname + ": file '" + filen + "' does not have longitudes '" + lonname +\
           "' !!"
@@ -2496 +2498 @@
     olat = onc.variables[latname]
 
+    Ndimlon = len(olon.shape)
+    if Ndimlon == 1:
+        lonvals = olon[:]
+        latvals = olat[:]
+    elif Ndimlon == 2:
+        lonvals = olon[:].flatten()
+        latvals = olat[:].flatten()
+    elif Ndimlon == 3:
+        lonvals = olon[1,:,:].flatten()
+        latvals = olat[1,:,:].flatten()
+# Playing for Anna
+#        lonvals = olon[:].flatten()
+#        latvals = olat[:].flatten()
+    elif Ndimlon == 4:
+        lonvals = olon[1,0,:,:].flatten()
+        latvals = olat[1,0,:,:].flatten()
+    else:
+        print errormsg
+        print '  ' + fname + ': longitude size:',len(olon),' not ready!!'
+        quit(-1)
+
     if labelsv == 'None':
         labels = None
@@ -2501 +2524 @@
         labels = labelsv.split(',')
 
-    drw.plot_list_points(olon[:], olat[:], gtit, figureK, pointcolor, pointtype,     \
-      labels, loclegend, kindfigure, fname)
+    drw.plot_list_points(lonvals, latvals, lonname, latname, gtit, figureK, pointcolor, pointtype,    \
+      pointsize, labels, loclegend, kindfigure, fname)
 
     onc.close()

trunk/tools/drawing_tools.py

@@ -2763 +2763 @@
     return
 
-def plot_list_points(xval, yval, vtit, figk, color, ptk, labels, lloc, kfig, figname):
+def plot_list_points(xval, yval, varxn, varyn, vtit, figk, color, ptk, pts, labels, lloc, kfig, figname):
     """ plotting points
       [x/yval]: x,y values to plot
+      var[x/y]n: names of the x,y variables
       vtit= title of the graph ('|' for spaces)
       figK= kind of figure
@@ -2772 +2773 @@
       color= color for the points/labels ('auto', for "red")
       ptk= kind of point
+      pts= point size
       labels= list of labels for the points (None, no labels)
       lloc = localisation of the legend
@@ -2792 +2794 @@
         for iv in range(len(xval)):
 #            print iv,xval[iv],yval[iv],labels[iv],ptkinds[N7pts]
-            plt.plot(xval[iv],yval[iv], ptk,label=labels[iv])
+            plt.plot(xval[iv],yval[iv], ptk, markersize=pts, label=labels[iv])
 
         if figk[0:8] == 'labelled':
@@ -2804 +2806 @@
 
     else: 
-        plt.plot(xval, yval, ptk, color=ptcol)
+        plt.plot(xval, yval, ptk, markersize=pts, color=ptcol)
+
+    plt.xlabel(varxn)
+    plt.ylabel(varyn)
 
     graphtit = vtit.replace('_','\_').replace('&','\&')