Ignore:
Timestamp:
Jan 8, 2013, 9:33:07 AM (12 years ago)
Author:
aslmd
Message:

UTIL PYTHON MCDonline. Support for MCD5. Added eps figures. Various other informations added (diapo mode, text file with web arborescence).

Location:
trunk/UTIL/PYTHON/mcd/proto
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed

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

    r827 r859  
    7373query=mcd.mcd()
    7474
     75# set MCD version changes if needed
     76betatest = form.getvalue("betatest")
     77if betatest == "on": query.toversion5()
     78
    7579# Get the kind of vertical coordinates and choose default behavior for "all"
    7680try: query.zkey = int(form.getvalue("zkey"))
    … …  
    9397if query.datekey == 1:
    9498    try: query.xdate = float(form.getvalue("ls"))
    95     except: query.xdate = float(1) ; badlschar = True
     99    except: query.xdate = float(1) ; badlschar = True # comment the second part if in debug command line mode
    96100else:
    97101    try: query.xdate = float(form.getvalue("julian"))
    … …  
    161165except: query.max2d = None
    162166
    163 try: query.dpi = float(form.getvalue("dpi"))
     167try: query.dpi = form.getvalue("dpi")
    164168except: query.dpi = 80.
    165 
     169if query.dpi == "eps":  yeaheps = True  ; query.dpi = 300.
     170else:                   yeaheps = False ; query.dpi = float(query.dpi)
    166171
    167172# Get variables to plot
    … …  
    194199
    195200 # reference name (to test which figures are already in the database)
    196  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)
    197  figname = '../img/'+reference+'.png'
     201 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)
     202 except: reference = "test"
     203 if yeaheps:  figname = '../img/'+reference+'.eps'
     204 else:        figname = '../img/'+reference+'.png'
    198205 txtname = '../txt/'+reference+'.txt'
    199206 testexist = daos.path.isfile(figname)
    … …  
    234241
    235242header="""<html><head><title>Mars Climate Database: The Web Interface</title></head><body>"""
     243if betatest == "on":
     244    print "<b>!!! THIS IS A BETA VERSION. RESULTS ARE NOT VALIDATED !!!</b>"
     245    if sumfree == 2:     print "<br>"
    236246
    237247print header
    … …  
    248258else:
    249259  if sumfree == 0:      query.update() ; query.htmlprinttabextvar(vartoplot)
    250   elif sumfree == 2:    print "<img src='"+figname+"'><br />"
     260  elif sumfree == 2:   
     261                        if yeaheps:  print "<hr><a href='"+figname+"'>!!!! Click here to download the EPS figure file !!!!</a><br /><hr>"
     262                        else:        print "<img src='"+figname+"'><br />"
    251263  elif sumfree == 1:     
    252264                        print "<a href='"+txtname+"'>Click here to download an ASCII file containing data</a><br />"
    253265                        print "<hr>"
    254                         print "<img src='"+figname+"'><br />"
     266                        if yeaheps:  print "<hr><a href='"+figname+"'>!!!! Click here to download the EPS figure file !!!!</a><br /><hr>"
     267                        else:        print "<img src='"+figname+"'><br />"
    255268
    256269## This is quite common

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

    r827 r859  
    108108<ul>
    109109<li>Dust scenario <select name="dust">
    110 <option value="1"         >MY24 min solar</option>
    111 <option value="2" selected>MY24 ave solar</option>
    112 <option value="3"         >MY24 max solar</option>
    113 <option value="4"         >dust storm tau=4 min solar</option>
    114 <option value="5"         >dust storm tau=4 ave solar</option>
    115 <option value="6"         >dust storm tau=4 max solar</option>
    116 <option value="7"         >warm scenario (dusty, max solar)</option>
    117 <option value="8"         >cold scenario (low dust, min solar)</option>
     110<option value="1"         >climatology min solar</option>
     111<option value="2" selected>climatology ave solar</option>
     112<option value="3"         >climatology max solar</option>
     113<option value="4"         >dust storm min solar</option>
     114<option value="5"         >dust storm ave solar</option>
     115<option value="6"         >dust storm max solar</option>
     116<option value="7"         >warm (dusty, max solar)</option>
     117<option value="8"         >cold (low dust, min solar)</option>
    118118</select></li>
    119119<li>Interpolate using MOLA topography <input type="radio" name="hrkey" value="1" checked /> on <input type="radio" name="hrkey" value="0" /> off </li>
     120<li> <span style="font-size: 80%;"> Beta-testing (only for developers)
     121<input type="radio" name="betatest" value="off" checked /> off
     122<input type="radio" name="betatest" value="on"          /> on
     123</span>
     124</li>
    120125</ul>
    121126</td>
    … …  
    163168<option value="co"            >[CO] vol. mixing ratio (mol/mol)</option>
    164169<option value="visc"          >Air viscosity estimation (N s m-2)</option>
     170<option value="pbl"           >(beta) Convective PBL height (m)</option>
     171<option value="stress"        >(beta) Surf. wind stress (Kg/m/s2)</option>
     172<option value="ar"            >(beta) Ar vol.mix.rat. (mol/mol)</option>
     173<option value="updraft"       >(beta) Max PBL updraft wind (m/s)</option>
     174<option value="downdraft"     >(beta) Max PBL downdraft wind (m/s)</option>
     175<option value="pblwvar"       >(beta) PBL vert wind variance (m2/s2)</option>
     176<option value="pblhvar"       >(beta) PBL eddy vert heat flux (m/s/K)</option>
    165177</select>
    166178<br />
    … …  
    192204<option value="co"            >[CO] vol. mixing ratio (mol/mol)</option>
    193205<option value="visc"          >Air viscosity estimation (N s m-2)</option>
     206<option value="pbl"           >(beta) Convective PBL height (m)</option>
     207<option value="stress"        >(beta) Surf. wind stress (Kg/m/s2)</option>
     208<option value="ar"            >(beta) Ar vol.mix.rat. (mol/mol)</option>
     209<option value="updraft"       >(beta) Max PBL updraft wind (m/s)</option>
     210<option value="downdraft"     >(beta) Max PBL downdraft wind (m/s)</option>
     211<option value="pblwvar"       >(beta) PBL vert wind variance (m2/s2)</option>
     212<option value="pblhvar"       >(beta) PBL eddy vert heat flux (m/s/K)</option>
    194213</select>
    195214<br />
    … …  
    221240<option value="co"            >[CO] vol. mixing ratio (mol/mol)</option>
    222241<option value="visc"          >Air viscosity estimation (N s m-2)</option>
     242<option value="pbl"           >(beta) Convective PBL height (m)</option>
     243<option value="stress"        >(beta) Surf. wind stress (Kg/m/s2)</option>
     244<option value="ar"            >(beta) Ar vol.mix.rat. (mol/mol)</option>
     245<option value="updraft"       >(beta) Max PBL updraft wind (m/s)</option>
     246<option value="downdraft"     >(beta) Max PBL downdraft wind (m/s)</option>
     247<option value="pblwvar"       >(beta) PBL vert wind variance (m2/s2)</option>
     248<option value="pblhvar"       >(beta) PBL eddy vert heat flux (m/s/K)</option>
    223249</select>
    224250<br />
    … …  
    250276<option value="co"            >[CO] vol. mixing ratio (mol/mol)</option>
    251277<option value="visc"          >Air viscosity estimation (N s m-2)</option>
     278<option value="pbl"           >(beta) Convective PBL height (m)</option>
     279<option value="stress"        >(beta) Surf. wind stress (Kg/m/s2)</option>
     280<option value="ar"            >(beta) Ar vol.mix.rat. (mol/mol)</option>
     281<option value="updraft"       >(beta) Max PBL updraft wind (m/s)</option>
     282<option value="downdraft"     >(beta) Max PBL downdraft wind (m/s)</option>
     283<option value="pblwvar"       >(beta) PBL vert wind variance (m2/s2)</option>
     284<option value="pblhvar"       >(beta) PBL eddy vert heat flux (m/s/K)</option>
    252285</select>
    253286</td>
    … …  
    257290<input type="radio" name="dpi" value="80" checked> medium
    258291<input type="radio" name="dpi" value="160"> high
     292<input type="radio" name="dpi" value="eps"> eps
    259293</li>
    260294<li> Set colormap

  • trunk/UTIL/PYTHON/mcd/proto/martian_time.js

    r821 r859  
    462462Convert2Ls();
    463463PlaceValues(0.,0.);
    464 DefaultSpaceTime()
     464DefaultSpaceTime();
    465465}
    466466
    … …  
    469469document.calendar.submit();
    470470}
     471
Note: See TracChangeset for help on using the changeset viewer.