Changeset 1946 in lmdz_wrf for trunk

Timestamp:

Jul 18, 2018, 2:15:05 AM (6 years ago)

Author:

lfita

Message:

Fixing....

Location:

trunk/tools

Files:

• drawing.py (modified) (3 diffs)
• drawing_tools.py (modified) (2 diffs)

trunk/tools/drawing.py

@@ -8956 +8956 @@
     if type(tdavals) != type(gen.mamat):
         tdavals = ma.masked_array(tdavals)
-    if type(tavals) != type(gen.mamat):
+    if type(presvals) != type(gen.mamat):
         presvals = ma.masked_array(presvals)
 
@@ -9052 +9052 @@
         kgraphv['collines'] = gen.str_list_rep(kindgraphv[2], ',', Nfiles)
         kgraphv['kindlines'] = gen.str_list_rep(kindgraphv[3], ',', Nfiles)
-        kgraphv['kindmarkers'] = gen.str_list_rep(kindgraphv[4], ',', Nfiles)
+        kgraphv['kindmarkers'] = gen.str_list_rep(kindgraphv[4], ';', Nfiles)
         kgraphv['widthlines'] = gen.str_list_rep(kindgraphv[5], ',', Nfiles)
     else:
@@ -9108 +9108 @@
         else:
             vavals[ifile] = vals
-        if type(presvals) != type(gen.mamat):
+        if type(pvals) != type(gen.mamat):
             presvals[ifile] = ma.masked_array(pvals)
         else:

trunk/tools/drawing_tools.py

@@ -11663 +11663 @@
         kmark = kindgv['kindmarkers'][iline]
         kline = kindgv['kindlines'][iline]
-        wline = kindgv['widthlines'][iline]
+        wline = np.float(kindgv['widthlines'][iline])
 
         # Checking for variable consistency
@@ -11682 +11682 @@
         # log scaling in Y, as dictated by the typical meteorological plot
         tamask = ta.mask
+        if len(tamask.shape) == 0:
+            print '    ' + fname + ': values without any masked value!'
+            tamask = np.ones((ta.shape), dtype=bool)*tamask
 
         if lline != 'None':