Changeset 1075 for trunk/UTIL

Timestamp:

Oct 18, 2013, 5:24:05 PM (11 years ago)

Author:

aslmd

Message:

UTIL PYTHON. MCD online. previous changes after progress meeting were not committed.

Location:

trunk/UTIL/PYTHON/mcd

Files:

• gfortran_netcdf4_fPIC (added)
• inimeso/inimeso5.py (modified) (1 diff)
• inimeso/input_coord (modified) (1 diff)
• mcd.py (modified) (6 diffs)
• proto/cgi-bin/mcdcgi.py (modified) (2 diffs)
• proto/index4.html (modified) (2 diffs)
• proto/index5.html (modified) (2 diffs)

trunk/UTIL/PYTHON/mcd/inimeso/inimeso5.py

@@ -22 +22 @@
 
 ### GET and WRITE SURFACE VALUES
-query.xz = 0. ; query.update() ; query.printmeanvar()
+query.xz = 0.1 ; query.update() ; query.printmeanvar()
 sounding.write( "%10.2f%12.2f%12.2f\n" % (query.pres/100.,query.temp*(610./query.pres)**(1.0/3.9),0.) )
 more.write( "%10.2f%10.2f" % (query.extvar[1],query.extvar[14]) ) ; more.close()
 
 ### GET and WRITE VERTICAL PROFILE
-query.profile( tabperso = np.append([0,5,10,20,50,100],np.linspace(200.,float(split(lines[4])[0])*1000.,float(split(lines[5])[0]))) )
+query.profile( tabperso = np.append([0.1,5,10,20,50,100],np.linspace(200.,float(split(lines[4])[0])*1000.,float(split(lines[5])[0]))) )
 for iz in range(len(query.prestab)):
     sounding.write(   "%10.2f%12.2f%12.2f%12.2f%12.2f\n" % ( \

trunk/UTIL/PYTHON/mcd/inimeso/input_coord

@@ -1 @@
-353.87  lon
--1.88   lat
-244.    ls
-06.     lct
-20      ztop
+173.0   lon
+-1.0    lat
+120.    ls
+05.     lct
+25      ztop
 100.    nz

trunk/UTIL/PYTHON/mcd/mcd.py

@@ -28 +28 @@
         self.name      = "MCD v4.3"
         self.ack       = "Mars Climate Database (c) LMD/OU/IAA/ESA/CNES"
-        self.dset      = '/home/aymeric/Science/MCD_v4.3/data/'
-        #self.dset      = '/home/marshttp/MCD_v4.3/data/'
+        #self.dset      = '/home/aymeric/Science/MCD_v4.3/data/'
+        self.dset      = '/home/marshttp/MCD_v4.3/data/'
         ## 1. spatio-temporal coordinates
         self.lat       = 0.
@@ -82 +82 @@
         self.max2d = None
         self.dpi = 80.
+        self.islog = False
 
     def toversion5(self):
@@ -231 +232 @@
         if "(K)" in dastuff:      self.fmt="%.0f"
         elif "effective radius" in dastuff: self.fmt="%.2e"
-        elif "(Pa)" in dastuff:   self.fmt="%.1f"
+        elif "(Pa)" in dastuff:   self.fmt="%.2e"
         elif "(W/m2)" in dastuff: self.fmt="%.0f"
         elif "(m/s)" in dastuff:  self.fmt="%.1f"
@@ -472 +473 @@
       if "(mol/mol)" in fieldlab or "(kg/kg)" in fieldlab or "(kg/m2)" in fieldlab or "(W/m2)" in fieldlab:
          ind = np.where(field < 1.e-30)
-         if ind != -1: field[ind] = 1.e-30  ## 0 does not work everywhere.
+         if ind != -1: field[ind] = 0.e0 #1.e-30  ## 0 does not work everywhere.
       return field,fieldlab
 
@@ -603 +604 @@
       else:                  ordo = self.xcoord ; absc = field ; absclab = fieldlab ; ordolab = self.xlabel
       mpl.plot(absc,ordo,'-bo') ; mpl.ylabel(ordolab) ; mpl.xlabel(absclab) #; mpl.xticks(query.xcoord)
+      # cases with log axis
       if self.zkey == 4: mpl.semilogy() ; ax = mpl.gca() ; ax.set_ylim(ax.get_ylim()[::-1])
+      if not self.vertplot and self.islog: mpl.semilogy()
+      if self.vertplot and self.islog: mpl.semilogx()
       mpl.figtext(0.5, 0.01, self.ack, ha='center')
 
@@ -633 +637 @@
         choice = tabtodo[i]
         (field, fieldlab) = self.definefield(choice)
+
+        # in log plots we do not show the negative values
+        if self.islog: field[np.where(field <= 0.e0)] = np.nan
+
         if not self.vertplot:  absc = self.xcoord ; ordo = field ; ordolab = fieldlab ; absclab = self.xlabel
         else:                  ordo = self.xcoord ; absc = field ; absclab = fieldlab ; ordolab = self.xlabel
+
         yeah.plot(absc,ordo,'-bo') #; mpl.xticks(query.xcoord)
         ax = fig.gca() ; ax.set_ylabel(ordolab) ; ax.set_xlabel(absclab)
 
         if self.xzs is not None and self.zkey == 4: ax.set_yscale('log') ; ax.set_ylim(ax.get_ylim()[::-1])
+        if not self.vertplot and self.islog: ax.set_yscale('log')
+        if self.vertplot and self.islog: ax.set_xscale('log')
 
         if self.lats is not None:      ax.set_xticks(np.arange(-90,91,15)) ; ax.set_xbound(lower=self.lats, upper=self.late)

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

@@ -145 +145 @@
 if badrange: 
     errormess = errormess+"<li>One or several coordinate intervals are not... intervals. Set either a real range or an unique value."
+if query.xdate == 666.:
+    errormess = "<li>CONGRATULATIONS! <br><img src='../surprise.jpg'><br> You reached secret mode.<br> You can <a href='http://www.youtube.com/watch?v=fTpQOZcNASw'>watch a nice video</a>."
 
 # Get how many free dimensions we have
@@ -196 +198 @@
 else:                  query.zonmean=False
 
+islog = form.getvalue("islog")
+if islog  == "on": query.islog=True
+else:              query.islog=False
+
 ### now, proceed...
 if errormess == "":
 
  # reference name (to test which figures are already in the database)
- try: reference = query.getnameset()+str(var1)+str(var2)+str(var3)+str(var4)+str(iswind)+str(isfixedlt)+str(iszonmean)+query.colorm+str(query.min2d)+str(query.max2d)+str(query.dpi)
+ try: reference = query.getnameset()+str(var1)+str(var2)+str(var3)+str(var4)+str(iswind)+str(isfixedlt)+str(iszonmean)+query.colorm+str(query.min2d)+str(query.max2d)+str(query.dpi)+str(islog)
  except: reference = "test"
  if yeaheps:  figname = '../img/'+reference+'.eps'

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

@@ -286 +286 @@
 <input type="radio" name="zonmean" value="on"          /> on
 </li>
+<li>Log(values) in 1D plots
+<input type="radio" name="islog" value="off" checked /> off
+<input type="radio" name="islog" value="on" /> on
+</li>
 </ul>
 </td>
@@ -303 +307 @@
 <a href="http://www-mars.lmd.jussieu.fr">Mars Climate Database</a> (c) LMD/OU/IAA/ESA/CNES.<br />
 Interface written by <a href="http://www.lmd.jussieu.fr/~aslmd/">A. Spiga</a> (LMD) using <a href="http://www.python.org">Python</a>.<br />
+Javascript time conversion by <a href="http://www.lmd.jussieu.fr/~emlmd">E. Millour</a> (<a href="http://www-mars.lmd.jussieu.fr/mars/time/martian_time.html">link</a>).
 </td>
 </tr>

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

@@ -389 +389 @@
 <input type="radio" name="zonmean" value="on"          /> on
 </li>
+<li>Log(values) in 1D plots
+<input type="radio" name="islog" value="off" checked /> off
+<input type="radio" name="islog" value="on" /> on 
+</li>
 </ul>
 </td>
@@ -406 +410 @@
 <a href="http://www-mars.lmd.jussieu.fr">Mars Climate Database</a> (c) LMD/OU/IAA/ESA/CNES.<br />
 Interface written by <a href="http://www.lmd.jussieu.fr/~aslmd/">A. Spiga</a> (LMD) using Python.<br />
+Javascript time conversion by <a href="http://www.lmd.jussieu.fr/~emlmd">E. Millour</a> (<a href="http://www-mars.lmd.jussieu.fr/mars/time/martian_time.html">link</a>).
 </td>
 </tr>