Changeset 1011 in lmdz_wrf

Timestamp:

Aug 11, 2016, 6:50:20 PM (9 years ago)

Author:

lfita

Message:

Working version of some diagnostics. NOT working for 2D in `pinterp'

Location:

trunk/tools

Files:

• model_graphics.py (modified) (13 diffs)
• model_graphics_template.dat (modified) (2 diffs)

trunk/tools/model_graphics.py

@@ -32 +32 @@
         filescr = True
         figscr = True
-#        tim.sleep(10)
+        tim.sleep(10)
     else:
         scr = False
@@ -140 +140 @@
 #        quit(-1)
 
-    # Getting only the first possibility of diagnostic
+    # Getting only the first possibility of model and diagnostic
+    if vmod is not None:
+        modV = vmod[0]
+    else:
+        modV = None
     if vdiag is not None:
-        varcomp = VariableInf(var, headerf, vmod, vdiag[0])
+        diagV = vdiag[0]
     else:
-        varcomp = VariableInf(var, headerf, vmod, vdiag)
+        diagV = None
+
+    varcomp = VariableInf(var, headerf, modV, diagV)
 
     # a ';' list 'varcompute' it is created for each variable giving:
@@ -250 +256 @@
            providing a consecutive number of calculations separated by '+'
              VAR_[calc1]+[calc2] = tas:wss
-           will compute first [calc1] and ten [calc2] for 'tas' and 'wss'
+           will compute first [calc1] and then [calc2] for 'tas' and 'wss'
       minf= class with information about the model
       Files= dictionary of files for heach header
@@ -269 +275 @@
     strfiles = gen.dictKeysVals_stringList(Files)
     strtestfiles = gen.dictKeysVals_stringList(TestFiles)
+
+    print 'Lluis' + fname + ': strtestfile:', strtestfiles
 
     Svarcompute = ''
@@ -357 +365 @@
     return Files, TestFiles, allvarcomp, ivop
 
-def function compute_variable(minf, idir, usefiles, odir, cvar, gP, db):
+def compute_variable(minf, idir, usefiles, odir, cvar, gP, scr, pyH, Tref, Tunits, db):
     """ Function to compute a variable
       minf= class with the information of the model
@@ -363 +371 @@
       usefiles= dictionary of files as dict([headerf]) = [file1], ..., [fileN]
       odir= directory to write the output files
-      cvar= class with the 'name', 'fheader', 'varmod', 'vardiag'
+      cvar= class with the information of the variable: 'name', 'fheader', 'varmod', 'vardiag'
       gP= kind of vertical interpolation ('global', 'local', 'none')
+      scr= should it be done from the scratch?
+      pyH= location of the python HOME
+      Tref= CF time reference
+      Tunits= CF time units
     """
     fname='compute_variable'
@@ -384 +396 @@
     # Computing separately and then joinging for all files
     Ntotfiles = len(cfiles)
+    Nzeros = len(str(Ntotfiles))
+    NStot = str(Ntotfiles).zfill(Nzeros)
+
+    # For that variables which require vertical interpolation 'p' suffix to the 
+    #   file header is added
+    if gP != 'none':
+        SgP = 'p'
+    else:
+        SgP = ''
+
+    # Getting in working dir
+    os.chdir(odir)
+
+    # File to keep track of all operations
+    otrackf = open( odir + '/all_computevars.inf', 'a')
+
+    # Computing variable
     ifile=1
-
     for cf in cfiles:
-        ifS = str(ifile)
-
-# Computing variable
-    # Changing file head when it is a pressure-interpolated variable
-    if test ${vark} == 'pinterp'; then
-      fhead=${headerf}p
-    else
-      fhead=${headerf}
-    fi
-
-    filen=${odir}/${CFvarn}_${fhead}_${ifile}-${Ntotfiles}.nc
-    if ${scratch}; then 
-      rm ${filen} >& /dev/null
-      rm ${odir}/${CFvarn}_${fhead}.nc >& /dev/null
-    fi
-
-    if test ! -f ${filen} && test ! -f ${odir}/${CFvarn}_${fhead}.nc; then
-# Since model direct values are retrieved from `variables_valules.dat' which was initially coincived
-#   as a way to only give variable attributes, range and color bars, if a variable has a diagnostic
-#   way to be computed, the later one will be preferred
-
-      if test ! ${modvar} = 'None' && test ${diagvar} = 'None'; then
-        # model variable
-        values=${modvar}',0,-1,-1'
-        vs=${modvar},${vdnx},${vdny},${vdnz},${vdnt}
-        pyout=`${pyHOME}/nc_var.py -f ${cf} -o DataSetSection_multivars -v ${vs}     \
-          -S ${values} | grep succesfull | awk '{print $6}' | tr '"' ' '`
-        pyn=$?
-        Spyout=`echo ${pyout} | tr '\n' '#' | tr ' ' '!'`
-        ferrmsg ${pyn} ${fname} "python!'DataSetSection_multivars'!failed"${Spyout}
-        mv ${pyout} ${filen}
-
-        # Keeping the operations
-        pyins=${pyHOME}"/nc_var.py -f "${cf}" -o DataSetSection_multivars -v "${vs}
-        pyins=${pyins}" -S "${values}
-        echo " " >> ${odir}/all_computevars.inf
-        echo "# ${CFvarn}" "${modvar}" >> ${odir}/all_computevars.inf
-        echo ${pyins} >> ${odir}/all_computevars.inf
-
-        pyout=`${pyHOME}/nc_var.py -f ${filen} -o chvarname -v ${modvar} -S ${CFvarn}`
-        pyn=$?
-        Spyout=`echo ${pyout} | tr '\n' '#' | tr ' ' '!'`
-        ferrmsgF ${pyn} ${fname} "python!'chvarname'!failed"${Spyout} ${filen}
-      else
-        # diagnostic variable
-        dims=${dnt}@${vdnt},${dnz}@${vdnz},${dny}@${vdny},${dnx}@${vdnx}
-        diagn=`echo ${diagvar} | tr ':' '\n' | head -n 1`
-        Ndiagvars=`echo ${diagvar} | tr ':' ' ' | wc -w | awk '{print $1}'`
-        idiagv=2
-        diagc=''
-        while test ${idiagv} -le ${Ndiagvars}; do
-          diag1=`echo ${diagvar} | tr ':' '\n' | head -n ${idiagv} | tail -n 1`
-          if test ${idiagv} -eq 2; then
-            diagc=${diag1}
-          else
-            diagc=${diagc}'@'${diag1}
-          fi
-          idiagv=`expr ${idiagv} + 1`
-        done
-        pyout=`python ${pyHOME}/diagnostics.py -f ${cf} -d ${dims} -v ${diagn}'|'${diagc}`
-        pyn=$?
-        Spyout=`echo ${pyout} | tr '\n' '#' | tr ' ' '!'`
-        ferrmsg ${pyn} ${fname} "python!'diagnostics'!failed#"${Spyout}
-        mv diagnostics.nc ${filen}
-
-        # Keeping the operations
-        pyins=${pyHOME}"/diagnostics.py -f "${cf}" -d "${dims}" -v '"${diagn}"|"
-        pyins=${pyins}${diagc}"'"
-        echo " " >> ${odir}/all_computevars.inf
-        echo "# ${CFvarn}" "${diagvar}" >> ${odir}/all_computevars.inf
-        echo ${pyins} >> ${odir}/all_computevars.inf
-      fi
-
-      # adding CF lon,lat,time in WRF files
-      if test ${headerf:0:3} = 'wrf'; then
-        WRF_toCF ${filen} ${vdnx} ${vdny}
-      fi
-      # Attaching necessary variables for the pressure interpolation
-      if test ${vark} == 'pinterp'; then
-        requiredinterpvars='P:PB:PSFC:PH:PHB:HGT:T:QVAPOR:'
-        rqvs=`echo ${requiredinterpvars} | tr ':' ' '`
-        echo "  "${fname}": adding variables: "${rqvs}" to allow pressure interpolation"
-        for rqv in ${rqvs}; do
-          pyout=`${pyHOME}/nc_var.py -o fvaradd -S ${cf},${rqv} -f ${filen}`
-          pyn=$?
-          Spyout=`echo ${pyout} | tr '\n' '#' | tr ' ' '!'`
-          ferrmsgF ${pyn} ${fname} "python!'fvaradd'!failed#"${Spyout} ${filen}
-        done
-      fi
-    fi
-
-    ifile=`expr ${ifile} + 1`
-# End of files
-  done
-
-  # Joining variable files
-  filen=${odir}/${CFvarn}_${fhead}.nc
-  if ${scratch}; then rm ${filen} >& /dev/null; fi
-
-  if test ! -f ${filen}; then
-    pyout=`python ${pyHOME}/nc_var.py -f ${CFvarn}'_'${fhead}'_,-,.nc'               \
-      -o netcdf_fold_concatenation_HMT -S ./,time -v all`
-    pyn=$?
-    Spyout=`echo ${pyout} | tr '\n' '#' | tr ' ' '!'`
-    ferrmsg ${pyn} ${fname} "python!'netcdf_fold_concatenation_HMT'!failed#"${Spyout}
-    mv netcdf_fold_concatenated_HMT.nc ${filen}
-    if test -f ${filen}; then
-      rm ${CFvarn}_${fhead}_*-*.nc
-    fi
-  fi
-}
-
-
-def compute_vars(config, Files, allvarcomp, debug):
+        ifS = str(ifile).zfill(Nzeros)
+        ifilen = odir + '/' + CFvarn + '_' + headerf + SgP + '_' + ifS + '-' +       \
+          NStot + '.nc'
+        fileon = odir + '/' + CFvarn + '_' + headerf + SgP + '.nc'
+
+        if db:
+            print '  ' + fname + ": creation of variable file '" + ifilen + "' ..."
+
+        if scr:
+            sout = sub.call('rm ' + ifilen + ' >& /dev/null', shell=True)
+            sout = sub.call('rm ' + fileon + ' >& /dev/null', shell=True)
+
+        if not os.path.isfile(ifilen) and not os.path.isfile(fileon):
+# Since model direct values are retrieved from `variables_valules.dat' which was 
+#   initially coincived as a way to only give variable attributes, range and color 
+#   bars, if a variable has a diagnostic way to be computed, the later one will be 
+#   preferred
+
+            if modvar is not None and diagvar is None:
+                # model variable
+                values = modvar + ',0,-1,-1'
+                vs = modvar + ',' + vdnx + ',' + vdny + ',' + vdnz + ',' + vdnt
+                with gen.Capturing() as output:
+                    ncvar.DataSetSection_multivars(values, cf, vs)
+                
+                newfile, loc = gen.search_sec_list(output,'succesfull')
+                print fname, 'Lluis newfile', newfile
+                ofile = newfile[0].split(' ')[7]
+                sub.call('mv ' + ofile + ' ' + ifilen, shell=True)
+
+                # Keeping track of the operations
+                pyins = pyH + "/nc_var.py -f "+cf+" -o DataSetSection_multivars -v "+\
+                  vs + " -S '" + values + "'"
+                otrackf.write('\n')
+                otrackf.write('# ' + CFvarn + " " + modvar + '\n')
+                otrackf.write(pyins + '\n')
+
+                # CF renaming of variable
+                ncvar.chvarname(CFvarn,ifilen,modvar)
+            else:
+                # diagnostic variable
+                dims = dnt+'@'+vdnt+','+dnz+'@'+vdnz+','+dny+'@'+vdny+','+dnx+'@'+vdnx
+                diagn = diagvar[0]
+                Ndiagvars = len(diagvar)
+                diagc = '@'.join(diagvar[1:])
+            
+                values = '-f ' + cf + ' -d ' + dims + " -v '" + diagn + '|' +diagc+"'"
+                sout = sub.call('python ' + pyH + '/diagnostics.py ' + values,       \
+                  shell=True)
+                sout = sub.call(' mv diagnostics.nc ' + ifilen, shell=True)
+
+                # Keeping track of the operations
+                pyins = 'python ' + pyH + '/diagnostics.py ' + values
+                otrackf.write('\n')
+                otrackf.write('# ' + CFvarn + " " + diagn + '\n')
+                otrackf.write(pyins + '\n')
+
+        # adding CF lon,lat,time in WRF files
+        if minf.name == 'WRF':
+            values = vdnx + ':' + vdny + ':'+ Tref + ':' + Tunits
+            ncvar.WRF_toCF(values, ifilen) 
+
+        # Attaching necessary variables for the pressure interpolation
+        if gP != 'none':
+            requiredinterpvars = ['P', 'PB', 'PSFC', 'PH', 'PHB', 'HGT', 'T','QVAPOR']
+            print "    " + ": adding variables:", requiredinterpvars, ' to allow ' + \
+              'pressure interpolation'
+            for rqv in requiredinterpvars:
+                ncvar.fvaradd(cf+','+rqv,ifilen)
+
+        ifile = ifile + 1
+
+    otrackf.close()
+
+    # Joining variable files
+    if not os.path.isfile(fileon):
+        if db:
+            print '  ' + fname + ": concatenating all variable files to create '" +  \
+              fileon + "..."
+        ncvar.netcdf_fold_concatenation_HMT('./,time', CFvarn+'_'+headerf+SgP+       \
+          '_,-,.nc', 'all')
+        sout = sub.call('mv netcdf_fold_concatenated_HMT.nc ' + fileon, shell=True)
+        if os.path.isfile(fileon):
+            sout = sub.call('rm ' + CFvarn + '_' + headerf + '_*-*.nc', shell=True)
+
+    return
+
+def compute_statistics(minf, idir, usefiles, odir, cvar, plevels, gP, Opers, scr,    \
+  pyH, db):
+    """ Function to compute different statistics it will take previous steps if they 
+        are availale
+      minf= class with the information of the model
+      idir= directory with the input files
+      usefiles= ',' list of files to use [file1],...,[fileN]
+      odir= directory to write the output files
+      cvar= class with the information of the variable: 'name', 'fheader', 'varmod', 'vardiag'
+      plevels= ':' separated list of pressures (in Pa) to use for the vertical interpolation
+      gP= kind of vertical interpolation ('global', 'local', 'none')
+      Opers= kind of operation: (as possible multiple consecutive combination of operations separated by '+'
+        [calc1]+[calc2] will compute first [calc1] and then [calc2] 
+        acc: temporal accumulated values
+        diff: differences between models
+        direct: no statistics
+        last: last temporal value
+        Lmean: latitudinal mean values
+        Lsec: latitudinal section (latitudinal value must be given, [var]@[lat]) 
+        lmean: longitudinal mean values
+        lsec: longitudinal section (longitudinal value must be given, [var]@[lat])
+        pinterp: pressure interpolation (to the given $plevels)
+        tmean: temporal mean values
+        turb: Taylor's turbulence decomposition value
+        xmean: x-axis mean values
+        ymean: y-axis mean values
+        zsum: vertical aggregated values
+      scr= should it be done from the scratch?
+      pyH= location of the python HOME
+    """
+    fname='compute_statistics'
+
+    # Getting a previous file name to continue with(for combinations)
+    CFvarn=cvar.name
+    headerf = cvar.fheader 
+    modvar = cvar.model
+    diagvar = cvar.diag
+
+    cfiles = usefiles[headerf]
+
+    # dimensions
+    dnx = minf.dimxn
+    dny = minf.dimyn
+    # var-dimensions
+    vdnx = minf.vardxn
+    vdny = minf.vardyn
+
+    # For that variables which require vertical interpolation 'p' suffix to the 
+    #   file header is added
+    if gP != 'none':
+        SgP = 'p'
+        if gP == 'local':
+            CFvarnp = CFvarn + ',P,PB,PSFC,PH,PHB,HGT,T,QVAPOR,XLONG,XLAT,Times'
+        else:
+            CFvarnp = CFvarn
+    else:
+        SgP = ''
+        CFvarnp = CFvarn
+
+    # Getting in working dir
+    os.chdir(odir)
+
+    # File to keep track of all operations
+    otrackf = open( odir + '/all_statsvars.inf', 'a')
+
+    # Input file
+    ifilen = odir + '/' + CFvarn + '_' + headerf + SgP + '.nc'
+
+    # Computing variable statisitcs
+    istats=0
+
+    # List of not computed statistics
+    wrongstats = []
+
+    # Variables to be kept in the final file
+    varkeep = []
+
+    # Mandatory CF variables to be in all files
+    varnCFs = ['lon', 'lat', 'pres', 'time']
+
+    opers = Opers.split('+')
+    Fopers = ''
+    if db: print '    computing statistics of variable:', CFvarn, ' ...'
+    for op in opers:
+        if op == opers[0]:
+            Fopers = op
+            prevfile = ifilen
+        else:
+            Fopers = Fopers + '_' + op
+            prevfile = fileon
+        fileon = odir + '/' + CFvarn + '_' + headerf + SgP + '_' + Fopers + '.nc'
+
+        if scr:
+            sout = sub.call('rm ' + fileon + ' >& /dev/null', shell=True)
+
+        hprevfile = prevfile[0:len(prevfile)-3]
+        if not os.path.isfile(fileon):
+            if db: print '      ', op, "using '" + prevfile + "' "
+        
+            if op == 'acc':
+                # temporal accumulated values
+                print "  " + fname + ": kind '" + op + "' not ready !!"
+                wrongstats.appen(CFvarn + '_' + opers)
+                break
+            elif op == 'direct':
+                # no statistics
+                sout = sub.call('mv ' + prevfile + ' ' + fileon, shell=True)
+            elif op == 'last':
+                # last temporal value
+                vals='time,-9,0,0'
+                with gen.Capturing() as output:
+                    ncvar.DataSetSection(vals,prevfile)
+                
+                sout = sub.call('mv ' + hprevfile + '_time_B-9-E0-I0.nc ' + fileon, \
+                  shell=True)
+
+                # Keeping the operations
+                pyins=pyH + "/nc_var.py -o DataSetSection -S '" + vals + "' -f " +  \
+                  prevfile
+                otrackf.write("\n")
+                otrackf.write("# " + CFvarn + " " + Fopers + "\n")
+                otrackf.write(pyins + "\n")
+            elif op =='Lmean':
+                # latitudinal mean values
+                print "  " + fname + ": kind '" + op + "' not ready !!"
+                wrongstats.appen(CFvarn + '_' + opers)
+                break
+            elif op =='Lsec':
+                # latitudinal section (latitudinal value must be given, [var]@[lat]) 
+                print "  " + fname + ": kind '" + op + "' not ready !!"
+                wrongstats.appen(CFvarn + '_' + opers)
+                break
+            elif op =='lmean':
+                # longitudinal mean values
+                print "  " + fname + ": kind '" + op + "' not ready !!"
+                wrongstats.appen(CFvarn + '_' + opers)
+                break
+            elif op =='lsec':
+                # longitudinal section (longitudinal value must be given, [var]@[lon])
+                print "  " + fname + ": kind '" + op + "' not ready !!"
+                wrongstats.appen(CFvarn + '_' + opers)
+                break
+            elif op == 'pinterp':
+                # pinterp: pressure interpolation (to the given $plevels)
+                vals=plevels + ',1,1'
+                ncvar.pinterp(vals,prevfile,CFvarnp)
+                sout = sub.vall('mv pinterp.nc ' + fileon, shell=True)
+
+                # Keeping the operations
+                pyins=pyH + "/nc_var.py -o pinterp -S '" + vals + "' -f " +          \
+                  prevfile + "-v " + CFvarnp
+                otrackf.write("\n")
+                otrackf.write("# " + CFvarn + " " + Fopers + "\n")
+                otrackf.write(pyins + "\n")
+
+                # adding CF lon,lat,time in WRF files
+                if minf.name == 'WRF':
+                    values = vdnx + ':' + vdny + ':'+ Tref + ':' + Tunits
+                    ncvar.WRF_toCF(values, fileon)
+
+                # vertical interpolation variables are no more needed
+                CFvarnp = CFvarn
+
+            elif op == 'tmean':
+                # temporal mean values
+                vals='time|-1,time,mean,lon:lat:' + vdnz + ':time:pres'
+                dims='time@time,' + dnz + '@' + vdnz + ',lat@lat,lon@lon'
+                ncvar.file_oper_alongdims(vals,prevfile,CFvarnp)
+                sout = sub.call('mv file_oper_alongdims_mean.nc '+fileon, shell=True)
+
+                # Keeping the operations
+                pyins=pyH + "/nc_var.py -o file_oper_alongdims -S '" + vals +        \
+                  "' -f " + prevfile + " -v " + CFvarnp
+                otrackf.write("\n")
+                otrackf.write("# " + CFvarn + " " + Fopers + "\n")
+                otrackf.write(pyins + "\n")
+
+                varkeep.append(CFvarn + 'mean')
+                varkeep.append('timestats')
+
+#            elif op == 'turb':
+#                # turbulence values
+#                vals='turbulence|'${CFvarn}
+#                dims='time@time,'${dnz}'@'${vdnz}',lat@lat,lon@lon,pres@pres'
+#                pyout=`python ${pyHOME}/diagnostics.py -d ${dims} -v ${vals} -f ${cfiles}`
+
+#                # Keeping the operations
+#                pyins="python "${pyHOME}"/diagnostics.py -d "${dims}" -v '"${vals}
+#                pyins=${pyins}"' -f ${cfiles}"
+#                echo " " >> ${odir}/all_statsvars.inf
+#                echo "# ${CFvarn}" "${vark}" >> ${odir}/all_statsvars.inf
+#                echo ${pyins} >> ${odir}/all_statsvars.inf
+
+#                varkeep=':'${CFvarn}'turb'
+
+            elif op == 'xmean':
+                # x-axis mean values
+                vals='lon|-1,lon,mean,lon:lat:' + vdnz + ':time:pres'
+                dims='time@time,' + dnz + '@' + vdnz + ',lat@lat,lon@lon'
+                ncvar.file_oper_alongdims(vals,prevfile,CFvarnp)
+                sout = sub.call('mv file_oper_alongdims_mean.nc '+fileon, shell=True)
+
+                # Keeping the operations
+                pyins=pyH + "/nc_var.py -o file_oper_alongdims -S '" + vals +        \
+                  "' -f " + prevfile + " -v " + CFvarnp
+                otrackf.write("\n")
+                otrackf.write("# " + CFvarn + " " + Fopers + "\n")
+                otrackf.write(pyins + "\n")
+
+                varkeep.append(CFvarn + 'mean')
+                varkeep.append('lonstats')
+
+            elif op == 'ymean':
+                # y-axis mean values
+                vals='lat|-1,lat,mean,lon:lat:' + vdnz + ':time:pres'
+                dims='time@time,' + dnz + '@' + vdnz + ',lat@lat,lon@lon'
+                ncvar.file_oper_alongdims(vals,prevfile,CFvarnp)
+                sout = sub.call('mv file_oper_alongdims_mean.nc '+fileon, shell=True)
+
+                # Keeping the operations
+                pyins=pyH + "/nc_var.py -o file_oper_alongdims -S '" + vals +        \
+                  "' -f " + prevfile + " -v " + CFvarnp
+                otrackf.write("\n")
+                otrackf.write("# " + CFvarn + " " + Fopers + "\n")
+                otrackf.write(pyins + "\n")
+
+                varkeep.append(CFvarn + 'mean')
+                varkeep.append('latstats')
+            elif op == 'zsum':
+                # vertical aggregated values
+                print "  " + fname + ": kind '" + op + "' not ready !!"
+                wrongstats.appen(CFvarn + '_' + opers)
+                break
+            else:
+                print errmsg
+                print '  ' + fname + ": operation '" + op + "' not ready !!"
+                quit(-1)
+
+            # End of kind of operation
+            if len(varkeep) > 0:
+                varkeepS = ',' + ','.join(varkeep)
+            else:
+                varkeepS = ''
+
+            totalvarkeeps = CFvarnp + ',' + ','.join(varnCFs) + varkeepS
+            oclean = ncvar.cleaning_varsfile(totalvarkeeps,fileon)
+
+    # End of operations
+    if len(wrongstats) > 1:
+        print warnmsg
+        print '  ' + fname + ": statisitcs not possible to compute:", wrongstats
+
+    return 
+
+def compute_vars(config, modinf, idir, odir, Files, allvarcomp, fscr, debug):
     """ Function to compute the variables
       config= Configuration of the experiment
+      modinf= class with information about the model
+      idir= input experiment folder
+      odir= output experiment folder
       Files= dictionary with the header and the files' correspondence
       allvarcomp= dictionary with all the variables to compute and their information
+      fscr= whether files should be done from the scratch or not
     """
     fname = 'compute_vars'
@@ -522 +782 @@
 
         # Computing CF variable
-        if model is not None and diag is not None:
+        if model is not None or diag is not None:
             vinf = VariableInf(vn,fheader,model,diag)
-            compute_variable ${Iwdir} ${Files} ${Owdir} ${cvar} ${Moddims} ${Modvdims} ${Filescratch}
+            # Comppute variable
+            compute_variable(modinf, idir, Files, odir, vinf, globalP, fscr,         \
+              config['pyHOME'], config['CFreftime'], config['CFunitstime'], debug)
+
+            # Compute variable statistics
+            compute_statistics(modinf, iwdir, Files, owdir, vinf, config['plevels'], \
+              globalP, op, fscr, config['pyHOME'], debug)
+
         else:
             print errmsg
@@ -532 +799 @@
 
     return
-
-
 
 # Files with information about the configuration of the script
@@ -559 +824 @@
 
     # Characteristics of the model
-    modinf = ncvar.model_characteristics(mod,'None','False')
-    dnx = modinf.dimxn
-    dny = modinf.dimyn
-    dnz = modinf.dimzn
-    dnt = modinf.dimtn
-    vdnx = modinf.vardxn
-    vdny = modinf.vardyn
-    vdnz = modinf.vardzn
-    vdnt = modinf.vardtn
+    Modinf = ncvar.model_characteristics(mod,'None','False')
+    dnx = Modinf.dimxn
+    dny = Modinf.dimyn
+    dnz = Modinf.dimzn
+    dnt = Modinf.dimtn
+    vdnx = Modinf.vardxn
+    vdny = Modinf.vardyn
+    vdnz = Modinf.vardzn
+    vdnt = Modinf.vardtn
 
     if dbg:
@@ -640 +905 @@
                 gen.printing_dictionary(testfiles)
          
-            allcompvar, Nvar = compvars_listconstruct(cnf, modinf, files, testfiles, \
+            allcompvar, Nvar = compvars_listconstruct(cnf, Modinf, files, testfiles, \
               iwdir, owdir, dbg)
         else: 
@@ -647 +912 @@
             files, testfiles, allcompvar, Nvar = read_varcomp_file(owdir +           \
               '/varcompute.inf')          
+        # End of avoiding to repeat all the experiment search
 
         print "  For experiment '"+exp+"' is required to compute:", Nvar, "variables"
@@ -654 +920 @@
 ###
         print "    Computing variables ..."
-        compute_vars(conf, files, allcompvar, dbg)
-
-# End of avoiding to repeat all the experiment search
-    fi
-
+        compute_vars(cnf, Modinf, iwdir, owdir, files, allcompvar, filescratch, dbg)
+
+        quit()
 
     # end of experiments loop

trunk/tools/model_graphics_template.dat

@@ -89 +89 @@
 # Variables to compute (as possible multiple consecutive combination of operations must start by 'VAR_' separated by '+'
 #   VAR_[calc1]+[calc2] = tas:wss
-#     will compute first [calc1] and ten [calc2] for 'tas' and 'wss'
+#     will compute first [calc1] and then [calc2] for 'tas' and 'wss'
 VAR_last = tas:uas:vas:hfss:hfls:wss
 VAR_mean = tas:uas:vas:hfss:hfls:wss
@@ -108 +108 @@
 
 # Pressure levels
-#   Common vertical pressure levels to compute vertical differences
+#   Common vertical pressure levels (in Pa) to vertically interpolate
 #39Lowp#plevels = 100500.:100000.:98500.:97500.:95000.:92500.:90000.:87500.:85000.:80000.:75000.:70000.:65000.:60000.:55000.:50000.:45000.:40000.:35000.:30000.:25000.:20000.:15000.:10000.:900.:800.:700.:600.:500.:400.:300.:200.::1000.:85.:50.:40.:30.:20.:10.
 #26#plevels = 100000.:97500.:95000.:92500.:90000.:85000.:80000.:75000.:70000.:65000.:60000.:55000.:50000.:45000.:40000.:35000.:30000.:25000.:20000.:15000.:10000.:5000.:2500.:1000.:500.:250.