Changeset 1119 in lmdz_wrf

Timestamp:

Sep 29, 2016, 5:04:28 PM (9 years ago)

Author:

lfita

Message:

First attemps to prepare the scripts for multiple plots

• Adding the close value on `draw_2D_shad'
• Adding the close value in `plot_2D_shadow'
• Re-aranging the `output_kind'

Location:

trunk/tools

Files:

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

trunk/tools/drawing.py

@@ -52 +52 @@
   'draw_vectors',  'draw_vertical_levels', 'list_graphics', 'variable_values']
 
-def draw_2D_shad(ncfile, values, varn):
+def draw_2D_shad(ncfile, values, varn, axfig=None, fig=None):
     """ plotting a fields with shading
     draw_2D_shad(ncfile, values, varn)
@@ -89 +89 @@
             * 'h', high
             * 'f', full
+        [close]: Whether figure should be finished or not
       valules= 'rh:z|-1,x|-1:z|-1,x|-1:lat:pressure:BuPu:0.,100.:rh:pdf:flip@y:None'
       varn= [varsn] name of the variable to plot with shading
@@ -114 +115 @@
     revals = values.split(':')[8]
     mapvalue = values.split(':')[9]
-#    varn = values.split(':')[10]
+    close = gen.Str_Bool(values.split(':')[10])
 
     ncfiles = ncfile
@@ -222 +223 @@
 
     drw.plot_2D_shadow(valshad, vnamesfig, odimxv, odimyv, odimxu, odimyu, dimnamesv,\
-      colbarn, shading_nx, varunits, figtitle, figkind, revals, mapvalue, True)
+      colbarn, shading_nx, varunits, figtitle, figkind, revals, mapvalue, close)
 
     return

trunk/tools/drawing_tools.py

@@ -2552 +2552 @@
         quit()
 
-    if kindf == 'null':
-        print 'showing figure...'
-        plt.show()
-    elif kindf == 'gif':
-        plt.savefig(namef + ".gif")
-        if close: print "Successfully generation of figure '" + namef + ".jpg' !!!"
-    elif kindf == 'jpg':
-        plt.savefig(namef + ".jpg")
-        if close: print "Successfully generation of figure '" + namef + ".jpg' !!!"
-    elif kindf == 'pdf':
-        plt.savefig(namef + ".pdf")
-        if close: print "Successfully generation of figure '" + namef + ".pdf' !!!"
-    elif kindf == 'png':
-        plt.savefig(namef + ".png")
-        if close: print "Successfully generation of figure '" + namef + ".png' !!!"
-    elif kindf == 'ps':
-        plt.savefig(namef + ".ps")
-        if close: print "Successfully generation of figure '" + namef + ".ps' !!!"
-    else:
-        print errormsg
-        print '  ' + fname + ' output format: "' + kindf + '" not ready !!'
-        print errormsg
-        quit(-1)
-
     if close:
+        if kindf == 'null':
+            print 'showing figure...'
+            plt.show()
+        elif kindf == 'gif':
+            plt.savefig(namef + ".gif")
+            if close: print "Successfully generation of figure '" + namef + ".jpg' !!!"
+        elif kindf == 'jpg':
+            plt.savefig(namef + ".jpg")
+            if close: print "Successfully generation of figure '" + namef + ".jpg' !!!"
+        elif kindf == 'pdf':
+            plt.savefig(namef + ".pdf")
+            if close: print "Successfully generation of figure '" + namef + ".pdf' !!!"
+        elif kindf == 'png':
+            plt.savefig(namef + ".png")
+            if close: print "Successfully generation of figure '" + namef + ".png' !!!"
+        elif kindf == 'ps':
+            plt.savefig(namef + ".ps")
+            if close: print "Successfully generation of figure '" + namef + ".ps' !!!"
+        else:
+            print errormsg
+            print '  ' + fname + ' output format: "' + kindf + '" not ready !!'
+            print errormsg
+            quit(-1)
+
         plt.close()
 
@@ -3933 +3933 @@
     vsend = np.zeros((2), dtype=np.float)
 # Changing limits of the colors
-    if type(vs[0]) != type(np.float(1.)):
+    if type(vs[0]) != type(np.float(1.)) and type(vs[0]) != type(np.float64(1.)):
         if vs[0] == 'Srange':
             vsend[0] = np.min(varsv)