Changes between Version 10 and Version 11 of ticket/0684


Ignore:
Timestamp:
2010-07-09T14:52:09+02:00 (10 years ago)
Author:
acc
Comment:

Legend:

Unmodified
Added
Removed
Modified
  • ticket/0684

    v10 v11  
    395395}}} 
    396396 
     397{{{ 
     398svn ci -m"ticket #684 step 8: Add in changes from the trunk between revisions 1879 and the 3.2.1 tag (rev 1986)" 
     399}}} 
     400 
    397401=== Step 9 === The code merging is now complete. Step 9 is to compile and then to run it through the Nemo Validation ToolKit. 
     402 
     403First obvious problem is a missing module from the DEV_1879_mpp_rep branch. This was added at revision 2003 so merge it in now: 
     404 
     405{{{ 
     406svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/DEV_1879_mpp_rep@1920 svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/DEV_1879_mpp_rep@2003 
     407 
     408--- Merging r1921 through r2003 into '.': 
     409A    NEMO/OPA_SRC/lib_fortran.F90 
     410}}} 
    398411 
    399412=== Testing ===