Changeset 723 for trunk/UTIL/PYTHON/mcd

Timestamp:

Jul 16, 2012, 5:49:10 PM (12 years ago)

Author:

aslmd

Message:

UTIL PYTHON : added seasonal and wind capability to MCD python interface. updated READMEs for LMD insiders.

Location:

trunk/UTIL/PYTHON/mcd

Files:

• mcd.py (modified) (2 diffs)
• proto/index.html (modified) (1 diff)

trunk/UTIL/PYTHON/mcd/mcd.py

@@ -247 +247 @@
       for i in range(nd): self.xz = self.xcoord[i] ; self.update() ; self.put1d(i)
 
+    def seasonal(self,nd=12,start=0.,end=360.):
+    ### retrieve a seasonal slice
+      self.xlabel = "Areocentric longitude (degrees)"
+      self.prepare(ndx=nd) ; self.xcoord = np.linspace(start,end,nd)
+      for i in range(nd): self.xdate = self.xcoord[i] ; self.update() ; self.put1d(i)
+
     def latlon(self,ndx=37,startx=-180.,endx=180.,ndy=19,starty=-90.,endy=90.):
     ### retrieve a latitude/longitude slice
@@ -283 +289 @@
       self.extvartab[i,j,1:100] = self.extvar[0:99] ## note: var numbering according to MCD manual is kept
 
-    def makemap2d(self,choice):
+    def makemap2d(self,choice,incwind=False):
     ### one 2D map is created for the user-defined variable in choice.
+      self.latlon() ## a map is implicitely a lat-lon plot. otherwise it is a plot (cf. makeplot2d)
       (field, fieldlab) = self.definefield(choice)
-      myplot.maplatlon(self.xcoord,self.ycoord,field,title=fieldlab,proj="moll")
-
-    def map2d(self,tabtodo):
+      if incwind:
+          (windx, fieldlabwx) = self.definefield("u")
+          (windy, fieldlabwy) = self.definefield("v")
+          myplot.maplatlon(self.xcoord,self.ycoord,field,title=fieldlab,proj="cyl",vecx=windx,vecy=windy)
+      else:
+          myplot.maplatlon(self.xcoord,self.ycoord,field,title=fieldlab,proj="moll")
+
+    def map2d(self,tabtodo,incwind=False):
     ### complete 2D figure with possible multiplots
       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 = mpl.figure() ; subv,subh = myplot.definesubplot( len(tabtodo) , fig ) 
-      for i in range(len(tabtodo)): mpl.subplot(subv,subh,i+1) ; self.makemap2d(tabtodo[i])
+      for i in range(len(tabtodo)): mpl.subplot(subv,subh,i+1) ; self.makemap2d(tabtodo[i],incwind=incwind)
 
     ### TODO: makeplot2d, plot2d, passer plot settings, vecteurs, plot loct pas fixe

trunk/UTIL/PYTHON/mcd/proto/index.html

@@ -51 +51 @@
 <li>Altitude   
 <input type="radio" name="isaltfree" value="0" checked> Value: <input type="text" size="2" name="altitude" value="10.">
-<input type="radio" name="isaltfree" value="1"> All [0 ; 100000] km
+<input type="radio" name="isaltfree" value="1"> All [0 ; 100000] m
 </li>
 </ul>