Changeset 218 in lmdz_wrf for trunk

Timestamp:

Jan 14, 2015, 5:28:41 PM (10 years ago)

Author:

lfita

Message:

Committing without knowing what's new!? brbrbrbrbrb

Location:

trunk/tools

Files:

• drawing.py (modified) (3 diffs)
• drawing_tools.py (modified) (4 diffs)
• nc_var_tools.py (modified) (7 diffs)

trunk/tools/drawing.py

@@ -1479 +1479 @@
     draw_lines(ncfilens, values, varname):
       ncfilens= [filen] ',' separated list of netCDF files
-      values= [dimvname]:[valuesaxis]:[dimtit]:[leglabels]:[vtit]:[title]:[graphk]
+      values= [dimvname]:[valuesaxis]:[dimtit]:[leglabels]:[vtit]:[title]:[locleg]:[graphk]
         [dimvname]: name of the variable with he values of the common dimension
         [valuesaxis]: which axis will be used for the values ('x', or 'y')
@@ -1486 +1486 @@
         [vartit]: name of the variable in the graph
         [title]: title of the plot ('|' for spaces)
+        [locleg]: location of the legend (-1, autmoatic)
+          1: 'upper right', 2: 'upper left', 3: 'lower left', 4: 'lower right',
+          5: 'right', 6: 'center left', 7: 'center right', 8: 'lower center',
+          9: 'upper center', 10: 'center'
         [graphk]: kind of the graphic
       varname= variable to plot
@@ -1498 +1502 @@
         quit()
 
-    expectargs = '[dimvname]:[valuesaxis]:[dimtit]:[leglabels]:[vtit]:[title]:[graphk]'
+    expectargs = '[dimvname]:[valuesaxis]:[dimtit]:[leglabels]:[vtit]:[title]:[locleg]:[graphk]'
     drw.check_arguments(fname,len(expectargs.split(':')),values,':',expectargs)
 

trunk/tools/drawing_tools.py

@@ -3466 +3466 @@
                         y[i,:] = dimyv
 
-    plt.rc('text', usetex=True)
+#    plt.rc('text', usetex=True)
 
     plt.pcolormesh(x, y, varsv, cmap=plt.get_cmap(colorbar), vmin=vs[0], vmax=vs[1])
@@ -4431 +4431 @@
     return
 
-def plot_lines(vardv, varvv, vaxis, dtit, linesn, vtit, vunit, gtit, kfig):
+def plot_lines(vardv, varvv, vaxis, dtit, linesn, vtit, vunit, gtit, gloc, kfig):
     """ Function to plot a collection of lines
       vardv= list of set of dimension values
@@ -4441 +4441 @@
       vunit= units of the vaxis
       gtit= main title
+      gloc= location of the legend (-1, autmoatic)
+        1: 'upper right', 2: 'upper left', 3: 'lower left', 4: 'lower right',
+        5: 'right', 6: 'center left', 7: 'center right', 8: 'lower center',
+        9: 'upper center', 10: 'center'
       kfig= kind of figure
       plot_lines([np.arange(10)], [np.sin(np.arange(10)*np.pi/2.5)], 'y', 'time (s)',      \
@@ -4485 +4489 @@
 
     plt.title(graphtit)
-    plt.legend()
+    plt.legend(loc=gloc)
     
     output_kind(kfig, figname, True)

trunk/tools/nc_var_tools.py

@@ -12134 +12134 @@
           'tex3': printed output as LaTeX table of three columns \verb+namelist_name+ & value
           'column': printed output as namelist_name value
-          'dic': as python dictionary object
+          'dict': as two python dictionary object (namelistname, value and namelistname, sectionname)
       namelist= namelist_like file to retrieve values
     >>> get_namelist_vars('geogrid,dic','/home/lluis/etudes/domains/medic950116/namelist.wps')
@@ -12167 +12167 @@
     sections = {}
     namelistvals = {}
+    namelistsecs = {}
     sectionnames = []
     namessec = []
     allnames = []
     namelistvalssec = {}
+    namelistsecssec = {}
+    nmlname = ''
     sectionname = ''
 
@@ -12182 +12185 @@
 
             sectionname = linevals[0][1:len(linevals[0])+1]
-            print '    ' + fname + ": new section '" + sectionname + "' !!!"
+#            print '    ' + fname + ": new section '" + sectionname + "' !!!"
             sectionnames.append(sectionname)
             namessec = []
+            nmlname = ''
         elif Nvals >= 1 and not searchInlist(commentchars,linevals[0][0:1]):
             if Nvals >= 3 and searchInlist(valuessep,linevals[1]):
@@ -12212 +12216 @@
                 print '    line values:',linevals
 #                quit(-1)
+
             namelistvals[nmlname] = nmlval
+            namelistsecs[nmlname] = sectionname
+
             namessec.append(nmlname)
             allnames.append(nmlname)
@@ -12230 +12237 @@
             for nnml in sections[secname]:
                 namelistvalssec[nnml] = namelistvals[nnml]
+                namelistsecssec[nnml] = secname
                 if nml == nnml: namestouse.append(nml)
     else:
         namestouse = allnames
         namelistvalssec = namelistvals
+        namelistsecssec = namelistsecs
 
     if kout == 'tex3':
@@ -12288 +12297 @@
         return
     elif kout == 'dict':
-        return namelistvalssec
+        return namelistvalssec, namelistsecssec
     else:
         print errormsg
@@ -12616 +12625 @@
 
 #filter_2dim('80,y,x,lon,lat', 'tahiti_5m_ll.grd', 'z')
-
 
 def ncreplace(values, ncfile, varn):