Changeset 5086 for branches/2014/dev_r4650_UKMO3_masked_damping/DOC/NEMO_book.tex

Timestamp:

2015-02-17T10:06:39+01:00 (9 years ago)

Author:

timgraham

Message:

Merged head of trunk into branch in preparation for putting code back onto the trunk
In working copy ran the command:
svn merge svn+sshtimgraham@…/ipsl/forge/projets/nemo/svn/trunk

Also recompiled NEMO_book.pdf with merged input files

File:

• branches/2014/dev_r4650_UKMO3_masked_damping/DOC/NEMO_book.tex (modified) (2 diffs)

branches/2014/dev_r4650_UKMO3_masked_damping/DOC/NEMO_book.tex

@@ -215 +215 @@
 %\date{\today}
 \date{
-January 2012  \\
-{\small  -- version 3.4 --} \\
+November 2014  \\
+{\small  -- version 3.6 --} \\
 ~  \\
 \textit{\small Note du P\^ole de mod\'{e}lisation de l'Institut Pierre-Simon Laplace No 27 }\\
@@ -227 +227 @@
 \Large Gurvan Madec, and the NEMO team  \\
  \texttt{\small gurvan.madec@locean-ipsl.umpc.fr} \\
- \texttt{\small nemo\_st@hermes.locean-ipsl.umpc.fr} \\
+ \texttt{\small nemo\_st@locean-ipsl.umpc.fr} \\
 %{\small Laboratoire d'Oc\'{e}anographie  et du Climat: Exp\'{e}rimentation et Approches Num\'{e}riques }
 }