Changeset 2777 in lmdz_wrf for trunk/tools

Timestamp:

Dec 1, 2019, 5:03:10 PM (5 years ago)

Author:

lfita

Message:

Last changes ?!

File:

• trunk/tools/drawing_tools.py (modified) (10 diffs)

trunk/tools/drawing_tools.py

@@ -3080 +3080 @@
             print '    provided:', projvals
             quit(-1)
-            m = Basemap(projection=proj, lat_0=projvals[0], lon_0=projvals[1],       \
-              llcrnrlon=projvals[2], llcrnrlat=projvals[3], urcrnrlon=projvals[4],   \
-              urcrnrlat=projvals[5], resolution=res)
+        defmap = Basemap(projection=proj, lat_0=projvals[0], lon_0=projvals[1],      \
+          llcrnrlon=projvals[2], llcrnrlat=projvals[3], urcrnrlon=projvals[4],       \
+          urcrnrlat=projvals[5], resolution=res)
 
     elif proj == 'npstere':
@@ -15104 +15104 @@
     return
 
-def shad_simple(vv, vn, vu, xv, yv, vmin, vmax, parameters):
+def shad_simple(vv, xv, yv, vmin, vmax, vn='var', vu='-',                            \
+  parameters=['Reds',0.85,'vertical','%6g']):
     """ Function to plot using pcolormesh
       vv: variable values
@@ -15123 +15124 @@
         cmapv = parameters[0]
 
-    splot = plt.pcolormesh(xv, yv, vv, cmap=cmapv, vmin=vmin,      \
-      vmax=vmax)
+    splot = plt.pcolormesh(xv, yv, vv, cmap=cmapv, vmin=vmin, vmax=vmax)
     orien = gen.auto_val(parameters[2], 'vertical')
     cbtkf = gen.auto_val(parameters[3], '%6g')
@@ -15139 +15139 @@
         cbar = plt.colorbar(format=cbtkf, orientation=orien)
 
-    cbar.set_label(gen.latex_text(extrapar[0]) +'('+ gen.units_lunits(extrapar[6]) + \
-      ')')
+    cbar.set_label(gen.latex_text(vn) +'('+ gen.units_lunits(vu) + ')')
 
     return splot
 
-def cnt_simple(vv, xv, yv, vmin, vmax, contkind, parameters):
+def cnt_simple(vv, xv, yv, vmin, vmax, contkind, vn='var', vu='-',                   \
+  parameters=['auto','auto','%g']):
     """ Function to plot using contour
-      vv: variables
+      vv: values variable
       xv, yv: x,y coordinates
       vmin, vmax: minimum and maximum rang of the plot
@@ -15158 +15158 @@
         freqv: frequency of the lines ('auto', pretty(minxv, maxv, 10))
         fmtlabs: format of the labels in the contour (None, also possible) ('auto', 
-          '%d')
+          '%g')
     """
     fname = 'cnt_simple'
@@ -15164 +15164 @@
     availcontkind = ['cmap', 'fixc', 'fixsigc']
 
-    clabfmt = gen.auto_val(parameters[2], '%d')
+    clabfmt = gen.auto_val(parameters[2], '%g')
     if clabfmt == 'None': clabmt = None
 
-    if freqv == 'auto':
+    if parameters[1] == 'auto':
         vc = pretty(vmin, vmax, 10)
     else:
-        vc = np.arange(vmin, vmax+freqv, freqv)
-
-    contkind = ckind.split(',')[0]
+        vc = np.arange(vmin, vmax+parameters[1], parameters[1])
+
     if contkind == 'cmap':
         colorval = gen.auto_val(parameters[0], 'Reds') 
         cplot = plt.contour(xv, yv, vv, levels=vc, cmap=plt.get_cmap(colorval))
+        colorval = 'k'
     elif  contkind == 'fixc':
         colorval = gen.auto_val(parameters[0], '#FF0000') 
@@ -15198 +15198 @@
         maxcntS = '{:g}'.format(vc[len(vc)-1])        
 
+    plt.annotate(vn + ': '+ gen.units_lunits(vu), xy=(0.01,0.05),                    \
+      xycoords='figure fraction', color=colorval)
+
     return cplot
 
-def plot_multivar_multikind(infilen, figv, figtitle, mapv=None, legvals=[0,8,1],     \
+def plot_multivar_multikind(infilen, figv, figtitle, kfig='png',                     \
+  fign='plot_multivar_multikind', mapv=None, legvals=[0,8,1],                        \
   mervals=[8,'#AAAAAA',0,0.5], parvals=[8,'#AAAAAA',0,0.5],                          \
   coastlvals=[0.25,'#AAAAAA'], countrylvals=[0.25,'#161616'],                        \
@@ -15208 +15212 @@
       mapv= [m,meridians,parallels,x,y]: map environtment (from basemap) [None for 
         no map]
-      figv = {'lvars': ['vari', ...], 'vari': [valsi,drawtype,minv,maxv,dtypev]}: 
+      figv = {'lvars': ['vari', ...], 'vari': [valsi,vu,drawtype,minv,maxv,dtypev]}: 
         dictionary with the information of the variables
          'lvars': key with a sorted list of the variables to plot
           vari: a sort of name to be used in `variables_values'
+          vu: units of the variable
           valsi: matrix values to plot
           drawtype: type of figure to draw with this variable
@@ -15253 +15258 @@
     dvar1 = figv[var1]
     var1v = dvar1[0]
+    if len(var1v.shape) != 2:
+        print errormsg
+        print '  ' + fname + ": variable '" + lvars[0] + "' has not 2D rank !!"
+        print '    var shape', var1v.shape
+        quit(-1)
     dx = var1v.shape[1]
     dy = var1v.shape[0]
@@ -15268 +15278 @@
 
     for varn in lvars:
+        CFvals = gen.variables_values(varn)
         dvari = figv[varn]
+        Nvari = len(dvari)
         valsi = dvari[0]
-        figt = dvari[1]
-        vn = dvari[2]
-        vx = dvari[3]
-        parfigt = dvari[4]
+        vu = dvari[1]
+        figt = dvari[2]
+        vn = dvari[3]
+        vx = dvari[4]
+        parfigt = dvari[5:Nvari]
 
         if figt == 'cnt_cmap':
             figk = 'cmap'
-            ifp = cont_simple(valsi, x, y, vn, vx, figk, parfigt)
+            ifp = cnt_simple(valsi, x, y, vn, vx, figk, vn=CFvals[0], vu=vu,         \
+              parameters=parfigt)
         elif figt == 'cnt_fixc':
             figk = 'fixc'
-            ifp = cont_simple(valsi, x, y, vn, vx, figk, parfigt)
+            ifp = cnt_simple(valsi, x, y, vn, vx, figk, vn=CFvals[0], vu=vu,         \
+              parameters=parfigt)
         elif figt == 'cnt_fixsigc':
             figk = 'fixsigc'
-            ifp = cont_simple(valsi, x, y, vn, vx, figk, parfigt)
+            ifp = cnt_simple(valsi, x, y, vn, vx, figk, vn=CFvals[0], vu=vu,         \
+              parameters=parfigt)
         elif figt == 'shad':
-            ifp = shad_simple(valsi, x, y, vn, vx, parfigt)
+            ifp = shad_simple(valsi, x, y, vn, vx, vn=CFvals[0], vu=vu,              \
+              parameters=parfigt)
         else:
             print errormsg