Changeset 2450

Timestamp:

03/27/15 12:19:27 (9 years ago)

Author:

labetoulle

Message:

plot_jobs : default is now to plot the last three weeks instead of everything

Location:

TOOLS/ConsoGENCMIP6

Files:

• bin/plot_jobs.py (modified) (3 diffs)
• save/data (modified) (1 prop)

TOOLS/ConsoGENCMIP6/bin/plot_jobs.py

@@ -291 +291 @@
   # ------------------------------
   args = get_arguments()
-  if args.verbose:
-    print(args)
+
+  # ... Constants ...
+  # -----------------
+  WEEK_NB = 3
 
   # ... Turn interactive mode off ...
@@ -315 +317 @@
 
   img_name = "jobs"
-  today = os.path.basename(file_param).strip(OUT["PARAM"])
-  weeknum = string_to_date(today, fmt="%Y%m%d").isocalendar()[1]
+
+  today   = dt.datetime.today()
+  weeknum = today.isocalendar()[1]
 
   if args.verbose:
-    print(file_param)
-    print(file_utheo)
-    print(file_list)
-    print(img_name)
-    print(today)
+    fmt_str = "{:10s} : {}"
+    print(fmt_str.format("args", args))
+    print(fmt_str.format("today", today))
+    print(fmt_str.format("file_param", file_param))
+    print(fmt_str.format("file_utheo", file_utheo))
+    print(fmt_str.format("file_list", file_list))
+    print(fmt_str.format("img_name", img_name))
 
   # .. Get project info ..
@@ -355 +360 @@
     )
   else:
-    selected_items = bilan.get_items(args.inc)
+    # selected_items = bilan.get_items(args.inc)
+    range_end   = today
+    range_start = range_end + dt.timedelta(weeks=-WEEK_NB) - dt.timedelta(days=1)
+    selected_items = bilan.get_items_in_range(
+      range_start, range_end, args.inc
+    )
 
   # .. Compute data to be plotted ..

TOOLS/ConsoGENCMIP6/save/data

@@ -1 +1 @@
 OUT_*
-ccc_myproject.dat
+ccc_myproject.dat_*

@@ -1 +1 @@
 OUT_*
-ccc_myproject.dat
+ccc_myproject.dat_*

@@ -1 +1 @@
 OUT_*
-ccc_myproject.dat
+ccc_myproject.dat_*