Changeset 806

Timestamp:

Oct 15, 2012, 2:01:19 AM (12 years ago)

Author:

aslmd

Message:

UTIL PYTHON. mcd online. sections lon alt and lat alt. and set 'all' mode for any choice of vertical coordinates

Location:

trunk/UTIL/PYTHON/mcd

Files:

• mcd.py (modified) (5 diffs)
• proto/cgi-bin/mcdcgi.py (modified) (3 diffs)

trunk/UTIL/PYTHON/mcd/mcd.py

@@ -291 +291 @@
       return field,fieldlab
 
-    def ininterv(self,dstart,dend,nd,start=None,end=None,yaxis=False):
+    def ininterv(self,dstart,dend,nd,start=None,end=None,yaxis=False,vertcoord=False):
     ### user-defined start and end are used to create xcoord (or ycoord) vector
-      if start is not None and end is not None:  first, second = self.correctbounds(start,end)
-      else:                                      first, second = self.correctbounds(dstart,dend)  
-      if self.zkey != 4: tabtab = np.linspace(first,second,nd)
-      else:              tabtab = np.logspace(first,second,nd)
+      if start is not None and end is not None:  first, second = self.correctbounds(start,end,vertcoord)
+      else:                                      first, second = self.correctbounds(dstart,dend,vertcoord)  
+      if self.zkey != 4 or not vertcoord:   tabtab = np.linspace(first,second,nd)
+      else:                                 tabtab = np.logspace(first,second,nd)
       if not yaxis:      self.xcoord = tabtab
       else:              self.ycoord = tabtab
 
-    def correctbounds(self,start,end):
-      if self.zkey != 4:
+    def correctbounds(self,start,end,vertcoord):
+      if self.zkey != 4 or not vertcoord:
         # regular altitudes
         if start > end: first = end ; second = start
@@ -325 +325 @@
       elif self.zkey == 5: self.vunits = "m AMMRad"
 
+    def vertaxis(self,number,yaxis=False):
+      if self.zkey == 2:   self.ininterv(-5000.,100000.,number,start=self.xzs,end=self.xze,yaxis=yaxis,vertcoord=True)
+      elif self.zkey == 3: self.ininterv(0.,120000.,number,start=self.xzs,end=self.xze,yaxis=yaxis,vertcoord=True)
+      elif self.zkey == 5: self.ininterv(-5000.,100000.,number,start=self.xzs,end=self.xze,yaxis=yaxis,vertcoord=True)
+      elif self.zkey == 4: self.ininterv(1000.,0.001,number,start=self.xzs,end=self.xze,yaxis=yaxis,vertcoord=True)
+      elif self.zkey == 1: self.ininterv(3396000,3596000,number,start=self.xzs,end=self.xze,yaxis=yaxis,vertcoord=True)
+
 ###################
 ### 1D analysis ###
@@ -369 +376 @@
       if tabperso is not None: nd = len(tabperso)
       correct = False
-      self.prepare(ndx=nd) ; self.ininterv(0.,120000.,nd,start=self.xzs,end=self.xze)
+      self.prepare(ndx=nd) ; self.vertaxis(nd)
       if tabperso is not None: self.xcoord = tabperso
       for i in range(nd): self.xz = self.xcoord[i] ; self.update() ; self.put1d(i)
@@ -446 +453 @@
       if not fixedlt: self.loct = umst
       self.lon = save1 ; self.lat = save2 ; self.loct = save3
+
+    def lonalt(self,ndx=37,ndy=20,fixedlt=False):
+    ### retrieve a longitude/altitude slice
+      save1 = self.lon ; save2 = self.xz ; save3 = self.loct
+      self.vertlabel() ; self.ylabel = self.xlabel
+      self.xlabel = "East longitude (degrees)"
+      self.prepare(ndx=ndx,ndy=ndy)
+      self.ininterv(-180.,180.,ndx,start=self.lons,end=self.lone)
+      self.vertaxis(ndy,yaxis=True)
+      if not fixedlt: umst = self.loct
+      for i in range(ndx):
+       for j in range(ndy):
+         self.lon = self.xcoord[i] ; self.xz = self.ycoord[j] 
+         if not fixedlt: 
+           if self.lons is not None and self.lone is not None: self.loct = (umst + (self.lons+self.lone)/30.) % 24
+           else:                                               self.loct = (umst + self.lon/15.) % 24
+         self.update() ; self.put2d(i,j)
+      if not fixedlt: self.loct = umst
+      self.lon = save1 ; self.xz = save2 ; self.loct = save3
+
+    def latalt(self,ndx=19,ndy=20,fixedlt=False):
+    ### retrieve a latitude/altitude slice
+      save1 = self.lat ; save2 = self.xz ; save3 = self.loct
+      self.vertlabel() ; self.ylabel = self.xlabel
+      self.xlabel = "North latitude (degrees)"
+      self.prepare(ndx=ndx,ndy=ndy)
+      self.ininterv(-90.,90.,ndx,start=self.lats,end=self.late)
+      self.vertaxis(ndy,yaxis=True)
+      if not fixedlt: umst = self.loct
+      for i in range(ndx):
+       for j in range(ndy):
+         self.lat = self.xcoord[i] ; self.xz = self.ycoord[j] 
+         if not fixedlt: self.loct = (umst + self.lon/15.) % 24
+         self.update() ; self.put2d(i,j)
+      if not fixedlt: self.loct = umst
+      self.lat = save1 ; self.xz = save2 ; self.loct = save3
 
     def put2d(self,i,j):
@@ -547 +590 @@
       canvas.print_figure(figname, dpi=80)
 
+    def htmlplot2d(self,tabtodo,fixedlt=False,figname="temp.png",title=""):
+    ### complete 2D figure with possible multiplots
+    ### added in 10/2012 for online MCD
+    ### see http://www.dalkescientific.com/writings/diary/archive/2005/04/23/matplotlib_without_gui.html
+      from matplotlib.figure import Figure
+      from matplotlib.backends.backend_agg import FigureCanvasAgg
+      from matplotlib.cm import get_cmap
+      if isinstance(tabtodo,np.str): tabtodo=[tabtodo] ## so that asking one element without [] is possible.
+      if isinstance(tabtodo,np.int): tabtodo=[tabtodo] ## so that asking one element without [] is possible.
+      fig = Figure(figsize=(8,8)) ; subv,subh = myplot.definesubplot( len(tabtodo) , fig )
+
+      for i in range(len(tabtodo)):
+        yeah = fig.add_subplot(subv,subh,i+1)
+        choice = tabtodo[i]
+
+        if self.lons is not None:    self.lonalt(fixedlt=fixedlt)
+        elif self.lats is not None:  self.latalt(fixedlt=fixedlt)
+
+        (field, fieldlab) = self.definefield(choice)
+
+        colorb="jet" ; ndiv=20 ; title=""
+
+        ## define field. bound field.
+        what_I_plot = np.transpose(field)
+        zevmin, zevmax = myplot.calculate_bounds(what_I_plot)  ## vmin=min(what_I_plot_frame), vmax=max(what_I_plot_frame))
+        what_I_plot = myplot.bounds(what_I_plot,zevmin,zevmax)
+        ## define contour field levels. define color palette
+        ticks = ndiv + 1
+        zelevels = np.linspace(zevmin,zevmax,ticks)
+        palette = get_cmap(name=colorb)
+        # contour field
+        c = yeah.contourf( self.xcoord, self.ycoord, what_I_plot, zelevels, cmap = palette )
+        clb = Figure.colorbar(fig,c,orientation='vertical',format="%.1e")
+        clb.set_label(fieldlab)
+        ax = fig.gca() ; ax.set_ylabel(self.ylabel) ; ax.set_xlabel(self.xlabel)
+        if self.zkey == 4: ax.set_yscale('log') ; ax.set_ylim(ax.get_ylim()[::-1])
+
+        #ax.set_xticks(np.arange(-180,181,45)) ; ax.set_xbound(lower=self.lons, upper=self.lone)
+        #ax.set_yticks(np.arange(-90,91,30)) ; ax.set_ybound(lower=self.lats, upper=self.late)
+
+      self.gettitle()
+      fig.text(0.5, 0.95, self.title, ha='center')
+      fig.text(0.5, 0.01, self.ack, ha='center')
+      canvas = FigureCanvasAgg(fig)
+      # The size * the dpi gives the final image size
+      #   a4"x4" image * 80 dpi ==> 320x320 pixel image
+      canvas.print_figure(figname, dpi=80)
+
 
     ### TODO: makeplot2d, plot2d, passer plot settings

trunk/UTIL/PYTHON/mcd/proto/cgi-bin/mcdcgi.py

@@ -59 +59 @@
 else:                isloctfree = 0 ; query.loct = float(getloct)
 
+try: query.zkey = int(form.getvalue("zkey"))
+except: query.zkey = int(3)
+
 query.xz = -9999.
 getalt = form.getvalue("altitude")
 if getalt == None: getalt = "1"
-if getalt == "all":  isaltfree = 1 ; query.xzs = 0. ; query.xze = 120000.
+if getalt == "all":  
+    isaltfree = 1 
+    if query.zkey == 2:    query.xzs = -5000.   ; query.xze = 100000.
+    elif query.zkey == 3:  query.xzs = 0.       ; query.xze = 120000.
+    elif query.zkey == 5:  query.xzs = -5000.   ; query.xze = 100000.
+    elif query.zkey == 4:  query.xzs = 1000.    ; query.xze = 0.001
+    elif query.zkey == 1:  query.xzs = 3396000. ; query.xze = 3596000.
 elif ";" in getalt:  isaltfree = 1 ; ind = getalt.find(";") ; query.xzs = float(getalt[:ind]) ; query.xze = float(getalt[ind+1:])
 else:                isaltfree = 0 ; query.xz = float(getalt)
@@ -83 +92 @@
 try: query.dust = int(form.getvalue("dust"))
 except: query.dust  = int(1)
-try: query.zkey = int(form.getvalue("zkey"))
-except: query.zkey = int(3)
 #        self.perturkey = 0  #integer perturkey ! perturbation type (0: none)
 #        self.seedin    = 1  #random number generator seed (unused if perturkey=0)
@@ -141 +148 @@
 
     ### getting data
-    if islatfree == 1 and islonfree == 1:       query.latlon()   
-    else:                                       exit()  
-
-    ### figure    
-    query.htmlmap2d(vartoplot,incwind=iswindlog,fixedlt=input_fixedlt,figname=figname) 
-    #mpl.savefig("img/temp.png",dpi=110,bbox_inches='tight',pad_inches=0.4)
-    #Image.open("img/temp.png").save(figname,'JPEG') ##lighter images   
-    ### http://www.pythonware.com/library/pil/handbook/introduction.htm
+    if islatfree == 1 and islonfree == 1:       
+        query.htmlmap2d(vartoplot,incwind=iswindlog,fixedlt=input_fixedlt,figname=figname) 
+        #mpl.savefig("img/temp.png",dpi=110,bbox_inches='tight',pad_inches=0.4)
+        #Image.open("img/temp.png").save(figname,'JPEG') ##lighter images   
+        ### http://www.pythonware.com/library/pil/handbook/introduction.htm
+    elif isaltfree == 1 and islonfree == 1:     
+        query.htmlplot2d(vartoplot,fixedlt=input_fixedlt,figname=figname)
+    elif isaltfree == 1 and islatfree == 1:     
+        query.htmlplot2d(vartoplot,fixedlt=input_fixedlt,figname=figname)
+    else:
+        exit()  
 
 ## This is quite common