New URL for NEMO forge!   http://forge.nemo-ocean.eu

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.
cfg.txt in trunk/NEMOGCM/CONFIG – NEMO

source: trunk/NEMOGCM/CONFIG/cfg.txt @ 4990

Last change on this file since 4990 was 4990, checked in by timgraham, 9 years ago

Merged branches/2014/dev_MERGE_2014 back onto the trunk as follows:

In the working copy of branch ran:
svn merge svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@HEAD
1 conflict in LIM_SRC_3/limdiahsb.F90
Resolved by keeping the version from dev_MERGE_2014 branch
and commited at r4989

In working copy run:
svn switch svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk
to switch working copy

Run:
svn merge --reintegrate svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2014/dev_MERGE_2014
to merge the branch into the trunk - no conflicts at this stage.

  • Property svn:keywords set to Id
File size: 396 bytes
Line 
1GYRE_PISCES OPA_SRC TOP_SRC
2ORCA2_LIM_CFC_C14b OPA_SRC LIM_SRC_2 NST_SRC TOP_SRC
3GYRE_XIOS OPA_SRC
4ORCA2_SAS_LIM OPA_SRC SAS_SRC LIM_SRC_2 NST_SRC
5C1D_PAPA OPA_SRC
6GYRE_BFM OPA_SRC TOP_SRC
7AMM12 OPA_SRC
8ORCA2_LIM_PISCES OPA_SRC LIM_SRC_2 NST_SRC TOP_SRC
9ORCA2_OFF_PISCES OPA_SRC OFF_SRC TOP_SRC
10ISOMIP OPA_SRC
11GYRE OPA_SRC
12ORCA2_LIM3 OPA_SRC LIM_SRC_3 NST_SRC
13ORCA2_LIM OPA_SRC LIM_SRC_2 NST_SRC
Note: See TracBrowser for help on using the repository browser.