Changes between Version 4 and Version 5 of ticket/1006_dev_NOC_2012_rev3555

Timestamp:

2012-11-22T16:38:32+01:00 (11 years ago)

Author:

acc

Comment:

--

ticket/1006_dev_NOC_2012_rev3555

@@ -704 +704 @@
 }}}
 
-This completes the NOCS merge. 
+This completes the '''NOCS''' merge. 
+
+'''Step 9'''. Merge in trunk changes between trunk@3385 and trunk@3452. Check-in changes if no conflicts arise
+
+{{{
+svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@3385 \
+          svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@3452 \
+          ./
+
+--- Merging r3386 through r3452 into '.':
+U    NEMOGCM/TOOLS/SECTIONS_DIADCT/src/compute_sections.f90
+U    NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist_pisces
+U    NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/namelist_pisces
+A    NEMOGCM/ARCH/CNRS/arch-ifort_CICLAD.fcm
+U    NEMOGCM/NEMO/OFF_SRC/domain.F90
+U    NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90
+U    NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90
+Conflict discovered in 'NEMOGCM/NEMO/OPA_SRC/DOM/closea.F90'.
+Select: (p) postpone, (df) diff-full, (e) edit,
+        (mc) mine-conflict, (tc) theirs-conflict,
+        (s) show all options: p
+C    NEMOGCM/NEMO/OPA_SRC/DOM/closea.F90
+U    NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90
+U    NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90
+U    NEMOGCM/NEMO/OPA_SRC/lib_fortran.F90
+U    NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90
+U    NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90
+Conflict discovered in 'NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90'.
+Select: (p) postpone, (df) diff-full, (e) edit,
+        (mc) mine-conflict, (tc) theirs-conflict,
+        (s) show all options: p
+C    NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90
+U    NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90
+U    NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90
+U    NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90
+U    NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso_grif.F90
+U    NEMOGCM/NEMO/OPA_SRC/TRD/trdtra.F90
+U    NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90
+U    NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90
+U    NEMOGCM/NEMO/TOP_SRC/PISCES/p4zsink.F90
+U    NEMOGCM/NEMO/TOP_SRC/TRP/trczdf.F90
+U    NEMOGCM/NEMO/TOP_SRC/TRP/trdmod_trc.F90
+Summary of conflicts:
+  Text conflicts: 2
+
+}}}
+
+Resolved conflicts. 1 minor one in sbcmod.F90. 1 slightly trickier one in closea.F90.
+
+{{{
+
+svn ci -m"Branch dev_NOC_2012_r3555. #1006. Step 9: Merge in trunk changes between revision 3385 and 3452"
+ 
+Sending        .
+Adding         NEMOGCM/ARCH/CNRS/arch-ifort_CICLAD.fcm
+Sending        NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS.fcm
+Sending        NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS_MPT.fcm
+Sending        NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS_SETTE.fcm
+Sending        NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/namelist_pisces
+Sending        NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist_pisces
+Sending        NEMOGCM/CONFIG/cfg.txt
+Sending        NEMOGCM/NEMO/OFF_SRC/domain.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/DOM/closea.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso_grif.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/TRD/trdtra.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/lib_fortran.F90
+Sending        NEMOGCM/NEMO/TOP_SRC/PISCES/p4zsink.F90
+Sending        NEMOGCM/NEMO/TOP_SRC/TRP/trczdf.F90
+Sending        NEMOGCM/NEMO/TOP_SRC/TRP/trdmod_trc.F90
+Sending        NEMOGCM/TOOLS/SECTIONS_DIADCT/src/compute_sections.f90
+Transmitting file data .......................
+Committed revision 3632.
+}}}