Changeset 34 for trunk

Timestamp:

02/03/11 11:28:19 (13 years ago)

Author:

pinsard

Message:

sphinx intermapping with cdo

Location:

trunk

Files:

• adm/cdo.inv (added)
• adm/makefile (modified) (2 diffs)
• adm/sphinx/conf.py (modified) (2 diffs)
• src/compute_erai_daily_region_2d.sh (modified) (5 diffs)

trunk/adm/makefile

@@ -23 +23 @@
 # ==========
 #
+# - fplod 20110203T101853Z aedon.locean-ipsl.upmc.fr (Darwin)
+#
+#   * add cdo inventory file for sphinx intermapping
+#
 # - fplod 20110110T165518Z aedon.locean-ipsl.upmc.fr (Darwin)
 #
@@ -79 +83 @@
 LIST_INVENTORY = \
 $(DIRADM)/saxo.inv \
-$(DIRADM)/nco.inv
+$(DIRADM)/nco.inv \
+$(DIRADM)/cdo.inv
 
 LIST_RST_GUIDES = \

trunk/adm/sphinx/conf.py

@@ -27 +27 @@
 # EVOLUTIONS
 # ==========
+#
+# - fplod 20110203T101316Z aedon.locean-ipsl.upmc.fr (Darwin)
+#
+#   * intersphinx with cdo
 #
 # - fplod 20110106T151836Z aedon.locean-ipsl.upmc.fr (Darwin)
@@ -285 +289 @@
 # intersphinx with saxo
 intersphinx_mapping = {'saxo': ('http://forge.ipsl.jussieu.fr/saxo/download/idldoc_html_output/','saxo.inv'),
-                       'nco' : ('http://nco.sourceforge.net/','nco.inv')}
-
+                       'nco' : ('http://nco.sourceforge.net/',                                   'nco.inv'),
+                       'cdo' : ('https://code.zmaw.de/embedded/cdo/1.4.7/',                      'cdo.inv')
+                      }
+

trunk/src/compute_erai_daily_region_2d.sh

@@ -103 +103 @@
 # :func:`ncflint <nco:ncflint>`
 #
+# :func:`sub <cdo:sub>`
+# :func:`divc <cdo:divc>`
+#
 # :ref:`interp_erai_dewt_1989_2009.pro`
 # :ref:`interp_erai_lwr_1989_2009.pro`
@@ -112 +115 @@
 # ====
 #
-# add cdo reference
+# trouble with cdo reference (extra %23name in generated url using sphinx1.0.7)
 #
 # minimize use of generic characters (*) to avoid ambiguity
@@ -132 +135 @@
 #  ncrcat: WARNING Intra-file non-monotonicity. Record coordinate "time" does not monotonically decrease between (input file /homedata/pinsard/log//compute_erai_daily_region_2d.20110126T154235Z.temp//temp_int_str_199012.nc record indices: 29, 30) (output file /homedata/pinsard/tropflux_d//erai_TROP_1d_19900101_19901231_str_gridOrig.nc record indices 363, 364) record coordinate values -0.000278, -0.000278
 #
-#  
+#
 #  this seems to be solved by using cdo instead of ncflint. to be confirmed !
 #
@@ -142 +145 @@
 #
 #     str:long_name = "Surface thermal radiation" ;
-#     str:units = "W/m^2 s" 
-# 
+#     str:units = "W/m^2 s"
+#
 # still true after ncflint/cdo arithmetic ?
 #
@@ -154 +157 @@
 #
 # $URL$
+#
+# - fplod 20110203T101720Z aedon.locean-ipsl.upmc.fr (Darwin)
+#
+#   * add cdo reference
 #
 # - pinsard 2011-02-02T16:11:07Z loholt1.ipsl.polytechnique.fr (Linux)