Changeset 1056 in lmdz_wrf for trunk

Timestamp:

Aug 27, 2016, 11:56:31 AM (9 years ago)

Author:

lfita

Message:

Working up to the differences among experiments even with `LMDZ'

File:

• trunk/tools/model_graphics.py (modified) (11 diffs)

trunk/tools/model_graphics.py

@@ -609 +609 @@
             # Attaching necessary variables for the pressure interpolation
             if gP != 'none':
-                requiredinterpvars = ['P', 'PB', 'PSFC', 'PH', 'PHB', 'HGT', 'T',    \
-                  'QVAPOR', 'XLONG', 'XLAT', 'Times']
+                if minf.name == 'WRF' or minf.name == 'WRF_LMDZ':
+                    requiredinterpvars = ['P', 'PB', 'PSFC', 'PH', 'PHB', 'HGT', 'T',\
+                      'QVAPOR', 'XLONG', 'XLAT', 'Times']
+                elif minf.name == 'LMDZ':
+                    requiredinterpvars = ['pres', 'psol', 'geop', 'phis', 'temp',    \
+                      'ovap', 'lon', 'lat', 'time_counter']
+                else:
+                    print errmsg
+                    print fname + ": for model '" + minf.name + "' required " +      \
+                      " variables for vertical interpolation are not known !!"
+                    quit(-1)
+
                 print "   " + fname + ": adding variables:", requiredinterpvars,     \
                   ' to allow pressure interpolation'
@@ -639 +649 @@
                     for sout in output: print sout
             elif minf.name == 'LMDZ':
-                ncvar.LMDZ_toCF(ifilen) 
-
                 try:
                     with gen.Capturing() as output:
@@ -1068 +1076 @@
                 otrackf.write(pyins + "\n")
 
+            # removing dimension variable-dimension 'lon'
+            varnCFs.remove('lon')
+
             varkeep.append('lonstats')
 
@@ -1095 +1106 @@
                 otrackf.write("# " + CFvarn + " " + Fopers + "\n")
                 otrackf.write(pyins + "\n")
+
+            # removing dimension variable-dimension 'lat'
+            varnCFs.remove('lat')
 
             varkeep.append('latstats')
@@ -1144 +1158 @@
                     except:
                         print errmsg
-                        print 'fvaradd(', prevfile, ','+CFvn+','+fileon+')'
+                        print 'fvaradd(' + prevfile + ',' + CFvn +', '+fileon+')'
                         for sout in output: print sout
                         quit(-1)
@@ -1203 +1217 @@
         if model is not None or diag is not None:
             vinf = VariableInf(vn,fheader,model,diag)
+            if op.find('pinterp') != -1: 
+                SP = 'p'
+            else:
+                SP = ''
+
             # Comppute variable
-            compute_variable(modinf, idir, Files, odir, vinf, globalP, fscr,         \
-              config['pyHOME'], config['CFreftime'], config['CFunitstime'], debug)
+            finalfilen = odir + '/' + vn + '_' + fheader + SP + '.nc'
+            if fscr:
+                sout = sub.call('rm ' + finalfilen + ' >& /dev/null', shell=True)
+
+            if not os.path.isfile(finalfilen):
+                compute_variable(modinf, idir, Files, odir, vinf, globalP, fscr,     \
+                  config['pyHOME'], config['CFreftime'], config['CFunitstime'], debug)
 
             # Compute variable statistics
-            compute_statistics(modinf, cnf, iwdir, Files, owdir, vinf, globalP, op,  \
-              fscr, debug)
+            finalfilen = odir + '/' + vn + '_' + fheader + SP + '_' +                \
+              op.replace('+','_') + '.nc'
+            if fscr:
+                sout = sub.call('rm ' + finalfilen + ' >& /dev/null', shell=True)
+
+            if not os.path.isfile(finalfilen):
+                compute_statistics(modinf, cnf, iwdir, Files, owdir, vinf, globalP,  \
+                  op, fscr, debug)
 
         else:
@@ -1451 +1481 @@
             crange = str(cnt[0]) + ',' + str(cnt[1])
             cfmt = cnt[3]
-            cline = cnt[4]
+            ckind = cnt[4]
+            cline = cnt[5]
 
             graphvals = ','.join(CFvplot)
             graphvals = graphvals + ':lon|-1,lat|-1:lon|-1,lat|-1:lon:lat:' + cbar + \
-              ':fixc,' + cline + ':' + cfmt + ':' + srange + ':' + crange + ',9:' +  \
-              figtit + ':' + kfig + ':None:' + mapval
+              ':' + ckind + ',' + cline + ':' + cfmt + ':' + srange + ':' + crange + \
+              ',9:' + figtit + ':' + kfig + ':None:' + mapval
 
             fvarS = ','.join(vplot)
@@ -1492 +1523 @@
             crange = str(cnt[0]) + ',' + str(cnt[1])
             cfmt = cnt[3]
-            cline = cnt[4]
+            ckind = cnt[4]
+            cline = cnt[5]
             # It is assumed that if the space variable is 'lon': is desired a 
             #   (lon, time) plot it it is 'lat': then (time, lat) plot
@@ -1512 +1544 @@
             graphvals = ','.join(CFvplot)
             graphvals = graphvals + ';'+ dims +';'+ cbar +  \
-              ';fixsigc,' + cline + ';' + cfmt + ';' + srange + ';' + crange +',9;'+ \
-              figtit + ';' + kfig + ';' + reverse + ';' + 'time|' + tunits + '|'+ \
-              timekind + '|' + timefmt + '|' + timelabel
+              ';' + ckind + ',' + cline + ';' + cfmt + ';' + srange + ';' + crange + \
+              ',9;' + figtit + ';' + kfig + ';' + reverse + ';' + 'time|' + tunits + \
+              '|'+ timekind + '|' + timefmt + '|' + timelabel
 
             fvarS = ','.join(vplot)
@@ -1550 +1582 @@
             crange = str(cnt[0]) + ',' + str(cnt[1])
             cfmt = cnt[3]
-            cline = cnt[4]
+            ckind = cnt[4]
+            cline = cnt[5]
 
             # It is assumed that if the space variable is 'lon': is desired a 
@@ -1571 +1604 @@
 
             graphvals = ','.join(CFvplot)
-            graphvals = graphvals + ':' + dims + ':' + cbar + ':fixc,' + cline +     \
-              ':' + cfmt + ':' + srange + ':' + crange + ',9:' + figtit + ':' +      \
-              kfig + ':' + reverse + ':None'
+            graphvals = graphvals + ':' + dims + ':' + cbar + ':' + ckind + ',' +    \
+              cline + ':' + cfmt + ':' + srange + ':' + crange + ',9:' + figtit +    \
+              ':' + kfig + ':' + reverse + ':None'
  
             fvarS = ','.join(vplot)