Changeset 16 for trunk/adm

Timestamp:

12/16/10 17:16:50 (13 years ago)

Author:

pinsard

Message:

add OAFLUX and ERA-I in guides

Location:

trunk/adm

Files:

• guides/data_content.rst (modified) (4 diffs)
• guides/generate_tropflux.rst (modified) (2 diffs)
• guides/glossary.rst (modified) (2 diffs)
• sphinx/conf.py (modified) (2 diffs)

trunk/adm/guides/data_content.rst

@@ -1 +1 @@
 .. +
+..
+.. TODO
+.. ====
+..
+.. subsection cf. http://sphinx.pocoo.org/rest.html#sections
 ..
 .. EVOLUTIONS
 .. ==========
 ..
+.. - fplod 20101216T142435Z aedon.locean-ipsl.upmc.fr (Darwin)
+..
+..   * add data_in_oaflux subsection
+..
+.. - fplod 20101216T120745Z aedon.locean-ipsl.upmc.fr (Darwin)
+..
+..   * add data_in_erai subsection
+..
 .. - fplod 20101213T161512Z aedon.locean-ipsl.upmc.fr (Darwin)
 ..
@@ -31 +44 @@
 ----------
 
+.. _data_in_oaflux:
+
+OAFLUX
+~~~~~~
+
+Reference files
+^^^^^^^^^^^^^^^
+
+:file:`ftp://ftp.whoi.edu/pub/science/oaflux/data_v3/monthly/turbulence/lh_oaflux_2004.nc.gz`
+
+size 3 Mo (after decompression)
+
+Derived files
+^^^^^^^^^^^^^
+
+:file:`/Users/jv/data/OAFLUX/mask_oaflux_30N30S.nc`
+
+:ref:`get_oaflux.sh`
+
+:ref:`oaflux_mask_30N30S.pro`
+
+.. _data_in_erai:
+
+ERA-I
+~~~~~
+
+Between 1989-now
+ 
+Reference files
+^^^^^^^^^^^^^^^
+
+For variables lsp cp :
+ :file:`climserv:/bdd/ERAI/NETCDF/GLOBAL_075/4xdaily/FC_SF/{yyyy}/{mm}/{var}.{yyyymmdd}*`
+
+For variables e slhf ssr trd sshf ssrd str ewss nsss :
+ :file:`climserv:/bdd/ERAI/NETCDF/GLOBAL_075/4xdaily/FC_SF/{yyyy}/{mm}/{var}.{yyyymmdd}*`
+
+For variables geopt msl sstk t2 d2 u10 v10 :
+ :file:`climserv:/bdd/ERAI/NETCDF/GLOBAL_075/4xdaily/AN_SF/yyyy/mm/{var}.yyyymm.ashei.GLOBAL_075.nc`
+
+
+Derived files
+^^^^^^^^^^^^^
+
+For variables lsp cp e slhf ssr trd sshf ssrd str ewss nsss geopt msl sstk t2 d2 u10 v10 :
+ :file:`climserv:/bdd/IPCC/Reanalysis/ERAI/GLOB/erai_GLOB_1d_{yyyy}0101_{yyyy}1231_{var}_gridOrig.nc`
+
+:ref:`compute_erai_daily_region_2d.sh`
+
 .. _data_in_olr:
 
@@ -37 +99 @@
 
 Interpolated
-++++++++++++
+^^^^^^^^^^^^
 
 :file:`ftp://ftp.cdc.noaa.gov/Datasets/interp_OLR/olr.day.mean.nc`
@@ -44 +106 @@
 
 Uninterpolated
-++++++++++++++
-
+^^^^^^^^^^^^^^
 :file:`ftp://ftp.cdc.noaa.gov/Datasets/uninterp_OLR/olr.day.mean.nc`
 

trunk/adm/guides/generate_tropflux.rst

@@ -11 +11 @@
 .. ==========
 ..
-..  - fplod 20101125T084625Z aedon.locean-ipsl.upmc.fr (Darwin)
+.. - fplod 20101216T160822Z aedon.locean-ipsl.upmc.fr (Darwin)
 ..
-..    * use :math: to improve notation of geophysical parameter thanks to
-..      http://sphinx.pocoo.org/latest/ext/math.html#module-sphinx.ext.mathbase
-..      and ftp://ftp.ams.org/pub/tex/doc/amsmath/amsldoc.pdf
+..   * add ref to OAFLUX tools
 ..
-..  - fplod 20101123T145240Z aedon.locean-ipsl.upmc.fr (Darwin)
+.. - fplod 20101216T120541Z aedon.locean-ipsl.upmc.fr (Darwin)
+.. 
+..   * add ref to compute_erai_daily_region_2d.sh
 ..
-..    * creation from mail send by Jérôme Vialard
+.. - fplod 20101125T084625Z aedon.locean-ipsl.upmc.fr (Darwin)
+..
+..   * use :math: to improve notation of geophysical parameter thanks to
+..     http://sphinx.pocoo.org/latest/ext/math.html#module-sphinx.ext.mathbase
+..     and ftp://ftp.ams.org/pub/tex/doc/amsmath/amsldoc.pdf
+..
+.. - fplod 20101123T145240Z aedon.locean-ipsl.upmc.fr (Darwin)
+..
+..   * creation from mail send by Jérôme Vialard
 ..
 .. -
@@ -29 +37 @@
 -----------
 
+OAFLUX data
+
+   for sea land mask
+
+   tools:
+
+   - :ref:`get_oaflux.sh`
+   - :ref:`oaflux_mask_30N30S.pro`
+
 ERA-I data 
     (wind components at 10m, air temperature at 2m, dewpoint temperature at 2m, net SW, net LW)
-    scripts from Matthieu
+
+   tools:
+
+   - :ref:`compute_erai_daily_region_2d.sh`
 
 ISCCP shortwave

trunk/adm/guides/glossary.rst

@@ -3 +3 @@
 .. EVOLUTIONS
 .. ==========
+..
+.. - fplod 20101215T131258Z aedon.locean-ipsl.upmc.fr (Darwin)
+..
+..   * usage of glossary directive
 ..
 .. - fplod 20101118T172108Z aedon.locean-ipsl.upmc.fr (Darwin)
@@ -13 +17 @@
 ========
 
-.. _glossary:
+.. glossary::
+   :sorted:
 
-ERA-I
-   ERA-INTERIM
-   http://www.ecmwf.int/research/era/do/get/era-interim 
-ECMWF
-   European +todo+
-COARE
-   +todo+
-GPCP
-   Global Precipitation Climatology Project
-ISCCP
-   International Satellite Cloud Climatology Project
-OAFLUX
-   +todo+
-OLR
-   Outgoing Long-Wave Radiation
-RAMA
-   Research Moored Array for African-Asian-Australian Monsoon Analysis
-TAO
-   Tropical Atmosphere Ocean project
-   http://www.pmel.noaa.gov/tao/
-PIRATA
-   Prediction and Research Moored Array in the Tropical Atlantic
-SWR
-   surface set shortwave radiation
-LWR
-   surface net longwave radiation
-SST
-   sea surface temperature
+   ERA-I
+      ERA-INTERIM
+      http://www.ecmwf.int/research/era/do/get/era-interim 
+
+   ECMWF
+      European +todo+
+
+   COARE
+      +todo+
+
+   GPCP
+      Global Precipitation Climatology Project
+
+   ISCCP
+      International Satellite Cloud Climatology Project
+
+   OAFLUX
+      http://oaflux.whoi.edu/
+
+   OLR
+      Outgoing Long-Wave Radiation
+
+   RAMA
+      Research Moored Array for African-Asian-Australian Monsoon Analysis
+
+   TAO
+      Tropical Atmosphere Ocean project
+      http://www.pmel.noaa.gov/tao/
+
+   PIRATA
+      Prediction and Research Moored Array in the Tropical Atlantic
+
+   SWR
+      surface set shortwave radiation
+
+   LWR
+      surface net longwave radiation
+
+   SST
+      sea surface temperature

trunk/adm/sphinx/conf.py

@@ -23 +23 @@
 # EVOLUTIONS
 # ==========
+#
+# - fplod 20101216T155711Z aedon.locean-ipsl.upmc.fr (Darwin)
+#
+#   * add new hard coded manual pages
 #
 # - fplod 20101214T110437Z aedon.locean-ipsl.upmc.fr (Darwin)
@@ -253 +257 @@
     ('plogd.sh', 'plogd.sh', u'plogd.sh Documentation', [u'IRD'], 1),
     ('tlogd.sh', 'tlogd.sh', u'tlogd.sh Documentation', [u'IRD'], 1),
+    ('get_oaflux.sh', 'get_oaflux.sh', u'get_oaflux.sh Documentation', [u'IRD'], 1),
     ('get_olr.sh', 'get_olr.sh', u'get_olr.sh Documentation', [u'IRD'], 1),
     ('get_olrnint.sh', 'get_olrnint.sh', u'get_olrnint.sh Documentation', [u'IRD'], 1),
     ('get_pirata_netcdf.sh', 'get_pirata_netcdf.sh', u'get_pirata_netcdf.sh Documentation', [u'IRD'], 1),
     ('get_rama_netcdf.sh', 'get_rama_netcdf.sh', u'get_rama_netcdf.sh Documentation', [u'IRD'], 1),
-    ('get_tao_netcdf.sh', 'get_tao_netcdf.sh', u'get_tao_netcdf.sh Documentation', [u'IRD'], 1)
+    ('get_tao_netcdf.sh', 'get_tao_netcdf.sh', u'get_tao_netcdf.sh Documentation', [u'IRD'], 1),
+    ('compute_erai_daily_region_2d.sh', 'compute_erai_daily_region_2d.sh', u'compute_erai_daily_region_2d.sh Documentation', [u'IRD'], 1)
 ]