'''
== Merging NOC developments for 2011 ==
'''

Branches to be merged:


{{{
dev_r2782_NOCS_Griffies               [added to merge at changeset 2980]
dev_r2787_NOCS_NEPTUNE
dev_r2802_NOCL_bfrimp
dev_r2802_NOCL_prjhpg
dev_r2802_NOCL_Smagorinsky
dev_r2802_NOCL_vppm
dev_r2802_NOCS_vvlfix
dev_r2855_NOCS_mppsca
}}}


'''Step 1.''' copy trunk at lowest revision number used by any of the branches to be merged


{{{
svn copy svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2782 \
         svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_NOC_2011_MERGE \
         -m"Create branch for the merge of all NOC 2011 developments. See ticket #874. Step 1: copy trunk at lowest revision number used by any of the branches to be merged"
}}}

Successfully created new branch:  '''branches/2011/dev_NOC_2011_MERGE'''

'''Step 2'''. merge in changes from the first development branch into a checked out version of the merge branch. This simply recreates the first development branch but consolidates the
changes made on that branch into a single changeset:


{{{
svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2782 \
                 svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_r2782_NOCS_Griffies \
                 dev_NOC_2011_MERGE

--- Merging r2783 through r2979 into 'dev_NOC_2011_MERGE':
U    dev_NOC_2011_MERGE/DOC/TexFiles/Namelist/namtra_ldf
U    dev_NOC_2011_MERGE/NEMOGCM/CONFIG/GYRE/EXP00/namelist
U    dev_NOC_2011_MERGE/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist
U    dev_NOC_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist
U    dev_NOC_2011_MERGE/NEMOGCM/CONFIG/POMME/EXP00/namelist
U    dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90
U    dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra_oce.F90
U    dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra.F90
U    dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90
U    dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso_grif.F90
U    dev_NOC_2011_MERGE/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90
U    dev_NOC_2011_MERGE/NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90
}}}

'''NOTE: STILL SOME DOCUMENTATION CHANGES NEEDED FOR THIS BRANCH'''

Check in merge branch:


{{{
cd dev_NOC_201_MERGE
svn ci -m"Branch dev_NOC_2011_MERGE. #874. Step 2: Add changes from the 2011/dev_r2782_NOCS_Griffies branch"

Sending        DOC/TexFiles/Namelist/namtra_ldf
Sending        NEMOGCM/CONFIG/GYRE/EXP00/namelist
Sending        NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist
Sending        NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist
Sending        NEMOGCM/CONFIG/POMME/EXP00/namelist
Sending        NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90
Sending        NEMOGCM/NEMO/OPA_SRC/LDF/ldftra.F90
Sending        NEMOGCM/NEMO/OPA_SRC/LDF/ldftra_oce.F90
Sending        NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90
Sending        NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso_grif.F90
Sending        NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90
Sending        NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90
Transmitting file data ............
Committed revision 2980.
}}}