New URL for NEMO forge!

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
#890 (Merging NOC and UKMO 2011 developments) – NEMO

Opened 12 years ago

Closed 12 years ago

Last modified 6 years ago

#890 closed Task (fixed)

Merging NOC and UKMO 2011 developments

Reported by: acc Owned by: acc
Priority: low Milestone:
Component: OCE Version: v3.3
Severity: Keywords:


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

Commit History (10)


Branch dev_NOC_UKMO_MERGE #890. bdy namelist changes to all configs


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


Branch dev_NOC_UKMO_MERGE #890. More tweaks to AMM reference configuration


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


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


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


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


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


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


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 12 years ago by acc

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

comment:2 Changed 12 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 6 years ago by nemo

  • Type changed from Development to Task

Remove 'Development' type

Note: See TracTickets for help on using tickets.