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.

Step 2. Merge in changes from the UKMO 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/devukmo2010 .

--- Merging differences between repository URLs into '.':
U    CONFIG/GYRE_LOBSTER/EXP00/namelist
U    CONFIG/GYRE/EXP00/namelist
U    CONFIG/ORCA2_OFF_PISCES/EXP00/namelist
U    CONFIG/ORCA2_LIM/EXP00/1_namelist
U    CONFIG/ORCA2_LIM/EXP00/namelist
U    CONFIG/ORCA2_LIM_PISCES/EXP00/namelist
U    CONFIG/POMME/EXP00/namelist
Conflict discovered in 'DOC/NEMO_book.pdf'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (h) help for more options: p
C    DOC/NEMO_book.pdf
U    DOC/TexFiles/Chapters/Chap_LDF.tex
U    DOC/TexFiles/Chapters/Chap_SBC.tex
U    DOC/TexFiles/Namelist/namsbc_rnf
U    DOC/TexFiles/Namelist/nam_dynldf
U    DOC/NEMO_book.tex
U    NEMO/OFF_SRC/IOM/iom_ioipsl.F90
U    NEMO/OFF_SRC/IOM/iom_nf90.F90
U    NEMO/OPA_SRC/DOM/closea.F90
U    NEMO/OPA_SRC/DOM/daymod.F90
A    NEMO/OPA_SRC/jul2greg.h90
A    NEMO/OPA_SRC/ASM
A    NEMO/OPA_SRC/ASM/asmpar.F90
A    NEMO/OPA_SRC/ASM/asminc.F90
A    NEMO/OPA_SRC/ASM/asmtrj.F90
U    NEMO/OPA_SRC/IOM/iom_ioipsl.F90
U    NEMO/OPA_SRC/IOM/iom.F90
U    NEMO/OPA_SRC/IOM/iom_nf90.F90
U    NEMO/OPA_SRC/DYN/dynnxt.F90
U    NEMO/OPA_SRC/DYN/divcur.F90
U    NEMO/OPA_SRC/DYN/sshwzv.F90
U    NEMO/OPA_SRC/DYN/dynspg_flt.F90
U    NEMO/OPA_SRC/DYN/dynspg_ts.F90
U    NEMO/OPA_SRC/DYN/dynldf_lap.F90
U    NEMO/OPA_SRC/DYN/dynldf.F90
U    NEMO/OPA_SRC/SOL/solmat.F90
U    NEMO/OPA_SRC/cla_div.F90
U    NEMO/OPA_SRC/OBC/obcdyn_bt.F90
U    NEMO/OPA_SRC/OBC/obcini.F90
U    NEMO/OPA_SRC/OBC/obcvol.F90
U    NEMO/OPA_SRC/OBC/obc_oce.F90
U    NEMO/OPA_SRC/OBC/obcrad.F90
U    NEMO/OPA_SRC/OBC/obcdta.F90
U    NEMO/OPA_SRC/OBC/obcrst.F90
U    NEMO/OPA_SRC/LDF/ldfdyn_oce.F90
U    NEMO/OPA_SRC/LDF/ldfdyn_c1d.h90
U    NEMO/OPA_SRC/LDF/ldfdyn_c2d.h90
U    NEMO/OPA_SRC/LDF/ldfdyn_c3d.h90
U    NEMO/OPA_SRC/LDF/ldfdyn_substitute.h90
U    NEMO/OPA_SRC/LDF/ldfdyn.F90
U    NEMO/OPA_SRC/SBC/sbcana.F90
U    NEMO/OPA_SRC/SBC/sbc_oce.F90
U    NEMO/OPA_SRC/SBC/geo2ocean.F90
U    NEMO/OPA_SRC/SBC/sbcfwb.F90
U    NEMO/OPA_SRC/SBC/sbcmod.F90
U    NEMO/OPA_SRC/SBC/sbcrnf.F90
U    NEMO/OPA_SRC/BDY/bdy_oce.F90
U    NEMO/OPA_SRC/BDY/bdytra.F90
U    NEMO/OPA_SRC/BDY/bdydta.F90
U    NEMO/OPA_SRC/BDY/bdytides.F90
U    NEMO/OPA_SRC/BDY/bdydyn.F90
U    NEMO/OPA_SRC/BDY/bdyini.F90
A    NEMO/OPA_SRC/BDY/bdyice.F90
U    NEMO/OPA_SRC/BDY/bdyvol.F90
U    NEMO/OPA_SRC/BDY/bdy_par.F90
A    NEMO/OPA_SRC/julian.F90
U    NEMO/OPA_SRC/lib_mpp.F90
U    NEMO/OPA_SRC/cla_dynspg.F90
A    NEMO/OPA_SRC/greg2jul.h90
A    NEMO/OPA_SRC/OBS
A    NEMO/OPA_SRC/OBS/obs_sla.F90
A    NEMO/OPA_SRC/OBS/obs_readmdt.F90
A    NEMO/OPA_SRC/OBS/obsvel_io.h90
A    NEMO/OPA_SRC/OBS/obs_read_vel.F90
A    NEMO/OPA_SRC/OBS/obsseaice_io.h90
A    NEMO/OPA_SRC/OBS/obs_grid.F90
A    NEMO/OPA_SRC/OBS/obs_sort.F90
A    NEMO/OPA_SRC/OBS/obs_mpp.F90
A    NEMO/OPA_SRC/OBS/obs_grid_search_bruteforce.h90
A    NEMO/OPA_SRC/OBS/obs_prof_io.F90
A    NEMO/OPA_SRC/OBS/obs_surf_def.F90
A    NEMO/OPA_SRC/OBS/obs_level_search.h90
A    NEMO/OPA_SRC/OBS/diaobs.F90
A    NEMO/OPA_SRC/OBS/obs_conv_functions.h90
A    NEMO/OPA_SRC/OBS/obsinter_z1d.h90
A    NEMO/OPA_SRC/OBS/obs_read_sst.F90
A    NEMO/OPA_SRC/OBS/ddatetoymdhms.h90
A    NEMO/OPA_SRC/OBS/obs_oper.F90
A    NEMO/OPA_SRC/OBS/obssla_types.h90
A    NEMO/OPA_SRC/OBS/maxdist.h90
A    NEMO/OPA_SRC/OBS/obs_read_altbias.F90
A    NEMO/OPA_SRC/OBS/obs_read_sla.F90
A    NEMO/OPA_SRC/OBS/obs_rot_vel.F90
A    NEMO/OPA_SRC/OBS/obs_seaice_io.F90
A    NEMO/OPA_SRC/OBS/str_c_to_for.h90
A    NEMO/OPA_SRC/OBS/obsinter_h2d.h90
A    NEMO/OPA_SRC/OBS/obs_profiles.F90
A    NEMO/OPA_SRC/OBS/obs_read_seaice.F90
A    NEMO/OPA_SRC/OBS/obs_const.F90
A    NEMO/OPA_SRC/OBS/mpp_map.F90
A    NEMO/OPA_SRC/OBS/grt_cir_dis.h90
A    NEMO/OPA_SRC/OBS/obs_seaice.F90
A    NEMO/OPA_SRC/OBS/obs_write.F90
A    NEMO/OPA_SRC/OBS/linquad.h90
A    NEMO/OPA_SRC/OBS/obs_inter_z1d.F90
A    NEMO/OPA_SRC/OBS/obs_sst_io.F90
A    NEMO/OPA_SRC/OBS/obs_utils.F90
A    NEMO/OPA_SRC/OBS/obsprof_io.h90
A    NEMO/OPA_SRC/OBS/obs_read_prof.F90
A    NEMO/OPA_SRC/OBS/obs_profiles_def.F90
A    NEMO/OPA_SRC/OBS/obs_sla_types.F90
A    NEMO/OPA_SRC/OBS/obssst_io.h90
A    NEMO/OPA_SRC/OBS/obs_fbm.F90
A    NEMO/OPA_SRC/OBS/obs_types.F90
A    NEMO/OPA_SRC/OBS/find_obs_proc.h90
A    NEMO/OPA_SRC/OBS/obs_conv.F90
A    NEMO/OPA_SRC/OBS/obs_prep.F90
A    NEMO/OPA_SRC/OBS/obs_sla_io.F90
A    NEMO/OPA_SRC/OBS/obs_inter_sup.F90
A    NEMO/OPA_SRC/OBS/obs_sst.F90
A    NEMO/OPA_SRC/OBS/obssla_io.h90
A    NEMO/OPA_SRC/OBS/grt_cir_dis_saa.h90
A    NEMO/OPA_SRC/OBS/obs_vel_io.F90
A    NEMO/OPA_SRC/OBS/obs_inter_h2d.F90
U    NEMO/OPA_SRC/ZDF/zdftke.F90
U    NEMO/OPA_SRC/ZDF/zdfkpp.F90
U    NEMO/OPA_SRC/TRA/tradmp.F90
U    NEMO/OPA_SRC/TRA/trasbc.F90
U    NEMO/OPA_SRC/cla.F90
U    NEMO/OPA_SRC/DIA/diafwb.F90
U    NEMO/OPA_SRC/DIA/diawri.F90
U    NEMO/OPA_SRC/DIA/diawri_dimg.h90
U    NEMO/OPA_SRC/step.F90
U    NEMO/OPA_SRC/opa.F90