Changeset 1968 in lmdz_wrf

Timestamp:

Jul 24, 2018, 6:45:52 PM (7 years ago)

Author:

lfita

Message:

Adding to `draw_2D_shad_contdisc'

• [plotrange]: range of the plot
• Extremes of plots only from mapping area

Location:

trunk/tools

Files:

• drawing.py (modified) (11 diffs)
• drawing_tools.py (modified) (6 diffs)

trunk/tools/drawing.py

@@ -9151 +9151 @@
         * NOTE: limits of the graph will be computed from the continuous variable
       values=[vnamefs]:[dvarxn],[dvaryn]:[dimxyfmt]:[colorbarvals]:[sminv],[smaxv]:
-       [discvals]:[figt]:[kindfig]:[reverse]:[mapv]:[close]
+       [discvals]:[figt]:[kindfig]:[reverse]:[mapv]:[plotrange]:[close]
         [vnamefs]: Name in the figure of the variable to be shaded
         [dvarxn],[dvaryn]: name of the dimensions for the final x-axis and y-axis at 
@@ -9207 +9207 @@
             * 'h', high
             * 'f', full
+        [plotrange]: range of the plot
+          'strict': map covers only the minimum and maximum lon,lats from the 
+            locations of the discrtete points
+          'sponge,'[dlon],[dlat]: map covers an extended [dlon],[dlat] from the 
+            minimum and maximum lon,lats from the locations of the discrtete points
+          'fullcontinuous': map covers all the shadding area
         [close]: Whether figure should be finished or not
     """
@@ -9217 +9223 @@
 
     expectargs = '[vnamefs]:[dvarxn],[dvaryn]:[dimxyfmt]:[colorbarvals]:[sminv],' +  \
-      '[smaxv]:[discvals]:[figt]:[kindfig]:[reverse]:[mapv]:[close]'
+      '[smaxv]:[discvals]:[figt]:[kindfig]:[reverse]:[mapv]:[plotrange]:[close]'
  
     drw.check_arguments(fname,values,expectargs,':')
@@ -9231 +9237 @@
     revals = values.split(':')[8]
     mapvalue = values.split(':')[9]
-    close = gen.Str_Bool(values.split(':')[10])
+    plotrange = values.split(':')[10]
+    close = gen.Str_Bool(values.split(':')[11])
 
     ncs = ncfiles.split('@')
@@ -9266 +9273 @@
         if  not onc.variables.has_key(varn):
             print errormsg
-            print '  ' + fname + ": '" + hfn + "' file '" + ncfile +                 \
+            print '  ' + fname + ": '" + hfn + "' file '" + ncfilen +                \
               "' does not have variable '" + varn + "' !!"
             varns = sorted(onc.variables.keys())
@@ -9276 +9283 @@
         vals, dims = drw.slice_variable(ovar, dimvals.replace(',','|'))
 
-        # Values have to be 2D (might not be true for disc?)
-        if len(vals.shape) != 2:
+        # Values have to be 2D
+        if hfn == 'cont' and len(vals.shape) != 2:
             print errormsg
             print '  ' + fname + ": values have to be 2D !!"
@@ -9294 +9301 @@
         if  not onc.variables.has_key(vdimxn):
             print errormsg
-            print '  ' + fname + ": '" + hfn + "' file '" + ncfile +                 \
+            print '  ' + fname + ": '" + hfn + "' file '" + ncfilen +                \
               "' does not have x-dimension variable '" +  vdimxn + "' !!"
             varns = sorted(onc.variables.keys())
@@ -9301 +9308 @@
         if  not onc.variables.has_key(vdimyn):
             print errormsg
-            print '  ' + fname + ": '" + hfn + "' file '" + ncfile +                 \
+            print '  ' + fname + ": '" + hfn + "' file '" + ncfilen +                \
               "' does not have y-dimension variable '" +  vdimyn + "' !!"
             varns = sorted(onc.variables.keys())
@@ -9392 +9399 @@
             absyn = dyn
             absyx = dyx
+            contxynx = [dxn, dxx, dyn, dyx]
 
         else:
@@ -9403 +9411 @@
                 madiscvarv = vals
 
-            # Getting 2D dimensions
-            [d2Dx, d2Dy] = np.meshgrid(odimxv0, odimyv0)
-
-            # Checking for flipping axis?
-            if d2Dx.shape[0] == vals.shape[1] and d2Dx.shape[1] == vals.shape[0]:
-                print '  rotating values !'
-                #madiscvarv = madiscvarv.transpose()
-                d2Dx = d2Dx.transpose()
-                d2Dy = d2Dy.transpose()
-
-            # vals have to be 2D otherwise... ?
-            dx = madiscvarv.shape[1]
-            dy = madiscvarv.shape[0]
-            for j in range(dy):
-                for i in range(dx):
-                    if not madiscvarv.mask[j,i]:
-                        discvarv.append(madiscvarv[j,i])
-                        discx.append(d2Dx[j,i])
-                        discy.append(d2Dy[j,i])
+            if len(vals.shape) == 1:
+                if type(madiscvarv.mask) == type(np.True_):
+                    discvarv = list(madiscvarv[:])
+                    discx = list(odimxv0[:])
+                    discy = list(odimyv0[:])
+                else:
+                    for i in range(vals.shape[0]):
+                        if not madiscvarv.mask[i]:
+                            discvarv.append(madiscvarv[i])
+                            discx.append(odimxv0[i])
+                            discy.append(odimyv0[i])
+
+            elif len(vals.shape) == 2:
+                # Getting 2D dimensions
+                [d2Dx, d2Dy] = np.meshgrid(odimxv0, odimyv0)
+
+                # Checking for flipping axis?
+                if d2Dx.shape[0] == vals.shape[1] and d2Dx.shape[1] == vals.shape[0]:
+                    print '  rotating values !'
+                    #madiscvarv = madiscvarv.transpose()
+                    d2Dx = d2Dx.transpose()
+                    d2Dy = d2Dy.transpose()
+
+                # vals have to be 2D otherwise... ?
+                dx = madiscvarv.shape[1]
+                dy = madiscvarv.shape[0]
+                for j in range(dy):
+                    for i in range(dx):
+                        if not madiscvarv.mask[j,i]:
+                            discvarv.append(madiscvarv[j,i])
+                            discx.append(d2Dx[j,i])
+                            discy.append(d2Dy[j,i])
+            else:
+                # Values have to be 1D or 2D
+                print errormsg
+                print '  ' + fname + ": disc. values have to be 1D or 2D !!"
+                print '    provided shape:', vals.shape, 'for slice:', dimvals
+                quit(-1)
 
             Ndiscvals = len(discvarv)
@@ -9438 +9465 @@
         onc.close()
 
-    graphnx = [absxn, absxx, absyn, absyx]
-    print 'limits of the graphic:', graphnx
+    if plotrange[0:6] == 'strict': 
+        graphnx = [absxn, absxx, absyn, absyx]
+    elif plotrange[0:6] == 'sponge':
+        dlon = np.float(plotrange.split(',')[1])
+        dlat = np.float(plotrange.split(',')[2])
+        graphnx = [absxn-dlon, absxx+dlon, absyn-dlat, absyx+dlat]
+    elif plotrange[0:14] == 'fullcontinuous':
+        graphnx = contxynx 
+
+    print "  '" + plotrange + "' limits of the graphic:", graphnx
 
     shading_nx = []

trunk/tools/drawing_tools.py

@@ -11837 +11837 @@
     pixkind = 'data'
 
-    print 'reva:', reva
     if reva is not None:
         varsv, dimxv, dimyv, dimxt, dimyt, dimxl, dimyl, dimxT, dimyT, limx, limy =      \
@@ -11864 +11863 @@
         dy = lat0.shape[0]
 
-        nlon = np.min(lon0)
-        xlon = np.max(lon0)
-        nlat = np.min(lat0)
-        xlat = np.max(lat0)
+        #nlon = np.min(lon0)
+        #xlon = np.max(lon0)
+        #nlat = np.min(lat0)
+        #xlat = np.max(lat0)
+        nlon = gmaxmin[0]
+        xlon = gmaxmin[1]
+        nlat = gmaxmin[2]
+        xlat = gmaxmin[3]
 
         lon2 = lon0[dy/2,dx/2]
@@ -11888 +11891 @@
  
         x,y = m(lon0,lat0)
-
     else:
         # No following data values
@@ -11898 +11900 @@
     fvarsv = varsv.flatten()
     fobsv = obsv[:,2].flatten()
-    allvals = np.array(list(fvarsv) + list(fobsv))
+
+    # Getting extremes only from the plotted area
+    stmapvals, ijmapvals = ncvar.stats_lonlat_box(varsv, lon0, lat0, nlon, xlon, nlat, xlat)
+    allvals = np.array(stmapvals[0:2] + list(fobsv))
+    #print '  Figure minmax:', stmapvals[0:2], 'absolute:', np.min(varsv), np.max(varsv)
 
     vsend = graphic_range(vs, allvals)
@@ -11929 +11935 @@
 
     for iobs in range(Nobs):
-        xobs = (obsv[iobs,0]-xmin)/(xmax-xmin)
-        yobs = (obsv[iobs,1]-ymin)/(ymax-ymin)
+        if mapv is None:
+            xobs = (obsv[iobs,0]-xmin)/(xmax-xmin)
+            yobs = (obsv[iobs,1]-ymin)/(ymax-ymin)
+        else:
+            xobs = obsv[iobs,0]
+            yobs = obsv[iobs,1]
         clv = my_cmap(norm(obsv[iobs,2]))
         plt.plot(xobs, yobs, discinf[0], color=clv, markersize=discinf[1], zorder=100)
@@ -12037 +12047 @@
     plt.title(gen.latex_text(figtitle))
 
-    figname = '2Dshad_obs-sim_comparison.png'
+    figname = '2Dshad_obs-sim_comparison'
     output_kind(kfig, figname, close)