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