Changes between Version 8 and Version 9 of ticket/0684


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

Legend:

Unmodified
Added
Removed
Modified
  • ticket/0684

    v8 v9  
    311311}}} 
    312312 
    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. 
     313=== Step 7 === Back to the Rivers branch. By popular demand this branch is to be included regardless of any future algorithmic changes required. The branch required some 
     314tidying first to impose coding standards, update namelists and remove redundant variables. This was done first on the branch (see changes between DEV_R1821_Rivers@1938 and DEV_R1821_Rivers@1998). 
     315Changes on this branch were then added to the merge branch. Note this is now out of sequence since the merge branch includes trunk changes up to 1879 so some conflicts may occur. Fortunately, 
     316the trunk changes between 1821 and 1879 have minimal overlap with the changes on the Rivers branch so this is not a major concern: 
     317 
     318 
     319{{{ 
     320svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@1821 svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/DEV_R1821_Rivers 
     321 
     322<password> 
     323 
     324--- Merging r1822 through r1998 into '.': 
     325U    CONFIG/GYRE_LOBSTER/EXP00/namelist 
     326U    CONFIG/GYRE/EXP00/namelist 
     327U    CONFIG/ORCA2_LIM/EXP00/namelist 
     328U    CONFIG/ORCA2_LIM_PISCES/EXP00/namelist 
     329U    CONFIG/POMME/EXP00/namelist 
     330U    NEMO/OPA_SRC/DOM/closea.F90 
     331U    NEMO/OPA_SRC/DYN/sshwzv.F90 
     332U    NEMO/OPA_SRC/DYN/dynspg_flt.F90 
     333U    NEMO/OPA_SRC/DYN/dynspg_ts.F90 
     334U    NEMO/OPA_SRC/cla_div.F90 
     335U    NEMO/OPA_SRC/OBC/obcvol.F90 
     336U    NEMO/OPA_SRC/SBC/sbc_oce.F90 
     337Conflict discovered in 'NEMO/OPA_SRC/SBC/sbcfwb.F90'. 
     338Select: (p) postpone, (df) diff-full, (e) edit, (h) help for more options: p 
     339C    NEMO/OPA_SRC/SBC/sbcfwb.F90 
     340U    NEMO/OPA_SRC/SBC/sbcmod.F90 
     341Conflict discovered in 'NEMO/OPA_SRC/SBC/sbcrnf.F90'. 
     342Select: (p) postpone, (df) diff-full, (e) edit, (h) help for more options: p 
     343C    NEMO/OPA_SRC/SBC/sbcrnf.F90 
     344U    NEMO/OPA_SRC/BDY/bdyvol.F90 
     345U    NEMO/OPA_SRC/cla_dynspg.F90 
     346U    NEMO/OPA_SRC/ZDF/zdfkpp.F90 
     347U    NEMO/OPA_SRC/TRA/trasbc.F90 
     348U    NEMO/OPA_SRC/cla.F90 
     349U    NEMO/OPA_SRC/DIA/diafwb.F90 
     350U    NEMO/OPA_SRC/DIA/diawri.F90 
     351U    NEMO/OPA_SRC/DIA/diawri_dimg.h90 
     352}}} 
     353 
     354The two conflicts were easily resolved and the code committed to the repository: 
     355 
     356{{{ 
     357svn ci -m"ticket #684 step 7: Add in changes between the head of the DEV_r1821_Rivers branch and the trunk@1821. Note untested changes were made to the Rivers branch before this merge see wiki ticket page for details" 
     358}}} 
     359 
     360=== 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 
     361 
     362=== Step 9 === The code merging is now complete. Step 9 is to compile and then to run it through the Nemo Validation ToolKit. 
    315363 
    316364=== Testing ===