Changeset 2460 for TOOLS/ConsoGENCMIP6/bin/plot_bilan.py

Timestamp:

04/02/15 12:12:26 (9 years ago)

Author:

labetoulle

Message:

• Use an INI config file
• reaname "gencmip6" variables

Location:

TOOLS/ConsoGENCMIP6/bin

Files:

• . (modified) (1 prop)
• plot_bilan.py (modified) (9 diffs)

TOOLS/ConsoGENCMIP6/bin

@@ -1 @@
-gencmip6_path.py
+*.pyc

@@ -1 @@
-gencmip6_path.py
+*.pyc

TOOLS/ConsoGENCMIP6/bin/plot_bilan.py

@@ -13 +13 @@
 
 # Application library imports
-from gencmip6 import *
-from gencmip6_path import *
+from libconso import *
 
 
@@ -204 +203 @@
     line_width = 0.1
 
-  ax_conso.bar(xcoord, consos, width=1, align="center", color="linen",
-               linewidth=line_width, label="conso (heures)")
-
-  ax_theo.plot(xcoord, theo_equs, "--",
-               color="firebrick", linewidth=0.5,
-               solid_capstyle="round", solid_joinstyle="round")
-  ax_theo.plot(xcoord, theo_uses, line_style, color="firebrick",
-               linewidth=1, markersize=8,
-               solid_capstyle="round", solid_joinstyle="round",
-               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\nréelle (%)")
-
-
-########################################
-def plot_config(fig, ax_conso, ax_theo, xcoord, dates, title, conso_per_day):
+  ax_conso.bar(
+    xcoord, consos, width=1, align="center", color="linen",
+    linewidth=line_width, label="conso (heures)"
+  )
+
+  ax_theo.plot(
+    xcoord, theo_equs, "--",
+    color="firebrick", linewidth=0.5,
+    solid_capstyle="round", solid_joinstyle="round"
+  )
+  ax_theo.plot(
+    xcoord, theo_uses, line_style, color="firebrick",
+    linewidth=1, markersize=8,
+    solid_capstyle="round", solid_joinstyle="round",
+    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\nréelle (%)"
+  )
+
+
+########################################
+def plot_config(fig, ax_conso, ax_theo, xcoord, dates, title,
+                conso_per_day):
   """
   """
@@ -273 +281 @@
   ax_conso.set_xticks(xcoord, minor=True)
   ax_conso.set_xticks(maj_xticks, minor=False)
-  ax_conso.set_xticklabels(maj_xlabs, rotation="vertical", size="x-small")
+  ax_conso.set_xticklabels(
+    maj_xlabs, rotation="vertical", size="x-small"
+  )
 
   yticks = list(ax_conso.get_yticks())
@@ -365 +375 @@
   # ... Files and directories ...
   # -----------------------------
+  project_name, DIR, OUT = parse_config("bin/config.ini")
+
   (file_param, file_utheo, file_data) = \
       get_input_files(DIR["SAVEDATA"],
@@ -381 +393 @@
   # .. Get project info ..
   # ======================
-  gencmip6 = Project()
-  gencmip6.fill_data(file_param)
-  gencmip6.get_date_init(file_utheo)
+  projet = Project()
+  projet.fill_data(file_param)
+  projet.get_date_init(file_utheo)
 
   # .. Fill in data ..
@@ -390 +402 @@
   # ----------------------
   bilan = DataDict()
-  bilan.init_range(gencmip6.date_init, gencmip6.deadline)
+  bilan.init_range(projet.date_init, projet.deadline)
   # ... Extract data from file ...
   # ------------------------------
@@ -423 +435 @@
   consos    = np.array(consos, dtype=float)
 
-  conso_per_day = gencmip6.alloc / gencmip6.days
+  conso_per_day = projet.alloc / projet.days
 
   theo_uses = np.array([100.*item.theo_use for item in selected_items],
@@ -456 +468 @@
   # --------------------
   title = "Consommation {}\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)
+    projet.project.upper(),
+    projet.date_init,
+    projet.deadline
+  )
+
+  plot_config(
+    fig, ax_conso, ax_theo, xcoord, dates, title, conso_per_day
+  )
 
   # ... Save figure ...
@@ -469 +483 @@
                          "{}_{}.pdf".format(img_name, today))
 
-  plot_save(img_in, img_out, title)
+  plot_save(img_in, img_out, title, DIR)
 
   # ... Publish figure on dods ...
   # ------------------------------
   if args.dods:
-    dods_cp(img_in)
+    dods_cp(img_in, DIR)
 
   if args.show:

@@ -1 @@
-gencmip6_path.py
+*.pyc