Changeset 7646 for trunk/NEMOGCM

2017-02-06T10:25:03+01:00 (4 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:// .
2) Resolve minor conflicts in and namelist_cfg for ORCA2LIM3 (due to a change in trunk after branch was created)
3) svn commit
4) svn switch svn+ssh://
5) svn merge svn+ssh:// .
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 which was causing problems on the Paris machine.

43 deleted
342 edited
86 copied

Note: See TracChangeset for help on using the changeset viewer.