Changeset 2448

Timestamp:

03/26/15 11:30:01 (9 years ago)

Author:

labetoulle

Message:

plot_bilan_jobs.py : make title more explicit + add max value if graph is truncated

Location:

TOOLS/ConsoGENCMIP6/bin

Files:

• plot_bilan.py (modified) (1 diff)
• plot_bilan_jobs.py (modified) (5 diffs)
• plot_jobs.py (modified) (1 diff)

TOOLS/ConsoGENCMIP6/bin/plot_bilan.py

@@ -279 +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_theo.spines["right"].set_color("firebrick")
+  ax_theo.tick_params(colors="firebrick")
+  ax_theo.yaxis.label.set_color("firebrick")
 
   ax_conso.axhline(y=conso_per_day, color="blue", alpha=0.5,

TOOLS/ConsoGENCMIP6/bin/plot_bilan_jobs.py

@@ -219 +219 @@
                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 (%)")
 
   line_width = 0.
@@ -234 +234 @@
   ax_jobs.bar(xcoord, pen_mean, bottom=run_mean, width=width, align="center",
               # yerr=pen_std/2, ecolor="darkred",
-              color="indianred", linewidth=line_width, antialiased=True,
+              color="firebrick", linewidth=line_width, antialiased=True,
               label="jobs pending")
 
@@ -245 +245 @@
   # -------------------
   # 1) Range
-  # if args.max:
-  #   ymax = gencmip6.alloc
-  # else:
-  #   ymax = np.nanmax(consos) + np.nanmax(consos)*.1
+  conso_max = np.nanmax(consos)
+  if args.max:
+    ymax = conso_max  # + conso_max*.1
+  else:
+    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*0.9),
+      textcoords="axes fraction",
+      xytext=(0.01, 0.8),
+      arrowprops=dict(
+        arrowstyle="->",
+        shrinkA=0,
+        shrinkB=0,
+        color="gray",
+      ),
+    )
 
   xmin, xmax = xcoord[0]-1, xcoord[-1]+1
   ax_conso.set_xlim(xmin, xmax)
-  # ax_conso.set_ylim(0., ymax)
+  ax_conso.set_ylim(0., ymax)
   ax_theo.set_ylim(0., 100)
 
@@ -283 +302 @@
     ax.axhline(y=y, color="blue", alpha=0.5,
                label="conso journaliÚre\nidéale ({})".format(label))
+
+  ax_theo.spines["right"].set_color("firebrick")
+  ax_theo.tick_params(colors="firebrick")
+  ax_theo.yaxis.label.set_color("firebrick")
 
   for x, d in zip(xcoord, dates):
@@ -458 +481 @@
   # ... Tweak figure ...
   # --------------------
-  title = "Consommation {}\n({:%d/%m/%Y} - {:%d/%m/%Y})".format(
-    gencmip6.project.upper(),
-    gencmip6.date_init,
-    gencmip6.deadline
-  )
+  title = "{} : Conso globale et suivi des jobs " \
+          "(moyenne journaliÚre)\n({:%d/%m/%Y} - {:%d/%m/%Y})".format(
+            gencmip6.project.upper(),
+            gencmip6.date_init,
+            gencmip6.deadline
+          )
 
   plot_config(fig, ax_conso, ax_theo, xcoord, dates, title, conso_per_day)

TOOLS/ConsoGENCMIP6/bin/plot_jobs.py

@@ -197 +197 @@
   ax.bar(xcoord, pen_jobs, bottom=run_jobs, width=width,
          linewidth=line_width, align="center",
-         color="indianred", antialiased=True,
+         color="firebrick", antialiased=True,
          label="jobs pending")