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

[[BR]]

'''Author''' : acc

'''ticket''' : #684

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

'''The 2010 mid-year merge branch'''[[BR]]
 This branch will contain all the bug-fixes up to tag version 3.2.1 + code from the following completed developments:

    * DEV_r1784_3DF
    * DEV_r1837_mass_heat_salt_fluxes
    * dev_r1821_mixed_ldfdyn
    * DEV_R1821_Rivers
    * DEV_1879_mpp_rep [[BR]]

Step 1 is to create the branch from the earliest trunk revision from which any of the branches to be merged were created. In this case revision 1784. The command used was:

{{{
svn copy svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@1784 \
         svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/DEV_r1784_mid_year_merge_2010 \
          -m "ticket #684 step 1: Create branch for mid year branch; start at the earliest base revision for the branches to be merged"

}}}

Step 2 is to checkout the new branch, merge in the differences between the head of the 3DF branch and the trunk@1784 and check back in the modified branch. This will simply recreate the 3DF branch but the associated changes will be easily identified:


{{{
svn co svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/DEV_r1784_mid_year_merge_2010

svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@1784 \
          svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/DEV_r1784_3DF DEV_r1784_mid_year_merge_2010

<password>


--- Merging r1785 through r1950 into 'DEV_r1784_mid_year_merge_2010':
U    DEV_r1784_mid_year_merge_2010/CONFIG/ORCA2_LIM/EXP00/namelist
U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/SBC/sbcssr.F90
U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/SBC/fldread.F90
U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/SBC/sbcblk_clio.F90
U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/SBC/sbcice_if.F90
U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/SBC/sbcblk_core.F90
U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/SBC/sbcrnf.F90
U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/SBC/sbcflx.F90
U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/DTA/dtasal.F90
U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/DTA/dtatem.F90
U    DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/TRA/traqsr.F90

cd DEV_r1784_mid_year_merge_2010
<password>
svn ci -m"ticket #684 step 2: Add in changes from the DEV_r1784_3DF branch"
}}}

=== Testing ===

||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!'''||


 * 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 !'''||


----
=== 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'''||