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.
#1802 (New development branch for merging NOC 2016 developments) – NEMO

Opened 7 years ago

Closed 6 years ago

Last modified 6 years ago

#1802 closed Task (fixed)

New development branch for merging NOC 2016 developments

Reported by: acc Owned by: nemo
Priority: low Milestone: 2016 WP
Component: OCE Version: trunk
Severity: Keywords:



New branch to receive the merged developments from NOC for 2016


Branches to be merged (in order):

2016/dev_r6381_SIMPLIF_5 (Smagorinsky)
2016/dev_r6393_NOC_WAD (Wetting and drying)
NERC/dev_r6998_ORCHESTRA (BDY and related changes only)

Finally bring upto trunk rev7161 ready for cross-centre merge

Commit History (4)


Ticket #1802. Merged in changes from 6998:HEAD of NERC/dev_r6998_ORCHESTRA (BDY changes only). This branch already includes trunk changes up to rev 7161


Ticket #1802. Merged in trunk changes from 6393:6998 and resolved single conflicit in cfg.txt


Ticket #1802. Merged in trunk changes from 6381:6393 and then changes from branches/2016/dev_r6393_NOC_WAD


Ticket #1802. Development branch for merging NOC 2016 developments

Change History (2)

comment:1 Changed 6 years ago by acc

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

Closed old development branch ticket.

comment:2 Changed 6 years ago by nemo

  • Type changed from Development to Task

Remove 'Development' type

Note: See TracTickets for help on using tickets.