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 @ 6210

Last change on this file since 6210 was 6140, checked in by timgraham, 8 years ago

Merge of branches/2015/dev_merge_2015 back into trunk. Merge excludes NEMOGCM/TOOLS/OBSTOOLS/ for now due to issues with the change of file type. Will sort these manually with further commits.

Branch merged as follows:
In the working copy of branch ran:
svn merge ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@HEAD
Small conflicts due to bug fixes applied to trunk since the dev_merge_2015 was copied. Bug fixes were applied to the branch as well so these were easy to resolve.
Branch committed at this stage

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/2015/dev_merge_2015
to merge the branch into the trunk and then commit - no conflicts at this stage.
  • Property svn:keywords set to Id
File size: 381 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_LIM3 OPA_SRC LIM_SRC_3 NST_SRC
10ORCA2_LIM OPA_SRC LIM_SRC_2 NST_SRC
11ORCA2_OFF_PISCES OPA_SRC OFF_SRC TOP_SRC
12GYRE OPA_SRC
Note: See TracBrowser for help on using the repository browser.