Changeset 1471 in lmdz_wrf

Timestamp:

Mar 23, 2017, 4:05:10 PM (8 years ago)

Author:

lfita

Message:

Improving `draw_points_lonlat'
Adding `draw_points_lonlat'

Location:

trunk/tools

Files:

• documentation/plotting/gallery.html (modified) (1 diff)
• documentation/plotting/plotting.html (modified) (1 diff)
• documentation/plotting/subbasin.html (modified) (2 diffs)
• drawing.py (modified) (5 diffs)
• drawing_tools.py (modified) (3 diffs)

trunk/tools/documentation/plotting/gallery.html

@@ -25 +25 @@
       <A HREF="Nlines_time.html"><IMG SRC="figs/lines_time.png" ALT="Nlines time" STYLE="float:left;width:200px;height:200px" TARGET="value"></IMG></A>
       <A HREF="plot_points.html"><IMG SRC="figs/stations_loc.png" ALT="plot points" STYLE="float:left;width:200px;height:200px" TARGET="value"></IMG></A>
+      <A HREF="plot_points_lonlat.html"><IMG SRC="figs/points_lonlat_5k.png" ALT="plot lon,lat points" STYLE="float:left;width:200px;height:200px" TARGET="value"></IMG></A>
+      <A HREF="plot_points_lonlat.html"><IMG SRC="figs/points_lonlat_hurs-tas.png" ALT="plot lon,lat points" STYLE="float:left;width:200px;height:200px" TARGET="value"></IMG></A>
       <A HREF="pointsZval.html"><IMG SRC="figs/pointsZval.png" ALT="plot points by Z value" STYLE="float:left;width:200px;height:200px" TARGET="value"></IMG></A>
       <A HREF="river_desc.html"><IMG SRC="figs/or_rivers.png" ALT="plot rivers from ORCHIDEE's description" STYLE="float:left;width:200px;height:200px" TARGET="value"></IMG></A>     

trunk/tools/documentation/plotting/plotting.html

@@ -15 +15 @@
       <A CLASS="lc" HREF="2Dshad_line_time.html" TARGET="value">2D shadow line time</A><BR>
       <A CLASS="lc" HREF="barbs.html" TARGET="value">barbs</A><BR>
-      <A CLASS="lc" HREF="basin.html" TARGET="value">basin</A><BR>
+      <A CLASS="lc" HREF="basins.html" TARGET="value">ORCHIDEE's basins</A><BR>
       <A CLASS="lc" HREF="Neighbourgh_evol.html" TARGET="value">Neighbourghood evolution</A><BR>
       <A CLASS="lc" HREF="Nlines.html" TARGET="value">Nlines</A><BR>
       <A CLASS="lc" HREF="Nlines_time.html" TARGET="value">Nlines time</A><BR>
       <A CLASS="lc" HREF="plot_points.html" TARGET="value">points</A><BR>
+      <A CLASS="lc" HREF="points_lonlat.html" TARGET="value">lon,lat points</A><BR>
       <A CLASS="lc" HREF="pointsZval.html" TARGET="value">points Zval</A><BR>
-      <A CLASS="lc" HREF="river_desc.html" TARGET="value">river description</A><BR>
-      <A CLASS="lc" HREF="subbasin.html" TARGET="value">sub-basin</A><BR>
+      <A CLASS="lc" HREF="river_desc.html" TARGET="value">ORCHIDEE's river description</A><BR>
+      <A CLASS="lc" HREF="subbasin.html" TARGET="value">ORCHIDEE's sub-basin</A><BR>
       <A CLASS="lc" HREF="Taylor.html" TARGET="value">Taylor diagram</A><BR>
       <A CLASS="lc" HREF="TimeSeries.html" TARGET="value">TimeSeries</A><BR>

trunk/tools/documentation/plotting/subbasin.html

@@ -11 +11 @@
     </DIV>
     <DIV CLASS="valimg">
-      Plotting subbasin from a given point of its discharge from 'routing.nc' ORCDHIEE file <BR>
-      &nbsp;&nbsp;Each river is composed of different subbasins. Grouped up-flow. This function use a different color <BR>
-      &nbsp;&nbsp;for the first level of suubbasins, and a different degree of color for the sub-subbasins of the first level <BR>
-      &nbsp;&nbsp;It takes output from `subbasin' function from 'nc_var.py'
+      Plotting subbasin from a given point of its discharge from 'routing.nc' ORCDHIEE file. Each river is composed of different subbasins. Grouped up-flow. This function use a different color for the first level of suubbasins, and a different degree of color for the sub-subbasins of the first level. It takes output from `subbasin' function from 'nc_var.py'
       <IMG WIDTH="100%" SRC="figs/tas_rainbow_auto.png"></IMG>
     </DIV>
@@ -49 +46 @@
     </DIV>
     <DIV CLASS="valins">
-      python ${pyHOME}/drawing.py -o draw_subbasin -f Caceres_subbasin.nc -S 'Caceres:None:cyl,l:2:True:Parana!subbasins!from!C&agrave;ceres:png:0:Caceres_subbasin:True:True'
+      python ${pyHOME}/drawing.py -o draw_subbasin -f Caceres_subbasin.nc -S 'Caceres:None:cyl,l:2:True:Parana!subbasins!from!C&aacute;ceres:png:0:Caceres_subbasin:True:True'
     </DIV>
   </BODY>

trunk/tools/drawing.py

@@ -3235 +3235 @@
     """ Function to plot a series of lon/lat points
       filen= name of the file
-      values= [lonvarname]:[latvarname]:[gkind]:[gtit]:[ptcolor]:[pttype]:[ptsize]:[labels]:[legvals]:[figureK]
+      values= [lonvarname]:[latvarname]:[gkind]:[gtit]:[ptcolor]:[pttype]:[ptsize]:[labels]:[legvals]:[figureK]:
+          [figclose]
         [lonvarname]: name of the variable longitude
         [latvarname]: name of the variable latitude
-        [gkind]: kind of graphical output
+        [gkind]: kind of graphical output (pdf, png, ps)
         [gtit]: graphic title '!' for spaces
         [ptcolor]: color of the points ('auto', for "red")
@@ -3253 +3254 @@
           'legend': only points in the map with the legend with the names
           'labelled',[txtsize],[txtcol]: points with the names and size, color of text
+        [figclose]: whether figures should be closed or not
     """
     fname = 'draw_points_lonlat'
@@ -3262 +3264 @@
 
     expectargs = '[lonvarname]:[latvarname]:[gkind]:[gtit]:[ptcolor]:[pttype]:' +    \
-      '[ptsize]:[labels]:[locleg]:[figureK]'
+      '[ptsize]:[labels]:[locleg]:[figureK]:[figclose]'
  
     drw.check_arguments(fname,values,expectargs,':')
@@ -3276 +3278 @@
     legvals = values.split(':')[8]
     figureK = values.split(':')[9]
-
-    fname = 'points_lonlat'
+    figclose = gen.Str_Bool(values.split(':')[10])
 
     onc = NetCDFFile(filen, 'r')
@@ -3333 +3334 @@
         labels = labelsv.split(',')
 
-    locleg, sizeleg = legend_values(legvals,'|')
+    locleg, sizeleg = drw.legend_values(legvals,'|')
 
     drw.plot_list_points(lonvals, latvals, lonname, latname, gtit, figureK, pointcolor, pointtype,    \
-      pointsize, labels, locleg, sizeleg, kindfigure, fname)
+      pointsize, labels, locleg, sizeleg, kindfigure, fname, figclose)
 
     onc.close()

trunk/tools/drawing_tools.py

@@ -3221 +3221 @@
 
 def plot_list_points(xval, yval, varxn, varyn, vtit, figk, color, ptk, pts, labels,  \
-  lloc, lsiz, kfig, figname):
+  lloc, lsiz, kfig, figname, fclose):
     """ plotting points
       [x/yval]: x,y values to plot
@@ -3237 +3237 @@
       kfig= kind of figure (jpg, pdf, png)
       figname= name of the figure
-
+      fclose= whether the figure should be close or not
     """
     fname = 'plot_points'
@@ -3275 +3275 @@
     plt.title(graphtit)
     
-    output_kind(kfig, figname, True)
+    output_kind(kfig, figname, fclose)
 
     return