Changeset 2251 in lmdz_wrf

Timestamp:

Nov 27, 2018, 8:22:54 PM (6 years ago)

Author:

lfita

Message:

Improving 'plot_multi_river_pattern' by adding:

• 'colortracktype': methodology to choice color of the river
• 'all_desc': using only rivers from ' river_desc'

Location:

trunk/tools

Files:

• drawing.py (modified) (8 diffs)
• drawing_tools.py (modified) (7 diffs)

trunk/tools/drawing.py

@@ -10961 +10961 @@
           [desclat]: latitude values
         [rivervalues]= '|' separated list of [colordescid]|[rivercolor]|[rivernocolor]|[riverwidth]
-            [riverwidth] (use 'auto' for 'rainbow|#AAAAAAA|#CCCCCC|0.5')
+            [riverwidth]|[rivercolortype] (use 'auto' for 'rainbow|#AAAAAAA|#CCCCCC|0.5|rivernum')
           [barcolordescid]: color bar to use to distinguish among selected rivers to draw
           [rivercolor]: color for the river-flows of the non selected rivers
           [rivernocolor]: color for the outflows of the non selected rivers
           [riverwidth]: width of the lines of the rivers' path
+          [rivercolortype]: method to deterine color of the tracks of the rivers
+            'riverid': following ids of the rivers
+            'rivernum': following number of rivers to be plotted
         [mapvalues]= map characteristics: [proj],[res]
           see full documentation: http://matplotlib.org/basemap/
@@ -11005 +11008 @@
         [closefig]= whether figure should be closed or not
       riverns= ',' list of the names of the rivers to plot (as in [descfilen])
-        'all': for all rivers in file
+        'all': for all rivers in 'routing.nc'
+        'all_desc': for all rivers in `river_desc.nc'
         'larger',[Npaths]: all river larger than [Npaths] grid points (NOT now)
     """
@@ -11063 +11067 @@
         rivernocolor = '#CCCCCC'
         riverwidth = 0.5
-    else:
-        [barcolordescid, rivercolor, rivernocolor, riverwidth]= rivervalues.split('|')
+        rivercolortype = 'rivernum'
+    else:
+        [barcolordescid, rivercolor, rivernocolor, riverwidth, rivercolortype] =     \
+          rivervalues.split('|')
         riverwidth = np.float(riverwdith)
 
@@ -11159 +11165 @@
         ostation.close()
 
+    # Lonlat box
+    lon, lat = drw.lonlat2D(blon, blat)
+
+    if lonlatbox == 'all':
+        nlon = np.min(lon)
+        nlat = np.min(lat)
+        xlon = np.max(lon)
+        xlat = np.max(lat)
+    else:
+        nlon = np.float(lonlatbox.split('|')[0])
+        nlat = np.float(lonlatbox.split('|')[1])
+        xlon = np.float(lonlatbox.split('|')[2])
+        xlat = np.float(lonlatbox.split('|')[3])
+
+    imin, imax, jmin, jmax = gen.ijlonlat(lon, lat, nlon, xlon, nlat, xlat)
+
     # Getting river's ids:
     if riverns.count(',') != 0:
@@ -11165 +11187 @@
         if riverns == 'all':
             rns = []
+            rns = list(set(list(bid[jmin:jmax,imin:imax].compressed())))
+        elif riverns == 'all_desc':
+            rns = []
+## Following river desc
             Ltail = len(TAILdesccoding)
             allvarns = odesc.variables.keys()
@@ -11179 +11205 @@
                   "': ", allvarns
                 quit(-1)
-
         elif riverns[0:6] == 'larger':
             print errormsg
@@ -11187 +11212 @@
             rns = [riverns]
 
-    print '  ' + fname + ': rivers to plot: [namne] [id] _____'
     codings = {}
-    for rn in rns:
-        ocoding = odesc.variables[rn + TAILdesccoding]
-        maskcoding = ocoding[:].mask
-        rnid = bid[~maskcoding][0]
-        if rnid != gen.mamat[0]:
-            codings[rn] = rnid
-            print rn ,':', rnid
-
-    lon, lat = drw.lonlat2D(blon, blat)
-
-    if lonlatbox == 'all':
-        nlon = np.min(lon)
-        nlat = np.min(lat)
-        xlon = np.max(lon)
-        xlat = np.max(lat)
-    else:
-        nlon = np.float(lonlatbox.split('|')[0])
-        nlat = np.float(lonlatbox.split('|')[1])
-        xlon = np.float(lonlatbox.split('|')[2])
-        xlat = np.float(lonlatbox.split('|')[3])
-
-    imin, imax, jmin, jmax = gen.ijlonlat(lon, lat, nlon, xlon, nlat, xlat)
+    if riverns != 'all':
+        print '  ' + fname + ': rivers to plot: [namne] [id] _____'
+        for rn in rns:
+            ocoding = odesc.variables[rn + TAILdesccoding]
+            maskcoding = ocoding[:].mask
+            rnid = bid[~maskcoding][0]
+            if rnid != gen.mamat[0]:
+                codings[rn] = rnid
+                print rn ,':', rnid
+    else:
+        for rn in rns: codings[rn] = rn
 
     # legend values
@@ -11221 +11234 @@
       bflow[jmin:jmax,imin:imax], bid[jmin:jmax,imin:imax], codings, dlon, dlat,     \
       stn, stlon, stlat, drawcountry, drawbasinid, barcolordescid, rivercolor,       \
-      rivernocolor, riverwidth, stcol, stsize, gtit, mapvals, kindfig, rns)
+      rivernocolor, riverwidth, rivercolortype, stcol, stsize, gtit, mapvals,        \
+      kindfig, rns)
 
     return

trunk/tools/drawing_tools.py

@@ -7809 +7809 @@
 def plot_multi_river_pattern(xvals, yvals, fvals, veccolor, descids, desclon,        \
   desclat, stn, stlon, stlat, drawcountry, drawbasinid, colordescid, coloriver,      \
-  colornoriver, pathwidth, colorst, stsize, graphtit, mapv, kfig, riverns):
+  colornoriver, pathwidth, colortracktype, colorst, stsize, graphtit, mapv, kfig,    \
+  riverns):
     """ Function to plot ORCHIDEE's pattern or multiple rivers (following trip variable from 
         'routing.nc' and river description following 'river_desc.nc')
@@ -7839 +7840 @@
       colornoriver= color for the non-river paths values
       pathwidth= width of the line with the river paths
+      colortracktype: method to deterine color of the tracks of the rivers
+        'riverid': following ids of the rivers
+        'rivernum': following number of rivers to be plotted
       colorst= color for the stations
       stsize= color for the size of the labels of the stations
@@ -7846 +7850 @@
     """
     fname = 'plot_multi_river_pattern'
+    availcolortracktype = ['ricerid', 'rivernum']
 
     figname = 'multi_river_pattern'
@@ -7880 +7885 @@
 # Setting up colors for each label
 #   From: http://stackoverflow.com/questions/15235630/matplotlib-pick-up-one-color-associated-to-one-value-in-a-colorbar
+    drawriverids = descids.values()
+
     my_cmap = plt.cm.get_cmap(colordescid)
-    vcolmin = np.min(descids.values())
-    vcolmax = np.max(descids.values())
-
-    norm = mpl.colors.Normalize(vcolmin, vcolmax)
+    vcolmin = np.min(drawriverids)
+    vcolmax = np.max(drawriverids)
+    Nrivers = len(drawriverids)
+
+    print '  ' + fname + ': river range ids to plot:', vcolmin, vcolmax,             \
+      'Number of rivers:', Nrivers
+
+    if colortracktype == 'riverid':
+        norm = mpl.colors.Normalize(vcolmin, vcolmax)
+    elif colortracktype == 'rivernum':
+        norm = mpl.colors.Normalize(0, Nrivers)
+    else:
+        print errormsg
+        print '  ' + fname + ": river track type '" + colortracktype + "' not ready !!"
+        print '    available ones:', availcolortracktype
+        quit(-1)
 
 # Vector angles
@@ -7891 +7910 @@
 
     print '  ' + fname + ': getting colors for the river-paths ...'
+    drawnriver = []
     for j in range(0,dy):
         for i in range(0,dx):
@@ -7934 +7954 @@
                     ilatlon[0] = gen.index_vec(difflat,mindiffL)
 
-                if not gen.searchInlist(descids.values(), veccolor[j,i]):
+                if not gen.searchInlist(drawriverids, veccolor[j,i]):
                     labcol.append(colornoriver)
                     colortrack.append(colornoriver)
@@ -7941 +7961 @@
 #                        print 'Lluis right! mindiffl', mindiffl,'mindiffL:',mindiffL
                     labcol.append(coloriver)
-                    colortrack.append(my_cmap(norm(veccolor[j,i])))
+                    if not gen.searchInlist(drawnriver, veccolor[j,i]): 
+                        drawnriver.append(veccolor[j,i])
+                    if colortracktype == 'riverid':
+                        colortrack.append(my_cmap(norm(veccolor[j,i])))
+                    elif colortracktype == 'rivernum':
+                        colortrack.append(my_cmap(norm(drawnriver.index(veccolor[j,i]))))
 
                 trackid.append(veccolor[j,i])