Changeset 2631

Timestamp:

08/26/15 11:52:12 (9 years ago)

Author:

labetoulle

Message:

add specific trick for gencmip6

Location:

TOOLS/ConsoGENCMIP6/bin

Files:

• plot_bilan.py (modified) (6 diffs)
• plot_bilan_jobs.py (modified) (6 diffs)
• plot_jobs.py (modified) (4 diffs)

TOOLS/ConsoGENCMIP6/bin/plot_bilan.py

@@ -237 +237 @@
 ########################################
 def plot_config(fig, ax_conso, ax_theo, xcoord, dates, title,
-                conso_per_day):
+                conso_per_day, conso_per_day_2):
   """
   """
@@ -247 +247 @@
     ymax = conso_max  # + conso_max*.1
   else:
-    ymax = 2. * conso_per_day
+    ymax = 3. * max(conso_per_day, conso_per_day_2)
 
   if conso_max > ymax:
@@ -295 +295 @@
   yticks = list(ax_conso.get_yticks())
   yticks.append(conso_per_day)
+  if conso_per_day_2:
+    yticks.append(conso_per_day_2)
   ax_conso.set_yticks(yticks)
 
@@ -303 +305 @@
   ax_conso.axhline(y=conso_per_day, color="blue", alpha=0.5,
                    label="conso journaliÚre\nidéale (heures)")
+
+  if conso_per_day_2:
+    ax_conso.axhline(y=conso_per_day_2, color="blue", alpha=0.5)
 
   for x, d in zip(xcoord, dates):
@@ -446 +451 @@
   consos = np.array(consos, dtype=float)
 
-  conso_per_day = projet.alloc / projet.days
+  if projet.project == "gencmip6":
+    alloc1 = 5.e6
+    alloc2 = projet.alloc - alloc1
+    conso_per_day   = 2 * alloc1 / projet.days
+    conso_per_day_2 = 2 * alloc2 / projet.days
+  else:
+    conso_per_day = projet.alloc / projet.days
+    conso_per_day_2 = None
 
   theo_uses = np.array(
@@ -497 +509 @@
 
   plot_config(
-    fig, ax_conso, ax_theo, xcoord, dates, title, conso_per_day
+    fig, ax_conso, ax_theo, xcoord, dates, title,
+    conso_per_day, conso_per_day_2
   )
 

TOOLS/ConsoGENCMIP6/bin/plot_bilan_jobs.py

@@ -259 +259 @@
 ########################################
 def plot_config(fig, ax_conso, ax_theo, xcoord, dates, title,
-                conso_per_day):
+                conso_per_day, conso_per_day_2):
   """
   """
@@ -269 +269 @@
     ymax = conso_max  # + conso_max*.1
   else:
-    ymax = 2. * conso_per_day
+    ymax = 3. * max(conso_per_day, conso_per_day_2)
 
   if conso_max > ymax:
@@ -318 +318 @@
   for ax, y, label in (
     (ax_conso, conso_per_day, "heures"),
-    (ax_jobs, conso_per_day / 24, "cœurs"),
+    (ax_jobs, conso_per_day / 24., "cœurs"),
   ):
     yticks = list(ax.get_yticks())
@@ -325 +325 @@
     ax.axhline(y=y, color="blue", alpha=0.5,
                label="conso journaliÚre\nidéale ({})".format(label))
+
+  if conso_per_day_2:
+    yticks.append(conso_per_day_2)
+    ax_conso.axhline(y=conso_per_day_2, color="blue", alpha=0.5)
+    ax_jobs.axhline(y=conso_per_day_2 / 24., color="blue", alpha=0.5)
 
   ax_theo.spines["right"].set_color("firebrick")
@@ -477 +482 @@
   consos = np.array(consos, dtype=float)
 
-  conso_per_day = projet.alloc / projet.days
+  if projet.project == "gencmip6":
+    alloc1 = 5.e6
+    alloc2 = projet.alloc - alloc1
+    conso_per_day   = 2 * alloc1 / projet.days
+    conso_per_day_2 = 2 * alloc2 / projet.days
+  else:
+    conso_per_day = projet.alloc / projet.days
+    conso_per_day_2 = None
 
   theo_uses = np.array(
@@ -529 +541 @@
 
   plot_config(
-    fig, ax_conso, ax_theo, xcoord, dates, title, conso_per_day
+    fig, ax_conso, ax_theo, xcoord, dates, title, 
+    conso_per_day, conso_per_day_2
   )
 

TOOLS/ConsoGENCMIP6/bin/plot_jobs.py

@@ -211 +211 @@
 
 ########################################
-def plot_config(fig, ax, xcoord, dates, title, conso_per_day):
+def plot_config(
+  fig, ax, xcoord, dates, title, conso_per_day, conso_per_day_2
+):
   """
   """
@@ -242 +244 @@
   yticks = list(ax.get_yticks())
   yticks.append(conso_per_day)
+  if conso_per_day_2:
+    yticks.append(conso_per_day_2)
   ax.set_yticks(yticks)
 
   ax.axhline(y=conso_per_day, color="blue", alpha=0.5,
              label="conso journaliÚre idéale")
+
+  if conso_per_day_2:
+    ax.axhline(y=conso_per_day_2, color="blue", alpha=0.5)
 
   for x, d in zip(xcoord, dates):
@@ -407 +414 @@
         )
 
-  conso_per_day = projet.alloc / (projet.days * 24.)
+  if projet.project == "gencmip6":
+    alloc1 = 5.e6
+    alloc2 = projet.alloc - alloc1
+    conso_per_day   = 2 * alloc1 / (projet.days * 24.)
+    conso_per_day_2 = 2 * alloc2 / (projet.days * 24.)
+  else:
+    conso_per_day = projet.alloc / (projet.days * 24.)
+    conso_per_day_2 = None
 
   # .. Plot stuff ..
@@ -427 +441 @@
   )
 
-  plot_config(fig, ax, xcoord, dates, title, conso_per_day)
+  plot_config(
+    fig, ax, xcoord, dates, title, conso_per_day, conso_per_day_2
+  )
 
   # ... Save figure ...