Changeset 380

Timestamp:

Nov 14, 2011, 1:20:02 PM (13 years ago)

Author:

aslmd

Message:

PYTHON: added an operation cat (especially aimed at time series with multiple files, working well with wrfout files. updated meso.py with last gcm.py changes. added a tip in help to use regular expressions in option -f.

Location:

trunk/UTIL/PYTHON

Files:

• meso.py (modified) (5 diffs)
• myscript.py (modified) (2 diffs)
• planetoplot.py (modified) (3 diffs)

trunk/UTIL/PYTHON/meso.py

@@ -44 +44 @@
         vmaxtab = adjust_length (opt.vmax, zelen)
 
+
+    ################################
+    ### General check
+ 
+    if opt.fref is not None:
+       if opt.operat is None:
+          print "you must specify an operation when using a reference file"
+          exit()
+    if opt.operat in ["+","-"]:
+       if opt.fref is None:
+          print "you must specifiy a reference file when using inter-file operations"
+          exit()
+
+    interpref=False
+    if opt.fref is not None:
+       if opt.operat is not None:
+          if opt.itp is not None:
+             interpref=True
+
+    ################################
+
+
     print "file, length", opt.file, len(opt.file)
 
@@ -57 +79 @@
     for i in range(len(opt.file)):
 
-        zefile = opt.file[i]
-        print zefile    
+        zefiles = separatenames(opt.file[i])
+        print "zefiles", zefiles
+
+        #zefile = opt.file[i]
+        #print zefile    
+        zefile = zefiles[0]
+              
         #zelevel = opt.lvl   
         stralt = None
@@ -99 +126 @@
         else:               zerange = range(zelen) 
 
+
+
+
+
+
+
+
+        if interpref:
+           interpolated_ref=""
+           interpolated_ref=call_zrecast(interp_mode=opt.itp,\
+                    input_name=[opt.fref],\
+                    fields=zevars)
+
+           reffile=interpolated_ref[0]
+        else:
+           reffile=opt.fref
+# Divers ####################################################
+    
         zexaxis=[opt.xmin,opt.xmax]
         zeyaxis=[opt.ymin,opt.ymax]
@@ -116 +161 @@
             #############
             ### Main call
-            name = planetoplot (zefile,level=int(zelevel),vertmode=opt.itp,\
+            name = planetoplot (zefiles,level=int(zelevel),vertmode=opt.itp,\
                 proj=opt.proj,back=opt.back,target=opt.tgt,stride=opt.ste,var=argvar,\
                 numplot=opt.num,colorb=opt.clb,winds=opt.winds,\
@@ -126 +171 @@
                 slon=zeslon,slat=zeslat,svert=zesvert,stime=zestime,\
                 outputname=opt.out,resolution=opt.res,\
+                ope=opt.operat,fileref=reffile,minop=opt.vminope,maxop=opt.vmaxope,titleref=opt.titref,\
                 invert_y=opt.inverty,xaxis=zexaxis,yaxis=zeyaxis,ylog=opt.logy)
         print 'Done: '+name

trunk/UTIL/PYTHON/myscript.py

@@ -2 +2 @@
 
     ### I/O
-    parser.add_option('-f', '--file',   action='append',dest='file',     type="string",  default=None,  help='[NEEDED] filename (append). Comma-separated: same fig')
+    parser.add_option('-f', '--file',   action='append',dest='file',     type="string",  default=None,  help='[NEEDED] filename. Append: different figures. Comma-separated: same figure (+ possible --operation). Regex tip: -f `echo foo* | sed s+" "+","+g`')
     parser.add_option('-t', '--target', action='store',dest='tgt',       type="string",  default=None,  help='destination folder')
     parser.add_option('-S', '--save',   action='store',dest='save',      type="string",  default="gui", help='save mode (png,eps,svg,pdf or gui) [gui]')
@@ -52 +52 @@
 
     ### OPERATIONS BETWEEN FILES
-    parser.add_option('--operation',    action='store',dest='operat',  type="string",  default=None,  help='operation to perform between input file (ifile) and reference file (rfile) specified through --fref. Available: "+","-". Done as: ifile +or- rfile.')
+    parser.add_option('--operation',    action='store',dest='operat',  type="string",  default=None,  help='operation to perform on input files given through -f. "+" or "-" acts on each input file by adding or substracting the ref file specified through --fref. "cat" acts on all input files in-a-row.')
     parser.add_option('--fref',         action='store',dest='fref',    type="string",  default=None,  help='reference namefile for the --operation option.')
     parser.add_option('--mope',         action='store',dest='vminope', type="float",   default=0.,  help='bounding minimum value for inter-file operation')

trunk/UTIL/PYTHON/planetoplot.py

@@ -161 +161 @@
          basename = getname(var=var,winds=winds,anomaly=anomaly)
          basename = basename + getstralt(nc,level)  ## can be moved elsewhere for a more generic routine
-      
+
       print "var, var2: ", var, var2
       if var: all_var[k] = getfield(nc,var)
@@ -173 +173 @@
 
     ##################################
-    ### Load reference file if there is one
-    if fileref is not None:
-       ncref  = Dataset(fileref)
-       ### ... VAR
+    ### Operation on files
+    if ope is not None:
        if var not in nc.variables: var = False
        if var: 
-             all_var[k] = getfield(ncref,var)
-             if ope is "-":
-                all_var[k+1]= all_var[k-1] - all_var[k]
-             elif ope is "+":
-                all_var[k+1]= all_var[k-1] + all_var[k]
+             print ope
+             if ope in ["-","+"]:
+                if fileref is not None:   all_var[k] = getfield(Dataset(fileref),var)
+                else:                     errormess("fileref is missing!") 
+                if ope == "-":     all_var[k+1]= all_var[k-1] - all_var[k]
+                elif ope == "+":   all_var[k+1]= all_var[k-1] + all_var[k]
+                numplot = numplot+2
+             elif ope in ["cat"]:
+                tab = all_var[0];k = 0
+                while k != len(namefiles)-1: 
+                    tab = np.append(tab,all_var[k],axis=0)
+                    k += 1
+                time = np.arange(0,len(tab),1) ### AS: time reference is simple, should be better
+                all_var[0] = np.array(tab);numplot = 1
              elif ope is not None:
-                print "non-implemented operation. Available op. are + and -."
-             numplot = numplot+2
+                errormess(ope+" : non-implemented operation. Available op. are + and -.")
 
     ##################################
@@ -195 +201 @@
     #################################
     ### Time loop for plotting device
-    found_lct = False
-    nplot = 1
-    itime = first
-    error = False
+    found_lct = False;nplot = 1;itime = first;error = False
     if itstep is None and numplot > 0: itstep = int(24./numplot)
     elif numplot <= 0:                 itstep = 1