New branch for LOCEAN and UKMO 2012 dev.

[cetlod]

1st step : Copy the UKMO branch into the merged LOCEAN/UKMO one

svn copy ​svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2012/dev_UKMO_2012 ​svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2012/dev_LOCEAN_UKMO_2012 -m "Step 1 : copy UKMO branch into a new one, dev_LOCEAN_UKMO_2012"

2nd step : checkout dev_LOCEAN_UKMO_2012 and merge in the LOCEAN one

svn co ​svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2012/dev_LOCEAN_UKMO_2012

svn merge -r3555:HEAD ​svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2012/dev_LOCEAN_2012 dev_LOCEAN_UKMO_2012

U NEMOGCM_dev_LOCEAN_UKMO_2012/TOOLS/COMPILE/bldxioxag.cfg
U NEMOGCM_dev_LOCEAN_UKMO_2012/TOOLS/COMPILE/bldxio.cfg
A NEMOGCM_dev_LOCEAN_UKMO_2012/TOOLS/COMPILE/bld_preproagr.cfg
U NEMOGCM_dev_LOCEAN_UKMO_2012/TOOLS/COMPILE/Fmake_WORK.sh
U NEMOGCM_dev_LOCEAN_UKMO_2012/TOOLS/COMPILE/bld.cfg
U NEMOGCM_dev_LOCEAN_UKMO_2012/TOOLS/COMPILE/bldxag.cfg
U NEMOGCM_dev_LOCEAN_UKMO_2012/TOOLS/COMPILE/agrifpp.sh
U NEMOGCM_dev_LOCEAN_UKMO_2012/SETTE/sette.sh
U NEMOGCM_dev_LOCEAN_UKMO_2012/SETTE/prepare_job.sh
A NEMOGCM_dev_LOCEAN_UKMO_2012/SETTE/BATCH_TEMPLATE/batch-X64_CURIE
D NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/GYRE_LOBSTER/cpp_GYRE_LOBSTER.fcm
D NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/GYRE_LOBSTER/EXP00/iodef.xml
D NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/GYRE_LOBSTER/EXP00/namelist_lobster
D NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/GYRE_LOBSTER/EXP00/AA_job
D NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/GYRE_LOBSTER/EXP00/xmlio_server.def
D NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/GYRE_LOBSTER/EXP00/namelist
D NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/GYRE_LOBSTER/EXP00/namelist_top
D NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/GYRE_LOBSTER/EXP00
D NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/GYRE_LOBSTER
U NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/GYRE/cpp_GYRE.fcm
U NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist_pisces
U NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/ORCA2_OFF_PISCES/EXP00/iodef.xml
U NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/ORCA2_OFF_PISCES/EXP00/xmlio_server.def
U NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist
U NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist_top
U NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/ORCA2_OFF_PISCES/cpp_ORCA2_OFF_PISCES.fcm
A NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/ORCA2_LIM_CFC_C14b
A NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/ORCA2_LIM_CFC_C14b/cpp_ORCA2_LIM_CFC_C14b.fcm
A NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/ORCA2_LIM_CFC_C14b/EXP00
A NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/namelist_ice_lim2
A NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/namelist_ice_lim3
A NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/1_atmc14.dat
A NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/cfc1112.atm
A NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/iodef.xml
A NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/namelist_c14b
A NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/namelist_cfc
A NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/1_splco2.dat
A NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/namelist_ice
A NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/1_namelist
A NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/namelist_top
A NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/1_namelist_ice_lim2
A NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/1_cfc1112.atm
A NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/atmc14.dat
A NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/iodef.xml_cfc
A NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/AGRIF_FixedGrids.in
A NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/1_namelist_c14b
A NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/1_namelist_cfc
A NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/splco2.dat
A NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/xmlio_server.def
A NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/namelist
A NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/STRAIT.dat
A NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/1_namelist_top
A NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/GYRE_PISCES
A NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/GYRE_PISCES/cpp_GYRE_PISCES.fcm
A NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/GYRE_PISCES/EXP00
A NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/GYRE_PISCES/EXP00/namelist_pisces
A NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/GYRE_PISCES/EXP00/iodef.xml
A NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/GYRE_PISCES/EXP00/AA_job
A NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/GYRE_PISCES/EXP00/xmlio_server.def
A NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/GYRE_PISCES/EXP00/namelist
A NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/GYRE_PISCES/EXP00/namelist_top
U NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/makenemo
U NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/ORCA2_LIM_PISCES/cpp_ORCA2_LIM_PISCES.fcm
U NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/ORCA2_LIM_PISCES/EXP00/namelist_pisces
U NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/ORCA2_LIM_PISCES/EXP00/iodef.xml
UC NEMOGCM_dev_LOCEAN_UKMO_2012/CONFIG/cfg.txt

C NEMOGCM_dev_LOCEAN_UKMO_2012/ARCH/NOC/arch-ALTIX_NAUTILUS.fcm
C NEMOGCM_dev_LOCEAN_UKMO_2012/ARCH/NOC/arch-ALTIX_NAUTILUS_MPT.fcm
C NEMOGCM_dev_LOCEAN_UKMO_2012/ARCH/NOC/arch-ALTIX_NAUTILUS_SETTE.fcm

U NEMOGCM_dev_LOCEAN_UKMO_2012/ARCH/CNRS/arch-X64_CURIE.fcm
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/OFF_SRC/dtadyn.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/OPA_SRC/nemogcm.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/OPA_SRC/IOM/iom_def.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/OPA_SRC/IOM/prtctl.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/OPA_SRC/SBC/cyclone.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/OPA_SRC/SBC/fldread.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/OPA_SRC/SBC/sbcblk_core.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/OPA_SRC/SBC/sbcice_lim_2.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/OPA_SRC/lib_cray.f90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/LIM_SRC_2/limtrp_2.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/LIM_SRC_2/limrhg_2.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/LOBSTER/trcbio.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/LOBSTER/trcini_lobster.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/LOBSTER/trcsed.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/LOBSTER/trcexp.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/LOBSTER/trcsms_lobster.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/LOBSTER/trcopt.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/LOBSTER/trcrst_lobster.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/LOBSTER/par_lobster.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/LOBSTER/sms_lobster.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/LOBSTER/trcnam_lobster.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/LOBSTER
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/SED/seddsr.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/SED/sedmodel.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/SED/sedwri.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/SED/sedmbc.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/SED/sedstp.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/SED/sedbtb.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/SED/seddta.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/SED/sedrst.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/SED/sedadv.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/SED/sedsfc.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/SED/sedchem.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/SED/sed.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/SED/sedini.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/SED/par_sed.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/SED/sedmat.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/SED/sedco3.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/SED/sedarr.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/SED
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/trcnam.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/trc.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/trcini.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/trcrst_pisces.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/p4zflx.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/p4zint.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/p4zche.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/p4zopt.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/p4zmeso.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/p4zprod.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/p4zsink.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/p4zlys.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/p4zbio.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/p4zmicro.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/p4zsed.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/p4zmort.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/p4zlim.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/p4zrem.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/par_pisces.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/sms_pisces.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/trcnam_pisces.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/P2Z
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/P2Z/p2zbio.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/P2Z/p2zsed.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/P2Z/p2zexp.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/P2Z/p2zopt.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/P2Z/p2zsms.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/SED
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/SED/seddsr.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/SED/sedmodel.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/SED/sedwri.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/SED/sedmbc.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/SED/sedstp.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/SED/sedbtb.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/SED/seddta.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/SED/sedrst.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/SED/sedadv.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/SED/sedsfc.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/SED/sedchem.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/SED/sed.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/SED/sedini.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/SED/par_sed.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/SED/sedmat.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/SED/sedco3.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/SED/sedarr.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/trcini_pisces.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/P4Z
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/P4Z/p4zfechem.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/P4Z/p4zflx.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/P4Z/p4zint.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/P4Z/p4zche.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/P4Z/p4zsms.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/P4Z/p4zopt.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/P4Z/p4zmeso.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/P4Z/p4zprod.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/P4Z/p4zsink.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/P4Z/p4zlys.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/P4Z/p4zsbc.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/P4Z/p4zbio.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/P4Z/p4zmicro.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/P4Z/p4zsed.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/P4Z/p4zlim.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/P4Z/p4zmort.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/P4Z/p4zrem.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/trcwri_pisces.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/PISCES/trcsms_pisces.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/par_trc.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/C14b/trcrst_c14b.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/C14b/trcwri_c14b.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/C14b/trcsms_c14b.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/C14b/par_c14b.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/CFC/trcrst_cfc.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/CFC/trcwri_cfc.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/CFC/trcsms_cfc.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/CFC/par_cfc.F90
D NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/MY_TRC/trcrst_my_trc.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/MY_TRC/trcwri_my_trc.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/MY_TRC/par_my_trc.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/MY_TRC/trcnam_my_trc.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/TRP/trcnxt.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/TRP/trdmld_trc_rst.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/TRP/trdmod_trc_oce.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/TRP/trctrp.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/TRP/trdmld_trc.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/TRP/trcrad.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/TRP/trcsbc.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/trcwri.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/trcsms.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/oce_trc.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/trcstp.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/prtctl_trc.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/TOP_SRC/trcrst.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/LIM_SRC_3/limrhg.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/NST_SRC/agrif_opa_sponge.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/NST_SRC/agrif_top_sponge.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/NST_SRC/agrif_user.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/NST_SRC/agrif_ice.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/NST_SRC/agrif2model.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/NST_SRC/agrif_top_interp.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/NST_SRC/agrif_lim2_interp.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/NST_SRC/agrif_top_update.F90
A NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/NST_SRC/agrif_lim2_update.F90
U NEMOGCM_dev_LOCEAN_UKMO_2012/NEMO/NST_SRC/agrif_oce.F90

3rd step: resolved the conflicts and commits the changes

svn ci """"

[nemo]

Remove 'Development' type