Changeset 204 for trunk/adm


Ignore:
Timestamp:
03/26/14 11:58:56 (10 years ago)
Author:
pinsard
Message:

fix thanks to coding rules; typo

Location:
trunk/adm
Files:
1 deleted
18 edited

Legend:

Unmodified
Added
Removed

  • trunk/adm/install.sh

    r199 r204  
    1616# ======== 
    1717# 
    18 # :: 
     18# .. code-block:: bash 
    1919# 
    20 #  $ install.sh -w dirwww -p dirpublish -u urlpublish -l login 
     20#    install.sh -w dirwww -p dirpublish -u urlpublish -l login 
    2121# 
    2222# DESCRIPTION 
    … …  
    2828# is launched. 
    2929# 
    30 # -w  input directort 
    31 # -p  output directory 
    32 # -u  output url 
    33 # -l  login used to access on output url 
     30# .. option:: -w <input directory> 
     31# .. option:: -p <output directory> 
     32# .. option:: -u <output url> 
     33# .. option:: -l <login used to access on output url> 
    3434# 
    3535# EXAMPLES 
    … …  
    4848# - fplod 2009-04-27T10:21:23Z aedon.locean-ipsl.upmc.fr (Darwin) 
    4949# 
    50 #   * creation from personnal tool (used for superbib, SAXO, etc.) 
     50#   * creation from personal tool (used for superbib, SAXO, etc.) 
    5151# 
    5252#- 
    … …  
    5454case "${system}" in 
    5555   AIX|IRIX64) 
    56       echo " www : no specific posix checking" 
     56       echo " www : no specific posix checking" 
    5757   ;; 
    5858   *) 
    59       set -o posix 
     59       set -o posix 
    6060   ;; 
    6161esac 
    … …  
    7373if [ ${#} -lt ${minargcount} ] 
    7474then 
    75    echo "eee : not enought arguments" 
     75   echo "eee : not enough arguments" 
    7676   echo "${usage}" 
    7777   exit 1 
    … …  
    111111answer=${1:-" "} 
    112112case ${answer} in 
    113    y|Y|n|N) 
    114    ;; 
    115    *) 
    116       if [ "${dirpublish}" != "none" ] 
    117       then 
    118          echo "Do you want to install ${dirwww} on ${dirpublish} (y|[n]) ?" 
    119          read answer 
    120       fi 
    121       if [ "${urlpublish}" != "none" ] 
    122       then 
    123          echo "Do you want to install ${dirwww} on ${urlpublish} (y|[n]) ?" 
    124          read answer 
    125       fi 
    126    ;; 
     113    y|Y|n|N) 
     114    ;; 
     115    *) 
     116        if [ "${dirpublish}" != "none" ] 
     117        then 
     118            echo "Do you want to install ${dirwww} on ${dirpublish} (y|[n]) ?" 
     119            read answer 
     120        fi 
     121        if [ "${urlpublish}" != "none" ] 
     122        then 
     123            echo "Do you want to install ${dirwww} on ${urlpublish} (y|[n]) ?" 
     124            read answer 
     125        fi 
     126    ;; 
    127127esac 
    128128# 
    129129case ${answer} in 
    130    y|Y) 
    131       if [ "${dirpublish}" != "none" ] 
    132       then 
    133          # copy of ${dirwww} on $dirpublish 
    134          echo "iii : update of ${dirpublish}" 
    135          rsync -av --exclude=".DS_Store" -e ssh ${dirwww}/ ${dirpublish} 
    136          # detect if in dirpublish following this pattern [USER@]HOST:SRC, HOST 
    137          # is cerbere.locean-ipsl.upmc.fr. If so, a specific update is launched 
    138          userhost=${dirpublish%%:*} 
    139          host=${userhost##*@} 
    140          if [ ${login} = "none" ] 
    141          then 
    142             user=${userhost%%@*} 
    143          else 
    144             user=${login} 
    145          fi 
    146          if [ "${host}" = "cerbere.locean-ipsl.upmc.fr" ] 
    147          then 
    148            wget -q "http://intranet.locean-ipsl.upmc.fr/persoweb/?fastupdate=1&user=${user}" -O /dev/null 
    149          fi 
    150       else 
    151          # urlpublish=http://www.locean-ipsl.upmc.fr/~ginette/produit 
    152          dirpublish=${urlpublish##*~} 
    153          cd ${dirwww} 
    154          #lftp -e "mirror -R . ${dirpublish};quit" -u ${LOGNAME} skyros.locean-ipsl.upmc.fr 
    155          lftp -e "mirror -R . ${dirpublish};quit" -u ${LOGNAME} www.locean-ipsl.upmc.fr 
    156          # ++ log 
    157       fi 
    158    ;; 
    159    *) 
    160       echo "no update of ${dirpublish} or ${urlpublish}" 
    161    ;; 
     130    y|Y) 
     131        if [ "${dirpublish}" != "none" ] 
     132        then 
     133            # copy of ${dirwww} on $dirpublish 
     134            echo "iii : update of ${dirpublish}" 
     135            rsync -av --exclude=".DS_Store" -e ssh ${dirwww}/ ${dirpublish} 
     136            # detect if in dirpublish following this pattern [USER@]HOST:SRC, HOST 
     137            # is cerbere.locean-ipsl.upmc.fr. If so, a specific update is launched 
     138            userhost=${dirpublish%%:*} 
     139            host=${userhost##*@} 
     140            if [ ${login} = "none" ] 
     141            then 
     142                user=${userhost%%@*} 
     143            else 
     144                user=${login} 
     145            fi 
     146            if [ "${host}" = "cerbere.locean-ipsl.upmc.fr" ] 
     147            then 
     148                wget -q "http://intranet.locean-ipsl.upmc.fr/persoweb/?fastupdate=1&user=${user}" -O /dev/null 
     149            fi 
     150        else 
     151            # urlpublish=http://www.locean-ipsl.upmc.fr/~ginette/produit 
     152            dirpublish=${urlpublish##*~} 
     153            cd ${dirwww} 
     154            #lftp -e "mirror -R . ${dirpublish};quit" -u ${LOGNAME} skyros.locean-ipsl.upmc.fr 
     155            lftp -e "mirror -R . ${dirpublish};quit" -u ${LOGNAME} www.locean-ipsl.upmc.fr 
     156            # ++ log 
     157        fi 
     158    ;; 
     159    *) 
     160        echo "no update of ${dirpublish} or ${urlpublish}" 
     161    ;; 
    162162esac 
    163163# 

  • trunk/adm/website/Readme.rst

    r202 r204  
    88----------------------------- 
    99 
    10 The TropFlux project aims at providing daily, timely, accurate air-sea heat and momentum flux data for the entire 30°N-30°S region.  Wind stresses and the four components of net surface heat flux are currently available for the entire 1979 to March 2013 period. We are currently working on a regular (~monthly) update of the TropFlux product until 3-4 months behind realtime. 
     10The TropFlux project aims at providing daily, timely, accurate air-sea heat and momentum flux data for the entire 30°N-30°S region.  Wind stresses and the four components of net surface heat flux are currently available for the entire 1979 to March 2013 period. We are currently working on a regular (~monthly) update of the TropFlux product until 3-4 months behind realtime. 
    1111 
    1212TropFlux is largely derived from a combination of ERA-I re-analysis data for turbulent and longwave fluxes, and ISCCP surface radiation data for shortwave flux. All input products are bias- and amplitude-corrected on the basis of Global Tropical Moored Buoy Array data, before surface net heat flux and wind stresses are computed using the COARE v3 bulk algorithm. A precise description of the flux computation procedure, as well as a detailed evaluation against other timely, daily air-sea heat flux alternatives (OAFLUX, NCEP, NCEP2, ERA-I) is provided in Praveen Kumar et al. 2012. The wind stress product is described, evaluated and compared against other widely used products (QuikSCAT, NCEP, NCEP2, ERA-I) in Praveen Kumar et al. 2013 
    … …  
    1818 - a simple estimate of surface shortwave radiation is provided from OLR data, as a near-realtime alternative to the more accurate but irregularly updated ISCCP data. 
    1919 
    20 The TropFlux product has been developed under a collaboration between the Laboratoire d'Océanographie: Expérimentation et Approches Numériques (LOCEAN) from Institut Pierre Simon Laplace, France and National Institute of Oceanography/CSIR, India. Bilateral scientific visits to France and India have been supported by Institut de Recherche pour le Développement, France. 
     20The TropFlux product has been developed under a collaboration between the Laboratoire d'Océanographie: Expérimentation et Approches Numériques (LOCEAN) from Institut Pierre Simon Laplace, France and National Institute of Oceanography/CSIR, India. Bilateral scientific visits to France and India have been supported by Institut de Recherche pour le Développement, France. 
    2121 
    2222Data format 
    … …  
    4040The data is provided in NetCDF format, with one file per variable for the complete dataset. 
    4141Daily (almost 1Gb per file) and monthly (32Mb per file) average data are proposed. 
    42 The data is provided on a 1° resolution grid (with the same land-sea mask than for the OAFLUX project, http://oaflux.whoi.edu/ ). 
     42The data is provided on a 1° resolution grid (with the same land-sea mask than for the OAFLUX project, http://oaflux.whoi.edu/ ). 
    4343There are 60 points in latitude at -29.5, -28.5, ..., 28.5 (positive north of the equator). 
    4444There are 350 points in longitude at 30.5, 31.5, ..., 379.5 (eastward of the Greenwich meridian). 

  • trunk/adm/website/bibliography_web.rst

    r200 r204  
    4646.. - fplod 20110421T085259Z aedon.locean-ipsl.upmc.fr (Darwin) 
    4747.. 
    48 ..   * add references about TAO/TRITION, PIRATA, and RAMA 
     48..   * add references about TAO/TRITON, PIRATA, and RAMA 
    4949.. 
    5050.. - fplod 20110407T084904Z aedon.locean-ipsl.upmc.fr (Darwin) 

  • trunk/adm/website/bibtropflux.xml

    r199 r204  
    88<!--rst 
    99 
    10 DESCRITPTION 
    11 ============ 
     10DESCRIPTION 
     11=========== 
    1212 
    1313Publications using TropFlux dataset 
    … …  
    2121==== 
    2222 
    23 add instruction to check somewhere:: 
     23add instruction to check somewhere: 
     24 
     25.. code-block:: bash 
    2426  
    2527   xml val \-\-err \-\-xsd http://www.docbook.org/xml/5.0/xsd/docbook.xsd bibtropflux.xml 
    … …  
    3638- fplod 20120412 
    3739 
    38 * replace praven-kumar2011_01 by praven-kumar2012_01 and update  
     40* replace praveen-kumar2011_01 by praveen-kumar2012_01 and update  
    3941 
    4042- fplod 20120228 
    … …  
    9496  </biblioset> 
    9597</biblioentry> 
    96 <biblioentry xml:id="praven-kumar2012_01"> 
    97 <!-- ++ bibtek key PraveenkumarVialardEtAl:CD:2012--> 
     98<biblioentry xml:id="praveen-kumar2012_01"> 
     99<!-- ++ bibtex key PraveenkumarVialardEtAl:CD:2012--> 
    98100    <authorgroup> 
    99101        <author> <personname> <surname>Praveen Kumar</surname> <firstname>B.</firstname> </personname> </author> 

  • trunk/adm/website/conf.py

    r203 r204  
    2020# - fplod 20110330T142745Z aedon.locean-ipsl.upmc.fr (Darwin) 
    2121# 
    22 #   * add path for matploblib extension of sphinx f(python installation) 
     22#   * add path for matplotlib extension of sphinx f(python installation) 
    2323# 
    2424# EVOLUTIONS 

  • trunk/adm/website/contact.rst

    r146 r204  
    66.. 
    77.. learn to use :fieldname: nocomments 
    8 .. cf http://sphinx.pocoo.org/markup/misc.html?highlight=comment 
    9 .. to avoid seeing snipets of this header on search results page. 
     8.. cf. http://sphinx.pocoo.org/markup/misc.html?highlight=comment 
     9.. to avoid seeing snippets of this header on search results page. 
    1010.. 
    1111.. EVOLUTIONS 
    … …  
    3838======= 
    3939 
    40 For any scientific queries or issues regarding TropFlux data, please contact us using the following mailing list (mailto:tropflux@locean-ipsl.upmc.fr). 
     40For any scientific queries or issues regarding TropFlux data, 
     41please contact us using the following 
     42mailing list (mailto:tropflux@locean-ipsl.upmc.fr). 

  • trunk/adm/website/data/changes.rst

    r203 r204  
    2525.. - fplod 20130725T150201Z cratos.locean-ipsl.upmc.fr (Linux) 
    2626.. 
    27 ..   * introducting update until March 2013 included 
     27..   * introducing update until March 2013 included 
    2828.. 
    2929.. - fplod 20130725T131036Z cratos.locean-ipsl.upmc.fr (Linux) 
    … …  
    3333.. - fplod 20121221T174433Z cratos.locean-ipsl.upmc.fr (Linux) 
    3434.. 
    35 ..   * introducting update until July 2012 included 
     35..   * introducing update until July 2012 included 
    3636.. 
    3737.. - fplod 20120229 
    … …  
    129129 
    130130  - correction of :file:`ws_tropflux_1m_1989_2010.nc` and 
    131     :file:`ws_tropflux_1d_1989_2010.nc` due to unappropriated unit conversion 
     131    :file:`ws_tropflux_1d_1989_2010.nc` due to inappropriate unit conversion 
    132132 
    133133.. _20110707: 

  • trunk/adm/website/data_access.rst

    r203 r204  
    2424.. - fplod 20130726T175139Z cratos.locean-ipsl.upmc.fr (Linux) 
    2525.. 
    26 ..   * introducting update until March 2013 included 
     26..   * introducing update until March 2013 included 
    2727.. 
    2828.. - fplod 20130725T131417Z cratos.locean-ipsl.upmc.fr (Linux) 
    … …  
    3232.. - fplod 20121221T174433Z cratos.locean-ipsl.upmc.fr (Linux) 
    3333.. 
    34 ..   * introducting update until july 2012 included 
     34..   * introducing update until july 2012 included 
    3535.. 
    3636.. - jv 20120229 
    3737.. 
    38 ..   * add LOCEAN in aknowledgement sentence 
     38..   * add LOCEAN in acknowledgement sentence 
    3939.. 
    4040.. - fplod 20120229 
    … …  
    107107Please acknowledge us by using the following sentence: 
    108108**The TropFlux data is produced under a collaboration between 
    109 Laboratoire d'Océanographie: Expérimentation et Approches Numériques (LOCEAN) from 
     109Laboratoire d'Océanographie: Expérimentation et Approches Numériques (LOCEAN) from 
    110110Institut Pierre Simon Laplace (IPSL, Paris, France) and 
    111111National Institute of Oceanography/CSIR (NIO, Goa, India), and 
    112 supported by Institut de Recherche pour le Développement (IRD, France). 
     112supported by Institut de Recherche pour le Développement (IRD, France). 
    113113TropFlux relies on data provided by the ECMWF Re-Analysis interim (ERA-I) 
    114114and ISCCP projects.** 

  • trunk/adm/website/description.rst

    r203 r204  
    1010.. ==== 
    1111.. 
    12 .. (July 1983 to December 2009 at the time of writing), ... not anymore true 
     12.. (July 1983 to December 2009 at the time of writing), ... not any more true 
    1313.. 
    1414.. EVOLUTIONS 
    … …  
    3838.. 
    3939..   * creation from description.odt 
    40 ..     transform to ReST using odt2sphinx + hand correction (diacritical, 
    41 ..     ponctuations, short lines, links !!) 
     40..     transform to ReStructuredText using odt2sphinx + hand correction 
     41..     (diacritical, punctuations, short lines, links !!) 
    4242.. 
    4343.. - 
    … …  
    7878 
    7979  * **An additional climatological surface temperature-dependent gustiness 
    80     is applied to wind speed, in order to account for unresolved (sub-daily and subgrid-scale) variability.** 
     80    is applied to wind speed, in order to account for unresolved (sub-daily 
     81    and subgrid-scale) variability.** 
    8182 
    8283  * Since ISCCP shortwave data 

  • trunk/adm/website/documentation.rst

    r203 r204  
    99.. ======== 
    1010.. 
    11 .. publication, bibliograhy 
     11.. publication, bibliography 
    1212.. 
    1313.. TODO 
    … …  
    3939.. 
    4040..   * add PraveenkumarVialardEtAl:CD:2012 and PraveenkumarVialardEtAl:CE:2012 
     41.. 
    4142.. - fplod 20110623T152527Z aedon.locean-ipsl.upmc.fr (Darwin) 
    4243.. 

  • trunk/adm/website/gen_logo.sh

    r203 r204  
    1717# see sample_tut from matplotlib for Sphinx usage 
    1818# 
    19 # see ImageMagick for image cration http://www.imagemagick.org/Usage/draw/ 
     19# see ImageMagick for image creation http://www.imagemagick.org/Usage/draw/ 
    2020# 
    2121# TODO 
    … …  
    2525# or in ../makefile 
    2626# 
    27  
    2827# EVOLUTIONS 
    2928# ========== 

  • trunk/adm/website/index.rst

    r203 r204  
    3838.. - fplod 20110623T153038Z aedon.locean-ipsl.upmc.fr (Darwin) 
    3939.. 
    40 ..   * replace bibliograhy by publications 
     40..   * replace bibliography by publications 
    4141..   * outline from jv 
    4242.. 

  • trunk/adm/website/maintropflux.xml

    r199 r204  
    1515main page of the project survey 
    1616 
    17 DESCRIPTIION 
    18 ============ 
     17DESCRIPTION 
     18=========== 
    1919 
    2020This file in DocBook 5 will be processed by superbib tools 

  • trunk/adm/website/motivation.rst

    r197 r204  
    99.. ==== 
    1010.. 
    11 .. bold is implemented with either ** .. ** and :strong:`..`, but witgh none 
     11.. bold is implemented with either ** .. ** and :strong:`..`, but with none 
    1212.. of these way I manage to mix text and hyperlink 
    1313.. 
    … …  
    5050.. 
    5151..   * creation from motivation.odt 
    52 ..     transform to ReST using odt2sphinx + hand correction (diacritical, 
    53 ..     ponctuations, short lines, links !!) 
     52..     transform to ReStructuredText using odt2sphinx + hand correction  
     53..     (diacritical, punctuations, short lines, links !!) 
    5454.. 
    5555.. - 
    … …  
    6868The tropics play an important role in the earth's climate and energy cycle. 
    6969The tropical oceans gain heat from downward shortwave radiation, allowing for 
    70 very high surface temperature (above 28°C) in the Indo-Pacific and 
     70very high surface temperature (above 28°C) in the Indo-Pacific and 
    7171Atlantic warm pools. 
    7272This high sea surface temperature can cause the atmospheric boundary layer to 
    … …  
    8484Bjerknes feedback, a positive feedback between the surface wind signal related 
    8585to deep atmospheric convection and its dynamical oceanic response, which is 
    86 critical to phenomena like El Niño (e.g. McPhaden et al. 2006) and the Indian 
     86critical to phenomena like El Niño (e.g. McPhaden et al. 2006) and the Indian 
    8787Ocean Dipole (Webster et al. 1999; Saji et al. 1999). 
    8888Those examples illustrate how an accurate knowledge of air-sea heat and 
    … …  
    9292fluxes that resolve the main phenomena of the tropical climate, at 
    9393intraseasonal (Madden-Julian Oscillation, monsoon active and break phases), 
    94 seasonal and interannual (El Niño, Indian Ocean Dipole ...) time scales.** 
     94seasonal and interannual (El Niño, Indian Ocean Dipole ...) time scales.** 
    9595 
    9696 

  • trunk/adm/website/overview.rst

    r203 r204  
    2020.. - fplod 20121221T174433Z cratos.locean-ipsl.upmc.fr (Linux) 
    2121.. 
    22 ..   * introducting update until july 2012 included 
     22..   * introducing update until July 2012 included 
    2323.. 
    2424.. 
    … …  
    7070 
    7171The TropFlux project aims at providing daily, timely, accurate air-sea heat 
    72 and momentum flux data for the entire 30°N-30°S region. 
     72and momentum flux data for the entire 30°N-30°S region. 
    7373 
    7474Wind stresses and the four components of net surface heat flux are currently 
    … …  
    108108 
    109109The TropFlux product has been developed under a collaboration between the 
    110 `Laboratoire d'Océanographie: Expérimentation et Approches Numériques (LOCEAN) <http://www.locean-ipsl.upmc.fr/>`_ from 
     110`Laboratoire d'Océanographie: Expérimentation et Approches Numériques (LOCEAN) <http://www.locean-ipsl.upmc.fr/>`_ from 
    111111`Institut Pierre Simon Laplace <http://www.ipsl.fr/>`_, France and 
    112112`National Institute of Oceanography/CSIR <http://www.nio.org/>`_, India. 
    113113Bilateral scientific visits to France and India have been supported by 
    114 `Institut de Recherche pour le Développement <http://www.ird.fr/>`_, France. 
     114`Institut de Recherche pour le Développement <http://www.ird.fr/>`_, France. 
    115115 

  • trunk/adm/website/publications.rst

    r200 r204  
    1212.. 
    1313.. either look for improvement of citation within docutils or 
    14 .. (favorite option .. in progress) connect sphinx and superbib 
     14.. (favourite option .. in progress) connect sphinx and superbib 
    1515.. 
    1616.. EVOLUTIONS 
    … …  
    8181.. 
    8282..   * no more usage references defined in bibliography.rst because 
    83 ..     citation are ugly (only [bibkey]). In fact it is not a Splhinx pb but 
    84 ..     a docuils's one 
     83..     citation are ugly (only [bibkey]). In fact it is not a Sphinx pb but 
     84..     a docutils's one 
    8585..     Now I copy bibliography.rst ! 
    8686.. 

  • trunk/adm/website/selected_results.rst

    r203 r204  
    1111.. Why is there a blank space above figure 1? (jv) 
    1212.. 
    13 ..   solved with sphinx >= 1.0.8  (tested with 1.1.2 but not yet availble on 
     13..   solved with sphinx >= 1.0.8  (tested with 1.1.2 but not yet available on 
    1414..   cratos) 
    1515..   see http://sphinx.pocoo.org/changes.html 
    16 ..   "#644: Fix spacing of centered figures in HTML output" 
     16..   "#644: Fix spacing of centred figures in HTML output" 
    1717.. 
    1818.. The units look ugly in the caption of figure 6 (jv) 
    19 ..   might a pb on latex configuration 
     19.. might a pb on latex configuration 
    2020.. 
    2121.. Add full references of the papers at the end (jv) 
    … …  
    5959..   * split long lines 
    6060..   * units in math 
    61 ..   * from selected_resultds.odt 
    62 ..     transform to MediaWiki by openofice and hand transformation to ReST 
    63 ..     (diacritical, ponctuations, short lines, links !!) 
     61..   * from selected_results.odt 
     62..     transform to MediaWiki by OpenOffice and hand transformation to 
     63..     ReStructuredText (diacritical, punctuations, short lines, links !!) 
    6464.. 
    6565.. - 
    … …  
    159159In the eastern equatorial Indian ocean, there is also a clear interannual 
    160160wind stress variability associated with the Indian Ocean Dipole and remote 
    161 response to El Nino. 
     161response to El Niño. 
    162162 
    163163Intraseasonal variability 

  • trunk/adm/website/usertropflux.xml

    r199 r204  
    22<!DOCTYPE users SYSTEM "user.dtd"> 
    33<!-- 
    4 DESCRITION 
     4 
     5DESCRIPTION 
    56========== 
    67 
    … …  
    2526replace dtd by xsd when ready 
    2627 
    27 Netcdf-CF standard name for code parameters 
     28netCDF-CF standard name for code parameters 
    2829 
    2930EVOLUTIONS 
    … …  
    127128<othername role='mi'></othername> 
    128129</personname> 
    129 <status>producter</status> 
     130<status>producer</status> 
    130131<email>Jerome.Vialard@locean-ipsl.upmc.fr</email> 
    131132<parameters> 
    … …  
    263264<othername role='mi'></othername> 
    264265</personname> 
    265 <status>producter</status> 
     266<status>producer</status> 
    266267<email>pkb_ocean@yahoo.co.in</email> 
    267268<parameters> 
    … …  
    325326</user> 
    326327<user> 
    327 <userid>LENGAINE_m</userid> 
     328<userid>LENGAIGNE_m</userid> 
    328329<personname> 
    329330<surname>Lengaigne</surname> 
Note: See TracChangeset for help on using the changeset viewer.