Changeset 2850

Timestamp:

05/12/16 16:49:35 (8 years ago)

Author:

labetoulle

Message:

[consogencmip6] Change cpt parsing to reflect latest changes in ccc_myproject output

File:

• TOOLS/ConsoGENCMIP6/bin/conso_gencmip6.py (modified) (7 diffs)

TOOLS/ConsoGENCMIP6/bin/conso_gencmip6.py

@@ -75 +75 @@
     # Then extract script date
     for ligne in filein:
-      if project["name"] in ligne:
+      if "Accounting" in ligne and \
+          project["name"] in ligne:
         today = ligne.split()[-1]
         today = string_to_date(today)
@@ -82 +83 @@
         break
 
-    # Skip next two lines : first is blank and second is login titles
-    for _ in xrange(1):
-      next(filein)
-
-    # Login list, until blank line
-    for ligne in filein:
-      if not ligne.strip():
-        break
-      login, conso = ligne.split()
+    # Skip until we find login title line
+    for ligne in filein:
+      if "Login" in ligne:
+        if "Account" in ligne:
+          fg_account = True
+        else:
+          fg_account = False
+        break
+
+    # Login list, until Subtotal or blank line
+    for ligne in filein:
+      if not ligne.strip() or \
+         "Subtotal" in ligne:
+        break
+      if fg_account:
+        login, account, conso = ligne.split()
+      else:
+        login, conso = ligne.split()
       logins[login] = float(conso)
 
@@ -137 +147 @@
 
 ########################################
-def write_bilan(filename, today, total, ureal, utheo,
-                run_mean, pen_mean, run_std, pen_std):
+def write_bilan(
+  filename, today, total, ureal, utheo,
+  runp_mean, penp_mean, runp_std, penp_std,
+  runf_mean, penf_mean, runf_std, penf_std
+):
   """
   Conso totale par jour
@@ -146 +159 @@
   """
 
-  fmt_str = "{:10s} {:12s} {:11s} {:11s} {:13s} {:13s} {:13s} {:13s}\n"
+  fmt_str = (
+    "{:10s} {:12s} {:11s} {:11s} "
+    "{:14s} {:14s} {:14s} {:14s} "
+    "{:14s} {:14s} {:14s} {:14s} "
+    "\n"
+  )
 
   title_str = fmt_str.format(
@@ -153 +171 @@
     "real_use(%)",
     "theo_use(%)",
-    "running(core)",
-    "pending(core)",
-    "run_std(core)",
-    "pen_std(core)",
+    "runningP(core)",
+    "pendingP(core)",
+    "run_stdP(core)",
+    "pen_stdP(core)",
+    "runningF(core)",
+    "pendingF(core)",
+    "run_stdF(core)",
+    "pen_stdF(core)",
   )
 
   fmt_str = (
     "{:%Y-%m-%d} {:12.2f} {:11.2f} {:11.2f} "
-    "{:13.2f} {:13.2f} {:13.2f} {:13.2f}\n"
+    "{:14.2f} {:14.2f} {:14.2f} {:14.2f} "
+    "{:14.2f} {:14.2f} {:14.2f} {:14.2f} "
+    "\n"
   )
 
@@ -169 +193 @@
     ureal,
     utheo,
-    run_mean,
-    pen_mean,
-    run_std,
-    pen_std,
+    runp_mean,
+    penp_mean,
+    runp_std,
+    penp_std,
+    runf_mean,
+    penf_mean,
+    runf_std,
+    penf_std,
   )
 
@@ -434 +462 @@
     run_std,
     pen_std,
+    runf_mean,
+    penf_mean,
+    runf_std,
+    penf_std,
   )