Changeset 782 in lmdz_wrf

Timestamp:

May 27, 2016, 6:36:50 PM (9 years ago)

Author:

lfita

Message:

Adding to check whether the country borders and the id of the basins should be drawn in `draw_basins'

Location:

trunk/tools

Files:

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

trunk/tools/drawing.py

@@ -3335 +3335 @@
     """ Function to plot wind basins
       values= [lonlatbox]:[mapres]:[cbarname]:[xtrmbasin]:[mapdraw]:[veclength]:[freq]:
-        [ifreq]:[gtit]:[kindfig]:[figuren]
+        [ifreq]:[plotcountry]:[basinidn]:[gtit]:[kindfig]:[figuren]
         [lonlatbox]= [lonSW],[lonNE],[latSW],[latNE] coordinates of the lon/lat box
-        [xtrmbasin]= pminbasin],[maxbasin]
-        gtit= title of the graph ('|', for spaces)
-        kindfig= kind of figure
-        figuren= name of the figure
+        [mapres]= resolution of the mapping information
+        [cbarname]= colorbar name for the colors
+        [xtrmbasin]= [minbasin],[maxbasin] minimum and maximum basin numbers
+        [mapdraw]= whether to draw the map (and project the data) or not ('True/False')
+        [veclength]= length of the vectors of discharge at each grid cell
+        [freq]= frequency of values allong each axis (None, all grid points; 
+          'auto', computed automatically to have 20 vectors along each axis)
+        [plotcountry]= whether country lines should be plotted or not ('True/False')
+        [plotbasinid]= whether id of the basins should be plotted or not ('True/False')
+        [gtit]= title of the graph ('|', for spaces)
+        [kindfig]= kind of figure
+        [figuren]= name of the figure
       ncfile= file to use
     """
@@ -3351 +3359 @@
 
     expectargs = '[lonlatbox]:[mapres]:[cbarname]:[xtrmbasin]:[mapdraw]:' +          \
-      '[veclength]:[freq]:[ifreq]:[gtit]:[kindfig]:[figuren]'
+      '[veclength]:[freq]:[plotcountry]:[basinidn]:[gtit]:[kindfig]:[figuren]'
  
     drw.check_arguments(fname,values,expectargs,':')
@@ -3372 +3380 @@
     minbasin = np.int(values.split(':')[3].split(',')[0])
     maxbasin = np.int(values.split(':')[3].split(',')[1])
-    mapdraw0 = gen.Str_Bool(values.split(':')[4])
+    mapdraw = gen.Str_Bool(values.split(':')[4])
     veclength = np.float(values.split(':')[5])
     freq0 = values.split(':')[6]
-    ifreq = int(values.split(':')[7])
-    gtit = values.split(':')[8].replace('|',' ')
-    kindfig = values.split(':')[9]
-    figuren = values.split(':')[10]
+    plotcountry = gen.Str_Bool(values.split(':')[7])
+    plotbasinid = gen.Str_Bool(values.split(':')[8])
+    gtit = values.split(':')[9].replace('|',' ')
+    kindfig = values.split(':')[10]
+    figuren = values.split(':')[11]
 
     if freq0 == 'None': freq = None
@@ -3404 +3413 @@
       oflow[jmin:jmax,imin:imax], freq, cbarname+'@basin@-',                         \
       obasins[jmin:jmax,imin:imax], veclength, minbasin, maxbasin, 'outflow', '-',   \
-      'cyl,'+map_res, gtit, kindfig, figuren)
+      'cyl,'+map_res, plotcountry, plotbasinid, gtit, kindfig, figuren)
 
     ofile.close()

trunk/tools/drawing_tools.py

@@ -6215 +6215 @@
 
 def plot_basins(xvals,yvals,fvals,vecfreq,vecoln,veccolor,veclength,vcolmin,vcolmax,windn,wuts,\
-  mapv,graphtit,kfig,figname):
+  mapv,drawcountry,basinid,graphtit,kfig,figname):
     """ Function to plot vectors
       xvals= values for the x-axis
@@ -6240 +6240 @@
           * 'h', high
           * 'f', full
+      drawcountry= whether country lines should be plotted or not
+      basinid= whether  basins id should be plotted or not
       graphtit= title of the graph ('|', for spaces)
       kfig= kind of figure
@@ -6337 +6339 @@
 
         m.drawcoastlines()
+        drawcountry = True
+        if drawcountry: m.drawcountries()
 
         meridians = pretty_int(nlon,xlon,5)
@@ -6370 +6374 @@
     cbar.set_label(vN + ' (' + units_lunits(vU) + ')')
 
-    for i in range(len(xlabpos)):
-        plt.text(xlabpos[i]+0.5*ddx, ylabpos[i]+0.95*ddy, labels[i],                  \
-          color=labcol[i], fontdict=fontcharac)
+    if basinid:
+        for i in range(len(xlabpos)):
+            plt.text(xlabpos[i]+0.5*ddx, ylabpos[i]+0.95*ddy, labels[i],             \
+              color=labcol[i], fontdict=fontcharac)
 
 # Sea-flow