'''2011 MERCATOR developments branch''' branchs to be merged: dev_r2787_MERCATOR2_tidalharm: create dat revision 2787 dev_r2787_MERCATOR3_tidalpot: create dat revision 2787 dev_r2802_MERCATOR9_floats: create dat revision 2802 dev_r2802_MERCATOR10_diadct: create dat revision 2802 '''step1''' {{{ svn copy svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2787 \ svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_MERCATOR_2011_MERGE \ -m "copy trunk rev 2787 in branch" }}} ==> "Committed revision 3045" '''step2: add changes form dev_r2787_MERCATOR2_tidalharm''' {{{ svn merge svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2787 \ svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_r2787_MERCATOR2_tidalharm \ dev_MERCATOR_2011_MERGE }}} {{{ --- Merging r2793 through r3045 into 'dev_MERCATOR_2011_MERGE': U dev_MERCATOR_2011_MERGE/DOC/TexFiles/Chapters/Chap_DIA.tex A dev_MERCATOR_2011_MERGE/DOC/TexFiles/Namelist/namdia_harm U dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef.xml U dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist U dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/step_oce.F90 A dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/tide_mod.F90 A dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/tide.h90 A dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/DIA/diaharm.F90 A dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/DIA/surdetermine.F90 U dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/step.F90 }}} {{{ svn ci -m "add changes from dev_r2787_MERCATOR2_tidalharm in dev_MERCATOR_2011_MERGE" }}} {{{ Sending DOC/TexFiles/Chapters/Chap_DIA.tex Adding DOC/TexFiles/Namelist/namdia_harm Sending NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef.xml Sending NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist Adding NEMOGCM/NEMO/OPA_SRC/DIA/diaharm.F90 Adding NEMOGCM/NEMO/OPA_SRC/DIA/surdetermine.F90 Adding NEMOGCM/NEMO/OPA_SRC/SBC/tide.h90 Adding NEMOGCM/NEMO/OPA_SRC/SBC/tide_mod.F90 Sending NEMOGCM/NEMO/OPA_SRC/step.F90 Sending NEMOGCM/NEMO/OPA_SRC/step_oce.F90 Transmitting file data ..... Committed revision 3046. }}} '''step3: add changes from dev_r2787_MERCATOR3_tidalpot ''' {{{ svn merge svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2787 \ svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_r2787_MERCATOR3_tidalpot \ dev_MERCATOR_2011_MERGE }}} {{{ --- Merging r2794 through r3046 into 'dev_MERCATOR_2011_MERGE': C dev_MERCATOR_2011_MERGE/DOC/TexFiles/Namelist/nam_tide G dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 G dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/step_oce.F90 C dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/tide_mod.F90 C dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/tide.h90 C dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/updtide.F90 C dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbctide.F90 G dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/step.F90 Summary of conflicts: Tree conflicts: 5 }}} Conflicts are solved. {{{ svn ci -m "add changes from dev_r2787_MERCATOR3_tidalpot" }}} '''step4. Merge in trunk changes between trunk@2787 and trunk@2802.''' {{{ svn merge svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2787 \ svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2802 \ ./ }}} {{{ --- Merging r2788 through r2802 into '.': U NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90 }}} '''step5: add changes from dev_r2802_MERCATOR10_diadct''' {{{ svn merge svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2802 \ svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_r2802_MERCATOR10_diadct \ dev_MERCATOR_2011_MERGE }}} {{{ --- Merging r2847 through r3048 into 'dev_MERCATOR_2011_MERGE': U dev_MERCATOR_2011_MERGE/DOC/NEMO_book.pdf U dev_MERCATOR_2011_MERGE/DOC/TexFiles/Figures/logo_MERCATOR.pdf Conflict discovered in 'dev_MERCATOR_2011_MERGE/DOC/TexFiles/Chapters/Chap_DIA.tex'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C dev_MERCATOR_2011_MERGE/DOC/TexFiles/Chapters/Chap_DIA.tex A dev_MERCATOR_2011_MERGE/DOC/TexFiles/Namelist/namdct A dev_MERCATOR_2011_MERGE/NEMOGCM/TOOLS/SECTIONS_DIADCT A dev_MERCATOR_2011_MERGE/NEMOGCM/TOOLS/SECTIONS_DIADCT/run A dev_MERCATOR_2011_MERGE/NEMOGCM/TOOLS/SECTIONS_DIADCT/run/list_sections.ascii_GYRE A dev_MERCATOR_2011_MERGE/NEMOGCM/TOOLS/SECTIONS_DIADCT/run/list_sections.ascii_exp A dev_MERCATOR_2011_MERGE/NEMOGCM/TOOLS/SECTIONS_DIADCT/run/list_sections.ascii_global A dev_MERCATOR_2011_MERGE/NEMOGCM/TOOLS/SECTIONS_DIADCT/run/namelist A dev_MERCATOR_2011_MERGE/NEMOGCM/TOOLS/SECTIONS_DIADCT/run/job.ksh A dev_MERCATOR_2011_MERGE/NEMOGCM/TOOLS/SECTIONS_DIADCT/src A dev_MERCATOR_2011_MERGE/NEMOGCM/TOOLS/SECTIONS_DIADCT/src/writesections.f90 A dev_MERCATOR_2011_MERGE/NEMOGCM/TOOLS/SECTIONS_DIADCT/src/compute_sections.f90 A dev_MERCATOR_2011_MERGE/NEMOGCM/TOOLS/SECTIONS_DIADCT/src/readsections.f90 A dev_MERCATOR_2011_MERGE/NEMOGCM/TOOLS/SECTIONS_DIADCT/src/sections_tools.f90 A dev_MERCATOR_2011_MERGE/NEMOGCM/TOOLS/SECTIONS_DIADCT/src/declarations.f90 A dev_MERCATOR_2011_MERGE/NEMOGCM/TOOLS/SECTIONS_DIADCT/src/diadct_sections.f90 A dev_MERCATOR_2011_MERGE/NEMOGCM/TOOLS/SECTIONS_DIADCT/src/readcoordmesh.f90 U dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/GYRE/EXP00/namelist U dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist Conflict discovered in 'dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist U dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/POMME/EXP00/namelist U dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 U dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/IOM/in_out_manager.F90 U dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/step_oce.F90 A dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90 U dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/step.F90 Summary of conflicts: Text conflicts: 2 }}} Conflicts are resolved by hand. {{{ svn resolved dev_MERCATOR_2011_MERGE/DOC/TexFiles/Chapters/Chap_DIA.tex svn resolved dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist }}} Commit: {{{ svn ci -m "add changes from dev_r2802_MERCATOR10_diadct" }}} {{{ Sending DOC/NEMO_book.pdf Sending DOC/TexFiles/Chapters/Chap_DIA.tex Sending DOC/TexFiles/Figures/logo_MERCATOR.pdf Adding DOC/TexFiles/Namelist/namdct 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/NST_SRC/agrif_opa_update.F90 Adding NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90 Sending NEMOGCM/NEMO/OPA_SRC/IOM/in_out_manager.F90 Sending NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 Sending NEMOGCM/NEMO/OPA_SRC/step.F90 Sending NEMOGCM/NEMO/OPA_SRC/step_oce.F90 Adding NEMOGCM/TOOLS/SECTIONS_DIADCT Adding NEMOGCM/TOOLS/SECTIONS_DIADCT/run Adding NEMOGCM/TOOLS/SECTIONS_DIADCT/run/job.ksh Adding NEMOGCM/TOOLS/SECTIONS_DIADCT/run/list_sections.ascii_GYRE Adding NEMOGCM/TOOLS/SECTIONS_DIADCT/run/list_sections.ascii_exp Adding NEMOGCM/TOOLS/SECTIONS_DIADCT/run/list_sections.ascii_global Adding NEMOGCM/TOOLS/SECTIONS_DIADCT/run/namelist Adding NEMOGCM/TOOLS/SECTIONS_DIADCT/src Adding NEMOGCM/TOOLS/SECTIONS_DIADCT/src/compute_sections.f90 Adding NEMOGCM/TOOLS/SECTIONS_DIADCT/src/declarations.f90 Adding NEMOGCM/TOOLS/SECTIONS_DIADCT/src/diadct_sections.f90 Adding NEMOGCM/TOOLS/SECTIONS_DIADCT/src/readcoordmesh.f90 Adding NEMOGCM/TOOLS/SECTIONS_DIADCT/src/readsections.f90 Adding NEMOGCM/TOOLS/SECTIONS_DIADCT/src/sections_tools.f90 Adding NEMOGCM/TOOLS/SECTIONS_DIADCT/src/writesections.f90 }}} '''step6: add changes from dev_r2802_MERCATOR9_floats''' {{{ svn merge svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2802 \ svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_r2802_MERCATOR9_floats\ dev_MERCATOR_2011_MERGE }}} {{{ --- Merging r2835 through r3050 into 'dev_MERCATOR_2011_MERGE': U dev_MERCATOR_2011_MERGE/DOC/TexFiles/Chapters/Chap_DIA.tex U dev_MERCATOR_2011_MERGE/DOC/TexFiles/Namelist/namflo U dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/GYRE/EXP00/iodef.xml U dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/GYRE/EXP00/namelist U dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist Conflict discovered in 'dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef.xml U dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist U dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/POMME/EXP00/namelist U dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 U dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90 U dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/IOM/in_out_manager.F90 U dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/FLO/flowri.F90 U dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/FLO/flo_oce.F90 U dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/FLO/floats.F90 A dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/FLO/florst.F90 U dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/FLO/flodom.F90 U dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/FLO/flo4rk.F90 Summary of conflicts: Text conflicts: 1 }}} Conflict resolved by hand. {{{ svn resolved dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef.xml Resolved conflicted state of 'dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef.xml' }}} Commit: {{{ svn ci -m "add changes from dev_r2802_MERCATOR9_floats" }}} {{{ Sending DOC/TexFiles/Chapters/Chap_DIA.tex Sending DOC/TexFiles/Namelist/namflo Sending NEMOGCM/CONFIG/GYRE/EXP00/iodef.xml Sending NEMOGCM/CONFIG/GYRE/EXP00/namelist Sending NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef.xml Sending NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist Sending NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist Sending NEMOGCM/CONFIG/POMME/EXP00/namelist Sending NEMOGCM/NEMO/OPA_SRC/FLO/flo4rk.F90 Sending NEMOGCM/NEMO/OPA_SRC/FLO/flo_oce.F90 Sending NEMOGCM/NEMO/OPA_SRC/FLO/floats.F90 Sending NEMOGCM/NEMO/OPA_SRC/FLO/flodom.F90 Adding NEMOGCM/NEMO/OPA_SRC/FLO/florst.F90 Sending NEMOGCM/NEMO/OPA_SRC/FLO/flowri.F90 Sending NEMOGCM/NEMO/OPA_SRC/IOM/in_out_manager.F90 Sending NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90 Sending NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 Transmitting file data ................ Committed revision 3051. }}} one commit was missing in dev_r2802_MERCATOR9_floats. after done it, re-merge: {{{ svn merge svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2802 \ svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_r2802_MERCATOR9_floats\ dev_MERCATOR_2011_MERGE }}} {{{ --- Merging r2835 through r3054 into 'dev_MERCATOR_2011_MERGE': U dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/GYRE_LOBSTER/EXP00/iodef.xml Conflict discovered in 'dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/GYRE/EXP00/namelist'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/GYRE/EXP00/namelist U dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/GYRE/cpp_GYRE.fcm Conflict discovered in 'dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist U dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist Conflict discovered in 'dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist U dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/cpp_ORCA2_LIM.fcm U dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/iodef.xml U dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/POMME/EXP00/iodef.xml Conflict discovered in 'dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/POMME/EXP00/namelist'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/POMME/EXP00/namelist U dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 U dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90 U dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/IOM/in_out_manager.F90 U dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/FLO/flo_oce.F90 U dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/FLO/floats.F90 C dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/FLO/florst.F90 U dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/FLO/flodom.F90 U dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/FLO/flo4rk.F90 Summary of conflicts: Text conflicts: 4 Tree conflicts: 1 }}} Conflict resolved by hand. svn resolved dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/GYRE/EXP00/namelist svn resolved dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist svn resolved dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist svn resolved dev_MERCATOR_2011_MERGE/NEMOGCM/CONFIG/POMME/EXP00/namelist svn resolved dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/FLO/florst.F90 '''step7. Merge in trunk changes between trunk@2802 and trunk@2855''' {{{ svn merge svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2802 \ svn+ssh://cbricaud@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2855 \ ./ }}} {{{ --- Merging r2803 through r2855 into '.': U NEMOGCM/NEMO/LIM_SRC_2/limistate_2.F90 U NEMOGCM/NEMO/LIM_SRC_2/iceini_2.F90 }}} '''step 8. Tests with SETTE''' restartability 1 proc: {{{ GYRE_LOBSTER: ok ORCA2_LIM_PISCES : ok }}} reproductibility: {{{ GYRE_LOBSTER 1_4 vs 2_2:ok ORCA2_LIM_PISCES 4_4 vs 2_8: ok POMME 1_4 vs 2_2:ok }}}