Changes between Version 7 and Version 8 of ticket/0684


Ignore:
Timestamp:
2010-06-29T17:39:28+02:00 (10 years ago)
Author:
acc
Comment:

Legend:

Unmodified
Added
Removed
Modified
  • ticket/0684

    v7 v8  
    273273 
    274274}}} 
    275  
     275=== Step 6 === is to merge in the changes between the head of the DEV_1879_mpp_rep branch and the trunk@1879 
     276 
     277 
     278{{{ 
     279svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@1879 \ 
     280          svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/DEV_1879_mpp_rep ./ 
     281 
     282<password> 
     283 
     284--- Merging r1880 through r1975 into '.': 
     285U    CONFIG/GYRE_LOBSTER/EXP00/namelist 
     286U    CONFIG/GYRE/EXP00/namelist 
     287U    CONFIG/ORCA2_LIM/EXP00/1_namelist 
     288U    CONFIG/ORCA2_LIM/EXP00/namelist 
     289U    CONFIG/ORCA2_LIM_PISCES/EXP00/namelist 
     290U    CONFIG/POMME/EXP00/namelist 
     291U    NEMO/OPA_SRC/DOM/dom_oce.F90 
     292U    NEMO/OPA_SRC/DOM/domain.F90 
     293U    NEMO/OPA_SRC/IOM/in_out_manager.F90 
     294U    NEMO/OPA_SRC/DYN/dynspg_flt.F90 
     295U    NEMO/OPA_SRC/SOL/solpcg.F90 
     296U    NEMO/OPA_SRC/SOL/solver.F90 
     297U    NEMO/OPA_SRC/SOL/solsor.F90 
     298U    NEMO/OPA_SRC/SBC/sbcana.F90 
     299U    NEMO/OPA_SRC/SBC/sbcfwb.F90 
     300U    NEMO/OPA_SRC/lib_mpp.F90 
     301U    NEMO/OPA_SRC/opa.F90 
     302U    NEMO/LIM_SRC_2/limdyn_2.F90 
     303U    NEMO/LIM_SRC_3/limdyn.F90 
     304 
     305}}} 
     306 
     307Still no conflicts. Commit these changes. 
     308 
     309{{{ 
     310svn ci -m"ticket #684 step 6: Add in changes between the head of the DEV_r1879_mpp_rep branch and the trunk@1879." 
     311}}} 
     312 
     313 
     314=== Step 7 === The code merging is now complete. Step 7 is to compile and then to run it through the Nemo Validation ToolKit. 
    276315 
    277316=== Testing ===