Changeset 160

Timestamp:

03/07/12 17:37:20 (12 years ago)

Author:

pinsard

Message:

README.rst was renamed to Readme.rst because of Apache policy

Location:

trunk

Files:

• adm/website/Readme.rst (moved) (moved from trunk/adm/website/README.rst) (3 diffs)
• docs/docs_dev/source/guides/updatedata.rst (modified) (7 diffs)

trunk/adm/website/Readme.rst

@@ -8 +8 @@
 -----------------------------
 
-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 September 2011 period. We are currently working on a regular (~monthly) update of the TropFlux product until 3-4 months behind realtime, which should be available in 2012.
+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 eptember 2011 period. We are currently working on a regular (~monthly) update of the TropFlux product until 3-4 months behind realtime, which should be available in 2012.
 
 TropFlux 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. 2011. The wind stress product is described, evaluated and compared against other widely used products (QuikSCAT, NCEP, NCEP2, ERA-I) in Praveen Kumar et al. submitted
@@ -15 +15 @@
 
  - better variability and less biases than re-analysis fluxes (and equivalent or slightly better than the best performing products: OAFLUX for heat fluxes and ERA-I for wind stresses) ,
- - available until Septempber 2011, and soon updated every month, lagging realtime by ~3 months,
+ - available until September 2011, and soon updated every month, lagging realtime by ~3 months,
  - 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.
 
@@ -38 +38 @@
  - Bulk sea surface temperature (sst, degC)
 
-The data is provided in netcdf format, with one file per variable for the complete dataset.
+The data is provided in NetCDF format, with one file per variable for the complete dataset.
 Daily (almost 1Gb per file) and monthly (32Mb per file) average data are proposed.
 The data is provided on a 1° resolution grid (with the same land-sea mask than for the OAFLUX project, http://oaflux.whoi.edu/ ).
-There are 60 points in latidude at -29.5, -28.5, ..., 28.5 (positive north of the equator).
-There are 350 points in longitude at 30.5, 31.5, ..., 379.5 (eastward of the Greenwhich meridian).
+There are 60 points in latitude at -29.5, -28.5, ..., 28.5 (positive north of the equator).
+There are 350 points in longitude at 30.5, 31.5, ..., 379.5 (eastward of the Greenwich meridian).
 This choice on longitude has been made: to avoid including points with only land (in central Africa)and to avoid cutting through a tropical ocean.
 

trunk/docs/docs_dev/source/guides/updatedata.rst

@@ -27 +27 @@
 .. tenir compte des images du site dans cette procédure
 ..
-.. tester la mise à jour de README.rst
+.. tester la mise à jour de Readme.rst
 ..
 .. EVOLUTIONS
@@ -35 +35 @@
 ..
 .. $URL$
+..
+.. - fplod 20120307
+..
+..   * README.rst was renamed to Readme.rst because of Apache policy
 ..
 .. - fplod 20120229
@@ -80 +84 @@
 If a new field is provided it must be described in :file:`data_out_website.rst`
 
-:file:`README.rst` may also be updated.
+:file:`Readme.rst` may also be updated.
 
 .. warning::
@@ -118 +122 @@
 .. parsed-literal::
 
-   $ mv README.rst obsolete_${datemodif}
+   $ mv Readme.rst obsolete_${datemodif}
    $ mv ./daily obsolete_${datemodif}
    $ mv ./monthly obsolete_${datemodif}
@@ -131 +135 @@
    $ newdir='/net/adonis/usr/adonis/varclim/tropflux_v1'
    $ export newdir
-   $ svn export svn+ssh://pinsard@forge.ipsl.jussieu.fr/ipsl/forge/projets/tropflux/svn/trunk/adm/website/README.rst \
-     /usr/lodyc/incas/fplod/tropflux_d/to_be_published/README.rst
+   $ svn export svn+ssh://pinsard@forge.ipsl.jussieu.fr/ipsl/forge/projets/tropflux/svn/trunk/adm/website/Readme.rst \
+     /usr/lodyc/incas/fplod/tropflux_d/to_be_published/Readme.rst
    $ cp -r ${newdir}/daily /usr/lodyc/incas/fplod/tropflux_d/to_be_published
    $ cp -r ${newdir}/monthly /usr/lodyc/incas/fplod/tropflux_d/to_be_published
@@ -162 +166 @@
 
    $ cd /usr/lodyc/incas/fplod/tropflux_d/
-   $ mv ./to_be_published/README.rst
-   $ ln -sf $(pwd)/README.rst daily/
-   $ ln -sf $(pwd)/README.rst monthly/
+   $ mv ./to_be_published/Readme.rst
+   $ ln -sf $(pwd)/Readme.rst daily/
+   $ ln -sf $(pwd)/Readme.rst monthly/
    $ mv ./to_be_published/daily ./
    $ mv ./to_be_published/monthly ./
@@ -196 +200 @@
    fplod@sonmac$ ftp www.locean-ipsl.upmc.fr
    ftp> cd |project_id|/data/
-   ftp> put README.rst
+   ftp> put Readme.rst
    ftp> cd daily
    ftp> lcd daily
    ftp> mput *.nc
    ftp> cd ../monthly
-   ftp> put ../README.rst
+   ftp> put ../Readme.rst
    ftp> lcd ../monthly
-   ftp> put ../README.rst
+   ftp> put ../Readme.rst
    ftp> mput *.nc