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

Last change on this file since 7646 was 7646, checked in by timgraham, 7 years ago

Merge of dev_merge_2016 into trunk. UPDATE TO ARCHFILES NEEDED for XIOS2.
LIM_SRC_s/limrhg.F90 to follow in next commit due to change of kind (I'm unable to do it in this commit).
Merged using the following steps:

1) svn merge --reintegrate svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk .
2) Resolve minor conflicts in sette.sh and namelist_cfg for ORCA2LIM3 (due to a change in trunk after branch was created)
3) svn commit
4) svn switch svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk
5) svn merge svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2016/dev_merge_2016 .
6) At this stage I checked out a clean copy of the branch to compare against what is about to be committed to the trunk.
6) svn commit #Commit code to the trunk

In this commit I have also reverted a change to Fcheck_archfile.sh which was causing problems on the Paris machine.

  • Property svn:keywords set to Id
File size: 482 bytes
Line 
1GYRE_PISCES OPA_SRC TOP_SRC
2GYRE_XIOS OPA_SRC
3GYRE 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 OPA_SRC LIM_SRC_2 NST_SRC
9ORCA2_OFF_PISCES OPA_SRC OFF_SRC TOP_SRC
10ORCA2_LIM_PISCES OPA_SRC LIM_SRC_2 NST_SRC TOP_SRC
11ORCA2_OFF_TRC OPA_SRC OFF_SRC TOP_SRC
12ISOMIP OPA_SRC
13ORCA2_LIM3_PISCES OPA_SRC LIM_SRC_3 TOP_SRC NST_SRC
14ORCA2_LIM3 OPA_SRC LIM_SRC_3 NST_SRC
15ORCA2_SAS_LIM3 OPA_SRC SAS_SRC LIM_SRC_3 NST_SRC
Note: See TracBrowser for help on using the repository browser.