Step 1 merge in changes from the NOCS branch:

svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2191 \
          svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/DEV_r1924_nocs_latphys .
.
.
svn -u status

M            2203   CONFIG/GYRE_LOBSTER/EXP00/namelist
M            2203   CONFIG/GYRE/EXP00/namelist
M            2203   CONFIG/ORCA2_OFF_PISCES/EXP00/namelist
M            2203   CONFIG/ORCA2_LIM/EXP00/namelist
M            2203   CONFIG/ORCA2_LIM_PISCES/EXP00/namelist
M            2203   CONFIG/POMME/EXP00/namelist
?                   DOC/math_abbrev.sty
?                   DOC/clean.sh
M            2203   DOC/NEMO_book.pdf
M            2203   DOC/TexFiles/Biblio/Biblio.bib
?                   DOC/TexFiles/Figures/Fig_qcells.pdf
?                   DOC/TexFiles/Figures/Fig_triad_fluxes.png
?                   DOC/TexFiles/Chapters/Annex_ISO.tex
M            2203   DOC/TexFiles/Chapters/Chap_Model_Basics_zstar.tex
D            2203   DOC/TexFiles/clean.sh
M            2203   DOC/NEMO_book.tex
M            2203   NEMO/OPA_SRC/LDF/ldfslp.F90
M            2203   NEMO/OPA_SRC/LDF/ldftra_oce.F90
M            2203   NEMO/OPA_SRC/LDF/ldftra.F90
?                   NEMO/OPA_SRC/TRA/traldf_iso_grif.F90
M            2203   NEMO/OPA_SRC/TRA/trazdf_imp.F90
M            2203   NEMO/OPA_SRC/TRA/traldf.F90
M            2203   NEMO/OPA_SRC/TRA/traadv.F90
M            2203   NEMO/OPA_SRC/step.F90
Status against revision:   2204

svn add DOC/math_abbrev.sty
A         DOC/math_abbrev.sty
svn add DOC/clean.sh
A         DOC/clean.sh
svn add DOC/TexFiles/Figures/Fig_qcells.pdf
A  (bin)  DOC/TexFiles/Figures/Fig_qcells.pdf
svn add DOC/TexFiles/Figures/Fig_triad_fluxes.png
A  (bin)  DOC/TexFiles/Figures/Fig_triad_fluxes.png
svn add DOC/TexFiles/Chapters/Annex_ISO.tex
A         DOC/TexFiles/Chapters/Annex_ISO.tex
svn add NEMO/OPA_SRC/TRA/traldf_iso_grif.F90
A         NEMO/OPA_SRC/TRA/traldf_iso_grif.F90

svn ci -m"#733 DEV_r2191_3partymerge2010. Merged in changes from DEV_r1924_nocs_latphys"
acc@forge.ipsl.jussieu.fr's password: 
Sending        CONFIG/GYRE/EXP00/namelist
Sending        CONFIG/GYRE_LOBSTER/EXP00/namelist
Sending        CONFIG/ORCA2_LIM/EXP00/namelist
Sending        CONFIG/ORCA2_LIM_PISCES/EXP00/namelist
Sending        CONFIG/ORCA2_OFF_PISCES/EXP00/namelist
Sending        CONFIG/POMME/EXP00/namelist
Sending        DOC/NEMO_book.pdf
Sending        DOC/NEMO_book.tex
Sending        DOC/TexFiles/Biblio/Biblio.bib
Adding         DOC/TexFiles/Chapters/Annex_ISO.tex
Sending        DOC/TexFiles/Chapters/Chap_Model_Basics_zstar.tex
Adding  (bin)  DOC/TexFiles/Figures/Fig_qcells.pdf
Adding  (bin)  DOC/TexFiles/Figures/Fig_triad_fluxes.png
Deleting       DOC/TexFiles/clean.sh
Adding         DOC/clean.sh
Adding         DOC/math_abbrev.sty
Sending        NEMO/OPA_SRC/LDF/ldfslp.F90
Sending        NEMO/OPA_SRC/LDF/ldftra.F90
Sending        NEMO/OPA_SRC/LDF/ldftra_oce.F90
Sending        NEMO/OPA_SRC/TRA/traadv.F90
Sending        NEMO/OPA_SRC/TRA/traldf.F90
Adding         NEMO/OPA_SRC/TRA/traldf_iso_grif.F90
Sending        NEMO/OPA_SRC/TRA/trazdf_imp.F90
Sending        NEMO/OPA_SRC/step.F90
Transmitting file data .......................
Committed revision 2205.