Changeset 88


Ignore:
Timestamp:
06/05/06 10:49:08 (18 years ago)
Author:
smasson
Message:

add main.xml and improve savesaxo

Location:
trunk/SRC/Documentation/xmldoc
Files:
2 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/SRC/Documentation/xmldoc/firststeps.html

    r82 r88  
    6565   <code class="prompt">idl&gt;</code> <strong class="userinput"><code><span><strong class="command">y = findgen(n)</strong></span></code></strong> <img src="images/callouts/1.png?format=raw" alt="1"> 
    6666   <code class="prompt">idl&gt;</code> <strong class="userinput"><code><span><strong class="command">plot, y</strong></span></code></strong> <a href="figpng/basic_plot.png?format=raw" target="_top"><span class="inlinemediaobject"><img src="images/showfig.png?format=raw" alt="show result"></span></a> 
    67         </pre><div class="calloutlist"><table border="0" summary="Callout list"><tr><td width="5%" valign="top" align="left"><img src="images/callouts/1.png" alt="1" border="0"></td><td valign="top" align="left"><p> 
     67        </pre><div class="calloutlist"><table border="0" summary="Callout list"><tr><td width="5%" valign="top" align="left"><img src="images/callouts/1.png?format=raw" alt="1" border="0"></td><td valign="top" align="left"><p> 
    6868                <span><strong class="command">findgen</strong></span> stands for <span><strong class="command">f</strong></span>loat <span><strong class="command">ind</strong></span>ex <span><strong class="command">gen</strong></span>erator.  
    6969                </p><pre class="screen"> 
    … …  
    9999  <code class="computeroutput">% Compiled module: CW_BGROUP.</code> 
    100100  <code class="computeroutput">% Compiled module: XMANAGER.</code> 
    101         </pre><div class="calloutlist"><table border="0" summary="Callout list"><tr><td width="5%" valign="top" align="left"><img src="images/callouts/1.png" alt="1" border="0"></td><td valign="top" align="left"><p> 
     101        </pre><div class="calloutlist"><table border="0" summary="Callout list"><tr><td width="5%" valign="top" align="left"><img src="images/callouts/1.png?format=raw" alt="1" border="0"></td><td valign="top" align="left"><p> 
    102102                <em><span class="remark">If needed, the name of the postscript will automatically be completed with .ps. Just hit return, if you want to use the default postcript name: <code class="filename">idl.ps</code>.</span></em>  
    103103              </p></td></tr></table></div></div><p> 
    … …  
    150150  <code class="prompt">idl&gt;</code> <strong class="userinput"><code><span><strong class="command">splot, findgen(360)/36., findgen(360)*2.*!dtor, /polar $</strong></span></code></strong> 
    151151  <code class="prompt">idl&gt;</code> <strong class="userinput"><code><span><strong class="command">    , small <span class="inlinemediaobject"><img src="images/callouts/1.png?format=raw" alt="1"></span> = [1, 2, 2], /noerase <span class="inlinemediaobject"><img src="images/callouts/2.png?format=raw" alt="2"></span></strong></span></code></strong> <a href="figpng/basic_splot3.png?format=raw" target="_top"><span class="inlinemediaobject"><img src="images/showfig.png?format=raw" alt="show result"></span></a> 
    152         </pre><div class="calloutlist"><table border="0" summary="Callout list"><tr><td width="5%" valign="top" align="left"><img src="images/callouts/1.png" alt="1" border="0"></td><td valign="top" align="left"><p> 
     152        </pre><div class="calloutlist"><table border="0" summary="Callout list"><tr><td width="5%" valign="top" align="left"><img src="images/callouts/1.png?format=raw" alt="1" border="0"></td><td valign="top" align="left"><p> 
    153153                the <code class="computeroutput">small</code> keyword is a 3 elements vector which defines how we devide the page and in which case we should make the plot: [number of columns, number of rows, case number]. The case numbering is starting at 1, from top to bottom and left to right. 
    154               </p></td></tr><tr><td width="5%" valign="top" align="left"><img src="images/callouts/2.png" alt="2" border="0"></td><td valign="top" align="left"> 
     154              </p></td></tr><tr><td width="5%" valign="top" align="left"><img src="images/callouts/2.png?format=raw" alt="2" border="0"></td><td valign="top" align="left"> 
    155155                you must put <code class="computeroutput">/norease</code> otherwise the second plot will be done in a new window. 
    156156              </td></tr></table></div></div><p> 
    … …  
    178178  <code class="prompt">idl&gt;</code> <strong class="userinput"><code><span><strong class="command">contour, z, /overplot, c_label = rebin([1, 0], 2, n) <span class="inlinemediaobject"><img src="images/callouts/1.png?format=raw" alt="1"></span>, levels = n*ind $</strong></span></code></strong> 
    179179  <code class="prompt">idl&gt;</code> <strong class="userinput"><code><span><strong class="command">    , c_charthick = 2, c_charsize = 1.5, c_colors = 250*ind</strong></span></code></strong> <a href="figpng/basic_scontour3.png?format=raw" target="_top"><span class="inlinemediaobject"><img src="images/showfig.png?format=raw" alt="show result"></span></a> 
    180         </pre><div class="calloutlist"><table border="0" summary="Callout list"><tr><td width="5%" valign="top" align="left"><img src="images/callouts/1.png" alt="1" border="0"></td><td valign="top" align="left"><p> 
     180        </pre><div class="calloutlist"><table border="0" summary="Callout list"><tr><td width="5%" valign="top" align="left"><img src="images/callouts/1.png?format=raw" alt="1" border="0"></td><td valign="top" align="left"><p> 
    181181              <span><strong class="command">rebin</strong></span> is used to build an array containing an alternation of 1 and 0 in order to label one contour every two contours. 
    182182                </p><pre class="screen"> 

  • trunk/SRC/Documentation/xmldoc/getsaxo.html

    r87 r88  
    7878  <code class="prompt">$</code> <strong class="userinput"><code><span><strong class="command">cd</strong></span> <em class="parameter"><code>SAXO_DIR</code></em></code></strong> 
    7979          </pre><p> 
    80           ... and download it the latest version of the sources tar file: <a href="http://forge.ipsl.jussieu.fr/saxo/download/SAXO_SRC_20060602.tar.gz" target="_top">SAXO_SRC_20060602.tar.gz</a> (4.0M Mb). This tar.gz file could also be downloaded with  
     80          ... and download it the latest version of the sources tar file: <a href="http://forge.ipsl.jussieu.fr/saxo/download/SAXO_SRC_20060605.tar.gz" target="_top">SAXO_SRC_20060605.tar.gz</a> (4.0M Mb). This tar.gz file could also be downloaded with  
    8181        </p><div class="variablelist"><dl><dt><span class="term"><span><strong class="command">wget</strong></span></span></dt><dd><pre class="screen"> 
    82   <code class="prompt">$</code> <strong class="userinput"><code><span><strong class="command">wget</strong></span> <em class="parameter"><code>http://forge.ipsl.jussieu.fr/saxo/download/SAXO_SRC_20060602.tar.gz</code></em></code></strong> 
     82  <code class="prompt">$</code> <strong class="userinput"><code><span><strong class="command">wget</strong></span> <em class="parameter"><code>http://forge.ipsl.jussieu.fr/saxo/download/SAXO_SRC_20060605.tar.gz</code></em></code></strong> 
    8383          </pre></dd><dt><span class="term"><span><strong class="command">curl</strong></span></span></dt><dd><pre class="screen"> 
    84   <code class="prompt">$</code> <strong class="userinput"><code><span><strong class="command">curl</strong></span> <code class="option">-O</code> <em class="parameter"><code>http://forge.ipsl.jussieu.fr/saxo/download/SAXO_SRC_20060602.tar.gz</code></em></code></strong> 
     84  <code class="prompt">$</code> <strong class="userinput"><code><span><strong class="command">curl</strong></span> <code class="option">-O</code> <em class="parameter"><code>http://forge.ipsl.jussieu.fr/saxo/download/SAXO_SRC_20060605.tar.gz</code></em></code></strong> 
    8585          </pre></dd></dl></div><p>      
    8686        Untar the file 
    8787        </p><pre class="screen"> 
    8888  <code class="prompt">$</code> <strong class="userinput"><code><span><strong class="command">cd</strong></span> <em class="parameter"><code><code class="envar">${HOME}</code>/SAXO_DIR</code></em></code></strong> 
    89   <code class="prompt">$</code> <strong class="userinput"><code><span><strong class="command">tar</strong></span> <code class="option">xvfz</code> <em class="parameter"><code>SAXO_SRC_20060602.tar.gz</code></em></code></strong> 
    90   <code class="prompt">$</code> <strong class="userinput"><code><span><strong class="command">rm</strong></span> <em class="parameter"><code>SAXO_SRC_20060602.tar.gz</code></em></code></strong> 
     89  <code class="prompt">$</code> <strong class="userinput"><code><span><strong class="command">tar</strong></span> <code class="option">xvfz</code> <em class="parameter"><code>SAXO_SRC_20060605.tar.gz</code></em></code></strong> 
     90  <code class="prompt">$</code> <strong class="userinput"><code><span><strong class="command">rm</strong></span> <em class="parameter"><code>SAXO_SRC_20060605.tar.gz</code></em></code></strong> 
    9191        </pre><p> 
    9292        </p></div><div class="sect3" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="saxo_data_tar"></a>2.3.2.&nbsp; 

  • trunk/SRC/Documentation/xmldoc/makehtml.sh

    r87 r88  
    164164          ${1}.xml > ${1}_${$}.xml  
    165165   ;; 
    166    firssteps) 
     166   firststeps) 
    167167      sed -e s/"\&figsplt_lev\;"/"${figsplt_lev}"/g \ 
    168168          -e s/"\&figsplt_orca2\;"/"${figsplt_orca2}"/g \ 
    … …  
    214214      section.autolabel=1 html.stylesheet="saxo.css" css.decoration=1 
    215215      rm -f all_plots_${$}.xml 
     216# not very nice... but useful !! 
     217      sed -e s/".png\""/".png?format=raw\""/g ${1}.html > ${1}_${$}.html 
     218      mv ${1}_${$}.html ${1}.html 
    216219   ;; 
    217220esac 

  • trunk/SRC/Documentation/xmldoc/savesaxo.sh

    r87 r88  
    1313doidldoc_assistant=0 
    1414doidlwavedoc=0 
    15 dotarsrc=1 
    16 dotardata=0 
     15doTARsrc=1 
     16doTARdata=0 
    1717doforge=1 
    18 dolodyc=0 
    19 # 
     18doSRClodyc=0 
     19doDTAlodyc=0 
     20doSRCidris=0 
     21doDTAidris=0 
     22# 
     23# 
     24# get the date in a nice format 
     25# 
     26ndate=`date +%Y%m%d` 
    2027# memorize current directory 
    2128memopwd=$(pwd) # should be <working space>/SRC/Documentation/xmldoc 
    22 # 
     29#------------------------------------------------------------------ 
    2330if [ ${dohtml} -eq 1 ] 
    2431then 
    … …  
    2734# 
    2835    cd ${memopwd} 
    29     for docxml in firststeps.xml getsaxo.xml mailing.xml tiplink.xml updatesaxo.xml whatissaxo.xml whatsnew.xml 
     36    for docxml in firststeps.xml getsaxo.xml mailing.xml main.xml tiplink.xml updatesaxo.xml whatissaxo.xml whatsnew.xml 
    3037    do 
    31     ./makehtml.sh $(basename ${docxml}) 
     38    ./makehtml.sh $(basename ${docxml} .xml) 
    3239 #   tidy -m $(basename ${docxml}).html 
    3340    done 
    3441    exit 0 
    3542fi 
    36 # 
    37 # get the date in a nice format 
    38 # 
    39 ndate=`date +%Y%m%d` 
    40 # 
    41 # 
     43#------------------------------------------------------------------ 
    4244if [ ${dooldtest} -eq 1 ] 
    4345then 
    … …  
    4850    exit 0 
    4951fi 
     52#------------------------------------------------------------------ 
    5053if  [ ${doidlwavedoc} -eq 1 ] 
    5154then 
    … …  
    5760    exit 0 
    5861fi 
     62#------------------------------------------------------------------ 
    5963if  [ ${doidldoc_html} -eq 1 ] 
    6064then 
    … …  
    6367    exit 1 
    6468fi 
     69#------------------------------------------------------------------ 
    6570if  [ ${doidldoc_assistant} -eq 1 ] 
    6671then 
    … …  
    6974    exit 1 
    7075fi 
    71 # 
    72 if [ ${dotarsrc} -eq 1 ] 
     76#------------------------------------------------------------------ 
     77if [ ${doTARsrc} -eq 1 ] 
    7378then 
    7479    localtarbase=/tmp/savesaxo_${$} 
    7580    mkdir  ${localtarbase}/ 
    7681# clean backup files : *~ 
    77 # 
    78     cd ${memopwd}/../../.. 
    79     find . -name "*~" -exec rm {} \; 
     82    find ${memopwd}/../../.. -name "*~" -exec rm {} \; 
    8083# prepare the source tar (without the svn...) 
    8184# 
    … …  
    8790    ls -l ${localtarbase} 
    8891fi 
    89 if [ ${dotardata} -eq 1 ] 
     92#------------------------------------------------------------------ 
     93if [ ${doTARdata} -eq 1 ] 
    9094then 
    9195    localtarbase=/tmp/savesaxo_${$} 
    … …  
    101105    ls -l ${localtarbase} 
    102106fi 
    103 # 
     107#------------------------------------------------------------------ 
    104108if [ ${doforge} -eq 1 ] 
    105109then 
    106110    echo "iii : you will be asked saxo@forge.ipsl.jussieu.fr passwd two times" 
    107     if [ ${dotarsrc} -ne 1 ] 
     111    if [ ${doTARsrc} -ne 1 ] 
    108112    then 
    109113       localtarbase=${1}  
    110114    fi 
    111     scp ${localtarbase}/*.tar.gz saxo@forge.ipsl.jussieu.fr:/ipsl/forge/projets/saxo/download/ 
     115    scp ${localtarbase}/SAXO_*.tar.gz saxo@forge.ipsl.jussieu.fr:/ipsl/forge/projets/saxo/download/ 
    112116    echo "iii : do not forget to update getsaxo.html" 
    113117    echo "iii : \$ ./makehtml.sh getsaxo" 
    114118    echo "iii : do not forget to clean ${localtarbase}" 
    115119fi 
    116 if [ $dolodyc -eq 1 ] 
    117 then 
    118 # 
    119 # put the src files on cerbere 
    120 # 
    121     cd ~/SAXO_RD 
    122     scp SAXO_RD_${ndate}.tar.gz smasson@cerbere.lodyc.jussieu.fr:. 
    123     cd ~/IDL 
    124     datafile=$( echo TestsData_*.tar.gz ) 
    125     cat > job_$$ << EOF 
     120#------------------------------------------------------------------ 
     121if [[ ($doSRClodyc -eq 1) || ($doDTAidris -eq 1) ]] 
     122then 
     123infosrc=$(ssh saxo@forge.ipsl.jussieu.fr ls -lht /ipsl/forge/projets/saxo/download/SAXO_SRC_*.tar.gz  | head -n 1) 
     124filesrc=$(echo ${infosrc} | awk '{print $NF}') 
     125filesrc=$( basename $filesrc ) 
     126# 
     127    cat <<EOF > job_src_$$ 
    126128#!/bin/bash 
    127 [ -f WWW/SAXO/DATA/$datafile ] && echo 0 || echo 1 
     129cd SAXO_DIR 
     130# 
     131rm -rf SRC 
     132wget http://forge.ipsl.jussieu.fr/saxo/download/$filesrc 
     133gunzip $filesrc 
     134tar xf $( basename $filesrc .gz ) 
     135rm -f $( basename $filesrc .gz ) 
     136# 
     137chmod -R 755 * 
     138exit 
     139# 
    128140EOF 
    129     scp job_$$ smasson@cerbere.lodyc.jussieu.fr:. 
    130     err=$( ssh smasson@cerbere.lodyc.jussieu.fr \ 
    131     "chmod 755 job_$$ ; ./job_$$ ; rm -f job4_$$" ) 
    132     rm -f job_$$ 
    133     [ $err -ne 0 ] && scp $datafile smasson@cerbere.lodyc.jussieu.fr:. 
    134 # 
    135 # create cerbere script... 
    136 # 
    137     cd ~/SAXO_RD 
    138     cat <<EOF > job_$$ 
     141fi 
     142# 
     143if [[ ($doDTAlodyc -eq 1) || ($doDTAidris -eq 1) ]] 
     144then 
     145infodata=$(ssh saxo@forge.ipsl.jussieu.fr ls -lht /ipsl/forge/projets/saxo/download/SAXO_DATA_*.tar.gz | head -n 1) 
     146filedata=$(echo ${infodata} | awk '{print $NF}') 
     147filedata=$(basename $filedata) 
     148    cat <<EOF > job_data_$$ 
    139149#!/bin/bash 
    140 rm -rf WWW/SAXO/SRC SAXO_RD 
    141 mkdir -p WWW/SAXO/SRC SAXO_RD 
    142 [ ! -d  WWW/SAXO/DATA ] && mkdir -p WWW/SAXO/DATA 
    143 # store SAXO_RD_${ndate}.tar.gz 
    144 mv -f SAXO_RD_${ndate}.tar.gz WWW/SAXO/SRC/. 
    145 # store $datafile 
    146 if [ -f $datafile ] 
    147 then 
    148     rm -f WWW/SAXO/DATA/TestsData_*.tar.gz 
    149     mv -f $datafile WWW/SAXO/DATA/. 
    150 fi 
    151 # redo SAXO_RD 
    152 cd SAXO_RD 
    153 ln -s ~/WWW/SAXO/SRC/SAXO_RD_${ndate}.tar.gz . 
    154 tar xvfz SAXO_RD_${ndate}.tar.gz 
    155 cd Tests 
    156 ln -s ~/WWW/SAXO/DATA/TestsData_*.tar.gz . 
    157 tar xvfz TestsData_*.tar.gz 
    158 mkdir TestsData 
    159 mv -f *.nc TestsData/. 
    160 # redo WWW/SAXO 
    161 cd /usr/home/smasson/WWW/SAXO/ 
    162 tar xvfz docall.tar.gz 
    163 rm -f docall.tar.gz 
    164 # 
    165 cd 
    166 chmod -R 755 SAXO_RD WWW 
    167 # for rhodes... 
    168 scp ~/WWW/SAXO/SRC/SAXO_RD_${ndate}.tar.gz reee217@rhodes.idris.fr:. 
    169 ssh reee217@rhodes.idris.fr "rm -rf SAXO_RD ; mkdir SAXO_RD" 
    170 ssh reee217@rhodes.idris.fr "mv SAXO_RD_${ndate}.tar.gz SAXO_RD/. ; cd SAXO_RD ; gunzip SAXO_RD_${ndate}.tar.gz" 
    171 ssh reee217@rhodes.idris.fr "cd SAXO_RD ; tar xvf SAXO_RD_${ndate}.tar ; gzip SAXO_RD_${ndate}.tar" 
    172 ssh reee217@rhodes.idris.fr "chmod -R 755 SAXO_RD" 
     150cd SAXO_DIR 
     151# 
     152rm -rf DATA 
     153wget http://forge.ipsl.jussieu.fr/saxo/download/$filedata 
     154gunzip $filedata 
     155tar xf $( basename $filedata .gz ) 
     156rm -f $( basename $filedata .gz ) 
     157# 
     158chmod -R 755 * 
     159exit 
    173160# 
    174161EOF 
    175 # 
    176 # update cerbere... 
    177 # 
    178     scp job_$$ smasson@cerbere.lodyc.jussieu.fr:. 
    179     ssh smasson@cerbere.lodyc.jussieu.fr "chmod 755 job_$$ ; ./job_$$ ; rm -f job_$$" 
    180     rm -f job_$$ 
    181 # 
    182 # 
    183 fi 
     162fi 
     163#------------------------------------------------------------------ 
     164if [ $doSRClodyc -eq 1 ] 
     165then 
     166# update src on cerbere 
     167# 
     168    echo "iii : update src on cerbere  cerbere" 
     169    scp job_src_$$ smasson@cerbere.lodyc.jussieu.fr:. 
     170    ssh smasson@cerbere.lodyc.jussieu.fr "chmod 755 job_src_$$ ; ./job_src_$$ ; rm -f job_src_$$" 
     171fi 
     172#------------------------------------------------------------------ 
     173if [ $doDTAlodyc -eq 1 ] 
     174then 
     175# update data on cerbere 
     176    echo "iii : update data on cerbere" 
     177    scp job_data_$$ smasson@cerbere.lodyc.jussieu.fr:. 
     178    ssh smasson@cerbere.lodyc.jussieu.fr "chmod 755 job_data_$$ ; ./job_data_$$ ; rm -f job_data_$$" 
     179fi 
     180#------------------------------------------------------------------ 
     181if [ $doSRCidris -eq 1 ] 
     182then 
     183# update src on rhodes 
     184    echo "iii : update src to rhodes" 
     185    scp job_src_$$ reee217@rhodes.idris.fr:. 
     186    ssh reee217@rhodes.idris.fr "chmod 755 job_src_$$ ; ./job_src_$$ ; rm -f job_src_$$" 
     187fi 
     188#------------------------------------------------------------------ 
     189if [ $doDTAidris -eq 1 ] 
     190then 
     191# update data on gaya 
     192    echo "iii : update data to gaya" 
     193    scp job_data_$$ reee217@gaya.idris.fr:. 
     194    ssh reee217@gaya.idris.fr "chmod 755 job_data_$$ ; ./job_data_$$ ; rm -f job_data_$$" 
     195fi 
     196#------------------------------------------------------------------ 
     197# 
     198[ -f job_src_$$ ] && rm -f job_src_$$ 
     199[ -f job_data_$$ ] && rm -f  
     200# 
     201exit 
     202# 

  • trunk/SRC/Documentation/xmldoc/updatesaxo.html

    r84 r88  
    2424  <code class="prompt">$</code> <strong class="userinput"><code><span><strong class="command">svn</strong></span> <code class="option">status</code> <code class="option">-u</code> <em class="parameter"><code><code class="filename"><code class="envar">${HOME}</code>/SAXO_DIR</code></code></em></code></strong> 
    2525        </pre><p> 
    26         Or, for example, if you want to check the status only of <code class="filename"><code class="envar">${HOME}</code>/SAXO_DIR/SRC</code> directory 
     26        Or, for example, if you only want to check the status of <code class="filename"><code class="envar">${HOME}</code>/SAXO_DIR/SRC</code> directory 
    2727        </p><pre class="screen"> 
    2828  <code class="prompt">$</code> <strong class="userinput"><code><span><strong class="command">svn</strong></span> <code class="option">status</code> <code class="option">-u</code> <em class="parameter"><code><code class="filename"><code class="envar">${HOME}</code>/SAXO_DIR/SRC</code></code></em></code></strong> 
    … …  
    3232  <code class="prompt">$</code> <strong class="userinput"><code><span><strong class="command">svn</strong></span> <code class="option">update</code> <em class="parameter"><code><code class="filename"><code class="envar">${HOME}</code>/SAXO_DIR</code></code></em></code></strong> 
    3333        </pre><p> 
    34         Or, for example, if you want to update only <code class="filename"><code class="envar">${HOME}</code>/SAXO_DIR/SRC</code> directory 
     34        Or, for example, if you only want to update <code class="filename"><code class="envar">${HOME}</code>/SAXO_DIR/SRC</code> directory 
    3535        </p><pre class="screen"> 
    3636  <code class="prompt">$</code> <strong class="userinput"><code><span><strong class="command">svn</strong></span> <code class="option">update</code> <em class="parameter"><code><code class="filename"><code class="envar">${HOME}</code>/SAXO_DIR/SRC</code></code></em></code></strong> 
Note: See TracChangeset for help on using the changeset viewer.