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

Step 3. Merge in changes from the FCM branch:

svn co svn+ssh://rblod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/DEV_r2191_3partymerge2010/NEMO
cd NEMO
svn merge -r 1879:HEAD svn+ssh://rblod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/DEV_r1879_FCM/NEMOGCM/NEMO .
--- Merging r1910 through r2207 into '.':U    OFF_SRC/DOM/domngb.F90
U    OFF_SRC/DOM/domstp.F90
U    OFF_SRC/DOM/domrea.F90
U    OFF_SRC/DOM/phycst.F90
U    OFF_SRC/DOM/daymod.F90
U    OFF_SRC/DOM/domzgr_substitute.h90
U    OFF_SRC/IOM/iom_def.F90
U    OFF_SRC/IOM/iom_ioipsl.F90
U    OFF_SRC/IOM/iom.F90
U    OFF_SRC/IOM/in_out_manager.F90
U    OFF_SRC/IOM/iom_rstdimg.F90
U    OFF_SRC/IOM/iom_nf90.F90
U    OFF_SRC/eosbn2.F90
U    OFF_SRC/SOL/sol_oce.F90
U    OFF_SRC/LDF/ldfslp.F90
 U   OFF_SRC/LDF/ldftra.F90
U    OFF_SRC/SBC/sbc_oce.F90
U    OFF_SRC/SBC/sbcrnf.F90
C    OFF_SRC/trc_oce.F90
C    OFF_SRC/lib_mpp.F90
U    OPA_SRC/DOM/domzgr.F90
U    OPA_SRC/DOM/dom_oce.F90
U    OPA_SRC/DOM/closea.F90
U    OPA_SRC/DOM/domngb.F90
U    OPA_SRC/DOM/domstp.F90
U    OPA_SRC/DOM/domain.F90
U    OPA_SRC/DOM/domvvl.F90
U    OPA_SRC/DOM/dommsk.F90
C    OPA_SRC/DOM/phycst.F90
U    OPA_SRC/DOM/daymod.F90
U    OPA_SRC/DOM/domcfg.F90
U    OPA_SRC/DOM/domzgr_substitute.h90
U    OPA_SRC/DOM/domhgr.F90
U    OPA_SRC/DOM/domwri.F90
D    OPA_SRC/agrif_opa_sponge.F90
D    OPA_SRC/agrif_opa_interp.F90
D    OPA_SRC/agrif_opa_update.F90
U    OPA_SRC/IOM/iom_def.F90
U    OPA_SRC/IOM/iom_ioipsl.F90
U    OPA_SRC/IOM/iom.F90
U    OPA_SRC/IOM/restart.F90
U    OPA_SRC/IOM/in_out_manager.F90
U    OPA_SRC/IOM/prtctl.F90
U    OPA_SRC/IOM/iom_rstdimg.F90
U    OPA_SRC/IOM/iom_nf90.F90
U    OPA_SRC/DYN/dynbfr.F90
U    OPA_SRC/DYN/dynnxt.F90
UU   OPA_SRC/DYN/dynadv.F90
U    OPA_SRC/DYN/dynzad.F90
U    OPA_SRC/DYN/dynhpg.F90
U    OPA_SRC/DYN/dynspg_oce.F90
U    OPA_SRC/DYN/dynldf_iso.F90
C    OPA_SRC/DYN/divcur.F90
UU   OPA_SRC/DYN/dynadv_cen2.F90
U    OPA_SRC/DYN/dynzdf.F90
UU   OPA_SRC/DYN/dynadv_ubs.F90
U    OPA_SRC/DYN/dynzdf_imp.F90
U    OPA_SRC/DYN/sshwzv.F90
UU   OPA_SRC/DYN/dynspg.F90
UU   OPA_SRC/DYN/dynspg_flt.F90
UU   OPA_SRC/DYN/dynspg_ts.F90
U    OPA_SRC/DYN/dynzdf_exp.F90
UU   OPA_SRC/DYN/dynspg_exp.F90
UU   OPA_SRC/DYN/dynldf.F90
U    OPA_SRC/DYN/dynkeg.F90
U    OPA_SRC/DYN/dynvor.F90
U    OPA_SRC/SOL/sol_oce.F90
U    OPA_SRC/SOL/solpcg.F90
U    OPA_SRC/SOL/solver.F90
C    OPA_SRC/SOL/solmat.F90
U    OPA_SRC/SOL/solsor.F90
U    OPA_SRC/oce.F90
U    OPA_SRC/OBC/obc_par_EEL_R5.h90
U    OPA_SRC/OBC/obcdyn_bt.F90
C    OPA_SRC/OBC/obcini.F90
U    OPA_SRC/OBC/obc_par.F90
U    OPA_SRC/OBC/obcfla.F90
U    OPA_SRC/OBC/obc_oce.F90
U    OPA_SRC/OBC/obcrad.F90
U    OPA_SRC/OBC/obctra.F90
U    OPA_SRC/OBC/obcdta.F90
U    OPA_SRC/OBC/obcrst.F90
U    OPA_SRC/LDF/ldfslp.F90
U    OPA_SRC/LDF/ldftra_oce.F90
U    OPA_SRC/LDF/ldfdyn_oce.F90
U    OPA_SRC/LDF/ldfdyn_c1d.h90
 U   OPA_SRC/LDF/ldfdyn_c2d.h90
 U   OPA_SRC/LDF/ldfdyn_c3d.h90
UU   OPA_SRC/LDF/ldftra.F90
UU   OPA_SRC/LDF/ldfdyn.F90
U    OPA_SRC/SBC/albedo.F90
U    OPA_SRC/SBC/sbc_ice.F90
U    OPA_SRC/SBC/sbcana.F90
U    OPA_SRC/SBC/sbcice_lim.F90
U    OPA_SRC/SBC/sbcssm.F90
U    OPA_SRC/SBC/sbc_oce.F90
U    OPA_SRC/SBC/sbcssr.F90
U    OPA_SRC/SBC/cpl_oasis3.F90
U    OPA_SRC/SBC/oasis4_date.F90
U    OPA_SRC/SBC/cpl_oasis4.F90
U    OPA_SRC/SBC/fldread.F90
U    OPA_SRC/SBC/geo2ocean.F90
U    OPA_SRC/SBC/sbcblk_clio.F90
U    OPA_SRC/SBC/sbccpl.F90
C    OPA_SRC/SBC/sbcfwb.F90
U    OPA_SRC/SBC/sbcice_if.F90
U    OPA_SRC/SBC/sbcmod.F90
U    OPA_SRC/SBC/sbcblk_core.F90
U    OPA_SRC/SBC/sbcice_lim_2.F90
U    OPA_SRC/SBC/sbcrnf.F90
U    OPA_SRC/SBC/sbcflx.F90
U    OPA_SRC/trc_oce.F90
UU   OPA_SRC/BDY/bdy_oce.F90
UU   OPA_SRC/BDY/bdytra.F90
UU   OPA_SRC/BDY/bdydta.F90
UU   OPA_SRC/BDY/bdytides.F90
UU   OPA_SRC/BDY/bdydyn.F90
UU   OPA_SRC/BDY/bdyini.F90
UU   OPA_SRC/BDY/bdyvol.F90
UU   OPA_SRC/BDY/bdy_par.F90
U    OPA_SRC/lib_mpp.F90
U    OPA_SRC/FLO/flowri.F90
U    OPA_SRC/FLO/flo_oce.F90
U    OPA_SRC/FLO/floats.F90
U    OPA_SRC/lib_cray.f90
U    OPA_SRC/ZDF/zdfevd.F90
U    OPA_SRC/ZDF/zdfini.F90
U    OPA_SRC/ZDF/zdfmxl.F90
U    OPA_SRC/ZDF/zdftke_old.F90
U    OPA_SRC/ZDF/zdftke.F90
U    OPA_SRC/ZDF/zdfddm.F90
U    OPA_SRC/ZDF/zdf_oce.F90
U    OPA_SRC/ZDF/zdftmx.F90
U    OPA_SRC/ZDF/zdfbfr.F90
U    OPA_SRC/ZDF/zdfkpp.F90
U    OPA_SRC/ZDF/zdfric.F90
U    OPA_SRC/TRA/traadv_eiv.F90
U    OPA_SRC/TRA/traadv_muscl.F90
U    OPA_SRC/TRA/traldf_iso.F90
U    OPA_SRC/TRA/tranpc.F90
U    OPA_SRC/TRA/tradmp.F90
U    OPA_SRC/TRA/eosbn2.F90
U    OPA_SRC/TRA/traadv_cen2.F90
U    OPA_SRC/TRA/trazdf.F90
U    OPA_SRC/TRA/traadv_ubs.F90
U    OPA_SRC/TRA/trabbc.F90
U    OPA_SRC/TRA/traadv_tvd.F90
U    OPA_SRC/TRA/trazdf_imp.F90
U    OPA_SRC/TRA/trabbl_adv.h90
U    OPA_SRC/TRA/trabbl.F90
U    OPA_SRC/TRA/traadv_muscl2.F90
U    OPA_SRC/TRA/trazdf_exp.F90
UU   OPA_SRC/TRA/traldf.F90
U    OPA_SRC/TRA/traqsr.F90
C    OPA_SRC/TRA/trasbc.F90
U    OPA_SRC/TRA/traadv_qck.F90
C    OPA_SRC/TRA/tranxt.F90
U    OPA_SRC/TRA/traadv.F90
U    OPA_SRC/istate.F90
U    OPA_SRC/TRD/trdicp.F90
U    OPA_SRC/TRD/trdvor_oce.F90
U    OPA_SRC/TRD/trdmod.F90
U    OPA_SRC/TRD/trdicp_oce.F90
U    OPA_SRC/TRD/trdmld_oce.F90
U    OPA_SRC/TRD/trdmld_rst.F90
U    OPA_SRC/TRD/trdmod_oce.F90
U    OPA_SRC/TRD/trdvor.F90
U    OPA_SRC/DIA/diaptr.F90
U    OPA_SRC/DIA/diaar5.F90
U    OPA_SRC/DIA/diagap.F90
U    OPA_SRC/DIA/dianam.F90
U    OPA_SRC/DIA/diafwb.F90
U    OPA_SRC/DIA/diawri.F90
U    OPA_SRC/DIA/diahth.F90
U    OPA_SRC/par_oce.F90
U    OPA_SRC/stpctl.F90
U    OPA_SRC/step.F90
C    OPA_SRC/opa.F90
U    LIM_SRC_2/par_ice_2.F90
U    LIM_SRC_2/limwri_2.F90
C    LIM_SRC_2/limtrp_2.F90
U    LIM_SRC_2/limtab_2.F90
U    LIM_SRC_2/limsbc_2.F90
U    LIM_SRC_2/limrst_2.F90
U    LIM_SRC_2/limadv_2.F90
U    LIM_SRC_2/limthd_2.F90
U    LIM_SRC_2/limdmp_2.F90
U    LIM_SRC_2/limrhg_2.F90
U    LIM_SRC_2/limthd_zdf_2.F90
U    LIM_SRC_2/limmsh_2.F90
U    LIM_SRC_2/limistate_2.F90
U    LIM_SRC_2/limdyn_2.F90
U    LIM_SRC_2/limdia_2.F90
U    LIM_SRC_2/dom_ice_2.F90
U    LIM_SRC_2/ice_2.F90
U    TOP_SRC/trc.F90
U    TOP_SRC/trcini.F90
   C TOP_SRC/PISCES/trcrst_pisces.F90
UU   TOP_SRC/PISCES/p4zflx.F90
UU   TOP_SRC/PISCES/p4zint.F90
U    TOP_SRC/PISCES/par_pisces.F90
UU   TOP_SRC/PISCES/p4zche.F90
U    TOP_SRC/PISCES/trcini_pisces.F90
UU   TOP_SRC/PISCES/p4zopt.F90
UU   TOP_SRC/PISCES/trcctl_pisces.F90
UU   TOP_SRC/PISCES/p4zmeso.F90
UU   TOP_SRC/PISCES/p4zprod.F90
UU   TOP_SRC/PISCES/p4zsink.F90
UU   TOP_SRC/PISCES/p4zlys.F90
UU   TOP_SRC/PISCES/p4zbio.F90
UU   TOP_SRC/PISCES/p4zmicro.F90
U    TOP_SRC/PISCES/sms_pisces.F90
UU   TOP_SRC/PISCES/p4zsed.F90
UU   TOP_SRC/PISCES/trclsm_pisces.F90
UU   TOP_SRC/PISCES/p4zmort.F90
U    TOP_SRC/PISCES/p4zlim.F90
UU   TOP_SRC/PISCES/p4zrem.F90
UU   TOP_SRC/PISCES/trcsms_pisces.F90
D    TOP_SRC/DUMMY
U    TOP_SRC/par_trc.F90
U    TOP_SRC/trcctl.F90
U    TOP_SRC/C14b/trcctl_c14b.F90
   C TOP_SRC/C14b/trcrst_c14b.F90
U    TOP_SRC/C14b/par_c14b.F90
U    TOP_SRC/C14b/trclsm_c14b.F90
U    TOP_SRC/C14b/trcini_c14b.F90
U    TOP_SRC/CFC/trcini_cfc.F90
U    TOP_SRC/CFC/trcctl_cfc.F90
U    TOP_SRC/CFC/trcsms_cfc.F90
   C TOP_SRC/CFC/trcrst_cfc.F90
U    TOP_SRC/CFC/par_cfc.F90
U    TOP_SRC/CFC/trclsm_cfc.F90
U    TOP_SRC/top_substitute.h90
U    TOP_SRC/MY_TRC/trcini_my_trc.F90
U    TOP_SRC/MY_TRC/trcctl_my_trc.F90
U    TOP_SRC/MY_TRC/trcsms_my_trc.F90
   C TOP_SRC/MY_TRC/trcrst_my_trc.F90
U    TOP_SRC/MY_TRC/par_my_trc.F90
U    TOP_SRC/MY_TRC/trclsm_my_trc.F90
U    TOP_SRC/trcdia.F90
UU   TOP_SRC/TRP/trcnxt.F90
U    TOP_SRC/TRP/trdmld_trc_oce.F90
UU   TOP_SRC/TRP/trcldf_iso_zps.F90
 U   TOP_SRC/TRP/trcldf_bilap.F90
U    TOP_SRC/TRP/trdmld_trc_rst.F90
 U   TOP_SRC/TRP/trcadv_muscl.F90
UU   TOP_SRC/TRP/trcldf_iso.F90
UU   TOP_SRC/TRP/trcdmp.F90
 U   TOP_SRC/TRP/trcadv_cen2.F90
UU   TOP_SRC/TRP/trcldf_bilapg.F90
U    TOP_SRC/TRP/trdmld_trc.F90
UU   TOP_SRC/TRP/trcbbc.F90
UU   TOP_SRC/TRP/trcadv_smolar.F90
UU   TOP_SRC/TRP/trcadv_tvd.F90
UU   TOP_SRC/TRP/trczdf_imp.F90
UU   TOP_SRC/TRP/trctrp_lec.F90
 U   TOP_SRC/TRP/trcbbl_adv.h90
 U   TOP_SRC/TRP/zpshde_trc.F90
UU   TOP_SRC/TRP/trczdf_iso.F90
UU   TOP_SRC/TRP/trcbbl.F90
 U   TOP_SRC/TRP/trcadv_muscl2.F90
 U   TOP_SRC/TRP/trczdf_exp.F90
UU   TOP_SRC/TRP/trcldf_lap.F90
U    TOP_SRC/TRP/trp_trc.F90
UU   TOP_SRC/TRP/trctrp.F90
UU   TOP_SRC/TRP/trczdf_iso_vopt.F90
UU   TOP_SRC/TRP/trcrad.F90
 U   TOP_SRC/TRP/trcsbc.F90
UU   TOP_SRC/TRP/trctrp_ctl.F90
U    TOP_SRC/trcwri.F90
U    TOP_SRC/trcsms.F90
U    TOP_SRC/trclec.F90
U    TOP_SRC/LOBSTER/trcbio.F90
U    TOP_SRC/LOBSTER/trcini_lobster.F90
U    TOP_SRC/LOBSTER/trcsed.F90
U    TOP_SRC/LOBSTER/trcctl_lobster.F90
U    TOP_SRC/LOBSTER/trcexp.F90
U    TOP_SRC/LOBSTER/trcsms_lobster.F90
U    TOP_SRC/LOBSTER/trcopt.F90
   C TOP_SRC/LOBSTER/trcrst_lobster.F90
U    TOP_SRC/LOBSTER/par_lobster.F90
U    TOP_SRC/LOBSTER/sms_lobster.F90
U    TOP_SRC/LOBSTER/trclsm_lobster.F90
U    TOP_SRC/oce_trc.F90
U    TOP_SRC/prtctl_trc.F90
U    TOP_SRC/trcdta.F90
U    TOP_SRC/trcrst.F90
U    LIM_SRC_3/limrhg.F90
U    LIM_SRC_3/limupdate.F90
U    LIM_SRC_3/limthd_ent.F90
U    LIM_SRC_3/limmsh.F90
U    LIM_SRC_3/limvar.F90
U    LIM_SRC_3/limistate.F90
U    LIM_SRC_3/limthd_dh.F90
U    LIM_SRC_3/limdyn.F90
U    LIM_SRC_3/thd_ice.F90
U    LIM_SRC_3/dom_ice.F90
U    LIM_SRC_3/limthd_lac.F90
U    LIM_SRC_3/par_ice.F90
U    LIM_SRC_3/limitd_me.F90
U    LIM_SRC_3/limthd_dif.F90
U    LIM_SRC_3/limtrp.F90
U    LIM_SRC_3/limtab.F90
U    LIM_SRC_3/limsbc.F90
U    LIM_SRC_3/limrst.F90
U    LIM_SRC_3/limadv.F90
U    LIM_SRC_3/limitd_th.F90
U    LIM_SRC_3/limthd_sal.F90
U    LIM_SRC_3/limthd.F90
U    NST_SRC/agrif_opa_sponge.F90
U    NST_SRC/agrif_top_sponge.F90
U    NST_SRC/agrif_user.F90
U    NST_SRC/agrif_opa_interp.F90
U    NST_SRC/agrif_opa_update.F90
U    NST_SRC/agrif2model.F90
U    NST_SRC/agrif_top_interp.F90
U    NST_SRC/agrif_top_update.F90
U    NST_SRC/agrif_oce.F90
U    C1D_SRC/step_c1d.F90
U    C1D_SRC/dyncor_c1d.F90
U    C1D_SRC/diawri_c1d.F90
U    C1D_SRC/c1d.F90
U    C1D_SRC/dynnxt_c1d.F90
Summary of conflicts:
  Text conflicts: 11
  Tree conflicts: 5
svn status?       OFF_SRC/trc_oce.F90.merge-left.r1909
?       OFF_SRC/lib_mpp.F90.merge-left.r1909
?       OFF_SRC/trc_oce.F90.working
?       OFF_SRC/lib_mpp.F90.working
?       OFF_SRC/trc_oce.F90.merge-right.r2207
?       OFF_SRC/lib_mpp.F90.merge-right.r2207
M       OFF_SRC/DOM/domngb.F90
M       OFF_SRC/DOM/domstp.F90
M       OFF_SRC/DOM/daymod.F90
M       OFF_SRC/DOM/domzgr_substitute.h90
M       OFF_SRC/IOM/iom_def.F90
M       OFF_SRC/IOM/iom_ioipsl.F90
M       OFF_SRC/IOM/iom.F90
M       OFF_SRC/IOM/in_out_manager.F90
M       OFF_SRC/IOM/iom_rstdimg.F90
M       OFF_SRC/IOM/iom_nf90.F90
M       OFF_SRC/eosbn2.F90
M       OFF_SRC/SOL/sol_oce.F90
M       OFF_SRC/LDF/ldfslp.F90
 M      OFF_SRC/LDF/ldftra.F90
M       OFF_SRC/SBC/sbc_oce.F90
M       OFF_SRC/SBC/sbcrnf.F90
C       OFF_SRC/trc_oce.F90
C       OFF_SRC/lib_mpp.F90
?       OPA_SRC/opa.F90.merge-left.r1909
?       OPA_SRC/opa.F90.working
?       OPA_SRC/opa.F90.merge-right.r2207
?       OPA_SRC/DOM/phycst.F90.merge-left.r1909
?       OPA_SRC/DOM/phycst.F90.working
?       OPA_SRC/DOM/phycst.F90.merge-right.r2207
M       OPA_SRC/DOM/domzgr.F90
M       OPA_SRC/DOM/dom_oce.F90
M       OPA_SRC/DOM/closea.F90
M       OPA_SRC/DOM/domngb.F90
M       OPA_SRC/DOM/domstp.F90
M       OPA_SRC/DOM/domain.F90
M       OPA_SRC/DOM/domvvl.F90
M       OPA_SRC/DOM/dommsk.F90
C       OPA_SRC/DOM/phycst.F90
M       OPA_SRC/DOM/daymod.F90
M       OPA_SRC/DOM/domcfg.F90
M       OPA_SRC/DOM/domzgr_substitute.h90
M       OPA_SRC/DOM/domhgr.F90
M       OPA_SRC/IOM/iom_def.F90
M       OPA_SRC/IOM/iom_ioipsl.F90
M       OPA_SRC/IOM/iom.F90
M       OPA_SRC/IOM/restart.F90
M       OPA_SRC/IOM/in_out_manager.F90
M       OPA_SRC/IOM/iom_rstdimg.F90
M       OPA_SRC/IOM/iom_nf90.F90
D       OPA_SRC/agrif_opa_update.F90
?       OPA_SRC/DYN/divcur.F90.merge-left.r1909
?       OPA_SRC/DYN/divcur.F90.working
?       OPA_SRC/DYN/divcur.F90.merge-right.r2207
M       OPA_SRC/DYN/dynnxt.F90
M       OPA_SRC/DYN/dynbfr.F90
MM      OPA_SRC/DYN/dynadv.F90
M       OPA_SRC/DYN/dynhpg.F90
M       OPA_SRC/DYN/dynzad.F90
M       OPA_SRC/DYN/dynldf_iso.F90
M       OPA_SRC/DYN/dynspg_oce.F90
MM      OPA_SRC/DYN/dynadv_cen2.F90
C       OPA_SRC/DYN/divcur.F90
MM      OPA_SRC/DYN/dynadv_ubs.F90
M       OPA_SRC/DYN/dynzdf.F90
M       OPA_SRC/DYN/dynzdf_imp.F90
M       OPA_SRC/DYN/sshwzv.F90
MM      OPA_SRC/DYN/dynspg.F90
MM      OPA_SRC/DYN/dynspg_flt.F90
MM      OPA_SRC/DYN/dynspg_ts.F90
M       OPA_SRC/DYN/dynzdf_exp.F90
MM      OPA_SRC/DYN/dynspg_exp.F90
MM      OPA_SRC/DYN/dynldf.F90
M       OPA_SRC/DYN/dynkeg.F90
M       OPA_SRC/DYN/dynvor.F90
?       OPA_SRC/SOL/solmat.F90.merge-right.r2207
?       OPA_SRC/SOL/solmat.F90.merge-left.r1909
?       OPA_SRC/SOL/solmat.F90.working
M       OPA_SRC/SOL/sol_oce.F90
M       OPA_SRC/SOL/solpcg.F90
M       OPA_SRC/SOL/solver.F90
C       OPA_SRC/SOL/solmat.F90
M       OPA_SRC/SOL/solsor.F90
D       OPA_SRC/agrif_opa_sponge.F90
M       OPA_SRC/oce.F90
?       OPA_SRC/OBC/obcini.F90.working
?       OPA_SRC/OBC/obcini.F90.merge-right.r2207
?       OPA_SRC/OBC/obcini.F90.merge-left.r1909
C       OPA_SRC/OBC/obcini.F90
M       OPA_SRC/OBC/obc_oce.F90
D       OPA_SRC/agrif_opa_interp.F90
M       OPA_SRC/LDF/ldfslp.F90
M       OPA_SRC/LDF/ldftra_oce.F90
M       OPA_SRC/LDF/ldfdyn_oce.F90
 M      OPA_SRC/LDF/ldfdyn_c2d.h90
 M      OPA_SRC/LDF/ldfdyn_c3d.h90
MM      OPA_SRC/LDF/ldftra.F90
MM      OPA_SRC/LDF/ldfdyn.F90
?       OPA_SRC/SBC/sbcfwb.F90.working
?       OPA_SRC/SBC/sbcfwb.F90.merge-right.r2207
?       OPA_SRC/SBC/sbcfwb.F90.merge-left.r1909
M       OPA_SRC/SBC/albedo.F90
M       OPA_SRC/SBC/sbcana.F90
M       OPA_SRC/SBC/sbc_ice.F90
M       OPA_SRC/SBC/sbcice_lim.F90
M       OPA_SRC/SBC/sbcssm.F90
M       OPA_SRC/SBC/sbc_oce.F90
M       OPA_SRC/SBC/oasis4_date.F90
M       OPA_SRC/SBC/cpl_oasis3.F90
M       OPA_SRC/SBC/sbcssr.F90
M       OPA_SRC/SBC/cpl_oasis4.F90
M       OPA_SRC/SBC/fldread.F90
M       OPA_SRC/SBC/geo2ocean.F90
C       OPA_SRC/SBC/sbcfwb.F90
M       OPA_SRC/SBC/sbccpl.F90
M       OPA_SRC/SBC/sbcblk_clio.F90
M       OPA_SRC/SBC/sbcice_if.F90
M       OPA_SRC/SBC/sbcmod.F90
M       OPA_SRC/SBC/sbcblk_core.F90
M       OPA_SRC/SBC/sbcice_lim_2.F90
M       OPA_SRC/SBC/sbcrnf.F90
M       OPA_SRC/SBC/sbcflx.F90
M       OPA_SRC/trc_oce.F90
MM      OPA_SRC/BDY/bdy_oce.F90
MM      OPA_SRC/BDY/bdytra.F90
MM      OPA_SRC/BDY/bdydta.F90
MM      OPA_SRC/BDY/bdytides.F90
MM      OPA_SRC/BDY/bdydyn.F90
MM      OPA_SRC/BDY/bdyini.F90
MM      OPA_SRC/BDY/bdyvol.F90
MM      OPA_SRC/BDY/bdy_par.F90
M       OPA_SRC/lib_mpp.F90
M       OPA_SRC/FLO/flowri.F90
M       OPA_SRC/FLO/flo_oce.F90
M       OPA_SRC/FLO/floats.F90
M       OPA_SRC/lib_cray.f90
M       OPA_SRC/ZDF/zdfevd.F90
M       OPA_SRC/ZDF/zdfini.F90
M       OPA_SRC/ZDF/zdfmxl.F90
M       OPA_SRC/ZDF/zdftke_old.F90
M       OPA_SRC/ZDF/zdftke.F90
M       OPA_SRC/ZDF/zdfddm.F90
M       OPA_SRC/ZDF/zdf_oce.F90
M       OPA_SRC/ZDF/zdftmx.F90
M       OPA_SRC/ZDF/zdfbfr.F90
M       OPA_SRC/ZDF/zdfkpp.F90
M       OPA_SRC/ZDF/zdfric.F90
?       OPA_SRC/TRA/trasbc.F90.merge-left.r1909
?       OPA_SRC/TRA/trasbc.F90.working
?       OPA_SRC/TRA/trasbc.F90.merge-right.r2207
?       OPA_SRC/TRA/tranxt.F90.merge-left.r1909
?       OPA_SRC/TRA/tranxt.F90.working
?       OPA_SRC/TRA/tranxt.F90.merge-right.r2207
M       OPA_SRC/TRA/traadv_muscl.F90
M       OPA_SRC/TRA/traadv_eiv.F90
M       OPA_SRC/TRA/traldf_iso.F90
M       OPA_SRC/TRA/tradmp.F90
M       OPA_SRC/TRA/tranpc.F90
M       OPA_SRC/TRA/traadv_cen2.F90
M       OPA_SRC/TRA/eosbn2.F90
M       OPA_SRC/TRA/traadv_ubs.F90
M       OPA_SRC/TRA/trazdf.F90
M       OPA_SRC/TRA/trabbc.F90
M       OPA_SRC/TRA/traadv_tvd.F90
M       OPA_SRC/TRA/trazdf_imp.F90
M       OPA_SRC/TRA/trabbl_adv.h90
M       OPA_SRC/TRA/trabbl.F90
M       OPA_SRC/TRA/traadv_muscl2.F90
M       OPA_SRC/TRA/trazdf_exp.F90
MM      OPA_SRC/TRA/traldf.F90
M       OPA_SRC/TRA/traqsr.F90
C       OPA_SRC/TRA/trasbc.F90
M       OPA_SRC/TRA/traadv_qck.F90
C       OPA_SRC/TRA/tranxt.F90
M       OPA_SRC/TRA/traadv.F90
M       OPA_SRC/istate.F90
M       OPA_SRC/TRD/trdicp.F90
M       OPA_SRC/TRD/trdvor_oce.F90
M       OPA_SRC/TRD/trdmod.F90
M       OPA_SRC/TRD/trdicp_oce.F90
M       OPA_SRC/TRD/trdmld_oce.F90
M       OPA_SRC/TRD/trdmld_rst.F90
M       OPA_SRC/TRD/trdmod_oce.F90
M       OPA_SRC/TRD/trdvor.F90
M       OPA_SRC/DIA/diaptr.F90
M       OPA_SRC/DIA/diaar5.F90
M       OPA_SRC/DIA/diagap.F90
M       OPA_SRC/DIA/diafwb.F90
M       OPA_SRC/DIA/diahth.F90
M       OPA_SRC/par_oce.F90
M       OPA_SRC/stpctl.F90
M       OPA_SRC/step.F90
C       OPA_SRC/opa.F90
?       LIM_SRC_2/limtrp_2.F90.merge-left.r1909
?       LIM_SRC_2/limtrp_2.F90.working
?       LIM_SRC_2/limtrp_2.F90.merge-right.r2207
M       LIM_SRC_2/par_ice_2.F90
M       LIM_SRC_2/limwri_2.F90
C       LIM_SRC_2/limtrp_2.F90
M       LIM_SRC_2/limtab_2.F90
M       LIM_SRC_2/limsbc_2.F90
M       LIM_SRC_2/limrst_2.F90
M       LIM_SRC_2/limadv_2.F90
M       LIM_SRC_2/limthd_2.F90
M       LIM_SRC_2/limrhg_2.F90
M       LIM_SRC_2/limdmp_2.F90
M       LIM_SRC_2/limthd_zdf_2.F90
M       LIM_SRC_2/limistate_2.F90
M       LIM_SRC_2/limdyn_2.F90
M       LIM_SRC_2/limdia_2.F90
M       LIM_SRC_2/dom_ice_2.F90
M       LIM_SRC_2/ice_2.F90
M       TOP_SRC/trc.F90
M       TOP_SRC/trcini.F90
MM      TOP_SRC/PISCES/p4zflx.F90
      C TOP_SRC/PISCES/trcrst_pisces.F90
      >   local obstruction, incoming add upon merge
M       TOP_SRC/PISCES/par_pisces.F90
MM      TOP_SRC/PISCES/p4zint.F90
MM      TOP_SRC/PISCES/p4zche.F90
M       TOP_SRC/PISCES/trcini_pisces.F90
MM      TOP_SRC/PISCES/p4zopt.F90
MM      TOP_SRC/PISCES/p4zmeso.F90
MM      TOP_SRC/PISCES/trcctl_pisces.F90
MM      TOP_SRC/PISCES/p4zsink.F90
MM      TOP_SRC/PISCES/p4zprod.F90
MM      TOP_SRC/PISCES/p4zlys.F90
MM      TOP_SRC/PISCES/p4zmicro.F90
MM      TOP_SRC/PISCES/p4zbio.F90
M       TOP_SRC/PISCES/sms_pisces.F90
MM      TOP_SRC/PISCES/p4zsed.F90
MM      TOP_SRC/PISCES/trclsm_pisces.F90
MM      TOP_SRC/PISCES/p4zmort.F90
M       TOP_SRC/PISCES/p4zlim.F90
MM      TOP_SRC/PISCES/p4zrem.F90
MM      TOP_SRC/PISCES/trcsms_pisces.F90
M       TOP_SRC/par_trc.F90
M       TOP_SRC/trcctl.F90
M       TOP_SRC/C14b/trcctl_c14b.F90
      C TOP_SRC/C14b/trcrst_c14b.F90
      >   local obstruction, incoming add upon merge
M       TOP_SRC/C14b/par_c14b.F90
M       TOP_SRC/C14b/trclsm_c14b.F90
M       TOP_SRC/C14b/trcini_c14b.F90
D       TOP_SRC/DUMMY
D       TOP_SRC/DUMMY/agrif_top_sponge.F90
D       TOP_SRC/DUMMY/agrif_top_interp.F90
D       TOP_SRC/DUMMY/agrif_top_update.F90
M       TOP_SRC/CFC/trcini_cfc.F90
M       TOP_SRC/CFC/trcctl_cfc.F90
M       TOP_SRC/CFC/trcsms_cfc.F90
      C TOP_SRC/CFC/trcrst_cfc.F90
      >   local obstruction, incoming add upon merge
M       TOP_SRC/CFC/par_cfc.F90
M       TOP_SRC/CFC/trclsm_cfc.F90
M       TOP_SRC/top_substitute.h90
M       TOP_SRC/MY_TRC/trcini_my_trc.F90
M       TOP_SRC/MY_TRC/trcctl_my_trc.F90
M       TOP_SRC/MY_TRC/trcsms_my_trc.F90
      C TOP_SRC/MY_TRC/trcrst_my_trc.F90
      >   local obstruction, incoming add upon merge
M       TOP_SRC/MY_TRC/par_my_trc.F90
M       TOP_SRC/MY_TRC/trclsm_my_trc.F90
M       TOP_SRC/trcdia.F90
MM      TOP_SRC/TRP/trcnxt.F90
MM      TOP_SRC/TRP/trcldf_iso_zps.F90
M       TOP_SRC/TRP/trdmld_trc_oce.F90
 M      TOP_SRC/TRP/trcldf_bilap.F90
 M      TOP_SRC/TRP/trcadv_muscl.F90
M       TOP_SRC/TRP/trdmld_trc_rst.F90
MM      TOP_SRC/TRP/trcldf_iso.F90
MM      TOP_SRC/TRP/trcdmp.F90
 M      TOP_SRC/TRP/trcadv_cen2.F90
MM      TOP_SRC/TRP/trcldf_bilapg.F90
M       TOP_SRC/TRP/trdmld_trc.F90
MM      TOP_SRC/TRP/trcbbc.F90
MM      TOP_SRC/TRP/trcadv_tvd.F90
MM      TOP_SRC/TRP/trcadv_smolar.F90
 M      TOP_SRC/TRP/trczdf_imp.F90
MM      TOP_SRC/TRP/trctrp_lec.F90
 M      TOP_SRC/TRP/trcbbl_adv.h90
 M      TOP_SRC/TRP/zpshde_trc.F90
 M      TOP_SRC/TRP/trczdf_iso.F90
MM      TOP_SRC/TRP/trcbbl.F90
 M      TOP_SRC/TRP/trcadv_muscl2.F90
 M      TOP_SRC/TRP/trczdf_exp.F90
MM      TOP_SRC/TRP/trcldf_lap.F90
M       TOP_SRC/TRP/trp_trc.F90
MM      TOP_SRC/TRP/trctrp.F90
MM      TOP_SRC/TRP/trczdf_iso_vopt.F90
MM      TOP_SRC/TRP/trcrad.F90
 M      TOP_SRC/TRP/trcsbc.F90
MM      TOP_SRC/TRP/trctrp_ctl.F90
M       TOP_SRC/trcwri.F90
M       TOP_SRC/trcsms.F90
M       TOP_SRC/trclec.F90
M       TOP_SRC/LOBSTER/trcbio.F90
M       TOP_SRC/LOBSTER/trcini_lobster.F90
M       TOP_SRC/LOBSTER/trcsed.F90
M       TOP_SRC/LOBSTER/trcctl_lobster.F90
M       TOP_SRC/LOBSTER/trcexp.F90
M       TOP_SRC/LOBSTER/trcsms_lobster.F90
M       TOP_SRC/LOBSTER/trcopt.F90
      C TOP_SRC/LOBSTER/trcrst_lobster.F90
      >   local obstruction, incoming add upon merge
M       TOP_SRC/LOBSTER/par_lobster.F90
M       TOP_SRC/LOBSTER/sms_lobster.F90
M       TOP_SRC/LOBSTER/trclsm_lobster.F90
M       TOP_SRC/oce_trc.F90
M       TOP_SRC/prtctl_trc.F90
M       TOP_SRC/trcdta.F90
M       TOP_SRC/trcrst.F90
M       LIM_SRC_3/limrhg.F90
M       LIM_SRC_3/limupdate.F90
M       LIM_SRC_3/limthd_ent.F90
M       LIM_SRC_3/limmsh.F90
M       LIM_SRC_3/limvar.F90
M       LIM_SRC_3/limistate.F90
M       LIM_SRC_3/limthd_dh.F90
M       LIM_SRC_3/limdyn.F90
M       LIM_SRC_3/thd_ice.F90
M       LIM_SRC_3/dom_ice.F90
M       LIM_SRC_3/limthd_lac.F90
M       LIM_SRC_3/par_ice.F90
M       LIM_SRC_3/limitd_me.F90
M       LIM_SRC_3/limthd_dif.F90
M       LIM_SRC_3/limtrp.F90
M       LIM_SRC_3/limtab.F90
M       LIM_SRC_3/limsbc.F90
M       LIM_SRC_3/limrst.F90
M       LIM_SRC_3/limadv.F90
M       LIM_SRC_3/limitd_th.F90
M       LIM_SRC_3/limthd_sal.F90
M       LIM_SRC_3/limthd.F90
M       NST_SRC/agrif_opa_sponge.F90
M       NST_SRC/agrif_top_sponge.F90
M       NST_SRC/agrif_user.F90
M       NST_SRC/agrif_opa_interp.F90
M       NST_SRC/agrif_opa_update.F90
M       NST_SRC/agrif2model.F90
M       NST_SRC/agrif_top_interp.F90
M       NST_SRC/agrif_top_update.F90
M       NST_SRC/agrif_oce.F90
M       C1D_SRC/step_c1d.F90
M       C1D_SRC/dyncor_c1d.F90
M       C1D_SRC/diawri_c1d.F90
M       C1D_SRC/c1d.F90
M       C1D_SRC/dynnxt_c1d.F90

Step4 : Merge branch DEV_1879_mpp_rep into DEV_r2191_3partymerge2010

svn merge -r 1879:HEAD svn+ssh://rblod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC  . (Here I forgot LIM_SRC_2)

Step5 : Merge branch devmercator2010_1 into DEV_r2191_3partymerge2010.

cd DEV_r2191_3partymerge2010/NEMO.

svn merge -r 1784:HEAD svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/devmercator2010_1/NEMO  .

svn st
?      OPA_SRC/opa.F90.merge-left.r1784
?      OPA_SRC/opa.F90.merge-right.r2217
?      OPA_SRC/opa.F90.working
?      OPA_SRC/DOM/phycst.F90.merge-left.r1784
?      OPA_SRC/DOM/phycst.F90.working
?      OPA_SRC/DOM/phycst.F90.merge-right.r2217
M      OPA_SRC/DOM/dom_oce.F90
C      OPA_SRC/DOM/phycst.F90
M      OPA_SRC/DOM/daymod.F90
M      OPA_SRC/IOM/restart.F90
?      OPA_SRC/DYN/divcur.F90.merge-left.r1784
?      OPA_SRC/DYN/divcur.F90.working
?      OPA_SRC/DYN/divcur.F90.merge-right.r2217
C      OPA_SRC/DYN/divcur.F90
M      OPA_SRC/DYN/dynzdf.F90
M      OPA_SRC/DYN/dynzdf_imp.F90
?      OPA_SRC/SOL/solmat.F90.merge-right.r2217
?      OPA_SRC/SOL/solmat.F90.merge-left.r1784
?      OPA_SRC/SOL/solmat.F90.working
C      OPA_SRC/SOL/solmat.F90
?      OPA_SRC/OBC/obcini.F90.working
?      OPA_SRC/OBC/obcini.F90.merge-right.r2217
?      OPA_SRC/OBC/obcdta.F90.merge-left.r1784
?      OPA_SRC/OBC/obcdta.F90.working
?      OPA_SRC/OBC/obcini.F90.merge-left.r1784
?      OPA_SRC/OBC/obcdta.F90.merge-right.r2217
C      OPA_SRC/OBC/obcini.F90
C      OPA_SRC/OBC/obcdta.F90
?      OPA_SRC/SBC/sbcice_lim_2.F90.merge-left.r1784
?      OPA_SRC/SBC/sbcfwb.F90.working
?      OPA_SRC/SBC/fldread.F90.merge-right.r2217
?      OPA_SRC/SBC/sbcrnf.F90.merge-left.r1784
?      OPA_SRC/SBC/sbcice_lim_2.F90.working
?      OPA_SRC/SBC/sbcrnf.F90.merge-right.r2217
?      OPA_SRC/SBC/fldread.F90.working
?      OPA_SRC/SBC/sbcfwb.F90.merge-right.r2217
?      OPA_SRC/SBC/sbcrnf.F90.working
?      OPA_SRC/SBC/sbcice_lim_2.F90.merge-right.r2217
?      OPA_SRC/SBC/fldread.F90.merge-left.r1784
?      OPA_SRC/SBC/sbcfwb.F90.merge-left.r1784
M      OPA_SRC/SBC/sbcssr.F90
C      OPA_SRC/SBC/fldread.F90
C      OPA_SRC/SBC/sbcfwb.F90
M      OPA_SRC/SBC/sbcblk_clio.F90
M      OPA_SRC/SBC/sbcice_if.F90
M      OPA_SRC/SBC/sbcblk_core.F90
C      OPA_SRC/SBC/sbcice_lim_2.F90
C      OPA_SRC/SBC/sbcrnf.F90
M      OPA_SRC/SBC/sbcflx.F90
M      OPA_SRC/DTA/dtasal.F90
M      OPA_SRC/DTA/dtatem.F90
M      OPA_SRC/ZDF/zdfini.F90
A  +   OPA_SRC/ZDF/zdfgls.F90
M      OPA_SRC/ZDF/zdfbfr.F90
?      OPA_SRC/TRA/trasbc.F90.merge-left.r1784
?      OPA_SRC/TRA/trasbc.F90.working
?      OPA_SRC/TRA/tranxt.F90.merge-right.r2217
?      OPA_SRC/TRA/tranxt.F90.merge-left.r1784
?      OPA_SRC/TRA/tranxt.F90.working
?      OPA_SRC/TRA/trasbc.F90.merge-right.r2217
M      OPA_SRC/TRA/trazdf.F90
M      OPA_SRC/TRA/traqsr.F90
C      OPA_SRC/TRA/trasbc.F90
C      OPA_SRC/TRA/tranxt.F90
M      OPA_SRC/DIA/diawri.F90
M      OPA_SRC/step.F90
C      OPA_SRC/opa.F90
A      LIM_SRC_2/limrhg.F90
M      LIM_SRC_2/limtrp_2.F90
M      LIM_SRC_2/limsbc_2.F90
M      LIM_SRC_2/limrst_2.F90
M      LIM_SRC_2/limrhg_2.F90
M      LIM_SRC_2/limmsh_2.F90
M      LIM_SRC_2/limdyn_2.F90
M      LIM_SRC_2/limdyn_2.F90
M      LIM_SRC_2/dom_ice_2.F90
M      LIM_SRC_2/iceini_2.F90
M      LIM_SRC_2/ice_2.F90
M      LIM_SRC_3/limrhg.F90
Last modified 10 years ago Last modified on 2010-10-12T17:06:57+02:00