Changeset 2428 for TOOLS

Timestamp:

03/02/15 18:10:22 (10 years ago)

Author:

labetoulle

Message:

• Process directory size without unit, => in bytes (from du -h)
• Typos

Location:

TOOLS/ConsoGENCMIP6/bin

Files:

• gencmip6.py (modified) (2 diffs)
• plot_login.py (modified) (1 diff)
• plot_store.py (modified) (1 diff)

TOOLS/ConsoGENCMIP6/bin/gencmip6.py

@@ -43 +43 @@
   """
   """
+  if unicode(x).isdecimal():
+    x = x + "o"
+
   (size, unit) = (float(x[:-1]), x[-1])
+
   return SizeUnit(size, unit)
 
@@ -213 +217 @@
     """
     """
-    prefixes = ["K", "M", "G", "T", "P", "H"]
+    prefixes = ["o", "K", "M", "G", "T", "P", "H"]
 
     if not self.size or \

TOOLS/ConsoGENCMIP6/bin/plot_login.py

@@ -256 +256 @@
   # ... Save figure ...
   # -------------------
-  plot_save(img_name, today, "Conso GENCMIP6 par login")
+  img_in  = os.path.join(DIR["PLOT"], "{}.pdf".format(img_name))
+  img_out = os.path.join(DIR["SAVEPLOT"],
+                         "{}_{}.pdf".format(img_name, today))
+
+  plot_save(img_in, img_out, "Conso GENCMIP6 par login")
 
   # ... Publish figure on dods ...
   # ------------------------------
   if args.dods:
-    dods_cp(os.path.join(DIR["PLOT"], img_name))
+    dods_cp(img_in)
 
   if args.show:

TOOLS/ConsoGENCMIP6/bin/plot_store.py

@@ -290 +290 @@
   # ... Save figure ...
   # -------------------
-  plot_save(img_name, today, "Occupation GENCMIP6 sur STORE par login")
+  img_in  = os.path.join(DIR["PLOT"], "{}.pdf".format(img_name))
+  img_out = os.path.join(DIR["SAVEPLOT"],
+                         "{}_{}.pdf".format(img_name, today))
+
+  plot_save(img_in, img_out, "Occupation GENCMIP6 sur STORE par login")
 
   # ... Publish figure on dods ...
   # ------------------------------
   if args.dods:
-    dods_cp(os.path.join(DIR["PLOT"], img_name))
+    dods_cp(img_in)
 
   if args.show: