Changeset 406

Timestamp:

Nov 22, 2011, 10:50:50 AM (13 years ago)

Author:

aslmd

Message:

GRAPHICS: time in the graph loop is now all_time[index_f]. convenient for multiple diagfi with different month length. also fixed something with ltst that is only useful for mesoscale, before a solution is found for GCM files.

File:

• trunk/UTIL/PYTHON/planetoplot.py (modified) (4 diffs)

trunk/UTIL/PYTHON/planetoplot.py

@@ -96 +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) 
-    else:                         all_var  = [[]]*zelen     ;  all_var2  = [[]]*zelen ;  all_title = [[]]*zelen ;  all_varname = [[]]*zelen ; all_namefile = [[]]*zelen
+    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
  
     #################################################################################################
@@ -175 +175 @@
       all_varname[k] = varname
       all_namefile[k] = namefile
+      all_time[k] = time
       if var2: all_var2[k] = getfield(nc,var2)
       ##### SPECIFIC
@@ -224 +225 @@
        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]) )
@@ -259 +262 @@
        else:
            indextime = getsindex(stime,((nplot-1)//(nlon*nlat*nvert))%ntime,time)
-           if indextime is not None: ltst = localtime ( interv[0]+indextime*interv[1], 0.5*(wlon[0]+wlon[1]) )  
+           if typefile in ['mesoapi','meso'] and indextime is not None:  ltst = localtime ( interv[0]+indextime*interv[1], 0.5*(wlon[0]+wlon[1]) )  
 
        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