Changeset 2443

Timestamp:

03/20/15 17:01:25 (9 years ago)

Author:

labetoulle

Message:

change default for y-range in plot_bilan : ymax = 2*(ideal daily consumption)

Location:

TOOLS/ConsoGENCMIP6/bin

Files:

• old/conso_gencmip6_v5 (added)
• plot_bilan.py (modified) (3 diffs)

TOOLS/ConsoGENCMIP6/bin/plot_bilan.py

@@ -213 +213 @@
                linewidth=1, markersize=8,
                solid_capstyle="round", solid_joinstyle="round",
-               label="conso théorique (%)")
+               label="conso\nthéorique (%)")
   ax_theo.plot(xcoord, real_uses, line_style, color="forestgreen",
                linewidth=1, markersize=8,
                solid_capstyle="round", solid_joinstyle="round",
-               label="conso réelle (%)")
+               label="conso\nréelle (%)")
 
 
@@ -227 +227 @@
   # -------------------
   # 1) Range
+  conso_max = np.nanmax(consos)
   if args.max:
-    ymax = gencmip6.alloc
+    ymax = np.nanmax(consos)  # + np.nanmax(consos)*.1
   else:
-    ymax = np.nanmax(consos) + np.nanmax(consos)*.1
+    ymax = 2. * conso_per_day
+
+  if conso_max > ymax:
+    ax_conso.annotate(
+      "{:.2e} heures".format(conso_max),
+      ha="left",
+      va="top",
+      fontsize="xx-small",
+      bbox=dict(boxstyle="round", fc="w", ec="0.5", color="gray",),
+      xy=(np.nanargmax(consos)+1.2, ymax),
+      textcoords="axes fraction",
+      xytext=(0.01, 0.9),
+      arrowprops=dict(
+        arrowstyle="->",
+        shrinkA=0,
+        shrinkB=0,
+        color="gray",
+      ),
+    )
 
   xmin, xmax = xcoord[0]-1, xcoord[-1]+1
@@ -260 +279 @@
   ax_conso.set_yticks(yticks)
 
+  ax_theo.spines["right"].set_color("indianred")
+  ax_theo.tick_params(colors="indianred")
+  ax_theo.yaxis.label.set_color("indianred")
+
   ax_conso.axhline(y=conso_per_day, color="blue", alpha=0.5,
-                   label="conso journaliÚre idéale (heures)")
+                   label="conso journaliÚre\nidéale (heures)")
 
   for x, d in zip(xcoord, dates):