Changeset 1039 in lmdz_wrf for trunk

Timestamp:

Aug 21, 2016, 10:06:35 PM (9 years ago)

Author:

lfita

Message:

Working version up to the drawing of both differences: op, var

Location:

trunk/tools

Files:

• model_graphics.py (modified) (37 diffs)
• model_graphics_template.dat (modified) (5 diffs)

trunk/tools/model_graphics.py

@@ -20 +20 @@
 warnmsg = ncvar.warnmsg
 
+def verify_configuration(ExpConf, debug):
+    """ Function to verify mandatory keys from experiment configuration
+      ExpConf= dictionary with the configuration
+    """
+    fname = 'verify_configuration'
+ 
+    # List with the mandatory keys
+    mandatorykeys = ['pyHOME', 'cdoHOME', 'scratch', 'filescratch', 'figscratch',    \
+      'diffscratch', 'figdiffscratch', 'addfiles', 'addfigures', 'adddiffs',         \
+      'debug', 'models', 'ifold', 'ofold', 'warnmsg', 'errmsg', 'titleoperations',   \
+      'kindfig', 'CFreftime', 'CFunitstime', 'mapval', 'timekind', 'timefmt',        \
+      'timelabel' ]
+
+    # List with the optional keys
+    optionalkeys = ['specificvarplot', 'specificdiffopplot', 'specificdiffvarplot']
+
+    # Dictionary with the mandatory keys which are required as function of a given value from the dictionary
+    ifkeys = {'WRFexps': ['models','WRF'], 'LMDZexps': ['models','LMDZ'],            \
+      'WRF_LMDZexps': ['models','WRF_LMDZ'], 'WRFheaders': ['models','WRF'],         \
+      'WRF_LMDZheaders': ['models','WRF_LMDZ'], 'LMDZheaders': ['models','LMDZ']}
+
+    for kdict in mandatorykeys:
+        if not ExpConf.has_key(kdict):
+            print errmsg
+            print '  ' + fname + "' configuration without required '" + kdict + "' !!"
+            quit(-1)
+        if debug:
+            print ExpConf[kdict]
+
+    for kdict in ifkeys.keys():
+        vals = ifkeys[kdict]
+        keyn = vals[0]
+        keyv = vals[1]
+        if type(ExpConf[keyn]) == type('A'):
+            if not ExpConf.has_key(kdict) and ExpConf[keyn] == keyv:
+                print errmsg
+                print '  ' + fname + "' configuration without '" + kdict +           \
+                  "' when it is required with configuration '" + keyn + '=' + keyv + \
+                  "' !!"
+                quit(-1)
+        elif type(ExpConf[keyn]) == type(['A', 'B']):
+            keyvals = ExpConf[keyn]
+            if not ExpConf.has_key(kdict) and gen.searchInlist(keyvals, keyv):
+                print errmsg
+                print '  ' + fname + "' configuration without '" + kdict +           \
+                  "' when it is required with configuration '" + keyn + '= [..., ' + \
+                 keyv + ", ...]' !!"
+                quit(-1)
+        else:
+            print errmsg
+            print '  ' +fname+ 'dictionary type ', type(ExpConf[keyn]), ' not ready!!'
+            quit(-1)
+        if debug:
+            print ExpConf[kdict]
+
+    print fname + ': configuration seems to be fine'
+
+    return
+
 def scratches(config):
     """ Function to set-up if it is needed to start from the scratch
@@ -34 +93 @@
         figscr = True
         difscr = True
+        figdifscr = True
         tim.sleep(10)
     else:
@@ -64 +124 @@
             difscr = False
 
+        if config['figdiffscratch'] == 'true':
+            figdifscr = True
+            print warnmsg
+            print "  " + main + ": figures differences starting from the SCRATCH !!"
+            print "    5 seconds left!!"
+            tim.sleep(5)
+        else:
+            figdifscr = False
+
     if config['addfiles'] == 'true':
         addfils = True
@@ -84 +153 @@
         debug = False
 
-    return scr, filescr, figscr, difscr, addfils, addfigs, adddiffs, debug
+    return scr, filescr, figscr, difscr, figdifscr, addfils, addfigs, adddiffs, debug
 
 def exp_headers(mod,config):
@@ -144 +213 @@
                 vmod, vdiag = ncvar.computevar_model(var, idir + '/' + filen)
         except:
+            print errmsg
             print 'ncvar.computevar_model(' + var + ', ' + idir + '/' + filen + ')'
             for sout in output: print sout
@@ -516 +586 @@
                           shell=True)
                 except:
+                    print errmsg
                     print 'python ' + pyH + '/diagnostics.py ' + values
                     for sout in output: print sout
@@ -541 +612 @@
                             ncvar.fvaradd(idir+'/'+cf+','+rqv,ifilen)
                     except:
+                        print errmsg
                         print 'fvaradd('+idir+'/'+cf+','+rqv+','+ifilen+')'
                         for sout in output: print sout
@@ -566 +638 @@
                   SgP+'_,-,.nc', 'all')
         except:
+            print errmsg
             print 'netcdf_fold_concatenation_HMT(./time, '+CFvarn+'_'+headerf+SgP+   \
               '_,-,.nc, all)'
@@ -739 +812 @@
                         ncvar.DataSetSection(vals,prevfile)
                 except:
+                    print errmsg
                     print 'DataSetSection('+vals+',', prevfile, ')'
                     for sout in output: print sout
@@ -784 +858 @@
                         ncvar.pinterp(vals,prevfile,vninF)
                 except:
+                    print errmsg
                     print 'pinterp('+vals+',', prevfile, ','+vninF+')'
                     for sout in output: print sout
@@ -818 +893 @@
                         ncvar.file_oper_alongdims(vals,prevfile,CFvarnp)
                 except:
+                    print errmsg
                     print 'file_oper_alongdims('+vals+',', prevfile, ','+CFvarnp+')'
                     for sout in output: print sout
@@ -863 +939 @@
                         ncvar.file_oper_alongdims(vals,prevfile,CFvarnp)
                 except:
+                    print errmsg
                     print 'file_oper_alongdims('+vals+',', prevfile, ','+CFvarnp+')'
                     for sout in output: print sout
@@ -890 +967 @@
                         ncvar.file_oper_alongdims(vals,prevfile,CFvarnp)
                 except:
+                    print errmsg
                     print 'file_oper_alongdims('+vals+',', prevfile, ','+CFvarnp+')'
                     for sout in output: print sout
@@ -940 +1018 @@
                     varinfile = ncvar.ivars(fileon)
             except:
+                print errmsg
                 print 'ivars('+fileon+')'
                 for sout in output: print sout
@@ -952 +1031 @@
                             ncvar.fvaradd(prevfile+','+CFvn, fileon)
                     except:
+                        print errmsg
                         print 'fvaradd(', prevfile, ','+CFvn+','+fileon+')'
                         for sout in output: print sout
@@ -964 +1044 @@
                     oclean = ncvar.cleaning_varsfile(totalvarkeeps,fileon)
             except:
+                print errmsg
                 print 'cleaning_varsfile('+totalvarkeeps+','+fileon+')'
                 for sout in output: print sout
@@ -1103 +1184 @@
     return doplots, plotsvar, indivplotsvar, varplotp
 
-def plots_listconstruct(config, odir, debug):
+def plots_listconstruct(config, pkind, finf, odir, debug):
     """ Function to create the list of plots to draw
       config= Configuration of the experiment
+      pkind= kind of plots ('DIRPLT', 'DIFFPLT')
+      finf= file with the instructions of the plots 
       odir= output experiment folder
     """
     fname='plots_listconstruct'
   
-    dirplot = gen.get_specdictionary_HMT(config, H='DIRPLT_')
+    dirplot = gen.get_specdictionary_HMT(config, H=pkind+'_')
 
     if debug:
-        print '  direct plots to draw ________'
+        print "  '" + pkind + "' plots to draw ________"
         gen.printing_dictionary(dirplot)
 
     # Getting plots by variable
-    plots, varplot, indivarplot, plotp = get_plots_var(dirplot,'DIRPLT_',debug)    
+    plots, varplot, indivarplot, plotp = get_plots_var(dirplot, pkind+'_', debug)
 
     Svarplot = gen.dictKeysVals_stringList(plots,cV=':')
@@ -1126 +1209 @@
 
     # Outwritting the varcompute to avoid next time (if it is not filescratch!)
-    objf = open(odir + '/directplotsdraw.inf', 'w')
+    objf = open(finf, 'w')
     objf.write('plots: ' + Svarplot + '\n')
     objf.write('itotp: ' + str(Nplots) + '\n')
@@ -1272 +1355 @@
                     sout0 = sub.call(plotins, shell=True)
             except:
+                print errmsg
                 print drwins + '(' + graphvals + ',' + figfs + ',' + fvarS + ')'
                 print sout0
@@ -1330 +1414 @@
                     sout0 = sub.call(plotins, shell=True)
             except:
+                print errmsg
                 print drwins + '(' + graphvals + ',' + figfs + ',' + fvarS + ')'
-                print sout0
                 for sout in output: print sout
                 quit(-1)
@@ -1388 +1472 @@
                     sout0 = sub.call(plotins, shell=True)
             except:
+                print errmsg
                 print drwins + '(' + graphvals + ',' + figfs + ',' + fvarS + ')'
-                print sout0
                 for sout in output: print sout
                 quit(-1)
@@ -1461 +1545 @@
 
     # Dictionary of plot specificities
-    #   [minval]: minimum value
-    #   [maxval]: minimum value
-    #   [colorbar]: name of the colorbar (from matplotlib) to use
-    #   [cntformat]: format of the contour labels
-    #   [colorcnt]: color for the countor lines
+    specplotkeyn = 'specificvarplot'
     plotspecifics = {}
-    plotspecs = config['specificvarplot'].split(':')
-    for pltspc in plotspecs:
-        pltvls = pltspc.split('|')
-        vn = pltvls[0]
-        op = pltvls[1]
-        fn = pltvls[2]
-        plotspecifics[fn + '_' + vn + '_' + op] = pltvls[3:]
-    if debug:
-        print 'Specific values for plots _______'
-        gen.printing_dictionary(plotspecifics)
+    if config.has_key(specplotkeyn):
+        #   [minval]: minimum value
+        #   [maxval]: minimum value
+        #   [colorbar]: name of the colorbar (from matplotlib) to use
+        #   [cntformat]: format of the contour labels
+        #   [colorcnt]: color for the countor lines
+        plotspecs = config[specplotkeyn].split(':')
+        for pltspc in plotspecs:
+            pltvls = pltspc.split('|')
+            vn = pltvls[0]
+            op = pltvls[1]
+            fn = pltvls[2]
+            plotspecifics[fn + '_' + vn + '_' + op] = pltvls[3:]
+        if debug:
+            print 'Specific values for plots _______'
+            gen.printing_dictionary(plotspecifics)
 
     # Kind of figures
@@ -1556 +1642 @@
                         dims = ncvar.idims(filen)
                 except:
+                    print errmsg
                     print 'ncvar.idims('+filen+')'
                     for sout in output: print sout
@@ -1934 +2021 @@
     # CF dimension-variables name
     OpersS = '+'.join(Opers)
-    if OpersS.find('pinterp') != -1:
+    if OpersS.find('pinterp') != -1 or filen.find('pinterp') != -1:
         varnCFs = ['lon', 'lat', 'pres', 'time']
     else:
@@ -2009 +2096 @@
                         ncvar.DataSetSection(vals,prevfile)
                 except:
+                    print errmsg
                     print 'DataSetSection('+vals+',', prevfile, ')'
                     for sout in output: print sout
@@ -2057 +2145 @@
                         ncvar.file_oper_alongdims(vals,prevfile,CFvarnp)
                 except:
+                    print errmsg
                     print 'file_oper_alongdims('+vals+',', prevfile, ','+CFvarnp+')'
                     for sout in output: print sout
@@ -2102 +2191 @@
                         ncvar.file_oper_alongdims(vals,prevfile,CFvarnp)
                 except:
+                    print errmsg
                     print 'file_oper_alongdims('+vals+',', prevfile, ','+CFvarnp+')'
                     for sout in output: print sout
@@ -2129 +2219 @@
                         ncvar.file_oper_alongdims(vals,prevfile,CFvarnp)
                 except:
+                    print errmsg
                     print 'file_oper_alongdims('+vals+',', prevfile, ','+CFvarnp+')'
                     for sout in output: print sout
@@ -2179 +2270 @@
                     varinfile = ncvar.ivars(fileon)
             except:
+                print errmsg
                 print 'ivars('+fileon+')'
                 for sout in output: print sout
@@ -2191 +2283 @@
                             ncvar.fvaradd(prevfile+','+CFvn, fileon)
                     except:
+                        print errmsg
                         print 'fvaradd(', prevfile, ','+CFvn+','+fileon+')'
                         for sout in output: print sout
@@ -2203 +2296 @@
                     oclean = ncvar.cleaning_varsfile(totalvarkeeps,fileon)
             except:
+                print errmsg
                 print 'cleaning_varsfile('+totalvarkeeps+','+fileon+')'
                 for sout in output: print sout
@@ -2332 +2426 @@
     return
 
+
+def draw_diff_plots(config, plots, odir, allvarcomp, kdiff, figscr, debug):
+    """ Function to draw all plots
+      config= Configuration of the experiment
+      plots= dictionary with the plots
+      odir= output experiment folder
+      allvarcomp= dictionary with all the variables to compute and their information
+      kdiff= kind of differences:
+        'diffop': plots from operation differences
+        'diffvar': plots from variable differences
+      figscr= whether figures should be done from the scratch or not
+
+    * Plot as 
+      {[kplot]} = [varn1]|[op1]#[varn2]|[op2]#[...[varnN]|[opN]], ...
+        [kplot] ___ 
+          diffmap2Dsfc: 2D map of surface differences values of 1 variable
+          diffmap2Dz: 2D map of 3D differences values of 1 variable
+          map2Dsfc: 2D map of surface values of 1 variable
+          map3D: 2D map of 3D values of 1 variable
+          shadconthovmsfc: Hovmoeller diagrams of 2 variable at the surface in shadow and the other in contourn
+          shadcont2Dsfc: 2D map of shadow (1st variable) and countour (2nd variable) [stvar1]#[stvar2]
+          shadcont2Dzsec: 2D map of vertical section of 2 variables one in shadow and the other in contourn
+        [varn] 
+          variable
+        [op]
+          '+' separated list of operations
+        in figures with more than 1 variable, use '#' to separate the [varn]|[op]
+    """ 
+    fname = 'draw_diff_plots'
+
+    os.chdir(odir)
+
+    # Dictionary with the operations with surnames for the operated variable
+    opersurnames = {}
+    opsur = gen.get_specdictionary_HMT(config, H='opsur_',M='',T='')
+    for opsr in opsur.keys():
+        opn = opsr.split('_')[1]
+        vls = opsur[opsr].split(':')
+        opersurnames[opn] = vls
+
+    # time values
+    # Units time for the plots
+    rd = config['CFreftime']
+    tunits = config['CFunitstime'] + '!since!' + rd[0:4] + '-' + rd[4:6] + '-' +  \
+      rd[6:8] + '!' + rd[8:10] + ':' + rd[10:12] + ':' + rd[12:14]
+    # time ticks kind
+    tkind = config['timekind']
+    # time ticks format
+    tfmt = config['timefmt']
+    # time axis label
+    tlab = config['timelabel']
+    timevals = [tunits, tkind, tfmt, tlab]
+
+    if kdiff == 'diffop':
+         specplotkeyn = 'specificdiffopplot'
+    elif kdiff == 'diffvar':
+         specplotkeyn = 'specificdiffvarplot'
+    else:
+         print errmsg
+         print '  ' + fname + ": differences kind '" + kdiff + "' not ready !!"
+         quit(-1)
+
+    # Dictionary of plot specificities
+    plotspecifics = {}
+    if config.has_key(specplotkeyn):
+        #   [minval]: minimum value
+        #   [maxval]: minimum value
+        #   [colorbar]: name of the colorbar (from matplotlib) to use
+        #   [cntformat]: format of the contour labels
+        #   [colorcnt]: color for the countor lines
+        plotspecs = config[specplotkeyn].split(':')
+        for pltspc in plotspecs:
+            pltvls = pltspc.split('|')
+            vn = pltvls[0]
+            op = pltvls[1]
+            fn = pltvls[2]
+            plotspecifics[fn + '_' + vn + '_' + op] = pltvls[3:]
+        if debug:
+            print 'Specific values for plots _______'
+            gen.printing_dictionary(plotspecifics)
+
+    # Kind of figures
+    kindfigure = config['kindfig']
+
+    # Map value
+    mapvalue = config['mapval']
+
+    # pythone scripts HOME
+    pyHOME = config['pyHOME']
+
+    # Title-text of operations
+    opexplained = {}
+    optits = config['titleoperations'].split(':')
+    for optit in optits:
+        opn = optit.split('|')[0]
+        opt = optit.split('|')[1]
+        opexplained[opn] = opt
+    if debug:
+        print 'Titles for operations  _______'
+        gen.printing_dictionary(opexplained)
+
+    for kplot in plots.keys():
+        varsplt = plots[kplot]
+        for varplt in varsplt:
+            if debug:
+                print "  printing '" + kplot + "' var ':" + varplt + "'..."
+            varops = varplt.split('#')
+
+            # CF variables in plot
+            CFvarsplot = []
+            # Files in plot
+            filesplot = []
+            # Variables in plot within the files
+            varsplot = []
+            # Dims in figure
+            dimsplot = []
+            # pictoric values in figure
+            pictplot = []
+            # Name of the figure
+            figname = ''
+            # Title of the figure
+            titfigure = ''
+
+            ivp = 0
+            for varop in varops:
+                vn = varop.split('|')[0]
+                op = varop.split('|')[1]
+
+                # CF variables in plot
+                CFvarsplot.append(vn)
+ 
+                vnopS = vn + '_' + op
+                if not allvarcomp.has_key(vnopS):
+                    print errmsg
+                    print '  ' + fname + ": no file for variable-operation '" +     \
+                      vnopS + "' !!"
+                vopvals = allvarcomp[vnopS]
+                mod1 = vopvals[0]
+                mod2 = vopvals[1]
+                mod3 = vopvals[2]
+                mod4 = vopvals[3]
+                headf = vopvals[4]
+
+                modexpdiff = mod2 + '/' + exp2 + ' - ' + mod1 + '/' + exp1
+                modexpdiffS = mod2 + '-' + exp2 + '_' + mod1 + '-' + exp1
+
+                difffilen = odir + '/' + vn + '_' + kdiff + '_' + modexpdiffS +      \
+                  '_' + op.replace('+','_') + '.nc'
+
+                filesplot.append(difffilen)
+                # Do we have processed the given difference?
+                if not os.path.isfile(difffilen):
+                    print warnmsg
+                    print "  " + fname + ": there is no file for '" + kdiff +        \
+                      "' difference '" + varop + "' skiping it !!"
+                    break
+
+                # Name of the variable inside the file
+                vnsur = varnoper(vn, op, opersurnames)
+                varsplot.append(vnsur)
+
+                # Dimensions in file
+                try:
+                    with gen.Capturing() as output:
+                        dims = ncvar.idims(difffilen)
+                except:
+                    print errmsg
+                    print 'ncvar.idims('+difffilen+')'
+                    for sout in output: print sout
+                    quit(-1)
+
+                dimsplot.append(dims)
+
+                # pictoric values for the figure
+                Sfivaop = kplot + '_' + vn + '_' + op
+                if plotspecifics.has_key(Sfivaop):
+                    pictvals = plotspecifics[Sfivaop]
+                else:
+                    Vvals = gen.variables_values(vn)
+                    pictvals = [Vvals[2], Vvals[3], Vvals[6], '%g', 'black']
+
+                pictplot.append(pictvals)
+
+                # Header of the name of the figure
+                if ivp == 0:
+                    figname = kplot + '_' + vn + '_' + kdiff + '_' + modexpdiffS +   \
+                      '_' + op.replace('+','-')
+                else:
+                    figname = figname + '-' + vn + '_' + op.replace('+','-')
+
+                # Title of the figure:
+                if mod1 == mod2:
+                    modexptit = mod1 + '!' + exp2 + '-' + exp1
+                else:
+                    modexptit = modexpdiff
+
+                if ivp == 0:
+                    titfigure = modexptit + "!" + kdiff + "!'" + vn + "'"
+                    vnS = vn
+                else:
+                    titfigure = titfigure + "!&!'" + vn + "'"
+                    vnS = vnS + '!&!' + vn
+
+                opvals = op.split('+')
+                for op1 in opvals:
+                    if not opexplained.has_key(op1):
+                        print errormsg
+                        print '  '+fname+": no explanation for operation '"+op1+"' !!"
+                        print '    provided:', opexplained.keys()
+                        quit(-1)
+                    if op1 == opvals[0]:
+                        titfigure = titfigure + '$_{[' + opexplained[op1]
+                        if len(opvals) == 1: titfigure = titfigure + ']}$'
+                    elif op1 == opvals[len(opvals)-1]:
+                        titfigure = titfigure + '\!' + opexplained[op1] + ']}$'
+                    else:
+                        titfigure = titfigure + '\!' + opexplained[op1]
+
+                ivp = ivp + 1
+            # End of variable-operation
+            figname = figname + '.' + kindfigure
+
+            if len(titfigure) > 80:
+                print warnmsg
+                print ' ' + fname + ": figure title '" + titfigure.replace('!', ' ')+\
+                  "' larger than 80 characters (actually", len(titfigure), ') !!'
+                print "  simplifying it to '" + modexptit.replace('!',' ') + '!' +   \
+                  kdiff + '!' + vnS + "'"
+                titfigure = modexptit.replace(' ','!') + '!' + kdiff + '!' + vnS
+
+            draw_plot(kplot, CFvarsplot, filesplot, varsplot, dimsplot, pictplot,    \
+              figname, titfigure, kindfigure, mapvalue, timevals, odir, pyHOME,      \
+              figscr, debug)
+
+        # End of variables-operations
+
+    # End of kind of plots
+
+    return
+
 # Files with information about the configuration of the script
 inffiles = ['varcompute.inf', 'all_computevars.inf', 'all_statsvars.inf']
@@ -2342 +2676 @@
 cnf = gen.get_configuration('model_graphics.dat', False)
 
+verify_configuration(cnf, gen.Str_Bool(cnf['debug']))
+
 # scratches
-scratch, filescratch, figscratch, diffscratch, addfiles, addfigures, adddiffs, dbg = scratches(cnf)
+scratch, filescratch, figscratch, diffscratch, figdiffscratch, addfiles, addfigures, \
+  adddiffs, dbg = scratches(cnf)
 
 # Getting models
@@ -2483 +2820 @@
 
         if not os.path.isfile(dirfigf):
-            listplots, Nplt = plots_listconstruct(cnf, owdir, dbg)
+            listplots, Nplt = plots_listconstruct(cnf, 'DIRPLT', dirfigf, owdir, dbg)
         else:
             print warnmsg
@@ -2519 +2856 @@
     for exp1 in exps[0:Nexps-1]:
         for exp2 in exps[1:Nexps]:
-            print '  ' + exp2 + '-' + exp1 + '...'
+            Sexps = exp2 + '-' + exp1
+            print '  ' + Sexps + '...'
             owdir = cnf['ofold'] + '/' + mod + '/' + exp2 + '-' + exp1
             sout = sub.call('mkdir -p ' + owdir, shell=True)
@@ -2534 +2872 @@
                     objf.close()
                     difff = owdir + '/all_vardiffstatistics.inf'
-                    sub.call('rm ' +  +' >& /dev/null', shell=True)
+                    sub.call('rm ' + difff +' >& /dev/null', shell=True)
                     objf = open(owdir+'/all_' + fdiff,'w')
                     objf.write("## Computation of all differences statistics " +     \
@@ -2572 +2910 @@
         compute_var_diffs(cnf, alldiffvar, owdir, diffscratch, dbg)
 
+# Plotting operation differences
+##
+        print "  " + main + ": Plotting operation differences' figures ..."
+        dirfigf = owdir + '/diffopplotsdraw.inf'
+        if figscratch:
+            sout = sub.call('rm ' + dirfigf + ' >& /dev/null', shell=True)
+
+            objf = open(owdir+'/all_diffopfigures.inf','w')
+            objf.write("## Drawing of all operation difference figures \n")
+            objf.close()
+
+        if addfigures:
+            sout = sub.call('rm ' + dirfigf + ' >& /dev/null', shell=True)
+
+        if not os.path.isfile(dirfigf):
+            listplots, Nplt = plots_listconstruct(cnf, 'PLOTDIFFOP', dirfigf, owdir, \
+              dbg)
+        else:
+            print warnmsg
+            print '  ' + main + ": getting plots to draw already from file !!"
+            listplots, Nplt = read_plot_file(dirfigf)
+
+        # End of avoiding to repeat all the plots search
+
+        print "  For experiment 'operation' differences '" + Sexps + "' is " +       \
+          "required to plot:" , Nplt, "plots"
+
+        if dbg:
+            print 'Plots to draw _______'
+            gen.printing_dictionary(listplots)
+
+        draw_diff_plots(cnf, listplots, owdir, alldiffop, 'diffop', figdiffscratch,  \
+          dbg)
+        draw_diff_plots(cnf, listplots, owdir, alldiffvar, 'diffvar', figdiffscratch,\
+          dbg)
+
     quit()
 # end of mods loop

trunk/tools/model_graphics_template.dat

@@ -32 +32 @@
 diffscratch = false
 
+# Scratch difference figures: should be any figures previous work removed and start from the scratch?
+figdiffscratch = false
+
 # Have new files been added and do they need to be processed?
 addfiles = false
@@ -42 +45 @@
 
 # Debug
-debug = true
+debug = false
 
 # Folder with the files
@@ -160 +163 @@
 
 DIRPLT_shadcont2Dsfc = uas|last#vas|last:hfls|last#hfss|last
-DIRPLT_shadconthovmsfc = hfls|xmean#hfss|last
+DIRPLT_shadconthovmsfc = hfls|xmean#hfss|xmean
 DIRPLT_shadcont2Dzsec = ua|pinterp+tmean+xmean#va|pinterp+tmean+xmean
 
@@ -167 +170 @@
 #pltshadcont2Dzsec = ua|pinterp@last@xmean#va|pinterp@last@xmean:hur|pinterp@last@xmean#ta|pinterp@last@xmean:ws|pinterp@turb@xmean#hus|pinterp@turb@xmean
 
-pltdiffshadcont2Dsfc = tas|tmean#wss|tmean:wss|last#tas|last
-pltdiffshadconthovmsfc = wss|xmean#tas|xmean
-pltdiffshadcont2Dzsec = ua|pinterp@last@xmean#va|pinterp@last@xmean
+PLOTDIFFOP_shadcont2Dsfc = hfls|last#hfss|last:hfss|tmean#hfls|tmean
+PLOTDIFFOP_shadconthovmsfc = uas|xmean#vas|xmean
+PLOTDIFFOP_shadcont2Dzsec = ua|pinterp+tmean+xmean#va|pinterp+tmean+xmean
+
+PLOTDIFFVAR_shadcont2Dsfc = hfls|last#hfss|last:hfss|tmean#hfls|tmean
+PLOTDIFFVAR_shadconthovmsfc = uas|xmean#vas|xmean
+PLOTDIFFVAR_shadcont2Dzsec = ua|pinterp+tmean+xmean#va|pinterp+tmean+xmean
 
 # Specific variable-statistisc graphic parameters (if no value is given, they will be retrieved from 'variables_values.dat')
@@ -183 +190 @@
 #        [colorcnt]: color for the countor lines
 specificvarplot = cll|last|shadcont2Dsfc|0.|1.|gist_gray|%g|black:clh|last|shadcont2Dsfc|0.|1.|gist_gray|%g|black:husturbmean|pinterp@turb@xmean|shadcont2Dzsec|0.|1.e-6|Blues|%g|black
-diffspecificvarplot = tas|tmean|shadcont2Dsfc|-20.|20.|seismic|%g|black:wss|tmean|shadcont2Dsfc|-30.|30.|seismic|%g|black:tas|last|shadcont2Dsfc|-20.|20.|seismic|%g|black:wss|last|shadcont2Dsfc|-30.|30.|seismic|%g|black
+specificdiffopplot = hfls|tmean|shadcont2Dsfc|-20.|20.|seismic|%g|black:hfss|tmean|shadcont2Dsfc|-30.|30.|seismic|%g|black:hfls|last|shadcont2Dsfc|-800.|0.|seismic|%g|black:hfss|last|shadcont2Dsfc|-400.|10.|seismic|%g|black:uas|xmean|shadcont2Dsfc|-20.|20.|seismic|%g|black:vas|xmean|shadcont2Dsfc|-30.|30.|seismic|%g|black:ua|pinterp+tmean+xmean|shadcont2Dsfc|-20.|20.|seismic|%g|black:va|pinterp+tmean+xmean|shadcont2Dsfc|-20.|20.|seismic|%g|black
+specificdiffvarplot = hfls|tmean|shadcont2Dsfc|-20.|20.|seismic|%g|black:hfss|tmean|shadcont2Dsfc|-30.|30.|seismic|%g|black:hfls|last|shadcont2Dsfc|-800.|0.|seismic|%g|black:hfss|last|shadcont2Dsfc|-400.|10.|seismic|%g|black:uas|xmean|shadcont2Dsfc|-20.|20.|seismic|%g|black:vas|xmean|shadcont2Dsfc|-30.|30.|seismic|%g|black:ua|pinterp+tmean+xmean|shadcont2Dsfc|-20.|20.|seismic|%g|black:va|pinterp+tmean+xmean|shadcont2Dsfc|-20.|20.|seismic|%g|black
 
 # Figures output kind