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

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

File:

• trunk/UTIL/PYTHON/mcd/proto/cgi-bin/mcdcgi.py (modified) (3 diffs)

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