Changeset 470 in lmdz_wrf for trunk/tools/drawing.py

Timestamp:

Jun 10, 2015, 11:37:09 AM (9 years ago)

Author:

lfita

Message:

Adding multiple dimvar values on `draw_lines'

File:

• trunk/tools/drawing.py (modified) (4 diffs)

trunk/tools/drawing.py

@@ -1515 +1515 @@
       ncfilens= [filen] ',' separated list of netCDF files
       values= [dimvname]:[valuesaxis]:[dimtit]:[leglabels]:[vtit]:[title]:[locleg]:[graphk]
-        [dimvname]: name of the variable with he values of the common dimension
+        [dimvname]: ',' list of names of the variable with he values of the common dimension
         [valuesaxis]: which axis will be used for the values ('x', or 'y')
         [dimtit]: title for the common dimension
@@ -1541 +1541 @@
 
     ncfiles = ncfilens.split(',')
-    dimvname = values.split(':')[0]
+    dimvnames = values.split(':')[0]
     valuesaxis = values.split(':')[1]
     dimtit = values.split(':')[2]
@@ -1571 +1571 @@
         objfile = NetCDFFile(filen, 'r')
 
-        if not objfile.variables.has_key(dimvname):
+        if dimvnames.find(',') != -1:
+            dimvname = dimvnames.split(',')
+        else:
+            dimvname = [dimvnames]
+   
+        found = False
+        for dvn in dimvname:
+            if objfile.variables.has_key(dvn):
+                found = True
+                break
+    
+        if not found:
             print errormsg
             print '  ' + fname + ": netCDF file '" + filen +                         \
-              "' does not have variable '" + dimvname + "' !!"
+              "' does not have variables '" + dimvname + "' !!"
             quit(-1)
 
@@ -1590 +1601 @@
             quit(-1)
 
-        vdobj = objfile.variables[dimvname]
-        if len(vdobj.shape) != 1:
-            print errormsg
-            print '  ' + fname + ': wrong shape:',vdobj.shape," of variable '" +     \
-              dimvname +  "' !!"
-            quit(-1)
+        for dimvn in dimvname:
+            if searchInlist(objfile.variables, dimvn):
+                vdobj = objfile.variables[dimvname]
+                if len(vdobj.shape) != 1:
+                    print errormsg
+                    print '  ' + fname + ': wrong shape:',vdobj.shape,               \
+                      " of variable '" + dimvn +  "' !!"
+                    quit(-1)
+                break
 
         varvalues.append(vvobj[:])