Changeset 203 for trunk/docs
- Timestamp:
- 02/11/14 18:41:24 (10 years ago)
- Location:
- trunk/docs/docs_dev/source
- Files:
-
- 2 deleted
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/docs/docs_dev/source/guides/bibliography.rst
r198 r203 29 29 .. - fplod 20110622T155451Z aedon.locean-ipsl.upmc.fr (Darwin) 30 30 .. 31 .. * remove kumarVialard to avoid redondancies between this bibligraphy and 31 .. * remove kumarVialard to avoid redondancies between this bibligraphy and 32 32 .. the web site one. same for LiebmannSmith:BAMS:1996 33 33 .. … … 66 66 .. [BourlesLumpkinEtAL:BAMS:2008] Bourlès, B., Lumpkin, R., McPhaden, M. J., Hernandez, F., Nobre, P., Campos, E., Yu, L. S., Planton, S., Busalacchi, A., Moura, A. D., Servain, J. and Trotte, J. *The PIRATA program : history, accomplishments, and future directions*, Bulletin of the American Meteorological Society, 2008, Vol. 89(8), pp. 1111-1125, http://dx.doi.org/10.1175/2008BAMS2462.1 67 67 68 .. [McPhadenMeyersEtAl:BAMS:2009] McPhaden, M. J., G. Meyers, K. Ando,Y. Masumoto, V. S. N. Murty, M. Ravichandran, 69 F. Syamsudin, J. Vialard, L. Yu, and W. Yu, 2009: RAMA: The Research Moored Array for African-Asian-Australian Monso 70 on Analysis and Prediction. Bull. Am. Meteorol. Soc., 90, 459-480, doi:10.1175/2008BAMS2608.1 68 .. [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 Monso on Analysis and Prediction. Bull. Am. Meteorol. Soc., 90, 459-480, doi:10.1175/2008BAMS2608.1 71 69 72 .. [McPhadenBusalacchiEtAL:JGR:1998] McPhaden, M.J., A.J. Busalacchi, R. Cheney, J.R. Donguy, K.S. Gage, D. Halpern, 73 M. Ji, P. Julian, G. Meyers, G.T. Mitchum, P.P. Niiler, J. Picaut, R.W. Reynolds, N. Smith, K. Takeuchi, 1998: The 74 Tropical Ocean-Global Atmosphere (TOGA) observing system: A decade of progress. J. Geophys. Res., 103, 14, 169-14,24 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 75 71 0. 76 72 -
trunk/docs/docs_dev/source/guides/builddoc.rst
r199 r203 8 8 .. SEE ALSO 9 9 .. ======== 10 .. 10 .. 11 11 .. :ref:`Makefile` 12 .. 12 .. 13 13 .. TODO 14 14 .. ===== … … 86 86 .. _Sphinx: http://sphinx.pocoo.org/ 87 87 88 .. parsed-literal::88 .. code-block:: bash 89 89 90 $cd ${PROJECT}/adm/91 $make clean92 $make before93 $make html_dev_sphinx90 cd ${PROJECT}/adm/ 91 make clean 92 make before 93 make html_dev_sphinx 94 94 95 95 et regarder le résultat dans :file:`../doc/html/index.html`. … … 98 98 documentations (HTML single, PDF et troff): 99 99 100 .. parsed-literal::100 .. code-block:: bash 101 101 102 $make all_dev102 make all_dev 103 103 104 104 Website |project| … … 112 112 .. parsed-literal:: 113 113 114 $cd ${PROJECT}/adm/115 $make clean116 $make before117 $make html_user114 cd ${PROJECT}/adm/ 115 make clean 116 make before 117 make html_user 118 118 119 119 et regarder le résultat dans :file:`./website/_build/html/index.html`. … … 131 131 .. parsed-literal:: 132 132 133 $make install_all133 make install_all -
trunk/docs/docs_dev/source/guides/contact.rst
r110 r203 10 10 .. - fplod 20101220T115124Z aedon.locean-ipsl.upmc.fr (Darwin) 11 11 .. 12 .. * creation 12 .. * creation 13 13 .. 14 14 .. - -
trunk/docs/docs_dev/source/guides/data_content.rst
r199 r203 8 8 .. section title by variable or by provider ... 9 9 .. 10 .. http://data-portal.ecmwf.int/data/d/interim_full_daily 10 .. http://data-portal.ecmwf.int/data/d/interim_full_daily 11 11 .. Pour sst : 12 12 .. select all time : 0,6, 12, 18 … … 152 152 ^^^^^^^ 153 153 154 oaflux isccp 154 oaflux isccp 155 155 156 156 Documentation -
trunk/docs/docs_dev/source/guides/generate_tropflux.rst
r199 r203 114 114 115 115 There's also one additional step to convert ERA-I dewpoint T :math:`d_{2m}` into specific humidity :math:`q_{2m}` : 116 116 117 117 - :func:`d2m_to_q2m_erai` (:func:`rh_to_spechum`, :func:`qsat`) 118 118 … … 148 148 tools : 149 149 - :func:`cronin_gustiness_ncdf` 150 - :func:`tropflux` (:func:`cor30a`), :func:`tropflux_nrt_ncdf` 150 - :func:`tropflux` (:func:`cor30a`), :func:`tropflux_nrt_ncdf` 151 151 152 152 After that step, there are 5 files: Tropflux :math:`T_{2m}`, :math:`q_{2m}`, SST, wind, and one file with the 4 components of the net flux (sensible, latent, SWR, LWR) … … 155 155 .. math:`T_{2m}`, :math:`q_{2m}`, SST, wind, swr and lwr came from correction mooring 156 156 .. final wind product is not corrected for wind gustiness. 157 .. sensible, latent shf and lhf came from coare correction 157 .. sensible, latent shf and lhf came from coare correction 158 158 159 159 .. _momentum_fluxes: -
trunk/docs/docs_dev/source/guides/glossary.rst
r110 r203 23 23 ERA-INTERIM 24 24 25 http://www.ecmwf.int/research/era/do/get/era-interim 25 http://www.ecmwf.int/research/era/do/get/era-interim 26 26 27 27 ECMWF -
trunk/docs/docs_dev/source/guides/history.rst
r110 r203 22 22 ======= 23 23 24 TropFlux project started in mid 2008 as joint research collaboration 25 between National Institute of Oceanography (NIO, CSIR), India, and 26 Institut Pierre Simon Laplace (IPSL), Paris. 27 TropFlux project aims at producing daily, timely, high quality air-sea fluxes over the global tropical ocean belt (30N-30S). Presently, it is available on 28 a 1 x 1 degree grid from 1989-2009. Eventually, we hope to update these fluxes 29 routinely about 3-4 months behind realtime. 24 TropFlux project started in mid 2008 as joint research collaboration 25 between National Institute of Oceanography (NIO, CSIR), India, and 26 Institut Pierre Simon Laplace (IPSL), Paris. 27 TropFlux project aims at producing daily, timely, high quality air-sea fluxes over the global tropical ocean belt (30N-30S). Presently, it is available on 28 a 1 x 1 degree grid from 1989-2009. Eventually, we hope to update these fluxes 29 routinely about 3-4 months behind realtime. 30 30 31 The air-sea fluxes are largely derived from ERA-interim re-analysis (see 32 http://www.ecmwf.int/research/era/do/get/era-interim for details) and 33 ISCCP project (http://isccp.giss.nasa.gov/) shortwave fluxes with ad hoc 34 corrections derived from the tropical moored buoy array. 35 See the reference below (available in this directory as 36 https://www.locean-ipsl.upmc.fr/~jv/data/TropFlux_Climate_Dynamics_r.pdf) for 37 more details. 38 39 31 The air-sea fluxes are largely derived from ERA-interim re-analysis (see 32 http://www.ecmwf.int/research/era/do/get/era-interim for details) and 33 ISCCP project (http://isccp.giss.nasa.gov/) shortwave fluxes with ad hoc 34 corrections derived from the tropical moored buoy array. 35 See the reference below (available in this directory as 36 https://www.locean-ipsl.upmc.fr/~jv/data/TropFlux_Climate_Dynamics_r.pdf) for 37 more details. -
trunk/docs/docs_dev/source/guides/updatedata.rst
r201 r203 135 135 .. parsed-literal:: 136 136 137 $datemodif="20120209"138 139 $export datemodif140 $cd /usr/lodyc/incas/fplod/tropflux_d/141 $mkdir obsolete_${datemodif}142 143 .. parsed-literal:: 144 145 $mv Readme.rst obsolete_${datemodif}146 $mv ./daily obsolete_${datemodif}147 $mv ./monthly obsolete_${datemodif}137 datemodif="20120209" 138 139 export datemodif 140 cd /usr/lodyc/incas/fplod/tropflux_d/ 141 mkdir obsolete_${datemodif} 142 143 .. parsed-literal:: 144 145 mv Readme.rst obsolete_${datemodif} 146 mv ./daily obsolete_${datemodif} 147 mv ./monthly obsolete_${datemodif} 148 148 149 149 .. _copynew1: … … 154 154 .. parsed-literal:: 155 155 156 $newdir='/net/adonis/usr/adonis/varclim/tropflux_v1'157 $export newdir158 $svn export svn+ssh://pinsard@forge.ipsl.jussieu.fr/ipsl/forge/projets/tropflux/svn/trunk/adm/website/Readme.rst \159 160 $cp -r ${newdir}/daily /usr/lodyc/incas/fplod/tropflux_d/to_be_published161 $cp -r ${newdir}/monthly /usr/lodyc/incas/fplod/tropflux_d/to_be_published156 newdir='/net/adonis/usr/adonis/varclim/tropflux_v1' 157 export newdir 158 svn export svn+ssh://pinsard@forge.ipsl.jussieu.fr/ipsl/forge/projets/tropflux/svn/trunk/adm/website/Readme.rst \ 159 /usr/lodyc/incas/fplod/tropflux_d/to_be_published/Readme.rst 160 cp -r ${newdir}/daily /usr/lodyc/incas/fplod/tropflux_d/to_be_published 161 cp -r ${newdir}/monthly /usr/lodyc/incas/fplod/tropflux_d/to_be_published 162 162 163 163 .. _compareversion: … … 172 172 .. parsed-literal:: 173 173 174 $++compare.sh -o obsolete_${datemodif} -n /usr/lodyc/incas/fplod/tropflux_d/to_be_published174 ++compare.sh -o obsolete_${datemodif} -n /usr/lodyc/incas/fplod/tropflux_d/to_be_published 175 175 176 176 Once comparison is done and PI happy, … … 184 184 .. parsed-literal:: 185 185 186 $cd /usr/lodyc/incas/fplod/tropflux_d/187 $mv ./to_be_published/Readme.rst .188 $mv ./to_be_published/daily ./189 $mv ./to_be_published/monthly ./190 $ln -sf $(pwd)/Readme.rst daily/191 $ln -sf $(pwd)/Readme.rst monthly/186 cd /usr/lodyc/incas/fplod/tropflux_d/ 187 mv ./to_be_published/Readme.rst . 188 mv ./to_be_published/daily ./ 189 mv ./to_be_published/monthly ./ 190 ln -sf $(pwd)/Readme.rst daily/ 191 ln -sf $(pwd)/Readme.rst monthly/ 192 192 193 193 … … 235 235 .. parsed-literal:: 236 236 237 $diskext="/Volumes/LCerbere"238 $mkdir ${diskext}239 $sshfs fplod@cerbere:/usr/lodyc/incas/fplod ${diskext} -odefer_permissions -o sshfs_debug237 diskext="/Volumes/LCerbere" 238 mkdir ${diskext} 239 sshfs fplod@cerbere:/usr/lodyc/incas/fplod ${diskext} -odefer_permissions -o sshfs_debug 240 240 241 241 .. _advertise: -
trunk/docs/docs_dev/source/guides/updatedata/updatedata_20130725.rst
r202 r203 45 45 :file:`${PROJECT}/adm/website/data_access.rst` 46 46 :file:`${PROJECT}/adm/website/overview.rst` 47 :file:`${PROJECT}/adm/website/Readme.rst` 47 :file:`${PROJECT}/adm/website/Readme.rst` 48 48 :file:`${PROJECT}/adm/website/_templates/layout.html` 49 49 … … 55 55 .. parsed-literal:: 56 56 57 $datemodif="20130725"58 59 $export datemodif60 $cd /usr/lodyc/incas/fplod/tropflux_d/61 $mkdir obsolete_${datemodif}62 63 .. parsed-literal:: 64 65 $mv Readme.rst obsolete_${datemodif}66 $mv ./daily obsolete_${datemodif}67 $mv ./monthly obsolete_${datemodif}57 datemodif="20130725" 58 59 export datemodif 60 cd /usr/lodyc/incas/fplod/tropflux_d/ 61 mkdir obsolete_${datemodif} 62 63 .. parsed-literal:: 64 65 mv Readme.rst obsolete_${datemodif} 66 mv ./daily obsolete_${datemodif} 67 mv ./monthly obsolete_${datemodif} 68 68 69 69 .. _copynew1_20130725: … … 74 74 .. parsed-literal:: 75 75 76 $mkdir /usr/lodyc/incas/fplod/tropflux_d/to_be_published77 $newdir='/net/adonis/usr/adonis/varclim/tropflux_v2'78 $export newdir76 mkdir /usr/lodyc/incas/fplod/tropflux_d/to_be_published 77 newdir='/net/adonis/usr/adonis/varclim/tropflux_v2' 78 export newdir 79 79 80 80 Is there enought space ? 81 81 82 ::83 84 $du -sh ${newdir}/daily82 .. parsed-literal:: 83 84 du -sh ${newdir}/daily 85 85 12G /net/adonis/usr/adonis/varclim/tropflux_v2/daily 86 $du -sh ${newdir}/monthly86 du -sh ${newdir}/monthly 87 87 396M /net/adonis/usr/adonis/varclim/tropflux_v2/monthly 88 $df -h /usr/lodyc/incas/fplod/tropflux_d/to_be_published88 df -h /usr/lodyc/incas/fplod/tropflux_d/to_be_published 89 89 Filesystem Size Used Avail Use% Mounted on 90 90 fslodyc:/usr/.lodyc 1.6T 1.6T 20G 99% /.autofs/lodyc … … 92 92 20GB vs 12.4 GB = yes 93 93 94 then, copy :: 95 96 $ cp ${PROJECT}/adm/website/Readme.rst /usr/lodyc/incas/fplod/tropflux_d/to_be_published/Readme.rst 97 $ cp -r ${newdir}/daily /usr/lodyc/incas/fplod/tropflux_d/to_be_published 98 $ cp -r ${newdir}/monthly /usr/lodyc/incas/fplod/tropflux_d/to_be_published 94 then, copy : 95 96 .. parsed-literal:: 97 98 cp ${PROJECT}/adm/website/Readme.rst /usr/lodyc/incas/fplod/tropflux_d/to_be_published/Readme.rst 99 cp -r ${newdir}/daily /usr/lodyc/incas/fplod/tropflux_d/to_be_published 100 cp -r ${newdir}/monthly /usr/lodyc/incas/fplod/tropflux_d/to_be_published 99 101 100 102 .. _compareversion_20130725: … … 108 110 see draft tool :ref:`compare.sh` 109 111 110 ::112 .. parsed-literal:: 111 113 112 114 log=${PROJECT_LOG}/compare.log … … 119 121 First check expected equality for data: 120 122 121 ::123 .. parsed-literal:: 122 124 123 125 grep "records differ" ${log} … … 130 132 On creation_date 131 133 132 ::134 .. parsed-literal:: 133 135 134 136 grep "^>" ${log} | grep creation_date … … 138 140 It is what happened in this 20130725 data update, so: 139 141 140 ::142 .. parsed-literal:: 141 143 142 144 change_creation_date.sh -d /usr/lodyc/incas/fplod/tropflux_d/to_be_published/ -c 20130725 … … 145 147 146 148 On time_range 147 :: 149 150 .. parsed-literal:: 148 151 149 152 grep "^>" ${log} | grep time_range 150 153 154 155 151 156 If nothing appears, you must modified this attributes. see :ref:`change_time_range.sh` 152 157 153 It is what happened in this 20130725 data update, so:: 158 It is what happened in this 20130725 data update, so: 159 160 .. parsed-literal:: 154 161 155 162 change_time_range.sh -d /usr/lodyc/incas/fplod/tropflux_d/to_be_published/ -b 19790101 -e 20130331 163 156 164 tlogd.sh change_time_range 157 165 158 Clean comparison log file:: 166 Clean comparison log file: 167 168 .. parsed-literal:: 159 169 160 170 rm ${log} … … 162 172 Correct terminology if still necessary: 163 173 164 ::165 166 correct_terminology.sh -d /usr/lodyc/incas/fplod/tropflux_d/to_be_published/ -good "1979_2013" -bad "1979_march2013"167 tlogd.sh correct_terminology174 .. parsed-literal:: 175 176 correct_terminology.sh -d /usr/lodyc/incas/fplod/tropflux_d/to_be_published/ -good "1979_2013" -bad "1979_march2013" 177 tlogd.sh correct_terminology 168 178 169 179 If modifications has been made, re-run comparison (go back to … … 181 191 .. parsed-literal:: 182 192 183 $ cd /usr/lodyc/incas/fplod/tropflux_d/ 184 $ mv ./to_be_published/Readme.rst . 185 $ mv ./to_be_published/daily ./ 186 $ mv ./to_be_published/monthly ./ 187 $ ln -sf $(pwd)/Readme.rst daily/ 188 $ ln -sf $(pwd)/Readme.rst monthly/ 189 193 cd /usr/lodyc/incas/fplod/tropflux_d/ 194 mv ./to_be_published/Readme.rst . 195 mv ./to_be_published/daily ./ 196 mv ./to_be_published/monthly ./ 197 ln -sf $(pwd)/Readme.rst daily/ 198 ln -sf $(pwd)/Readme.rst monthly/ 190 199 191 200 .. _desinstalldata_20130725: … … 242 251 243 252 244 Files in :file:`${PROJECT}/adm/website/` have been modified to tell the new time coverage so 253 Files in :file:`${PROJECT}/adm/website/` have been modified to tell the new time coverage so 245 254 see also :ref:`builddoc` to synchronize dataset and documentation 246 255 -
trunk/docs/docs_dev/source/guides/updatepapers.rst
r117 r203 72 72 fplod@sonmac$ ftp www.locean-ipsl.upmc.fr 73 73 ftp> cd |project_id| 74 ftp> mkdir papers 74 ftp> mkdir papers 75 75 76 76 La mise à disposition des fichiers de données, des papiers et des images sur l'URL … … 81 81 .. _savepaper: 82 82 83 Save papers 83 Save papers 84 84 ----------- 85 85 86 86 .. parsed-literal:: 87 87 88 $ paper=~/Downloads/tropflux_clivar_final_acc.pdf89 $export paper90 $mv ${paper}/usr/lodyc/incas/fplod/tropflux_d/papers/88 paper=~/Downloads/tropflux_clivar_final_acc.pdf 89 export paper 90 mv ${paper}/usr/lodyc/incas/fplod/tropflux_d/papers/ 91 91 92 92 Installation of the papers … … 108 108 .. parsed-literal:: 109 109 110 $diskext="/Volumes/LCerbere"111 $sshfs fplod@cerbere:/usr/lodyc/incas/fplod ${diskext} -odefer_permissions110 diskext="/Volumes/LCerbere" 111 sshfs fplod@cerbere:/usr/lodyc/incas/fplod ${diskext} -odefer_permissions 112 112 113 113 .. _biblio: -
trunk/docs/docs_dev/source/index_guides.rst
r199 r203 43 43 guides/updatepapers 44 44 guides/builddoc 45 guides/coding_rules46 45 47 46 .. +todo+ guides/requirements … … 49 48 .. +todo+ guides/using 50 49 .. +todo+ guides/contributing 50 51 52 see also 53 :ref:`coding_rules <fptools:coding_rules>` -
trunk/docs/docs_dev/source/manuals/index.rst
r199 r203 5 5 .. 6 6 .. $Id$ 7 .. 7 .. 8 8 .. $URL$ 9 9 .. … … 15 15 16 16 .. manuals: 17 17 18 18 ================ 19 19 TROPFLUX manuals 20 20 ================ 21 21 22 22 .. toctree:: 23 23 :maxdepth: 1 -
trunk/docs/docs_dev/source/manuals/manuals_python.rst
r199 r203 4 4 .. ==== 5 5 .. 6 .. see https://bitbucket.org/etienned/sphinx-autopackage-script/src/7199e9725789/generate_modules.py to automate 6 .. see https://bitbucket.org/etienned/sphinx-autopackage-script/src/7199e9725789/generate_modules.py to automate 7 7 .. 8 8 .. EVOLUTIONS
Note: See TracChangeset
for help on using the changeset viewer.