Index: trunk/UTIL/PYTHON/mcd/gfortran_netcdf4_fPIC =================================================================== --- trunk/UTIL/PYTHON/mcd/gfortran_netcdf4_fPIC (revision 1075) +++ trunk/UTIL/PYTHON/mcd/gfortran_netcdf4_fPIC (revision 1075) @@ -0,0 +1,48 @@ +#! /bin/bash + + +##wget http://www.lmd.jussieu.fr/~hourdin/PATCH_LMDZ4OR_G95/netcdf-3.6.1.tar.gz +##gunzip netcdf-3.6.1.tar.gz +#tar xvf netcdf-3.6.1.tar +#cd netcdf-3.6.1 + +#cp /donnees/emlmd/Downloads/Software/netcdf-4.0.1.tar.gz . +#gunzip netcdf-4.0.1.tar.gz +tar xvf netcdf-4.0.1.tar +cd netcdf-4.0.1 + +#export CC=gcc +#export CXX=g++ +#export CPP='gcc -E' +#export FC=gfortran +#export F77=gfortran +#export F90=gfortran +#export CFLAGS='-O2 -DpgiFortran' +#export CXXFLAGS='-O2 -DpgiFortran' +#export CPPFLAGS='-DpgiFortran' +#export FFLAGS='-O2 -fno-second-underscore' +#export FCFLAGS='-O2 -fno-second-underscore' +#export F90FLAGS='-O2 -fno-second-underscore' + +export FC=gfortran +export FFLAGS=" -O2 -fPIC" +export F90=gfortran +export FCFLAGS="-O2 -ffree-form -fPIC" +export CPPFLAGS="" +export CC=gcc +export CFLAGS="-O2 -fPIC" +export CXX=g++ +export CXXFLAGS="-O2 -fPIC" + +mkdir /home/marshttp/NETCDF/netcdf64-4.0.1_gfortran_fPIC +./configure --prefix=/home/marshttp/NETCDF/netcdf64-4.0.1_gfortran_fPIC #> configure.log 2>&1 +make #> make.log 2>&1 +make test #> make_test.log 2>&1 +make install #> make_install.log 2>&1 + +#cd src +## Compilation +#./configure +#make check +#make install + Index: trunk/UTIL/PYTHON/mcd/inimeso/inimeso5.py =================================================================== --- trunk/UTIL/PYTHON/mcd/inimeso/inimeso5.py (revision 1074) +++ trunk/UTIL/PYTHON/mcd/inimeso/inimeso5.py (revision 1075) @@ -22,10 +22,10 @@ ### 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" % ( \ Index: trunk/UTIL/PYTHON/mcd/inimeso/input_coord =================================================================== --- trunk/UTIL/PYTHON/mcd/inimeso/input_coord (revision 1074) +++ trunk/UTIL/PYTHON/mcd/inimeso/input_coord (revision 1075) @@ -1,6 +1,6 @@ -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 Index: trunk/UTIL/PYTHON/mcd/mcd.py =================================================================== --- trunk/UTIL/PYTHON/mcd/mcd.py (revision 1074) +++ trunk/UTIL/PYTHON/mcd/mcd.py (revision 1075) @@ -28,6 +28,6 @@ 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,4 +82,5 @@ self.max2d = None self.dpi = 80. + self.islog = False def toversion5(self): @@ -231,5 +232,5 @@ 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,5 +473,5 @@ 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,5 +604,8 @@ 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,10 +637,17 @@ 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) Index: trunk/UTIL/PYTHON/mcd/proto/cgi-bin/mcdcgi.py =================================================================== --- trunk/UTIL/PYTHON/mcd/proto/cgi-bin/mcdcgi.py (revision 1074) +++ trunk/UTIL/PYTHON/mcd/proto/cgi-bin/mcdcgi.py (revision 1075) @@ -145,4 +145,6 @@ if badrange: errormess = errormess+"
  • One or several coordinate intervals are not... intervals. Set either a real range or an unique value." +if query.xdate == 666.: + errormess = "
  • CONGRATULATIONS!

    You reached secret mode.
    You can watch a nice video." # Get how many free dimensions we have @@ -196,9 +198,13 @@ 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' Index: trunk/UTIL/PYTHON/mcd/proto/index4.html =================================================================== --- trunk/UTIL/PYTHON/mcd/proto/index4.html (revision 1074) +++ trunk/UTIL/PYTHON/mcd/proto/index4.html (revision 1075) @@ -286,4 +286,8 @@ on
    • +
  • Log(values) in 1D plots + off + on +
    • @@ -303,4 +307,5 @@ Mars Climate Database (c) LMD/OU/IAA/ESA/CNES.
    Interface written by A. Spiga (LMD) using Python.
    +Javascript time conversion by E. Millour (link). Index: trunk/UTIL/PYTHON/mcd/proto/index5.html =================================================================== --- trunk/UTIL/PYTHON/mcd/proto/index5.html (revision 1074) +++ trunk/UTIL/PYTHON/mcd/proto/index5.html (revision 1075) @@ -389,4 +389,8 @@ on +
  • Log(values) in 1D plots + off + on +
    • @@ -406,4 +410,5 @@ Mars Climate Database (c) LMD/OU/IAA/ESA/CNES.
    Interface written by A. Spiga (LMD) using Python.
    +Javascript time conversion by E. Millour (link).