Changeset 2420

Timestamp:

03/02/15 11:47:26 (9 years ago)

Author:

labetoulle

Message:

plot daily consumption instead of cumulative total

Location:

TOOLS/ConsoGENCMIP6/bin

Files:

• gencmip6.py (modified) (1 diff)
• plot_bilan.py (modified) (4 diffs)

TOOLS/ConsoGENCMIP6/bin/gencmip6.py

@@ -111 +111 @@
       missing_values="nan",
     )
-    print(data)
-    print(type(data))
-    print(data.shape)
-    print(data.size)
+    # print(data)
+    # print(type(data))
+    # print(data.shape)
+    # print(data.size)
     dates, utheos = zip(*data)
 

TOOLS/ConsoGENCMIP6/bin/plot_bilan.py

@@ -164 +164 @@
 ########################################
 def plot_data(ax_conso, ax_theo, xcoord, xlabels,
-              consos, theo_uses, real_uses, theo_equs):
+              consos, conso_per_day, theo_uses, real_uses, theo_equs):
   """
   """
@@ -176 +176 @@
   ax_conso.bar(xcoord, consos, align="center", color="linen",
                linewidth=line_width, label="conso (heures)")
+  # ax_conso.plot(xcoord, conso_per_day, line_style, color="blue",
+  #               linewidth=1, markersize=8, alpha=0.5,
+  #               # solid_capstyle="round", solid_joinstyle="round",
+  #               label="conso journaliÚre idéale (heures)")
+  ax_conso.axhline(y=conso_per_day[0], color="blue", alpha=0.5,
+                   label="conso journaliÚre idéale (heures)")
 
   ax_theo.plot(xcoord, theo_equs, "--",
@@ -320 +326 @@
   xlabels   = ["{:%d-%m}".format(item.date)
                for item in selected_items]
-  consos    = np.array([item.conso for item in selected_items],
+  cumul     = np.array([item.conso for item in selected_items],
                         dtype=float)
+  consos    = []
+  consos.append(cumul[0])
+  consos[1:nb_items] = cumul[1:nb_items] - cumul[0:nb_items-1]
+  consos    = np.array(consos, dtype=float)
+
+  conso_per_day = np.array([gencmip6.alloc / nb_items
+                              for item in selected_items], dtype=float)
+
   theo_uses = np.array([100.*item.theo_use for item in selected_items],
                        dtype=float)
@@ -338 +352 @@
   # -----------------
   plot_data(ax_conso, ax_theo, xcoord, xlabels,
-            consos, theo_uses, real_uses, theo_equs)
+            consos, conso_per_day, theo_uses, real_uses, theo_equs)
 
   # ... Tweak figure ...