Changeset 834 in lmdz_wrf for trunk

Timestamp:

Jun 16, 2016, 1:28:33 PM (8 years ago)

Author:

lfita

Message:

Adding:

• `basinwidth': with of the lines of the basin
• Avoiding too clear colors (all rgb >= 0.95) , by lookingt the largest and keeping the rest as 0.9
• New definition of figure size by means of sign and lengthtrack

File:

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

trunk/tools/drawing_tools.py

@@ -6940 +6940 @@
     return
 
-def plot_subbasin(subname, lons, lats, rsf, rLlf, rof, rcolors, mapv, drawsubid,     \
-  graphtit, kfig, lloc, figname):
+def plot_subbasin(subname, lons, lats, rsf, rLlf, rof, rcolors, mapv, basinwidth,    \
+  drawsubid, graphtit, kfig, lloc, figname):
     """ Function to plot rivers from 'river_desc.nc' ORCDHIEE
       subname= name of the subbasin
@@ -6961 +6961 @@
           * 'h', high
           * 'f', full
+      basinwidth = with of the lines of the basin
       drawsubid= wehther sub-flow ids should be plot or not
       graphtit= title of the graph ('|', for spaces)
@@ -7004 +7005 @@
 # All the colors should finish white...
     endcol = [1., 1., 1.]
+#    endcol = [0.9, 0.9, 0.9]
     colorsub = {}
     xlabpos = []
@@ -7022 +7024 @@
 # We do not want a last white value...
             if Nlevs < subhr.Nlevs: 
-                maxNcol = subhr.xlevs[ilev]
+                maxNcol = subhr.xlevs[ilev]+1
             else:
                 maxNcol = subhr.xlevs[ilev]+1
@@ -7029 +7031 @@
 
         colorsub[isub] = tuple(begcol)
+# Avoiding too clear colors
+        cols = colorsub[isub]
+        if (cols[0] >= 0.95)*(cols[1] >= 0.95)*(cols[2] >= 0.95):
+            print warnmsg
+            print '  ' + fname + ': avoiding to clear color:', colorsub[isub], '!!'
+            maxcol = np.max(cols)
+            imaxcol = gen.index_vec(cols, maxcol)
+            clear = np.ones((3), dtype=np.float)*0.9
+            clear[imaxcol] = 0.95
+            print '    keeping it clear:', clear
+            colorsub[isub] = tuple(clear)
+
         Llfs = rLlf[isub]
         outfs = rof[isub]
@@ -7056 +7070 @@
             ytrack.append(None)
             colortrack.append(colorsub[isub])
+
         xlabpos.append(ibeg)
         ylabpos.append(jbeg)
@@ -7070 +7085 @@
 
 # Making bigger the area to map
-    nlon = nlon-dlon-lengthtrac2
-    xlon = xlon+dlon+lengthtrac2
-    nlat = nlat-dlat-lengthtrac2
-    xlat = xlat+dlat+lengthtrac2
+#    nlon = nlon-dlon-lengthtrac2
+#    xlon = xlon+dlon+lengthtrac2
+#    nlat = nlat-dlat-lengthtrac2
+#    xlat = xlat+dlat+lengthtrac2
+    nlon = nlon-2.*lengthtrac*dlon/np.abs(dlon)
+    xlon = xlon+2.*lengthtrac*dlon/np.abs(dlon)
+    nlat = nlat-2.*lengthtrac*dlat/np.abs(dlat)
+    xlat = xlat+2.*lengthtrac*dlat/np.abs(dlat)
 
     plt.xlim(nlon,xlon)
@@ -7116 +7135 @@
     j = 0
     for i in range(len(xtrack)/3):
-        plt.plot(xtrack[j:j+2], ytrack[j:j+2], color=colortrack[i])
+        plt.plot(xtrack[j:j+2], ytrack[j:j+2], color=colortrack[i], linewidth=basinwidth)
         j = j + 3
 
@@ -7130 +7149 @@
     if drawsubid:
         for i in range(len(xlabpos)):
-            print ' Lluis:', rsf[i], ':', colorsub[rsf[i]]
             plt.text(xlabpos[i]+0.05*lengthtrac, ylabpos[i]+0.05*lengthtrac, rsf[i], \
               color=colorsub[rsf[i]], fontdict=fontcharac)