Changeset 2433

Timestamp:

03/05/15 11:55:57 (9 years ago)

Author:

labetoulle

Message:

cleaning

Location:

TOOLS/ConsoGENCMIP6

Files:

• bin/conso_gencmip6.py (modified) (1 diff)
• bin/gencmip6.py (modified) (3 diffs)
• bin/plot_bilan.py (modified) (3 diffs)
• bin/plot_jobs.py (modified) (7 diffs)
• bin/plot_login.py (modified) (1 diff)
• bin/plot_store.py (modified) (1 diff)
• bin/run_pen_v2.sh (added)
• launch_conso.sh (modified) (1 diff)

TOOLS/ConsoGENCMIP6/bin/conso_gencmip6.py

@@ -391 +391 @@
 
   exit(0)
+

TOOLS/ConsoGENCMIP6/bin/gencmip6.py

@@ -184 +184 @@
       missing_values="nan",
     )
-    # print(data)
-    # print(type(data))
-    # print(data.shape)
-    # print(data.size)
     dates, utheos = zip(*data)
 
@@ -207 +203 @@
     else:
       self.date_init = dt.datetime(self.deadline.year, 1, 1)
+
+    delta = self.deadline - self.date_init
+    self.days = delta.days + 1
 
 
@@ -245 +244 @@
 if __name__ == '__main__':
   pass
+

TOOLS/ConsoGENCMIP6/bin/plot_bilan.py

@@ -180 +180 @@
   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,
+  ax_conso.axhline(y=conso_per_day, color="blue", alpha=0.5,
                    label="conso journaliÚre idéale (heures)")
 
@@ -365 +361 @@
   consos    = np.array(consos, dtype=float)
 
-  conso_per_day = np.array([gencmip6.alloc / nb_items
-                              for item in selected_items], dtype=float)
+  conso_per_day = gencmip6.alloc / gencmip6.days
 
   theo_uses = np.array([100.*item.theo_use for item in selected_items],
@@ -418 +413 @@
 
   exit(0)
+

TOOLS/ConsoGENCMIP6/bin/plot_jobs.py

@@ -166 +166 @@
 
 ########################################
-def plot_data(ax, xcoord, xlabels, run_jobs, pen_jobs):
+def plot_data(ax, xcoord, xlabels, run_jobs, pen_jobs, conso_per_day):
   """
   """
+  line_width = 0.
 
   ax.bar(xcoord, run_jobs, align="center", color="lightgreen",
-         linewidth=0.1, label="running jobs cores")
+         linewidth=line_width, label="jobs running")
   ax.bar(xcoord, pen_jobs, bottom=run_jobs, align="center",
-         color="indianred", linewidth=0.1, label="pending jobs cores")
+         color="indianred", linewidth=line_width, label="jobs pending")
+
+  ax.axhline(y=conso_per_day, color="blue", alpha=0.5,
+             label="conso journaliÚre idéale")
 
 
@@ -192 +196 @@
   xcoord_maj = [x for x, l in zip(xcoord, xlabels)
                    if l.hour == 0 or l.hour == 12]
-  xlabels_maj = ["{:%d-%m-%d %Hh}".format(l) for l in xlabels
+  xlabels_maj = ["{:%d-%m %Hh}".format(l) for l in xlabels
                  if l.hour == 0 or l.hour == 12]
   ax.set_xticks(xcoord, minor=True)
@@ -285 +289 @@
       full_data = np.append(full_data, values=data)
 
-  # print(full_data)
-  # print(full_data.size)
-
   # .. Get project info ..
   # ======================
@@ -324 +325 @@
 
   xcoord   = np.linspace(1, nb_items, num=nb_items)
-  xlabels  = np.array([date for date, run, pen in full_data])
-  # xlabels  = ["{:%d-%m-%d %H:%M}".format(date)
-  #             for date, run, pen in full_data]
-
-  run_jobs = np.array([run for date, run, pen in full_data],
-                        dtype=int)
-  pen_jobs = np.array([pen for date, run, pen in full_data],
-                        dtype=int)
-
-  print(xcoord, xlabels)
-  print(run_jobs)
-  print(pen_jobs)
+  if full_data.size > 1:
+    xlabels  = np.array([date for date, run, pen in full_data])
+    run_jobs = np.array([run for date, run, pen in full_data],
+                          dtype=int)
+    pen_jobs = np.array([pen for date, run, pen in full_data],
+                          dtype=int)
+  else:
+    xlabels , run_jobs, pen_jobs = full_data.tolist()
+    xlabels = list(xlabels)
+    run_jobs = list(run_jobs )
+    pen_jobs = list(pen_jobs )
 
   # cumul     = np.array([item.conso for item in selected_items],
@@ -344 +344 @@
   # consos    = np.array(consos, dtype=float)
 
-  # conso_per_day = np.array([gencmip6.alloc / nb_items
-  #                             for item in selected_items], dtype=float)
+  conso_per_day = gencmip6.alloc / (gencmip6.days * 24.)
 
   # theo_uses = np.array([100.*item.theo_use for item in selected_items],
@@ -362 +361 @@
   # ... Plot data ...
   # -----------------
-  plot_data(ax, xcoord, xlabels, run_jobs, pen_jobs)
+  plot_data(ax, xcoord, xlabels, run_jobs, pen_jobs, conso_per_day)
 
   # # ... Tweak figure ...
@@ -396 +395 @@
 
   exit(0)
+

TOOLS/ConsoGENCMIP6/bin/plot_login.py

@@ -271 +271 @@
 
   exit(0)
+

TOOLS/ConsoGENCMIP6/bin/plot_store.py

@@ -305 +305 @@
 
   exit(0)
+

TOOLS/ConsoGENCMIP6/launch_conso.sh

@@ -73 +73 @@
 
 printf "\nEnd of script OK\n"
+