Opened 9 years ago

Closed 9 years ago

Last modified 3 years ago

#890 closed Task (fixed)

Merging NOC and UKMO 2011 developments

Reported by: acc Owned by: acc
Priority: low Milestone:
Component: OCE Version: release-3.3
Severity: Keywords:
Cc: Review:
MP ready?:
Progress:

Description

Creating a temporary branch for merging the 2011 developments from NOC and UKMO

Commit History (10)

ChangesetAuthorTimeChangeLog
3113acc2011-11-15T16:21:27+01:00

Branch dev_NOC_UKMO_MERGE #890. bdy namelist changes to all configs

3112acc2011-11-15T15:15:00+01:00

Branch dev_NOC_UKMO_MERGE #890. Bug fix in oce_trc.F90. Duplicate definition after merge.

3110acc2011-11-15T14:42:19+01:00

Branch dev_NOC_UKMO_MERGE #890. More tweaks to AMM reference configuration

3109acc2011-11-15T14:32:34+01:00

Branch dev_NOC_UKMO_MERGE #890. More tweaks to AMM reference configuration and dynhpg.F90

3108acc2011-11-15T12:55:23+01:00

Branch dev_NOC_UKMO_MERGE #890. Changes to AMM reference configuration and suppression of unwanted pressure gradient options in dynhpg.F90

3102acc2011-11-14T18:47:56+01:00

Branch dev_NOC_UKMO_MERGE #890. Corrected minor typo in dynhpg.F90

3101acc2011-11-14T18:39:45+01:00

Branch dev_NOC_UKMO_MERGE #890. Resolved conflicts (most arising from the tracer sub-timestepping)

3096acc2011-11-14T16:54:42+01:00

Branch dev_NOC_UKMO_MERGE #890. Undid some changes to fully reinstate OBC code

3094acc2011-11-14T16:28:04+01:00

Branch dev_NOC_UKMO_MERGE #890. Step 2. Merge in changes from the dev_UKM0_2011 branch with unwanted changes reverted

3089acc2011-11-14T14:44:48+01:00

Create branch for the merge of all NOC and UKMO 2011 developments. See ticket #890. Step 1: copy trunk at the base revision number used by both site merge branches

Change History (3)

comment:1 Changed 9 years ago by acc

Further details can be found on: wiki:ticket/890_NOC_UKMO_MERGE?

comment:2 Changed 9 years ago by acc

  • Resolution set to fixed
  • Status changed from new to closed

Completed. Merged into 2011 general merge. Now part of upcoming 3.4 release.

comment:3 Changed 3 years ago by nemo

  • Type changed from Development to Task

Remove 'Development' type

Note: See TracTickets for help on using tickets.