Changes between Version 8 and Version 9 of ticket/0883_MERCATOR_2011_MERGE

Timestamp:

2011-11-07T14:16:39+01:00 (12 years ago)

Author:

cbricaud

Comment:

--

ticket/0883_MERCATOR_2011_MERGE

@@ -131 +131 @@
 '''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
+}}}
+