Changeset 797 for trunk

Timestamp:

Oct 1, 2012, 8:45:43 AM (12 years ago)

Author:

aslmd

Message:

UTIL PYTHON: mcd interface, a more compact code. and added online handling of various vertical coordinates.

Location:

trunk/UTIL/PYTHON/mcd

Files:

• mcd.py (modified) (8 diffs)
• proto/cgi-bin/mcdcgi.py (modified) (2 diffs)
• proto/index.html (modified) (1 diff)

trunk/UTIL/PYTHON/mcd/mcd.py

@@ -41 +41 @@
         self.locte     = None
         self.xdate     = 0.  # see datekey
+        self.xdates    = None
+        self.xdatee    = None
         self.xz        = 10. # see zkey
         self.xzs       = None
@@ -46 +48 @@
         ## 1bis. related settings
         self.zkey      = 3  # specify that xz is the altitude above surface (m)
+                            # zkey  : <integer>   type of vertical coordinate xz
+                            # 1 = radius from centre of planet (m)
+                            # 2 = height above areoid (m) (MOLA zero datum)
+                            # 3 = height above surface (m)
+                            # 4 = pressure level (Pa)
+                            # 5 = altitude above mean Mars Radius(=3396000m) (m)
         self.datekey   = 1  # 0 = "Earth time": xdate is given in Julian days (localtime must be set to zero)
                             # 1 = "Mars date": xdate is the value of Ls
@@ -256 +264 @@
       return field,fieldlab
 
+    def ininterv(self,dstart,dend,nd,start=None,end=None,yaxis=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 not yaxis: self.xcoord = np.linspace(first,second,nd)
+      else:         self.ycoord = np.linspace(first,second,nd)
+      ## here we should code the log axis for pressure
+
+    def correctbounds(self,start,end):
+      if self.zkey != 4:
+        # regular altitudes
+        if start > end: first = end ; second = start
+        else:           first = start ; second = end
+      else:
+        # pressure: reversed avis
+        if start < end: first = end ; second = start
+        else:           first = start ; second = end
+      return first, second
+
 ###################
 ### 1D analysis ###
@@ -272 +299 @@
     ### retrieve a local time slice
       self.xlabel = "Local time (Martian hour)"
-      self.prepare(ndx=nd) 
-      if self.locts is not None and self.locte is not None:
-          if self.locts > self.locte: yeah = self.locts ; self.locts = self.locte ; self.locte = yeah
-          self.xcoord = np.linspace(self.locts,self.locte,nd)
-      else:
-          self.xcoord = np.linspace(0.,24.,nd)
+      self.prepare(ndx=nd) ; self.ininterv(0.,24.,nd,start=self.locts,end=self.locte) 
       for i in range(nd): self.loct = self.xcoord[i] ; self.update() ; self.put1d(i)
 
@@ -283 +305 @@
     ### retrieve a longitude slice
       self.xlabel = "East longitude (degrees)"
-      self.prepare(ndx=nd) 
-      if self.lons is not None and self.lone is not None:
-          if self.lons > self.lone: yeah = self.lons ; self.lons = self.lone ; self.lone = yeah
-          self.xcoord = np.linspace(self.lons,self.lone,nd)
-      else:
-          self.xcoord = np.linspace(-180.,180.,nd)
+      self.prepare(ndx=nd) ; self.ininterv(-180.,180.,nd,start=self.lons,end=self.lone)
       for i in range(nd): self.lon = self.xcoord[i] ; self.update() ; self.put1d(i)
 
@@ -294 +311 @@
     ### retrieve a latitude slice
       self.xlabel = "North latitude (degrees)"
-      self.prepare(ndx=nd)
-      if self.lats is not None and self.late is not None: 
-          if self.lats > self.late: yeah = self.lats ; self.lats = self.late ; self.late = yeah
-          self.xcoord = np.linspace(self.lats,self.late,nd)
-      else:                                               
-          self.xcoord = np.linspace(-90.,90.,nd)
+      self.prepare(ndx=nd) ; self.ininterv(-90.,90.,nd,start=self.lats,end=self.late)
       for i in range(nd): self.lat = self.xcoord[i] ; self.update() ; self.put1d(i)
 
@@ -306 +318 @@
       self.xlabel = "Altitude (m)"
       if tabperso is not None: nd = len(tabperso)
-      self.prepare(ndx=nd) 
-      if tabperso is not None:
-          self.xcoord = tabperso
-      elif self.xzs is not None and self.xze is not None:
-          ## here we should code the log axis for pressure
-          self.xcoord = np.linspace(self.xzs,self.xze,nd)
-      else:
-          self.xcoord = np.linspace(0.,120000.,nd)
+      correct = False
+      self.prepare(ndx=nd) ; self.ininterv(0.,120000.,nd,start=self.xzs,end=self.xze)
+      if tabperso is not None: self.xcoord = tabperso
       for i in range(nd): self.xz = self.xcoord[i] ; self.update() ; self.put1d(i)
 
-    def seasonal(self,nd=12,start=0.,end=360.):
+    def seasonal(self,nd=12):
     ### retrieve a seasonal slice
       self.xlabel = "Areocentric longitude (degrees)"
-      self.prepare(ndx=nd) ; self.xcoord = np.linspace(start,end,nd)
+      self.prepare(ndx=nd) ; self.ininterv(0.,360.,nd,start=self.xdates,end=self.xdatee)
       for i in range(nd): self.xdate = self.xcoord[i] ; self.update() ; self.put1d(i)
 
@@ -369 +376 @@
       self.xlabel = "East longitude (degrees)" ; self.ylabel = "North latitude (degrees)"
       self.prepare(ndx=ndx,ndy=ndy)
-      if self.lons is not None and self.lone is not None:
-          if self.lons > self.lone: yeah = self.lons ; self.lons = self.lone ; self.lone = yeah
-          self.xcoord = np.linspace(self.lons,self.lone,ndx)
-      else:
-          self.xcoord = np.linspace(-180.,180.,ndx)
-      if self.lats is not None and self.late is not None:
-          if self.lats > self.late: yeah = self.lats ; self.lats = self.late ; self.late = yeah
-          self.ycoord = np.linspace(self.lats,self.late,ndy)
-      else:
-          self.ycoord = np.linspace(-90.,90.,ndy)
+      self.ininterv(-180.,180.,ndx,start=self.lons,end=self.lone)
+      self.ininterv(-90.,  90.,ndy,start=self.lats,end=self.late,yaxis=True)
       if not fixedlt: umst = self.loct
       for i in range(ndx):

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

@@ -75 +75 @@
 try: query.dust = int(form.getvalue("dust"))
 except: query.dust  = int(1)
-#        self.zkey      = 3  # specify that xz is the altitude above surface (m)
+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)
@@ -154 +155 @@
 
 print header
+#print query.printset()
+#print "<br />"
 
 ## Now the part which differs

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

@@ -96 +96 @@
 <td align="center">
 <b>CUSTOMIZE COORDINATES ON MARS</b><br />
-please give: a value (or) a range val1;val2 (or) 'all'<br />
+write a value (or) a range val1;val2 (or) 'all'<br />
 <ul>
-<li>North Latitude <input type="text" size="7" name="latitude" value="0."> 
-<li>East Longitude <input type="text" size="7" name="longitude" value="0."> 
-<li>Local Time <input type="text" size="7" name="localtime" value="0."> 
-<li>Altitude (m) <input type="text" size="7" name="altitude" value="10."> 
+<li>Latitude <input type="text" size="7" name="latitude" value="0."> degree North 
+<li>Longitude <input type="text" size="7" name="longitude" value="0."> degree East
+<li>Local Time <input type="text" size="7" name="localtime" value="0."> Martian hour
+<li>Altitude <input type="text" size="9" name="altitude" value="10."> <select name="zkey">
+<option value="1"         >m (O: Mars center)</option>
+<option value="2"         >m (O: "sea level")</option>
+<option value="3" selected>m (O: surface)</option>
+<option value="4"         >Pa (pressure)</option>
+<option value="5"         >m (O: 3396 km)</option>
+</select>
 <!--
 <li>Latitude