Changeset 47


Ignore:
Timestamp:
02/04/14 14:39:22 (10 years ago)
Author:
pinsard
Message:

fix thanks to coding rules

Location:
trunk
Files:
1 added
1 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/adm/makefile

    r45 r47  
    9595        sed -e "s+$(DIRSRC)+$(DIRWWW)/manuals/pdf/many/+g" \ 
    9696            -e "s+\.sh+.sh.pdf+g") 
    97  
    98 RST2MAN = \ 
    99 rst2man.py 
    100  
    101 RST2HTML = \ 
    102 rst2html.py 
    103  
    104 RST2LATEX = \ 
    105 rst2latex.py 
    10697 
    10798.PHONY : \ 
    … …  
    118109man_troff \ 
    119110man_html \ 
    120 man_html_many \ 
    121111man_html_sphinx \ 
    122112man_pdf \ 
    123 man_pdf_many \ 
    124113man_pdf_sphinx 
    125114 
    … …  
    143132before : 
    144133        @mkdir -p $(DIRWWW)/manuals/man/man1/ 
    145         @mkdir -p $(DIRWWW)/manuals/html/many/ 
    146         @mkdir -p $(DIRWWW)/manuals/pdf/many/ 
    147134        @mkdir -p $(DIRWWW)/manuals/pdf/sphinx/ 
    148135        @mkdir -p $(DIRTMP)/sphinx_tmpdir/doctrees/ 
    … …  
    168155        -@rm -f $(DIRTMP)/*.rst 
    169156        -@rm -f $(DIRTMP)/*.tex 
    170         -@rm -f $(DIRWWW)/manuals/pdf/many/*.aux 
    171         -@rm -f $(DIRWWW)/manuals/pdf/many/*.log 
    172         -@rm -f $(DIRWWW)/manuals/pdf/many/*.out 
    173157        -@rm -fr $(DIRTMP)/sphinx_tmpdir/ 
    174158        -@rm -f $(DIRTMP)/sphinx_*.log 
    … …  
    190174 
    191175all : \ 
    192 man_troff \ 
    193176man_html \ 
    194177man_pdf 
    … …  
    198181 
    199182man_html : \ 
    200 man_html_many \ 
    201183man_html_sphinx 
    202  
    203 man_html_many : \ 
    204 $(DIRWWW)/manuals/html/many/index.html \ 
    205 $(LIST_SRCSH_HTML) 
    206184 
    207185man_html_sphinx : \ 
    … …  
    217195 
    218196man_pdf : \ 
    219 man_pdf_many \ 
    220197man_pdf_sphinx 
    221  
    222 man_pdf_many : \ 
    223 $(LIST_SRCSH_PDF) 
    224198 
    225199man_pdf_sphinx : \ 
    … …  
    237211           $(DIRWWW)/manuals/pdf/sphinx/ 
    238212 
    239 $(DIRWWW)/manuals/html/many/index.html : \ 
    240 $(DIRTMP)/index.rst 
    241         @$(RST2HTML) --input-encoding=ISO-8859-15 --strict \ 
    242         $< $@ 
    243  
    244 $(DIRTMP)/index.rst : 
    245         @echo "$(PRODUCTNAME) manuals" | tr [:print:] = > $@ 
    246         @echo "$(PRODUCTNAME) manuals" >> $@ 
    247         @echo "$(PRODUCTNAME) manuals" | tr [:print:] = >> $@ 
    248         @echo " " >> $@ 
    249         @echo "Shell scripts" >> $@ 
    250         @echo "Shell scripts" | tr [:print:] = >> $@ 
    251         @for file in $(LIST_SRCSH); do echo " ";echo "$$(basename $${file})_"; echo " "; echo ".. _$$(basename $${file}) : $$(basename $${file}).html"; done >> $@ 
    252  
    253         @echo " " >> $@ 
    254  
    255213$(DIRTMP)/sphinx_tmpdir/index.rst : 
    256214        @echo ".. _index:" > $@ 
    … …  
    276234        @echo " " >> $@ 
    277235 
    278 $(DIRWWW)/manuals/man/man1/%.1:$(DIRTMP)/%.rst 
    279         @$(RST2MAN) --input-encoding=ISO-8859-15 --strict \ 
    280         $< $@ 
    281  
    282 $(DIRWWW)/manuals/html/many/%.html:$(DIRTMP)/%.rst 
    283         @$(RST2HTML) --input-encoding=ISO-8859-15 --strict \ 
    284         $< $@ 
    285  
    286 $(DIRWWW)/manuals/pdf/many/%.pdf : $(DIRTMP)/%.tex 
    287         @-pdflatex -output-directory $(DIRWWW)/manuals/pdf/many/ $< 
    288         @-pdflatex -output-directory $(DIRWWW)/manuals/pdf/many/ $< 
    289  
    290 $(DIRTMP)/%.tex : $(DIRTMP)/%.rst 
    291         @$(RST2LATEX) $(RST2LATEX_OPTIONS_MANY) --input-encoding=ISO-8859-15 --strict \ 
    292         $< $@ 
    293  
    294236$(DIRTMP)/%.sh.rst : $(DIRSRC)/%.sh 
    295237        @$(DIRADM)/extract_rst.sh -i $< -l sh -o $@ 

  • trunk/detectbarotropicmode.sh

    r46 r47  
    22# 
    33#+ 
     4# 
     5# .. _detectbarotropicmode.sh: 
    46# 
    57# ======================= 
    … …  
    1416# ======== 
    1517# 
    16 # :: 
    17 # 
    18 #  $ detectbarotropicmode.sh -l list -r resolution -exp experience -g grid \ 
    19 #  -latmin latmin -latmax latmax -longmin longmin -longmax longmax 
     18# .. code-blcok:: bash 
     19# 
     20#    detectbarotropicmode.sh -l list -r resolution -exp experience -g grid \ 
     21#    -latmin latmin -latmax latmax -longmin longmin -longmax longmax 
    2022# 
    2123# DESCRIPTION 
    … …  
    2830# For detection on DRAKKAR G42 experiment with ORCA025 resolution on T points 
    2931# in the box [-50,30] [295,335]: 
    30 # :: 
    31 # 
    32 #  $ detectbarotropicmode.sh -l ${GEOMAG_OD}/list_G42 -r ORCA025 -exp G42 -g gridT \ 
    33 #  -latmin -50 -latmax -30 -longmin 295 -longmax 335 
     32# 
     33# .. code-block :: bash 
     34# 
     35#    detectbarotropicmode.sh -l ${GEOMAG_OD}/list_G42 -r ORCA025 -exp G42 -g gridT \ 
     36#    -latmin -50 -latmax -30 -longmin 295 -longmax 335 
    3437# 
    3538# EVOLUTIONS 
    … …  
    4245# - reee522 2007-11-26T11:33:42Z rhodes (IRIX64) 
    4346# 
    44 #   * externalization of  copy of data file in getmodelout.sh 
     47#   * externalization of copy of data file in getmodelout.sh 
    4548# 
    4649# - reee522 2007-11-26T10:55:44Z rhodes (IRIX64) 
    … …  
    162165# extract ssh and create a new set of files 
    163166list_ssh="" 
    164 for file in  `cat ${list}` 
     167for file in `cat ${list}` 
    165168do 
    166169   echo "iii : extraction from ${file}" # ++ voir seulement si debug demandé 
    … …  
    178181   fi 
    179182done 
    180 line=`head -n 1  ${list}` 
     183line=`head -n 1 ${list}` 
    181184bfile=`basename ${line}` 
    182185datemin=`echo ${bfile}  | awk -F "_" '{print $2}'` 
    183 line=`tail -n 1  ${list}` 
     186line=`tail -n 1 ${list}` 
    184187bfile=`basename ${line}` 
    185188datemax=`echo ${bfile}  | awk -F "_" '{print $2}'` 
    … …  
    187190# concatenation 
    188191filetot=${GEOMAG_OD}/${orcares}-${drakkar_exp}_${datemin}_${datemax}_${grid}_ssh.nc 
    189 rm -f  ${filetot} 2> /dev/null 
     192rm -f ${filetot} 2> /dev/null 
    190193ncrcat ${list_ssh} ${filetot} 
    191194status_ncrcat=${?} 

  • trunk/geomag_profile.sh

    r46 r47  
    22# 
    33#+ 
     4# .. _geomag_profile.sh: 
     5# 
    46# ================= 
    57# geomag_profile.sh 
    … …  
    1315# ======== 
    1416# 
    15 # Online usage:: 
    16 # 
    17 #  $ . geomag_profile.sh -d directory -i indir -o outdir -t tempdir 
    18 # 
    19 # In ${HOME}/.profile, add the following line:: 
    20 # 
    21 #  . geomag_profile.sh -d directory  -i indir -o outdir -t tempdir 
     17# Online usage 
     18# 
     19# .. code-block:: bash 
     20# 
     21#    . geomag_profile.sh -d directory -i indir -o outdir -t tempdir 
     22# 
     23# In :file:`${HOME}/.profile`, add the following line: 
     24# 
     25# .. code-block:: bash 
     26# 
     27#    . geomag_profile.sh -d directory -i indir -o outdir -t tempdir 
    2228# 
    2329# DESCRIPTION 
    2430# =========== 
    2531# 
     32# .. option:: -d  <directory> 
     33# .. option:: -i  <indir> 
     34# .. option:: -o  <outdir> 
     35# .. option:: -t  <tempdir> 
     36# 
    2637# define GEOMAG environment 
    2738# 
    2839# ${GEOMAG} is the base directory of tools. 
    2940# 
    30 # ${GEOMAG_LOG} is the directory where log files  will be written. 
     41# ${GEOMAG_LOG} is the directory where log files will be written. 
    3142# 
    3243# ${GEOMAG_ID} is the directory where input files must be. 
    … …  
    3950# ======== 
    4051# 
    41 # For fplod, on aedon.locean-ipsl.upmc.fr:: 
    42 # 
    43 #  $ cd /usr/home/fplod/incas/geomag/geomag_ws 
    44 #  $ . geomag_profile.sh -d /usr/home/fplod/incas/geomag/geomag_ws/ -i ${HOME}/geomag_d/ -o ${HOME}/geomag_d/ -t /usr/temp/${LOGNAME}/log/ 
    45 # 
    46 # For reee522 on rhodes.idris.fr:: 
    47 # 
    48 #  $ cd ${HOME}/incas/geomag/geomag_ws/ 
    49 #  $ . geomag_profile.sh -d ${HOME}/incas/geomag/geomag_ws/ -i ${HOMEGAYA}/geomag_d/ -o ${HOMEGAYA}/geomag_d/ -t /tmp/${LOGNAME}/log/ 
     52# For fplod, on aedon.locean-ipsl.upmc.fr: 
     53# 
     54# .. code-block:: bash 
     55# 
     56#    cd /usr/home/fplod/incas/geomag/geomag_ws 
     57#    . geomag_profile.sh -d /usr/home/fplod/incas/geomag/geomag_ws/ -i ${HOME}/geomag_d/ -o ${HOME}/geomag_d/ -t /usr/temp/${LOGNAME}/log/ 
     58# 
     59# For reee522 on rhodes.idris.fr: 
     60# 
     61# .. code-block:: bash 
     62# 
     63#    cd ${HOME}/incas/geomag/geomag_ws/ 
     64#    . geomag_profile.sh -d ${HOME}/incas/geomag/geomag_ws/ -i ${HOMEGAYA}/geomag_d/ -o ${HOMEGAYA}/geomag_d/ -t /tmp/${LOGNAME}/log/ 
    5065# 
    5166# TODO 
    … …  
    85100# - fplod 2007-03-13T16:12:41Z zeus.locean-ipsl.upmc.fr (Linux) 
    86101# 
    87 #   * add creation of $GEOMAG_ID and $GEOMAG_OD if they don't exist 
     102#   * add creation of ${GEOMAG_ID} and ${GEOMAG_OD} if they don't exist 
    88103# 
    89104# - reee522 2006-11-23T11:41:41Z rhodes (IRIX64) 

  • trunk/getmodelout.sh

    r46 r47  
    22# 
    33#+ 
     4# .. _getmodelout.sh: 
     5# 
    46# ============== 
    57# getmodelout.sh 
    … …  
    1315# ======== 
    1416# 
    15 # :: 
     17# .. code-block:: bash 
    1618# 
    17 #  $ getmodelout.sh -r orcares -exp drakkar_exp -g grid -yearmin yyyy -yearmax yyyy -o list 
     19#    getmodelout.sh -r orcares -exp drakkar_exp -g grid -yearmin yyyy -yearmax yyyy -o list 
    1820# 
    1921# DESCRIPTION 
    … …  
    2527# ======== 
    2628# 
    27 # To get DRAKKAR G42 experiment output on grid T points beteween year 9 and 10:: 
     29# To get DRAKKAR G42 experiment output on grid T points beteween year 9 and 10: 
    2830# 
    29 #  $ getmodelout.sh -r ORCA025 -exp G42 -g gridT -yearmin 9 -yearmax 10 -o ${GEOMAG_OD}/list_G42 
     31# .. code-block:: bash 
     32# 
     33#    getmodelout.sh -r ORCA025 -exp G42 -g gridT -yearmin 9 -yearmax 10 -o ${GEOMAG_OD}/list_G42 
    3034# 
    3135# EVOLUTIONS 

  • trunk/step2_diff.sh

    r46 r47  
    22# 
    33#+ 
     4# 
     5# .. _step2_diff.sh: 
    46# 
    57# ============= 
    … …  
    1416# ======== 
    1517# 
    16 # :: 
     18# .. code-blcok:: bash 
    1719# 
    18 #  $  step2_diff.sh -y year 
     20#    step2_diff.sh -y year 
    1921# 
    2022# EXAMPLES 
    2123# ======== 
    2224# 
    23 # For test on year 1994:: 
     25# For test on year 1994: 
    2426# 
    25 #  $ ./step2_diff.sh -y 1994 
     27# .. code-blcok:: bash 
     28# 
     29#    ./step2_diff.sh -y 1994 
    2630# 
    2731# EVOLUTIONS 
Note: See TracChangeset for help on using the changeset viewer.