Changeset 2744 in lmdz_wrf for trunk

Timestamp:

Nov 4, 2019, 2:33:42 PM (6 years ago)

Author:

lfita

Message:

Adding into `mapFigure', the use of 'DefineMap?'

File:

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

trunk/tools/drawing_tools.py

@@ -4401 +4401 @@
             m = DefineMap(map_proj, map_res, [lat2, lon2])
         elif map_proj == 'spstere':
-            if len(mapv.split(',')) > 2:
+            Nvals = len(mapv.split(','))
+            if Nvals > 2:
+                expected = ['xlat', 'ref_lon']
+                Nexpected = len(expected)
+                if Nvals - 2 != Nexpected:
+                    print errormsg
+                    print '  ' + fname + ": additional values provided for '" +      \
+                      map_proj + "' but ", Nexpected, "where expected and", Nvals,   \
+                      "provided"
+                    print '    one epxect to additinoaly have:', ','.join(expected)
+                    quit(-1)
                 xlat = np.float(mapv.split(',')[2])
                 ref_lon = np.float(mapv.split(',')[3])
                 m = DefineMap(map_proj, map_res, [xlat, ref_lon])
             else:
-                m = DefineMap(map_proj, map_res, [xlat, -65.])
+                m = DefineMap(map_proj, map_res, [xlat, lon2])
         else:
             print errormsg
@@ -4430 +4440 @@
         Nboxes = len(boxesX)/4
         for ibox in range(Nboxes):
-            print ibox, boxesX[ibox], boxesY[ibox]
-            plt.plot(boxesX[ibox*4], boxesY[ibox*4], linestyle='-', linewidth=3,     \
+            xi, yi = m(boxesX[ibox*4], boxesY[ibox*4])
+            plt.plot(xi, yi, linestyle='-', linewidth=3,                             \
               label=gen.latex_text(boxlabels[ibox].replace('!',' ')), color=cols[ibox])
-            plt.plot(boxesX[ibox*4+1], boxesY[ibox*4+1], linestyle='-', linewidth=3, \
-              color=cols[ibox])
-            plt.plot(boxesX[ibox*4+2], boxesY[ibox*4+2], linestyle='-', linewidth=3, \
-              color=cols[ibox])
-            plt.plot(boxesX[ibox*4+3], boxesY[ibox*4+3], linestyle='-', linewidth=3, \
-              color=cols[ibox])
-
-            lonlatb = [boxesX[ibox][0], boxesY[ibox][0], boxesX[ibox*4+2][0],        \
-              boxesY[ibox*4+2][0]]
-            labv = [gen.latex_text(boxlabels[ibox].replace('!',' ')), ]
-            drawpolygon_map(lonlatb, m, labv, 10, ['k', 2, '-'])
+            xi, yi = m(boxesX[ibox*4+1], boxesY[ibox*4+1])
+            plt.plot(xi, yi, linestyle='-', linewidth=3, color=cols[ibox])
+            xi, yi = m(boxesX[ibox*4+2], boxesY[ibox*4+2])
+            plt.plot(xi, yi, linestyle='-', linewidth=3, color=cols[ibox])
+            xi, yi = m(boxesX[ibox*4+3], boxesY[ibox*4+3])
+            plt.plot(xi, yi, linestyle='-', linewidth=3, color=cols[ibox])
 
         m.drawcoastlines()
@@ -14267 +14272 @@
 
     if map_proj == 'cyl':
-      mapenv = Basemap(projection=map_proj, llcrnrlon=nlon, llcrnrlat=nlat,          \
-        urcrnrlon=xlon, urcrnrlat= xlat, resolution=map_res)
+        mapenv = DefineMap(map_proj, map_res, [nlon,nlat,xlon,xlat])
     elif map_proj == 'lcc':
-      mapenv = Basemap(projection=map_proj, lat_0=lat2, lon_0=lon2, llcrnrlon=nlon,  \
-        llcrnrlat=nlat, urcrnrlon=xlon, urcrnrlat= xlat, resolution=map_res)
-    else:
-      print gen.errormsg
-      print '  ' + fname + ": map projection '" + map_proj + "' not defined!!!"
-      print '    available: cyl, lcc'
-      quit(-1)
+        mapenv = DefineMap(map_proj, map_res, [lat2, lon2, nlon, nlat, xlon, xlat])
+    elif map_proj == 'npstere':
+        mapenv = DefineMap(map_proj, map_res, [lat2, lon2])
+    elif map_proj == 'spstere':
+        Nvals = len(mapvals.split(','))
+        if Nvals > 2:
+            expected = ['xlat', 'ref_lon']
+            Nexpected = len(expected)
+            if Nvals - 2 != Nexpected:
+                print errormsg
+                print '  ' + fname + ": additional values provided for '" +      \
+                  map_proj + "' but ", Nexpected, "where expected and", Nvals,   \
+                  "provided"
+                print '    one epxect to additinoaly have:', ','.join(expected)
+                quit(-1)
+            xlat = np.float(mapvals.split(',')[2])
+            ref_lon = np.float(mapvals.split(',')[3])
+            mapenv = DefineMap(map_proj, map_res, [xlat, ref_lon])
+        else:
+            mapenv = DefineMap(map_proj, map_res, [xlat, lon2])
+    else:
+        print errormsg
+        print '  ' + fname + ": projection '" + map_proj + "' not ready !!"
+        quit(-1)
 
     merids = gen.pretty_int(nlon, xlon, Nlon)
@@ -14408 +14429 @@
       polylabv: [polylab, color, size, face, angle, pos]: values for the label of 
           the polygon. if color='auto', then: 
-            [polylab, 'k', 10, 'normal', angle=0, pos='c']
+            [polylab, 'k', 10, 'normal', 0, 'c']
         polylab: label of the polygon (already LaTeX freindly, None for no label)
         color: color of the characters
@@ -14474 +14495 @@
     if polylabv is not None:
         if polylabv[1] == 'auto':
-           polylabv = [polylabv[0], 'k', 10, 'normal', angle=0, pos='c']
+           polylabv = [polylabv[0], 'k', 10, 'normal', 0, 'c']
         polylabpos = polylabv[5].split(',')
         if polylabpos[0] == 'c':
@@ -14574 +14595 @@
       closeif= Boolean value if the figure has to be closed
     """
-    fname = 'plot_topofix_geogrid'
+    fname = 'plot_topofix_geogrid_boxes'
 
     topobnds=[-140., 0., 100., 200., 300., 400., 500., 600., 700., 800., 900., 1000.,\
@@ -14586 +14607 @@
     if type(varv) == type('S') and varv == 'h':
         print fname + '_____________________________________________________________'
-        print plot_topofix_geogrid.__doc__
+        print plot_topofix_geogrid_boxes.__doc__
         quit()