#885 closed Task (fixed)
merge of UKMO 2011 branches
| Reported by: | rfurner | Owned by: | rfurner |
|---|---|---|---|
| Priority: | low | Milestone: | |
| Component: | OCE | Version: | v3.3 |
| Severity: | Keywords: | 2011 | |
| Cc: |
Description
Ticket created to document the merge of the 2011 UK Met Office branches.
Merge done by Rachel Furner, beginning 9/11/2011
Commit History (12)
| Changeset | Author | Time | ChangeLog |
|---|---|---|---|
| 3078 | rfurner | 2011-11-10T18:29:56+01:00 | ticket #885 small bug fix to bdydta, and changes to documentation and in-code comments |
| 3073 | rfurner | 2011-11-10T11:07:24+01:00 | ticket #885 updated UKMO logo |
| 3071 | rfurner | 2011-11-09T17:54:30+01:00 | ticket #885 adding changes from branches/2011/dev_r2855_UKMO1_AMMCONFIG between r2855 and r3034 |
| 3070 | rfurner | 2011-11-09T17:29:17+01:00 | ticket #885 adding changes from branches/dev_2802_OBStools between r2802 and r3069 |
| 3067 | rfurner | 2011-11-09T14:14:18+01:00 | ticket #885 adding changes from branches/2011/dev_r2802_TOP_substepping between r2802 and r2971 |
| 3066 | rfurner | 2011-11-09T14:09:37+01:00 | ticket #885 adding changes from branches/2011/dev_r2802_UKMO8_cice between r2802 and r3041 |
| 3065 | rfurner | 2011-11-09T14:02:11+01:00 | ticket #885 adding changes from branches/2011/dev_r2802_UKMO8_sbccpl between r2802 and r3056 |
| 3064 | rfurner | 2011-11-09T13:07:11+01:00 | ticket #885 adding changes from branches/2011/dev_r2802_UKMET3_rebuild between r2802 and r3025 |
| 3063 | rfurner | 2011-11-09T12:42:58+01:00 | ticket #885 adding trunk changes between 2787 and 2802 |
| 3062 | rfurner | 2011-11-09T11:47:32+01:00 |
|
| 3061 | rfurner | 2011-11-09T11:18:20+01:00 | ticket #885. Step 1: Created dev_UKMO_2011 merge branch |
| 3059 | rfurner | 2011-11-09T11:00:41+01:00 | ticket #885. Step 1: Created dev_UKMO_2011 merge branch |
Change History (7)
comment:1 Changed 12 years ago by rfurner
- Status changed from new to assigned
comment:2 Changed 12 years ago by rfurner
- Type changed from Bug to Development branch
comment:3 Changed 12 years ago by rfurner
Merged changes from Dan Lea's OBStools branch
(svn merge svn+ssh://rfurner@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2802 svn+ssh://rfurner@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/dev_2802_OBStools@3069)
Committed to svn at revision 3070
(svn ci -m "ticket #885 adding changes from branches/dev_2802_OBStools between r2802 and r3069")
Updated branch to revision 2855 (merged trunk changes from r2802 to r2855)
(svn merge svn+ssh://rfurner@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2802 svn+ssh://rfurner@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2855)
Tried to commit to svn (svn ci -m "ticket #885 adding trunk changes between r2802 and r2855") but svn status showed that there were in fact no changes, as the updates to the trunk between r2802 and r2855 were identical to those already included in branches dev_r2802_UKMO8_cice and dev_r2802_UKMO8_sbccpl.
Merged Enda O'Dea's AMM Config branch
(svn merge svn+ssh://rfurner@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2855 svn+ssh://rfurner@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_r2855_UKMO1_AMMCONFIG@3034)
Committed to svn at revision 3071
(svn ci -m "ticket #885 adding changes from branches/2011/dev_r2855_UKMO1_AMMCONFIG between r2855 and r3034")
comment:4 Changed 12 years ago by rfurner
Dave Storkey ammnded the namelist in the AMM config file. All other config namelists also need updating.
A small bug fix was added to bdydta.
The CICE documentation was improved (formatting errors fixed), and a write statement was added to phycst.
Submitted to svn at 3078 (svn ci -m "ticket #885 small bug fix to bdydta, and changes to documentation and in-code comments")
comment:5 Changed 12 years ago by rblod
- Resolution set to fixed
- Status changed from assigned to closed
comment:6 Changed 8 years ago by nicolasmartin
- Keywords merge removed
comment:7 Changed 7 years ago by nemo
- Type changed from Development to Task
Remove 'Development' type
Merge branch created from trunk at revision 2787
(svn copy svn+ssh://rfurner@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2787 svn+ssh://rfurner@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_UKM0_2011 -m "ticket #885. Step 1: Created dev_UKMO_2011 merge branch")
Merged in changes from Dave Storkey's BDY and OBC merge branch
(svn merge svn+ssh://rfurner@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2787 svn+ssh://rfurner@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/UKMO_MERCATOR_obc_bdy_merge@2888)
Updates committed to branch at revision 3062
svn commit -m " ticket #885. added in changes from branches/2011/UKMO_MERCATOR_obc_bdy_merge@2888"
Merged updates to the trunk between revision 2787 and 2802
(svn merge svn+ssh://rfurner@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2787 svn+ssh://rfurner@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2802)
Trunk updates committed to branch at revision 3063
(svn ci -m "ticket #885 adding trunk changes between 2787 and 2802")
Merged changes from Ed Blockley's Rebuild branch
(svn merge svn+ssh://rfurner@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2802 svn+ssh://rfurner@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_r2802_UKMET3_rebuild@3025)
Committed to svn at revision 3064
(svn ci -m "ticket #885 adding changes from branches/2011/dev_r2802_UKMET3_rebuild between r2802 and r3025")
Merged changes from Chris Harris's sbccpl branch
(svn merge svn+ssh://rfurner@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2802 svn+ssh://rfurner@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_r2802_UKMO8_sbccpl@3056)
Committed to svn at revision 3065
(svn ci -m "ticket #885 adding changes from branches/2011/dev_r2802_UKMO8_sbccpl between r2802 and r3056")
Merged changes from Chris Harris's cice branch
(svn merge svn+ssh://rfurner@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2802 svn+ssh://rfurner@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_r2802_UKMO8_cice@3041)
Committed to svn at revision 3066
(svn ci -m "ticket #885 adding changes from branches/2011/dev_r2802_UKMO8_cice between r2802 and r3041")
Merged changes from Karen Edward's TOP Substepping branch
(svn merge svn+ssh://rfurner@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2802 svn+ssh://rfurner@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_r2802_TOP_substepping@2971)
Committed to svn at revision 3067
(svn ci -m "ticket #885 adding changes from branches/2011/dev_r2802_TOP_substepping between r2802 and r2971")