Changeset 422

Timestamp:

Nov 24, 2011, 6:49:00 PM (13 years ago)

Author:

aslmd

Message:

GRAPHICS: operations were broken by introducing all_time, fixed. also added operations on two variables through keywords add_var sub_var mul_var div_var. can work on more variables but since this could be cumbersome I just left an exit message when more than two variables are asked.

Location:

trunk/UTIL/PYTHON

Files:

• myplot.py (modified) (1 diff)
• myscript.py (modified) (1 diff)
• planetoplot.py (modified) (6 diffs)

trunk/UTIL/PYTHON/myplot.py

@@ -73 +73 @@
     import numpy as np
     from mymath import max,mean
-    csmooth = 12 ## a fair amount of grid points
+    csmooth = 12 ## a fair amount of grid points (too high results in high computation time)
     dimension = np.array(input).ndim
     shape = np.array(input).shape

trunk/UTIL/PYTHON/myscript.py

@@ -56 +56 @@
 
     ### OPERATIONS BETWEEN FILES
-    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('--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. "add_var" "sub_var" "mul_var" "div_var" acts on two variables.')
     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

@@ -81 +81 @@
     if not isinstance(namefiles, np.ndarray): namefiles = [namefiles]
     if not isinstance(var, np.ndarray):       var = [var]
-    if ope is not None and len(var) > 1:      errormess("you are using an operation... please set only one var !")
 
     ################################
@@ -97 +96 @@
     print "********** FILES, SLICES, VARS, TOTAL PLOTS: ", len(namefiles), nslices, len(var), numplot
     print "********** MAPMODE: ", mapmode
-    if fileref is not None:       all_var  = [[]]*(zelen+2) ;  all_varname = [[]]*(zelen+2)  ;  all_namefile = [[]]*(zelen+2) ; all_time = [[]]*(zelen+2)
-    else:                         all_var  = [[]]*zelen     ;  all_var2  = [[]]*zelen ;  all_title = [[]]*zelen ;  all_varname = [[]]*zelen ; all_namefile = [[]]*zelen ; all_time = [[]]*zelen
+    if fileref is not None:       zelen = zelen + 2
+    elif "var" in ope:            zelen = zelen + 1
+    all_var  = [[]]*zelen ; all_var2  = [[]]*zelen ; all_title = [[]]*zelen ; all_varname = [[]]*zelen ; all_namefile = [[]]*zelen ; all_time = [[]]*zelen
  
     #################################################################################################
@@ -194 +194 @@
     ##################################
     ### Operation on files
-    ### ... for the moment only OK when 1 var only
     if ope is not None:
-             print ope
+        print ope
+        if "var" not in ope:
+             if len(var) > 1: errormess("for this operation... please set only one var !")
              if ope in ["-","+"]:
-                if fileref is not None:   all_var[k] = getfield(Dataset(fileref),all_varname[k-1]) ; all_varname[k] = all_varname[k-1]
+                if fileref is not None:   all_var[k] = getfield(Dataset(fileref),all_varname[k-1]) ; all_varname[k] = all_varname[k-1] ; all_time[k] = all_time[k-1] ; all_namefile[k] = all_namefile[k-1]
                 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]
-                all_varname[k+1] = all_varname[k] ; numplot = numplot+2
+                all_varname[k+1] = all_varname[k] ; all_time[k+1] = all_time[k] ; all_namefile[k+1] = all_namefile[k] ; numplot = numplot+2
              elif ope in ["cat"]:
                 tab = all_var[0];k = 1
                 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 too simplistic, should be better
+                all_time[0] = np.arange(0,len(tab),1) ### AS: time reference is too simplistic, should be better
                 all_var[0] = np.array(tab) ; numplot = 1
-             elif ope is not None:
-                errormess(ope+" : non-implemented operation. Available op. are + and -.")
+             else: errormess(ope+" : non-implemented operation. Check pp.py --help")
+        else:
+             if len(namefiles) > 1: errormess("for this operation... please set only one file !")  
+             if len(var) > 2:       errormess("not sure this works for more than 2 vars... please check.")
+             if   ope in ["div_var"]: all_var[k] = all_var[k-2] / all_var[k-1] ; insert = '_div_'
+             elif ope in ["mul_var"]: all_var[k] = all_var[k-2] * all_var[k-1] ; insert = '_mul_'
+             elif ope in ["add_var"]: all_var[k] = all_var[k-2] + all_var[k-1] ; insert = '_add_'
+             elif ope in ["sub_var"]: all_var[k] = all_var[k-2] - all_var[k-1] ; insert = '_sub_'
+             else:                    errormess(ope+" : non-implemented operation. Check pp.py --help")
+             numplot = numplot + 1 ; all_time[k] = all_time[k-1] ; all_namefile[k] = all_namefile[k-1]
+             all_varname[k] = all_varname[k-2] + insert + all_varname[k-1] 
 
     ##################################
@@ -225 +235 @@
     while error is False:
        print "********** nplot", nplot, "itime",itime,"error",error
-       
-#       time = all_time[index_f]
-
+      
        ### Which local time ?
        ltst = localtime ( interv[0]+itime*interv[1], 0.5*(wlon[0]+wlon[1]) )
@@ -258 +266 @@
        indexvert = getsindex(svert,((nplot-1)//(nlon*nlat))%nvert,vert) 
 
-       if fileref is not None:      index_f = ((nplot-1)//(nlon*nlat*nvert*ntime))%(len(namefiles)+2)  ## OK only 1 var, see test in the beginning
+       if fileref is not None:      index_f = ((nplot-1)//(nlon*nlat*nvert*ntime))%(len(namefiles)+2)  ## OK only 1 var,  see test in the beginning
+       elif "var" in ope:           index_f = ((nplot-1)//(nlon*nlat*nvert*ntime))%(len(var)+1)        ## OK only 1 file, see test in the beginning
        else:                        yeah = len(namefiles)*len(var) ; index_f = ((nplot-1)//(nlon*nlat*nvert*ntime))%yeah
        time = all_time[index_f]
@@ -268 +277 @@
            indextime = getsindex(stime,((nplot-1)//(nlon*nlat*nvert))%ntime,time)
            if typefile in ['mesoapi','meso'] and indextime is not None:  ltst = localtime ( interv[0]+indextime*interv[1], 0.5*(wlon[0]+wlon[1]) )  
-
 ####################################################################