Changeset 937 for trunk

Timestamp:

Apr 23, 2013, 9:07:40 AM (12 years ago)

Author:

aslmd

Message:

UTIL PYTHON MCDonline. small bug fixes and mcd5

Location:

trunk/UTIL/PYTHON/mcd

Files:

• inimeso5.py (added)
• input_coord (modified) (1 diff)
• mymath.py (copied) (copied from trunk/UTIL/PYTHON/mymath.py)
• myplot.py (moved) (moved from trunk/UTIL/PYTHON/myplot.py.onlinemcd)
• proto/cgi-bin/mcdcgi.py (modified) (1 diff)
• proto/index.html (modified) (7 diffs)
• proto/index5.html (added)
• test_mcd.py (added)

trunk/UTIL/PYTHON/mcd/input_coord

@@ -2 +2 @@
 -1.88   lat
 244.    ls
-14.     lct
-20.     ztop
+06.     lct
+20      ztop
 100.    nz

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

@@ -74 +74 @@
 
 # set MCD version changes if needed
-betatest = form.getvalue("betatest")
+try:     betatest = form.getvalue("betatest")
+except:  betatest = "off"
 if betatest == "on": query.toversion5()
 

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

@@ -64 +64 @@
 <input type="radio" name="isfixedlt" value="on"          /> fixed for the whole planet<br />
 <hr>
-Earth Julian Date <input type="text" size="6" name="julian" readonly="readonly"><br />
-Mars year <input type="text" size="1" name="martianyear" readonly="readonly"> 
- - month <input type="text" size="1" name="martianmonth" readonly="readonly"><span style="font-size: 75%;"> / 12</span>
- - sol <input type="text" size="2" name="sol" readonly="readonly"><span style="font-size: 75%;"> / 669</span><br />
+Earth Julian Date <input type="text" size="6" name="julian" readonly="readonly" style="background-color : #F5DEB3;"><br />
+Mars year <input type="text" size="1" name="martianyear" readonly="readonly" style="background-color : #F5DEB3;"> 
+ - month <input type="text" size="1" name="martianmonth" readonly="readonly" style="background-color : #F5DEB3;"><span style="font-size: 75%;"> / 12</span>
+ - sol <input type="text" size="2" name="sol" readonly="readonly" style="background-color : #F5DEB3;"><span style="font-size: 75%;"> / 669</span><br />
 <input type="button" value="EARTH DATE >>> MARS DATE" onClick="Convert2Ls();"><br />
 </td>
@@ -108 +108 @@
 <ul>
 <li>Dust scenario <select name="dust">
-<option value="1"         >climatology min solar</option>
-<option value="2" selected>climatology ave solar</option>
-<option value="3"         >climatology max solar</option>
+<option value="1"         >MY24 min solar</option>
+<option value="2" selected>MY24 ave solar</option>
+<option value="3"         >MY24 max solar</option>
 <option value="4"         >dust storm min solar</option>
 <option value="5"         >dust storm ave solar</option>
@@ -118 +118 @@
 </select></li>
 <li>Interpolate using MOLA topography <input type="radio" name="hrkey" value="1" checked /> on <input type="radio" name="hrkey" value="0" /> off </li>
-<li> <span style="font-size: 80%;"> Beta-testing (only for developers)
-<input type="radio" name="betatest" value="off" checked /> off
-<input type="radio" name="betatest" value="on"          /> on
+<li> MCD version
+<input type="radio" name="betatest" value="off" checked /> 4.3
 </span>
 </li>
@@ -168 +167 @@
 <option value="co"            >[CO] vol. mixing ratio (mol/mol)</option>
 <option value="visc"          >Air viscosity estimation (N s m-2)</option>
-<option value="pbl"           >(beta) Convective PBL height (m)</option>
-<option value="stress"        >(beta) Surf. wind stress (Kg/m/s2)</option>
-<option value="ar"            >(beta) Ar vol.mix.rat. (mol/mol)</option>
-<option value="updraft"       >(beta) Max PBL updraft wind (m/s)</option>
-<option value="downdraft"     >(beta) Max PBL downdraft wind (m/s)</option>
-<option value="pblwvar"       >(beta) PBL vert wind variance (m2/s2)</option>
-<option value="pblhvar"       >(beta) PBL eddy vert heat flux (m/s/K)</option>
 </select>
 <br />
@@ -204 +196 @@
 <option value="co"            >[CO] vol. mixing ratio (mol/mol)</option>
 <option value="visc"          >Air viscosity estimation (N s m-2)</option>
-<option value="pbl"           >(beta) Convective PBL height (m)</option>
-<option value="stress"        >(beta) Surf. wind stress (Kg/m/s2)</option>
-<option value="ar"            >(beta) Ar vol.mix.rat. (mol/mol)</option>
-<option value="updraft"       >(beta) Max PBL updraft wind (m/s)</option>
-<option value="downdraft"     >(beta) Max PBL downdraft wind (m/s)</option>
-<option value="pblwvar"       >(beta) PBL vert wind variance (m2/s2)</option>
-<option value="pblhvar"       >(beta) PBL eddy vert heat flux (m/s/K)</option>
 </select>
 <br />
@@ -240 +225 @@
 <option value="co"            >[CO] vol. mixing ratio (mol/mol)</option>
 <option value="visc"          >Air viscosity estimation (N s m-2)</option>
-<option value="pbl"           >(beta) Convective PBL height (m)</option>
-<option value="stress"        >(beta) Surf. wind stress (Kg/m/s2)</option>
-<option value="ar"            >(beta) Ar vol.mix.rat. (mol/mol)</option>
-<option value="updraft"       >(beta) Max PBL updraft wind (m/s)</option>
-<option value="downdraft"     >(beta) Max PBL downdraft wind (m/s)</option>
-<option value="pblwvar"       >(beta) PBL vert wind variance (m2/s2)</option>
-<option value="pblhvar"       >(beta) PBL eddy vert heat flux (m/s/K)</option>
 </select>
 <br />
@@ -276 +254 @@
 <option value="co"            >[CO] vol. mixing ratio (mol/mol)</option>
 <option value="visc"          >Air viscosity estimation (N s m-2)</option>
-<option value="pbl"           >(beta) Convective PBL height (m)</option>
-<option value="stress"        >(beta) Surf. wind stress (Kg/m/s2)</option>
-<option value="ar"            >(beta) Ar vol.mix.rat. (mol/mol)</option>
-<option value="updraft"       >(beta) Max PBL updraft wind (m/s)</option>
-<option value="downdraft"     >(beta) Max PBL downdraft wind (m/s)</option>
-<option value="pblwvar"       >(beta) PBL vert wind variance (m2/s2)</option>
-<option value="pblhvar"       >(beta) PBL eddy vert heat flux (m/s/K)</option>
 </select>
 </td>