UKMO 2013 merge

[rfurner]

A branch needs to be created to hold the Met Office 2013 code updates, ahead of the merge party in Bologna.

[rfurner]

branch created from trunk at revision 3987;

svn copy -r 3987 ​svn+ssh://rfurner@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk ​svn+ssh://rfurner@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2013/dev_UKMO_2013

And checked out:

svn co svn+ssh://rfurner@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2013/dev_UKMO_2013 .

Merge in changes from ​branches/2013/dev_r3987_UKMO6_C1D and commit back;

svn merge -r !3987:4144 ​svn+ssh://rfurner@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2013/dev_r3987_UKMO6_C1D

svn ci -m "merging changes from !3987:4144 dev_r3987_UKMO6_C1D"

Merge in changes from ​branches/2013/dev_r3987_UKMO4_OBS and commit back:

svn merge -r !3987:4141 svn+ssh://rfurner@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2013/dev_r3987_UKMO4_OBS

svn ci -m "merging changes from 3987:4141 of dev_r3987_UKMO4_OBS"

[rfurner]

Merge in changes from branches/2013/dev_UKMO_NOC_reproducibililty_env_bathy and commit back;

svn merge -r !3987:4179
​svn+ssh://rfurner@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2013/dev_UKMO_NOC_reproducibililty_env_bathy caused issues due to OBS branch having pulled in trunk updates and so unnecessary conflicts ensued.  As such to avoid the conflicts the domzgr.F90 file from the dev_UKMO_NOC_reproducibililty_env_bathy branch was manually copied across.

Finally, Merge in changes from the trunk between 3987 and 4119...

'svn merge -r !3987:4119 ​svn+ssh://rfurner@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk gives no changes, as OBS branch was updated to trunk at 4125

[nemo]

Remove 'Development' type