Changeset 548 for trunk/UTIL/PYTHON/planetoplot.py

Timestamp:

Mar 1, 2012, 12:50:08 AM (13 years ago)

Author:

aslmd

Message:

UTIL PYTHON: no more meso,mesoapi,mesoideal types -- only meso. fixed wind plotting for idealized file. also more flexible possibilities for naming wind fields in getwinddef

File:

• trunk/UTIL/PYTHON/planetoplot.py (modified) (10 diffs)

trunk/UTIL/PYTHON/planetoplot.py

@@ -126 +126 @@
       ### ... TYPEFILE
       typefile = whatkindfile(nc)
-      if typefile in ['mesoideal']:   mapmode=0
-      elif typefile in ['gcm'] and len(nc.variables["longitude"][:]) is 1 and len(nc.variables["latitude"][:]) is 1:       mapmode=0
-      elif typefile in ['earthgcm'] and len(nc.variables["lon"][:]) is 1 and len(nc.variables["lat"][:]) is 1:       mapmode=0
-      if mapmode == 0:       winds=False
-      elif mapmode == 1 and redope is None:
+      if typefile in ['gcm'] and len(nc.variables["longitude"][:]) is 1 and len(nc.variables["latitude"][:]) is 1:       mapmode=0 ; winds=False
+      elif typefile in ['earthgcm'] and len(nc.variables["lon"][:]) is 1 and len(nc.variables["lat"][:]) is 1:           mapmode=0 ; winds=False
+      if redope is None and mapmode == 1:
           if svert is None:  svert = readslices(str(level)) ; nvert=1
           if stime is None and mrate is None:
@@ -152 +150 @@
       [lon2d,lat2d] = getcoorddef(nc)
       ### ... PROJECTION
-      if ((proj == None) and (typefile not in ['mesoideal'])):   proj = getproj(nc)                 
+      if proj == None:   proj = getproj(nc)                 
 
       if firstfile:
@@ -184 +182 @@
               time = (initime+time*24)%24
               print "LOCAL TIMES.... ", time
-      elif typefile in ['meso','mesoapi','geo','mesoideal']:
+      elif typefile in ['meso','geo']:
           area = None ## not active for the moment
           ###### STUFF TO GET THE CORRECT LAT/LON FROM MESOSCALE FILES WITH 2D LAT/LON ARRAYS
@@ -208 +206 @@
               lonp,latp = ( lon2d[indices[0,0,0],indices[0,0,1]] , lat2d[indices[0,0,0],indices[0,0,1]] )
           ######
-          if typefile in ['mesoapi','meso'] and mapmode == 1: lon2d = dumpbdy(lon2d,6) ; lat2d = dumpbdy(lat2d,6)  ### important to do that now and not before
+          if typefile in ['meso'] and mapmode == 1: lon2d = dumpbdy(lon2d,6) ; lat2d = dumpbdy(lat2d,6)  ### important to do that now and not before
           ######
           if varname in ['PHTOT','W']:    vertdim='BOTTOM-TOP_PATCH_END_STAG'
@@ -333 +331 @@
        else:                                 indextime = getsindex(stime,((nplot-1)//(nlon*nlat*nvert))%ntime,time)
        ltst = None 
-       if typefile in ['mesoapi','meso'] and indextime is not None:  ltst = localtime ( interv[0]+indextime*interv[1], 0.5*(wlon[0]+wlon[1]) )  
+       if typefile in ['meso'] and indextime is not None:  ltst = localtime ( interv[0]+indextime*interv[1], 0.5*(wlon[0]+wlon[1]) )  
        print "********** INDEX LON:",indexlon," LAT:",indexlat," VERT:",indexvert," TIME:",indextime
        ##var = nc.variables["phisinit"][:,:]
@@ -443 +441 @@
                             m = define_proj(proj,wlon,wlat,back=back,blat=blat,blon=blon)  ## this is dirty, defined above but out of imov loop
                             x, y = m(lon2d, lat2d)                                         ## this is dirty, defined above but out of imov loop
-                    if typefile in ['mesoapi','meso'] and mapmode == 1:   what_I_plot_frame = dumpbdy(what_I_plot_frame,6,condition=True)
+                    if typefile in ['meso'] and mapmode == 1:   what_I_plot_frame = dumpbdy(what_I_plot_frame,6,condition=True)
 #                   if typefile in ['mesoideal']:    what_I_plot_frame = dumpbdy(what_I_plot_frame,0,stag='W',condition=dumped_vert_stag)
 
@@ -471 +469 @@
                             #zelevels = np.linspace(zevmin*(1. + 1.e-7),zevmax*(1. - 1.e-7)) #,num=20)
                             zelevels = np.linspace(zevmin,zevmax,num=ticks)
+                            #what_I_plot_frame = smooth(what_I_plot_frame,100)
                             if mapmode == 1:       m.contourf( x, y, what_I_plot_frame, zelevels, cmap = palette, alpha=trans)
                             elif mapmode == 0:     contourf( x, y, what_I_plot_frame, zelevels, cmap = palette, alpha=trans)
@@ -487 +486 @@
                             if zeorientation == "horizontal" and zetitle != "fill": zecb.ax.set_xlabel(zetitle) ; zetitle=""
                         if winds:
-                            if typefile in ['mesoapi','meso']:
+                            if typefile in ['meso']:
                                 [vecx_frame,vecy_frame] = [dumpbdy(vecx_frame,6,stag=uchar,condition=True), dumpbdy(vecy_frame,6,stag=vchar,condition=True)]
                                 key = True
                             elif typefile in ['gcm']:
                                 key = False
-                            if metwind:  [vecx_frame,vecy_frame] = m.rotate_vector(vecx_frame, vecy_frame, lon2d, lat2d)
+                            if metwind and mapmode == 1:   [vecx_frame,vecy_frame] = m.rotate_vector(vecx_frame, vecy_frame, lon2d, lat2d)
                             if var:       colorvec = definecolorvec(back)
                             else:         colorvec = definecolorvec(colorb)
@@ -559 +558 @@
            basename = basename + getstralt(nc,level) 
        if mrate is not None: basename = "movie_" + basename 
-       if typefile in ['mesoapi','meso']:
+       if typefile in ['meso']:
             if slon is not None: basename = basename + "_lon_" + str(int(round(lonp)))
             if slat is not None: basename = basename + "_lat_" + str(int(round(latp)))
@@ -598 +597 @@
     ### Save the figure in a file in the data folder or an user-defined folder
     if outputname is None:
-       if typefile in ['meso','mesoapi']:   prefix = getprefix(nc)
+       if typefile in ['meso']:   prefix = getprefix(nc)
        elif typefile in ['gcm']:            prefix = 'LMD_GCM_'
        else:                                prefix = ''