Changeset 20 for trunk/adm

Timestamp:

12/20/10 11:22:11 (13 years ago)

Author:

pinsard

Message:

sphinx intermapping with SAXO

Location:

trunk/adm

Files:

• guides/bibliography.rst (modified) (2 diffs)
• guides/glossary.rst (modified) (3 diffs)
• makefile (modified) (8 diffs)
• saxo.inv (added)
• sphinx/conf.py (modified) (2 diffs)

trunk/adm/guides/bibliography.rst

@@ -14 +14 @@
 .. EVOLUTIONS
 .. ==========
+..
+.. - fplod 20101217T152744Z aedon.locean-ipsl.upmc.fr (Darwin)
+..
+..   * add OLR "how to cite" [LiebmannSmith:BAMS:1996]
 ..
 .. - fplod 20101209T105850Z aedon.locean-ipsl.upmc.fr (Darwin)
@@ -43 +47 @@
 .. [netcdf:cf:checker] http://titania.badc.rl.ac.uk/cgi-bin/cf-checker.pl
 
+.. [LiebmannSmith:BAMS:1996] Liebmann B. and C.A. Smith, 1996: Description of a Complete (Interpolated) Outgoing Longwave Radiation Dataset. Bulletin of the American Meteorological Society, 77, 1275-1277. http://www.esrl.noaa.gov/psd/data/gridded/OLRinterpolated.pdf

trunk/adm/guides/glossary.rst

@@ -22 +22 @@
    ERA-I
       ERA-INTERIM
+
       http://www.ecmwf.int/research/era/do/get/era-interim 
 
@@ -38 +39 @@
    OAFLUX
       WHOI Objectively Analyzed air-sea Fluxes (OAFlux) Project
+
       http://oaflux.whoi.edu/
 
@@ -48 +50 @@
    TAO
       Tropical Atmosphere Ocean project
+
       http://www.pmel.noaa.gov/tao/
 

trunk/adm/makefile

@@ -21 +21 @@
 # ==========
 #
+# - fplod 20101220T092552Z aedon.locean-ipsl.upmc.fr (Darwin)
+#
+#   * add saxo inventory file for sphinx intermapping
 #
 # - fplod 20101118T165524Z aedon.locean-ipsl.upmc.fr (Darwin)
@@ -59 +62 @@
 URLPUBLISH = \
 http://www.locean-ipsl.upmc.fr/~fplod/$(PRODUCT)/$(SUBPRODUCT)/doc/
+
+LIST_INVENTORY = \
+$(DIRADM)/saxo.inv
 
 LIST_RST_GUIDES = \
@@ -205 +211 @@
 $(DIRADM)/index_guides.rst \
 $(DIRTMP)/sphinx_tmpdir/index_manuals.rst \
+$(LIST_INVENTORY) \
 $(LIST_RST_GUIDES) \
 $(LIST_SRCSH_RST) \
@@ -211 +218 @@
         @cp $(DIRADM)/index_guides.rst $(DIRTMP)/sphinx_tmpdir/
         @cp $(LIST_RST_GUIDES) $(DIRTMP)/sphinx_tmpdir/guides/
+        @cp $(LIST_INVENTORY) $(DIRTMP)/sphinx_tmpdir/
         @sphinx-build -b html -c $(DIRADM)/sphinx \
             -d $(DIRTMP)/sphinx_tmpdir/doctrees \
@@ -222 +230 @@
 $(DIRADM)/index_guides.rst \
 $(DIRTMP)/sphinx_tmpdir/index_manuals.rst \
+$(LIST_INVENTORY) \
 $(LIST_RST_GUIDES) \
 $(LIST_SRCSH_RST) \
@@ -228 +237 @@
         @cp $(DIRADM)/index_guides.rst $(DIRTMP)/sphinx_tmpdir/
         @cp $(LIST_RST_GUIDES) $(DIRTMP)/sphinx_tmpdir/guides/
+        @cp $(LIST_INVENTORY) $(DIRTMP)/sphinx_tmpdir/
         @sphinx-build -b singlehtml -c $(DIRADM)/sphinx \
             -d $(DIRTMP)/sphinx_tmpdir/doctrees \
@@ -242 +252 @@
 $(DIRADM)/index_guides.rst \
 $(DIRTMP)/sphinx_tmpdir/index_manuals.rst \
+$(LIST_INVENTORY) \
 $(LIST_RST_GUIDES) \
 $(LIST_SRCSH_RST) \
@@ -248 +259 @@
         @cp $(DIRADM)/index_guides.rst $(DIRTMP)/sphinx_tmpdir/
         @cp $(LIST_RST_GUIDES) $(DIRTMP)/sphinx_tmpdir/guides/
+        @cp $(LIST_INVENTORY) $(DIRTMP)/sphinx_tmpdir/
         @sphinx-build -b latex -c $(DIRADM)/sphinx \
             -d $(DIRTMP)/sphinx_tmpdir/doctrees \

trunk/adm/sphinx/conf.py

@@ -25 +25 @@
 # EVOLUTIONS
 # ==========
+#
+# - fplod 20101220T092450Z aedon.locean-ipsl.upmc.fr (Darwin)
+#
+#   * intersphinx with saxo
+#     cf. http://sphinx.pocoo.org/ext/intersphinx.html
 #
 # - fplod 20101216T155711Z aedon.locean-ipsl.upmc.fr (Darwin)
@@ -267 +272 @@
     ('compute_erai_daily_region_2d.sh', 'compute_erai_daily_region_2d.sh', u'compute_erai_daily_region_2d.sh Documentation', [u'IRD'], 1)
 ]
+#
+# intersphinx with saxo
+intersphinx_mapping = {'saxo': ('http://forge.ipsl.jussieu.fr/saxo/download/idldoc_html_output/','saxo.inv')}
+