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

Timestamp:

2011-11-07T14:23:25+01:00 (12 years ago)

Author:

cbricaud

Comment:

--

ticket/0883_MERCATOR_2011_MERGE

@@ -181 +181 @@
 }}}
 
+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
+}}}
+
+
+
+
+
+