[[PageOutline]]
Last edited [[Timestamp]]

[[BR]]

'''Author''' : Christian Ethé

'''ticket''' : #877

'''Branch''' : [https://forge.ipsl.jussieu.fr/nemo/browser/branches/2011/dev_LOCEAN_2011     2011/dev_LOCEAN_2011 ] 
----

=== Description ===

This branch is the merge of all 2011 LOCEAN developments. We merge 4 mains branches :

 - 2011/dev_r2787_PISCES_improvment
 - 2011/dev_r2787_LOCEAN_offline_fldread/  
 - 2011/dev_r2787_LOCEAN3_TRA_TRP     --->     wiki:ticket/842_TRA_TRP
 - 2011/dev_r2855_LOCEAN7_SETTE/NEMOGCM/SETTE

'''Main tasks'''[[BR]]

'''(1) Copy of the trunk at the lowest base revision number for the branches to be merged ( rev 2787 )''' [[BR]] 
{{{
svn copy svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk -r 2787 \ 
         svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_LOCEAN_2011 \ 
         -m "Step 1: Created dev_LOCEAN_2011 merge branch, see ticket #877"
}}}

'''(2) Check out the new branch and merge in the first development branch '''[[BR]]
{{{
svn co svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_LOCEAN_2011  dev_LOCEAN_2011

svn merge svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2787 \
          svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_r2787_LOCEAN_offline_fldread \
          dev_LOCEAN_2011

U    dev_LOCEAN_2011/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OFF_SRC/domrea.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OFF_SRC/dommsk.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/trc_oce.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/oce_trc.F90

}}}

No conflicts

'''(3) Merge in the second development branch in the new branch ''' [[BR]]
{{{
svn merge svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2787 \
          svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_r2787_PISCES_improvment \
          dev_LOCEAN_2011

U    dev_LOCEAN_2011/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist_pisces
U    dev_LOCEAN_2011/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/namelist_pisces
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/trc.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/trcini.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/trcrst_pisces.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zflx.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zint.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/trcnam_pisces.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zche.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/trcini_pisces.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zopt.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zmeso.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zprod.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zsink.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zlys.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zbio.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zmicro.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/sms_pisces.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zsed.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zmort.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zlim.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zrem.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/trcsms_pisces.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/TRP/trcrad.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/trcstp.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/trcrst.F90
}}}

No conflicts

'''(4) Merge in the third development branch in the new branch ''' [[BR]]
{{{
svn merge svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2787 \
          svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_r2787_LOCEAN3_TRA_TRP \
          dev_LOCEAN_2011

U    dev_LOCEAN_2011/NEMOGCM/TOOLS/COMPILE/cfg.txt
U    dev_LOCEAN_2011/NEMOGCM/CONFIG/GYRE_LOBSTER/EXP00/namelist_lobster
U    dev_LOCEAN_2011/NEMOGCM/CONFIG/GYRE_LOBSTER/EXP00/namelist_top
U    dev_LOCEAN_2011/NEMOGCM/CONFIG/GYRE/EXP00/namelist
G    dev_LOCEAN_2011/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist
U    dev_LOCEAN_2011/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist_top
U    dev_LOCEAN_2011/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/cpp_ORCA2_OFF_PISCES.fcm
U    dev_LOCEAN_2011/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist
U    dev_LOCEAN_2011/NEMOGCM/CONFIG/ORCA2_LIM/cpp_ORCA2_LIM.fcm
U    dev_LOCEAN_2011/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/cpp_ORCA2_LIM_PISCES.fcm
C    dev_LOCEAN_2011/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/namelist_pisces
U    dev_LOCEAN_2011/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/namelist_top
U    dev_LOCEAN_2011/NEMOGCM/CONFIG/POMME/EXP00/namelist
C    dev_LOCEAN_2011/NEMOGCM/NEMO/OFF_SRC/domrea.F90
G    dev_LOCEAN_2011/NEMOGCM/NEMO/OFF_SRC/dommsk.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/ASM/asmtrj.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynzad.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv_cen2.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv_ubs.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_bilapg.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_imp.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_flt.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_exp.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynkeg.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/step_oce.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/LBC/cla.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/oce.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/OBC/obcrad.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/OBC/obctra.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/OBC/obcdta.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra_oce.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra_substitute.h90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/SBC/sbcana.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/SBC/sbcssm.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_if.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/C1D/step_c1d.F90
D    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/DTA/dtasal.F90
D    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/DTA/dtatem.F90
A    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/DTA/dtatsd.F90
C    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/trc_oce.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/BDY/bdytra.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/BDY/bdydta.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/FLO/flowri.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfkpp.F90
D    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/TRA/traswp.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_muscl.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/TRA/tradmp.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_cen2.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_muscl2.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/TRA/traldf.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_qck.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/TRD/trdicp.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/TRD/trdmld.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/TRD/trdmod.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/DIA/diaar5.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/DIA/diafwb.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/DIA/diahth.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/DIA/diawri_dimg.h90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/stpctl.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/step.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/OPA_SRC/wrk_nemo.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/LIM_SRC_2/limistate_2.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/trcnam.F90
C    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/trc.F90
C    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/trcini.F90
C    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/trcrst_pisces.F90
C    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zflx.F90
C    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zint.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/par_pisces.F90
C    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/trcnam_pisces.F90
G    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zche.F90
C    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/trcini_pisces.F90
C    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zopt.F90
C    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zmeso.F90
C    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zprod.F90
C    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zsink.F90
C    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zlys.F90
G    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zbio.F90
C    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zmicro.F90
C    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/sms_pisces.F90
C    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zsed.F90
C    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zmort.F90
C    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zlim.F90
C    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zrem.F90
C    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/trcsms_pisces.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/C14b/trcsms_c14b.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/C14b/trcnam_c14b.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/C14b/trcini_c14b.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/CFC/trcini_cfc.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/CFC/trcsms_cfc.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/CFC/par_cfc.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/CFC/trcnam_cfc.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/trcdia.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/TRP/trcnam_trp.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/trcwri.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/trcsms.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcbio.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcsed.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcexp.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcsms_lobster.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/LOBSTER/par_lobster.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcnam_lobster.F90
G    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/oce_trc.F90
C    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/trcstp.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/trcdta.F90
C    dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/trcrst.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/LIM_SRC_3/limistate.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/NST_SRC/agrif_opa_sponge.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/NST_SRC/agrif_user.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/NST_SRC/agrif_opa_interp.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90
U    dev_LOCEAN_2011/NEMOGCM/NEMO/NST_SRC/agrif_oce.F90
}}}

Resolve conflicts and commit the changes
{{{
svn_ci "Add in branch 2011/dev_LOCEAN_2011 changes from 2011/dev_r2787_PISCES_improvment, \
        2011/dev_r2787_LOCEAN_offline_fldread and 2011/dev_r2787_LOCEAN3_TRA_TRP branches, see ticket #877"

Sending        NEMOGCM/CONFIG/GYRE/EXP00/namelist
Sending        NEMOGCM/CONFIG/GYRE/cpp_GYRE.fcm
Sending        NEMOGCM/CONFIG/GYRE_LOBSTER/EXP00/namelist_lobster
Sending        NEMOGCM/CONFIG/GYRE_LOBSTER/EXP00/namelist_top
Sending        NEMOGCM/CONFIG/GYRE_LOBSTER/cpp_GYRE_LOBSTER.fcm
Sending        NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist
Sending        NEMOGCM/CONFIG/ORCA2_LIM/cpp_ORCA2_LIM.fcm
Sending        NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/namelist_pisces
Sending        NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/namelist_top
Sending        NEMOGCM/CONFIG/ORCA2_LIM_PISCES/cpp_ORCA2_LIM_PISCES.fcm
Sending        NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist
Sending        NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist_pisces
Sending        NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist_top
Sending        NEMOGCM/CONFIG/ORCA2_OFF_PISCES/cpp_ORCA2_OFF_PISCES.fcm
Sending        NEMOGCM/CONFIG/POMME/EXP00/namelist
Sending        NEMOGCM/CONFIG/POMME/cpp_POMME.fcm
Sending        NEMOGCM/NEMO/LIM_SRC_2/limistate_2.F90
Sending        NEMOGCM/NEMO/LIM_SRC_3/limistate.F90
Sending        NEMOGCM/NEMO/NST_SRC/agrif_oce.F90
Sending        NEMOGCM/NEMO/NST_SRC/agrif_opa_interp.F90
Sending        NEMOGCM/NEMO/NST_SRC/agrif_opa_sponge.F90
Sending        NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90
Sending        NEMOGCM/NEMO/NST_SRC/agrif_user.F90
Sending        NEMOGCM/NEMO/OFF_SRC/dommsk.F90
Sending        NEMOGCM/NEMO/OFF_SRC/domrea.F90
Sending        NEMOGCM/NEMO/OFF_SRC/dtadyn.F90
Sending        NEMOGCM/NEMO/OPA_SRC/ASM/asmtrj.F90
Sending        NEMOGCM/NEMO/OPA_SRC/BDY/bdydta.F90
Sending        NEMOGCM/NEMO/OPA_SRC/BDY/bdytra.F90
Sending        NEMOGCM/NEMO/OPA_SRC/C1D/step_c1d.F90
Sending        NEMOGCM/NEMO/OPA_SRC/DIA/diaar5.F90
Sending        NEMOGCM/NEMO/OPA_SRC/DIA/diafwb.F90
Sending        NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90
Sending        NEMOGCM/NEMO/OPA_SRC/DIA/diahth.F90
Sending        NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90
Sending        NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90
Sending        NEMOGCM/NEMO/OPA_SRC/DIA/diawri_dimg.h90
Sending        NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90
Deleting       NEMOGCM/NEMO/OPA_SRC/DTA/dtasal.F90
Deleting       NEMOGCM/NEMO/OPA_SRC/DTA/dtatem.F90
Adding         NEMOGCM/NEMO/OPA_SRC/DTA/dtatsd.F90
Sending        NEMOGCM/NEMO/OPA_SRC/DYN/dynadv_cen2.F90
Sending        NEMOGCM/NEMO/OPA_SRC/DYN/dynadv_ubs.F90
Sending        NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90
Sending        NEMOGCM/NEMO/OPA_SRC/DYN/dynkeg.F90
Sending        NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_bilapg.F90
Sending        NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90
Sending        NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_flt.F90
Sending        NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90
Sending        NEMOGCM/NEMO/OPA_SRC/DYN/dynzad.F90
Sending        NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_exp.F90
Sending        NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_imp.F90
Sending        NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90
Sending        NEMOGCM/NEMO/OPA_SRC/FLO/flowri.F90
Sending        NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90
Sending        NEMOGCM/NEMO/OPA_SRC/LBC/cla.F90
Sending        NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90
Sending        NEMOGCM/NEMO/OPA_SRC/LDF/ldftra_oce.F90
Sending        NEMOGCM/NEMO/OPA_SRC/LDF/ldftra_substitute.h90
Sending        NEMOGCM/NEMO/OPA_SRC/OBC/obcdta.F90
Sending        NEMOGCM/NEMO/OPA_SRC/OBC/obcrad.F90
Sending        NEMOGCM/NEMO/OPA_SRC/OBC/obctra.F90
Sending        NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90
Sending        NEMOGCM/NEMO/OPA_SRC/SBC/sbcana.F90
Sending        NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90
Sending        NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_if.F90
Sending        NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90
Sending        NEMOGCM/NEMO/OPA_SRC/SBC/sbcssm.F90
Sending        NEMOGCM/NEMO/OPA_SRC/TRA/traadv_cen2.F90
Sending        NEMOGCM/NEMO/OPA_SRC/TRA/traadv_muscl.F90
Sending        NEMOGCM/NEMO/OPA_SRC/TRA/traadv_muscl2.F90
Sending        NEMOGCM/NEMO/OPA_SRC/TRA/traadv_qck.F90
Sending        NEMOGCM/NEMO/OPA_SRC/TRA/tradmp.F90
Sending        NEMOGCM/NEMO/OPA_SRC/TRA/traldf.F90
Sending        NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90
Deleting       NEMOGCM/NEMO/OPA_SRC/TRA/traswp.F90
Sending        NEMOGCM/NEMO/OPA_SRC/TRD/trdicp.F90
Sending        NEMOGCM/NEMO/OPA_SRC/TRD/trdmld.F90
Sending        NEMOGCM/NEMO/OPA_SRC/TRD/trdmod.F90
Sending        NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90
Sending        NEMOGCM/NEMO/OPA_SRC/ZDF/zdfkpp.F90
Sending        NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90
Sending        NEMOGCM/NEMO/OPA_SRC/nemogcm.F90
Sending        NEMOGCM/NEMO/OPA_SRC/oce.F90
Sending        NEMOGCM/NEMO/OPA_SRC/step.F90
Sending        NEMOGCM/NEMO/OPA_SRC/step_oce.F90
Sending        NEMOGCM/NEMO/OPA_SRC/stpctl.F90
Sending        NEMOGCM/NEMO/OPA_SRC/trc_oce.F90
Sending        NEMOGCM/NEMO/OPA_SRC/wrk_nemo.F90
Sending        NEMOGCM/NEMO/TOP_SRC/C14b/trcini_c14b.F90
Sending        NEMOGCM/NEMO/TOP_SRC/C14b/trcnam_c14b.F90
Sending        NEMOGCM/NEMO/TOP_SRC/C14b/trcsms_c14b.F90
Sending        NEMOGCM/NEMO/TOP_SRC/CFC/par_cfc.F90
Sending        NEMOGCM/NEMO/TOP_SRC/CFC/trcini_cfc.F90
Sending        NEMOGCM/NEMO/TOP_SRC/CFC/trcnam_cfc.F90
Sending        NEMOGCM/NEMO/TOP_SRC/CFC/trcsms_cfc.F90
Sending        NEMOGCM/NEMO/TOP_SRC/LOBSTER/par_lobster.F90
Sending        NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcbio.F90
Sending        NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcexp.F90
Sending        NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcnam_lobster.F90
Sending        NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcsed.F90
Sending        NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcsms_lobster.F90
Sending        NEMOGCM/NEMO/TOP_SRC/PISCES/p4zbio.F90
Sending        NEMOGCM/NEMO/TOP_SRC/PISCES/p4zche.F90
Sending        NEMOGCM/NEMO/TOP_SRC/PISCES/p4zflx.F90
Sending        NEMOGCM/NEMO/TOP_SRC/PISCES/p4zint.F90
Sending        NEMOGCM/NEMO/TOP_SRC/PISCES/p4zlim.F90
Sending        NEMOGCM/NEMO/TOP_SRC/PISCES/p4zlys.F90
Sending        NEMOGCM/NEMO/TOP_SRC/PISCES/p4zmeso.F90
Sending        NEMOGCM/NEMO/TOP_SRC/PISCES/p4zmicro.F90
Sending        NEMOGCM/NEMO/TOP_SRC/PISCES/p4zmort.F90
Sending        NEMOGCM/NEMO/TOP_SRC/PISCES/p4zopt.F90
Sending        NEMOGCM/NEMO/TOP_SRC/PISCES/p4zprod.F90
Sending        NEMOGCM/NEMO/TOP_SRC/PISCES/p4zrem.F90
Sending        NEMOGCM/NEMO/TOP_SRC/PISCES/p4zsed.F90
Sending        NEMOGCM/NEMO/TOP_SRC/PISCES/p4zsink.F90
Sending        NEMOGCM/NEMO/TOP_SRC/PISCES/par_pisces.F90
Sending        NEMOGCM/NEMO/TOP_SRC/PISCES/sms_pisces.F90
Sending        NEMOGCM/NEMO/TOP_SRC/PISCES/trcini_pisces.F90
Sending        NEMOGCM/NEMO/TOP_SRC/PISCES/trcnam_pisces.F90
Sending        NEMOGCM/NEMO/TOP_SRC/PISCES/trcrst_pisces.F90
Sending        NEMOGCM/NEMO/TOP_SRC/PISCES/trcsms_pisces.F90
Sending        NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90
Sending        NEMOGCM/NEMO/TOP_SRC/TRP/trcnam_trp.F90
Sending        NEMOGCM/NEMO/TOP_SRC/TRP/trcrad.F90
Sending        NEMOGCM/NEMO/TOP_SRC/oce_trc.F90
Sending        NEMOGCM/NEMO/TOP_SRC/trc.F90
Sending        NEMOGCM/NEMO/TOP_SRC/trcdia.F90
Sending        NEMOGCM/NEMO/TOP_SRC/trcdta.F90
Sending        NEMOGCM/NEMO/TOP_SRC/trcini.F90
Sending        NEMOGCM/NEMO/TOP_SRC/trcnam.F90
Sending        NEMOGCM/NEMO/TOP_SRC/trcrst.F90
Sending        NEMOGCM/NEMO/TOP_SRC/trcsms.F90
Sending        NEMOGCM/NEMO/TOP_SRC/trcstp.F90
Sending        NEMOGCM/NEMO/TOP_SRC/trcwri.F90
Sending        NEMOGCM/TOOLS/COMPILE/cfg.txt
Transmitting file data ....................................................................................................................................
Committed revision 2977.
}}}

'''(5) Merge in the trunk changes between 2787 and 2855 ''' [[BR]]
{{{

cd dev_LOCEAN_2011

svn merge svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2787 \
          svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2855 ./

U    NEMOGCM/NEMO/LIM_SRC_2/limistate_2.F90
U    NEMOGCM/NEMO/LIM_SRC_2/iceini_2.F90
C    NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90
}}}

Resolve conflicts and commit the changes

{{{
svn ci -m "Add in changes from the trunk between revisions 2787 and 2855, see ticket #877"

Sending        NEMOGCM/NEMO/LIM_SRC_2/iceini_2.F90
Sending        NEMOGCM/NEMO/LIM_SRC_2/limistate_2.F90
Sending        NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90
Transmitting file data ...
Committed revision 2978.
}}}


'''(6) Merge in NEMOGCM/SETTE subdirectory of dev. branch 2011/dev_r2855_LOCEAN7_SETTE/ changes between 2757 and 3020 ''' [[BR]]
{{{

svn co svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_LOCEAN_2011/NEMOGCM dev_LOCEAN_2011

cd dev_LOCEAN_2011/SETTE

svn merge svn+ssh://cetlod@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_r2855_LOCEAN7_SETTE/NEMOGCM/SETTE -r 2757:3020 .

--- Merging r2856 through r3020 into '.':
A    input_ORCA2_OFF_PISCES.cfg
A    iodef_sette.xml
U    SETTE.pdf
A    input_ORCA2_LIM_AGRIF.cfg
U    README
U    sette.sh
U    param.cfg
A    prepare_exe_dir.sh
U    sette_beginner.sh
U    fcm_job.sh
U    all_functions.sh
A    BATCH_TEMPLATE
A    BATCH_TEMPLATE/sette_batch_template
A    BATCH_TEMPLATE/batch-ALTIX_NAUTILUS_MPT
A    BATCH_TEMPLATE/batch-X64_TITANE
A    BATCH_TEMPLATE/batch-PW6_VARGAS

}}}

Commit the changes
{{{
svn_ci "branch dev_LOCEAN_2011:Merge in changes between rev 2757:3020 of branch 2011/dev_r2855_LOCEAN7_SETTE/NEMOGCM/SETTE subdirectory, see ticket #877"
 
Adding         SETTE/BATCH_TEMPLATE
Adding         SETTE/BATCH_TEMPLATE/batch-ALTIX_NAUTILUS_MPT
Adding         SETTE/BATCH_TEMPLATE/batch-PW6_VARGAS
Adding         SETTE/BATCH_TEMPLATE/batch-X64_TITANE
Adding         SETTE/BATCH_TEMPLATE/sette_batch_template
Sending        SETTE/README
Sending        SETTE/SETTE.pdf
Sending        SETTE/all_functions.sh
Sending        SETTE/fcm_job.sh
Adding         SETTE/input_ORCA2_LIM_AGRIF.cfg
Adding         SETTE/input_ORCA2_OFF_PISCES.cfg
Adding         SETTE/iodef_sette.xml
Sending        SETTE/param.cfg
Adding         SETTE/prepare_exe_dir.sh
Sending        SETTE/sette.sh
Sending        SETTE/sette_beginner.sh
Transmitting file data .......
Committed revision 3021.

}}}
----
=== Testing ===
Testing could consider (where appropriate) other configurations in addition to NVTK].

see http://www.nemo-ocean.eu/Developing-with-NEMO/Validation/nemo_v3_4_validation

||NVTK Tested||!'''YES/NO!'''||
||Other model configurations||!'''YES/NO!'''||
||Processor configurations tested||[ Enter processor configs tested here ]||
||If adding new functionality please confirm that the [[BR]]New code doesn't change results when it is switched off [[BR]]and !''works!'' when switched on||!'''YES/NO/NA!'''||

(Answering UNSURE is likely to generate further questions from reviewers.)

'Please add further summary details here'

 * Processor configurations tested
 * etc----

=== Bit Comparability ===
||Does this change preserve answers in your tested standard configurations (to the last bit) ?||!'''YES/NO !'''||
||Does this change bit compare across various processor configurations. (1xM, Nx1 and MxN are recommended)||!'''YES/NO!'''||
||Is this change expected to preserve answers in all possible model configurations?||!'''YES/NO!'''||
||Is this change expected to preserve all diagnostics? [[BR]]!,,!''Preserving answers in model runs does not necessarily imply preserved diagnostics. !''||!'''YES/NO!'''||

If you answered !'''NO!''' to any of the above, please provide further details:

 * Which routine(s) are causing the difference?
 * Why the changes are not protected by a logical switch or new section-version
 * What is needed to achieve regression with the previous model release (e.g. a regression branch, hand-edits etc). If this is not possible, explain why not.
 * What do you expect to see occur in the test harness jobs?
 * Which diagnostics have you altered and why have they changed?Please add details here........

----
=== System Changes ===
||Does your change alter namelists?||!'''YES/NO !'''||
||Does your change require a change in compiler options?||!'''YES/NO !'''||

If any of these apply, please document the changes required here.......

----
=== Resources ===
!''Please !''summarize!'' any changes in runtime or memory use caused by this change......!''

----
=== IPR issues ===
||Has the code been wholly (100%) produced by NEMO developers staff working exclusively on NEMO?||!'''YES/ NO !'''||

If No:

 * Identify the collaboration agreement details
 * Ensure the code routine header is in accordance with the agreement, (Copyright/Redistribution etc).Add further details here if required..........