merge INGV and MERCATOR 2011 brnaches:


'''step 1: create the branch dev_MERCATOR_INGV_2011_MER'''

create the branch dev_MERCATOR_INGV_2011_MERGE by copying dev_MERCATOR_2011_MERGE in dev_MERCATOR_INGV_2011_MERGE


{{{
svn copy svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_MERCATOR_2011_MERGE \
         svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_MERCATOR_INGV_2011_MERGE \
-m "create branch for merge MERCATOR and INGV"
}}}



'''step 2: domwload this branch'''

{{{
svn co svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_MERCATOR_INGV_2011_MERGE dev_MERCATOR_INGV_2011_MERGE
}}}


'''step 3: merge in dev_MERCATOR_INGV_2011_MERGE INGV branch (  dev_INGV_2011)''' 



{{{
svn merge -r2855:3007    svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_INGV_2011 \
          dev_MERCATOR_INGV_2011_MERGE 
}}}


{{{
--- Merging r2803 through r3007 into 'dev_MERCATOR_INGV_2011_MERGE':
U    dev_MERCATOR_INGV_2011_MERGE/DOC/TexFiles/Biblio/Biblio.bib
U    dev_MERCATOR_INGV_2011_MERGE/DOC/TexFiles/Chapters/Chap_SBC.tex
U    dev_MERCATOR_INGV_2011_MERGE/DOC/TexFiles/Chapters/Chap_ZDF.tex
A    dev_MERCATOR_INGV_2011_MERGE/DOC/TexFiles/Namelist/namsbc_wave
U    dev_MERCATOR_INGV_2011_MERGE/DOC/TexFiles/Namelist/namsbc
A    dev_MERCATOR_INGV_2011_MERGE/DOC/TexFiles/Namelist/namsbc_ecmwf
U    dev_MERCATOR_INGV_2011_MERGE/DOC/TexFiles/Namelist/namzdf_ric
U    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/CONFIG/GYRE/EXP00/namelist
U    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist
U    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist
U    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/CONFIG/POMME/EXP00/namelist
A    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90
U    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90
U    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90
U    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_core.F90
A    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_ecmwf.F90
U    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfric.F90
U    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/LIM_SRC_2/limistate_2.F90
U    dev_MERCATOR_INGV_2011_MERGE/NEMOGCM/NEMO/LIM_SRC_2/iceini_2.F90
}}}


'''step 4. commit changes from INGV'''

{{{
svn ci -m "commit changes from dev_INGV_2011"

}}}


{{{
Sending        DOC/TexFiles/Biblio/Biblio.bib
Sending        DOC/TexFiles/Chapters/Chap_SBC.tex
Sending        DOC/TexFiles/Chapters/Chap_ZDF.tex
Sending        DOC/TexFiles/Namelist/namsbc
Adding         DOC/TexFiles/Namelist/namsbc_ecmwf
Adding         DOC/TexFiles/Namelist/namsbc_wave
Sending        DOC/TexFiles/Namelist/namzdf_ric
Sending        NEMOGCM/CONFIG/GYRE/EXP00/namelist
Sending        NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist
Sending        NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist
Sending        NEMOGCM/CONFIG/POMME/EXP00/namelist
Sending        NEMOGCM/NEMO/LIM_SRC_2/iceini_2.F90
Sending        NEMOGCM/NEMO/LIM_SRC_2/limistate_2.F90
Sending        NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90
Sending        NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_core.F90
Adding         NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_ecmwf.F90
Sending        NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90
Adding         NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90
Sending        NEMOGCM/NEMO/OPA_SRC/ZDF/zdfric.F90
Transmitting file data ...............
Committed revision 3085.
}}}


remove a mistake: there was a copy of trunk in the branch:


{{{
svn rm trunk 
svn ci -m "remove a mistake"
Password: 
Deleting       trunk
}}}

'''step 5. Tests with SETTE'''

Mercator

restartability 1 proc: 

{{{
GYRE_LOBSTER  OK
ORCA2_LIM_PISCES
}}}


reproductibility: 

{{{
GYRE_LOBSTER 1_4 vs 2_2:
ORCA2_LIM_PISCES 4_4 vs 2_8:
}}}



INGV