Changes between Version 9 and Version 10 of ticket/0684


Ignore:
Timestamp:
2010-07-09T13:51:43+02:00 (10 years ago)
Author:
acc
Comment:

Legend:

Unmodified
Added
Removed
Modified
  • ticket/0684

    v9 v10  
    360360=== Step 8 === Final merge step is to merge in the trunk changes between trunk@1879 and trunk@1986 which is the point at which the 3.2.1 tag was made 
    361361 
     362 
     363{{{ 
     364svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@1879 svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@1986 
     365 
     366<password> 
     367 
     368--- Merging r1880 through r1986 into '.': 
     369U    CONFIG/GYRE_LOBSTER/scripts/BB_make 
     370U    CONFIG/GYRE/scripts/BB_make 
     371U    CONFIG/ORCA2_OFF_PISCES/scripts/BB_make 
     372U    CONFIG/ORCA2_LIM/IGCM00/COMP/opa9.card 
     373U    CONFIG/ORCA2_LIM/IGCM00/COMP/opa9.driver 
     374U    CONFIG/ORCA2_LIM/scripts/BB_make 
     375U    CONFIG/ORCA2_LIM_PISCES/scripts/BB_make 
     376U    CONFIG/POMME/scripts/BB_make 
     377U    UTIL/fait_AA_make 
     378U    NEMO/OFF_SRC/DOM/phycst.F90 
     379U    NEMO/OFF_SRC/lib_mpp.F90 
     380U    NEMO/OPA_SRC/DOM/dom_oce.F90 
     381U    NEMO/OPA_SRC/DOM/domvvl.F90 
     382U    NEMO/OPA_SRC/DOM/phycst.F90 
     383U    NEMO/OPA_SRC/DOM/domwri.F90 
     384U    NEMO/OPA_SRC/OBC/obcfla.F90 
     385U    NEMO/OPA_SRC/SBC/fldread.F90 
     386U    NEMO/OPA_SRC/lib_mpp.F90 
     387U    NEMO/OPA_SRC/TRA/trasbc.F90 
     388U    NEMO/OPA_SRC/DIA/diaar5.F90 
     389U    NEMO/LIM_SRC_2/limtrp_2.F90 
     390U    NEMO/LIM_SRC_2/limsbc_2.F90 
     391U    NEMO/LIM_SRC_2/limthd_2.F90 
     392U    NEMO/LIM_SRC_2/limmsh_2.F90 
     393U    NEMO/LIM_SRC_3/limmsh.F90 
     394U    NEMO/LIM_SRC_3/limtrp.F90 
     395}}} 
     396 
    362397=== Step 9 === The code merging is now complete. Step 9 is to compile and then to run it through the Nemo Validation ToolKit. 
    363398