Changeset 205


Ignore:
Timestamp:
03/26/14 16:14:13 (8 years ago)
Author:
pinsard
Message:

website not any more hosted by LOCEAN

Location:
trunk
Files:
2 added
23 deleted
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/adm/makefile

    r199 r205  
    121121pdf \ 
    122122pdf_dev \ 
    123 pdf_dev_sphinx \ 
    124 pdf_user 
     123pdf_dev_sphinx 
    125124 
    126125help : 
     
    147146install_html_dev \ 
    148147install_html_user \ 
    149 install_pdf_dev \ 
    150 install_pdf_user 
     148install_pdf_dev 
    151149 
    152150install_html_dev : 
     
    158156install_pdf_dev : 
    159157        @$(DIRADM)/install.sh -w $(DIRWWW_DEV)/pdf/ -u $(URLPUBLISH_DEV)/pdf/ 
    160  
    161 install_pdf_user : 
    162         @$(DIRADM)/install.sh -w $(DIRWWW_USER)/pdf/ -u $(URLPUBLISH_USER)/pdf/ 
    163158 
    164159clean : \ 
     
    196191 
    197192all_user : \ 
    198 html_user \ 
    199 pdf_user 
     193html_user 
    200194 
    201195html : \ 
     
    217211 
    218212pdf : \ 
    219 pdf_user \ 
    220213pdf_dev 
    221  
    222 pdf_user : 
    223         cd $(DIRADM)/website/; make latexpdf 
    224214 
    225215pdf_dev : 
  • trunk/adm/website/Makefile

    r36 r205  
    1 # Makefile for Sphinx documentation 
     1# Makefile 
    22# 
    33 
    44# You can set these variables from the command line. 
    5 SPHINXOPTS    = 
    6 SPHINXBUILD   = sphinx-build 
    7 PAPER         = 
    85BUILDDIR      = _build 
    96 
    10 # Internal variables. 
    11 PAPEROPT_a4     = -D latex_paper_size=a4 
    12 PAPEROPT_letter = -D latex_paper_size=letter 
    13 ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . 
    14  
    15 .PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest 
     7.PHONY: help clean html 
    168 
    179help: 
    1810        @echo "Please use \`make <target>' where <target> is one of" 
    19         @echo "  html       to make standalone HTML files" 
    20         @echo "  dirhtml    to make HTML files named index.html in directories" 
    21         @echo "  singlehtml to make a single large HTML file" 
    22         @echo "  pickle     to make pickle files" 
    23         @echo "  json       to make JSON files" 
    24         @echo "  htmlhelp   to make HTML files and a HTML help project" 
    25         @echo "  qthelp     to make HTML files and a qthelp project" 
    26         @echo "  devhelp    to make HTML files and a Devhelp project" 
    27         @echo "  epub       to make an epub" 
    28         @echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter" 
    29         @echo "  latexpdf   to make LaTeX files and run them through pdflatex" 
    30         @echo "  text       to make text files" 
    31         @echo "  man        to make manual pages" 
    32         @echo "  changes    to make an overview of all changed/added/deprecated items" 
    33         @echo "  linkcheck  to check all external links for integrity" 
    34         @echo "  doctest    to run all doctests embedded in the documentation (if enabled)" 
     11        @echo "  html       to make HTML file" 
     12        @echo "  clean      to clean" 
    3513 
    3614clean: 
     
    3816 
    3917html: 
    40         $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html 
     18        mkdir -p $(BUILDDIR)/html/ 
     19        mkdir -p $(BUILDDIR)/html/_static/ 
     20        cp _static/*.jpg $(BUILDDIR)/html/_static/ 
     21        rst2html --strict --strip-comments \ 
     22                 --input-encoding=UTF-8 \ 
     23                 index.rst $(BUILDDIR)/html/index.html 
    4124        @echo 
    42         @echo "Build finished. The HTML pages are in $(BUILDDIR)/html." 
    43  
    44 dirhtml: 
    45         $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml 
    46         @echo 
    47         @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml." 
    48  
    49 singlehtml: 
    50         $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml 
    51         @echo 
    52         @echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml." 
    53  
    54 pickle: 
    55         $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle 
    56         @echo 
    57         @echo "Build finished; now you can process the pickle files." 
    58  
    59 json: 
    60         $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json 
    61         @echo 
    62         @echo "Build finished; now you can process the JSON files." 
    63  
    64 htmlhelp: 
    65         $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp 
    66         @echo 
    67         @echo "Build finished; now you can run HTML Help Workshop with the" \ 
    68               ".hhp project file in $(BUILDDIR)/htmlhelp." 
    69  
    70 qthelp: 
    71         $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp 
    72         @echo 
    73         @echo "Build finished; now you can run "qcollectiongenerator" with the" \ 
    74               ".qhcp project file in $(BUILDDIR)/qthelp, like this:" 
    75         @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/tropflux.qhcp" 
    76         @echo "To view the help file:" 
    77         @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/tropflux.qhc" 
    78  
    79 devhelp: 
    80         $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp 
    81         @echo 
    82         @echo "Build finished." 
    83         @echo "To view the help file:" 
    84         @echo "# mkdir -p $$HOME/.local/share/devhelp/tropflux" 
    85         @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/tropflux" 
    86         @echo "# devhelp" 
    87  
    88 epub: 
    89         $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub 
    90         @echo 
    91         @echo "Build finished. The epub file is in $(BUILDDIR)/epub." 
    92  
    93 latex: 
    94         $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex 
    95         @echo 
    96         @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex." 
    97         @echo "Run \`make' in that directory to run these through (pdf)latex" \ 
    98               "(use \`make latexpdf' here to do that automatically)." 
    99  
    100 latexpdf: 
    101         $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex 
    102         @echo "Running LaTeX files through pdflatex..." 
    103         make -C $(BUILDDIR)/latex all-pdf 
    104         @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." 
    105  
    106 text: 
    107         $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text 
    108         @echo 
    109         @echo "Build finished. The text files are in $(BUILDDIR)/text." 
    110  
    111 man: 
    112         $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man 
    113         @echo 
    114         @echo "Build finished. The manual pages are in $(BUILDDIR)/man." 
    115  
    116 changes: 
    117         $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes 
    118         @echo 
    119         @echo "The overview file is in $(BUILDDIR)/changes." 
    120  
    121 linkcheck: 
    122         $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck 
    123         @echo 
    124         @echo "Link check complete; look for any errors in the above output " \ 
    125               "or in $(BUILDDIR)/linkcheck/output.txt." 
    126  
    127 doctest: 
    128         $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest 
    129         @echo "Testing of doctests in the sources finished, look at the " \ 
    130               "results in $(BUILDDIR)/doctest/output.txt." 
     25        @echo "Build finished. The HTML page is in $(BUILDDIR)/html." 
  • trunk/adm/website/index.rst

    r204 r205  
    99.. ==== 
    1010.. 
    11 .. solve overview and index confusion : end-user should first see overview 
    12 .. (asked by jv) 
    13 .. 
    1411.. EVOLUTIONS 
    1512.. ========== 
     
    1815.. 
    1916.. $URL$ 
     17.. 
     18.. - fplod 20140326T114146Z callisto.locean-ipsl.upmc.fr (Linux) 
     19.. 
     20..   * only one page : cf. incois 
    2021.. 
    2122.. - fplod 20120229 
     
    5253 
    5354.. meta:: 
    54    :robots: noindex,nofollow,noarchive 
     55   :robots: noindex, nofollow, noarchive 
    5556 
    56 .. _contents: 
     57.. image:: _static/stress_netflux_clim_1989_2010_v4_jv.jpg 
     58   :align: center 
     59   :width: 90% 
     60   :alt: tropflux banner 
    5761 
    58 TropFlux documentation contents 
    59 =============================== 
     62.. image:: _static/sponso_IRD.jpg 
     63   :align: left 
     64   :target: http://www.ird.fr/"> 
     65   :alt: IRD logo 
     66   :width: 10% 
     67.. image:: _static/nio_logo.jpg 
     68   :target: http://www.nio.org/"> 
     69   :alt: NIO logo 
     70   :width: 10% 
     71.. image:: _static/incois_logo.jpg 
     72   :target: http://www.incois.gov.in/"> 
     73   :alt: INCOIS logo 
     74   :width: 10% 
     75.. image:: _static/sponso_locean.jpg 
     76   :target: http://www.locean-ipsl.upmc.fr"> 
     77   :alt: LOCEAN logo 
     78   :width: 10% 
     79.. image:: _static/sponso_simon.jpg 
     80   :target: http://www.ipsl.fr"> 
     81   :alt: IPSL logo 
     82   :width: 10% 
    6083 
    61 .. toctree:: 
    62    :maxdepth: 1 
     84.. warning:: 
    6385 
    64    overview 
    65    motivation 
    66    description 
    67    selected_results 
    68    data_access 
    69    documentation 
    70    publications 
    71    contact 
     86   The TropFlux product is now produced at INCOIS (link to http://www.incois.gov.in ) and 
     87   the TropFlux website has been migrated to the following address: 
     88   http://www.incois.gov.in/tropflux 
     89 
     90   Data, updates and information about this product can hence be found at the link above. 
  • trunk/docs/docs_dev/makefile_non_sphinx

    r199 r205  
    1717# :ref:`Makefile` 
    1818# 
    19 # :ref:`<fptools:extract_rst.sh>` 
     19# :ref:`<extract_rst.sh fptools:extract_rst.sh>` 
    2020# 
    2121# TODO 
  • trunk/docs/docs_dev/source/guides/bibliography.rst

    r204 r205  
    6868.. [McPhadenMeyersEtAl:BAMS:2009] McPhaden, M. J., G. Meyers, K. Ando,Y. Masumoto, V. S. N. Murty, M. Ravichandran, F. Syamsudin, J. Vialard, L. Yu, and W. Yu, 2009: RAMA: The Research Moored Array for African-Asian-Australian Monsoon on Analysis and Prediction. Bull. Am. Meteorol. Soc., 90, 459-480, doi:10.1175/2008BAMS2608.1 
    6969 
    70 .. [McPhadenBusalacchiEtAL:JGR:1998] McPhaden, M.J., A.J. Busalacchi, R. Cheney, J.R. Donguy, K.S. Gage, D. Halpern, M. Ji, P. Julian, G. Meyers, G.T. Mitchum, P.P. Niiler, J. Picaut, R.W. Reynolds, N. Smith, K. Takeuchi, 1998: The Tropical Ocean-Global Atmosphere (TOGA) observing system: A decade of progress. J. Geophys. Res., 103, 14, 169-14,24 
    71 0. 
     70.. [McPhadenBusalacchiEtAL:JGR:1998] McPhaden, M.J., A.J. Busalacchi, R. Cheney, J.R. Donguy, K.S. Gage, D. Halpern, M. Ji, P. Julian, G. Meyers, G.T. Mitchum, P.P. Niiler, J. Picaut, R.W. Reynolds, N. Smith, K. Takeuchi, 1998: The Tropical Ocean-Global Atmosphere (TOGA) observing system: A decade of progress. J. Geophys. Res., 103, 14, 169-14, 240. 
    7271 
    7372.. [AOMIP] Atmospheric Forcing Data - Humidity (AOMIP) http://efdl.cims.nyu.edu/project_aomip/forcing_data/atmosphere/humidity.html 
  • trunk/docs/docs_dev/source/guides/builddoc.rst

    r203 r205  
    3030.. 
    3131.. $URL$ 
     32.. 
     33.. - fplod 20140326T150244Z callisto.locean-ipsl.upmc.fr (Linux) 
     34.. 
     35..   * website locean réduit à sa plus simple expression 
    3236.. 
    3337.. - fplod 20120206 
     
    114118   cd ${PROJECT}/adm/ 
    115119   make clean 
    116    make before 
    117    make html_user 
     120   make html 
    118121 
    119122et regarder le résultat dans :file:`./website/_build/html/index.html`. 
  • trunk/src/t2m_correction_ncdf.pro

    r204 r205  
    8989; 
    9090; .. code-block:: bash 
    91 : 
     91; 
    9292;    ncks -v time -d time,0,1 /usr/work/incas/fplod/tropflux_d/TropFlux_t2m_19890101_20091231.nc 
    9393; 
  • trunk/src/test/average_pb.jnl

    r204 r205  
    116116LET sst_ave2 = sst[x=66:70@ave,y=6:18@ave,t=01-may-2001:30-jun-2001] 
    117117PLOT sst_ave2 
    118 !++LET/TITLE="SST anomaly x=66:70" sst_anom2 = sst - sst_ave2 
    119 !++PLOT sst_anom2 
     118! ++LET/TITLE="SST anomaly x=66:70" sst_anom2 = sst - sst_ave2 
     119! ++PLOT sst_anom2 
    120120! 
    121121! save data 
     
    123123! 
    124124! save figure++ 
    125 !++exit 
     125! ++exit 
  • trunk/src/tropflux.pro

    r204 r205  
    1 + 
     1;+ 
    22; 
    33; ============ 
Note: See TracChangeset for help on using the changeset viewer.