Changeset 12707 for NEMO

Timestamp:

2020-04-07T18:46:56+02:00 (4 years ago)

Author:

mathiot

Message:

NEMO_4.0.2_ENHANCE-02_ISF_nemo: in sync with release_4.0.2 (svn merge -r 12376:12389 ^{/NEMO/releases/release-4.0.2@12390)}

Location:

NEMO/branches/UKMO/NEMO_4.0.2_ENHANCE-02_ISF_nemo

Files:

• . (modified) (1 prop)
• INSTALL.rst (modified) (1 diff)
• doc/latex/global/document.tex (modified) (1 diff)
• doc/latex/global/frontpage.tex (modified) (1 diff)
• doc/latex/global/packages.tex (modified) (1 diff)
• doc/rst/source/conf.py (modified) (1 diff)

NEMO/branches/UKMO/NEMO_4.0.2_ENHANCE-02_ISF_nemo

@@ -1 @@
-^/utils/build/arch@HEAD       arch
-^/utils/build/makenemo@HEAD   makenemo
-^/utils/build/mk@HEAD         mk
-^/utils/tools@HEAD            tools
-^/vendors/AGRIF/dev@HEAD      ext/AGRIF
-^/vendors/FCM@HEAD            ext/FCM
-^/vendors/IOIPSL@HEAD         ext/IOIPSL
+^/utils/build/arch@12130      arch
+^/utils/build/makenemo@12191  makenemo
+^/utils/build/mk@11662        mk
+^/utils/tools@12273           tools
+^/vendors/AGRIF/dev@10586     ext/AGRIF
+^/vendors/FCM@10134           ext/FCM
+^/vendors/IOIPSL@9655         ext/IOIPSL

@@ -1 @@
-^/utils/build/arch@HEAD       arch
-^/utils/build/makenemo@HEAD   makenemo
-^/utils/build/mk@HEAD         mk
-^/utils/tools@HEAD            tools
-^/vendors/AGRIF/dev@HEAD      ext/AGRIF
-^/vendors/FCM@HEAD            ext/FCM
-^/vendors/IOIPSL@HEAD         ext/IOIPSL
+^/utils/build/arch@12130      arch
+^/utils/build/makenemo@12191  makenemo
+^/utils/build/mk@11662        mk
+^/utils/tools@12273           tools
+^/vendors/AGRIF/dev@10586     ext/AGRIF
+^/vendors/FCM@10134           ext/FCM
+^/vendors/IOIPSL@9655         ext/IOIPSL

NEMO/branches/UKMO/NEMO_4.0.2_ENHANCE-02_ISF_nemo/INSTALL.rst

@@ -122 +122 @@
 .. code:: console
 
-   $ svn co https://forge.ipsl.jussieu.fr/nemo/svn/NEMO/trunk
+   $ svn co https://forge.ipsl.jussieu.fr/nemo/svn/NEMO/releases/release-4.0.2
 
 Description of 1\ :sup:`st` level tree structure

NEMO/branches/UKMO/NEMO_4.0.2_ENHANCE-02_ISF_nemo/doc/latex/global/document.tex

@@ -5 +5 @@
 
 %% NEMO release version
-\def \version{trunk}
+\def \version{4.0.2}
 
 %% Preamble

NEMO/branches/UKMO/NEMO_4.0.2_ENHANCE-02_ISF_nemo/doc/latex/global/frontpage.tex

@@ -32 +32 @@
   \begin{center}
     \LARGE Version \version\ -\ \today \\
-    \medskip
-    \href{http://doi.org/10.5281/zenodo.\zid}{ \includegraphics{badges/zenodo.\zid} }
+%    \medskip
+%    \href{http://doi.org/10.5281/zenodo.\zid}{ \includegraphics{badges/zenodo.\zid} }
   \end{center}
 

NEMO/branches/UKMO/NEMO_4.0.2_ENHANCE-02_ISF_nemo/doc/latex/global/packages.tex

@@ -9 +9 @@
 
 %% customization (layout, header/footer styles & contents, background)
-\usepackage{draftwatermark}
+%\usepackage{draftwatermark}
 \usepackage[margin = 2cm]{geometry}
 \usepackage[pages = some]{background}   %% 'some' for title page

NEMO/branches/UKMO/NEMO_4.0.2_ENHANCE-02_ISF_nemo/doc/rst/source/conf.py

@@ -50 +50 @@
 #
 # The short X.Y version.
-version = 'trk'
+version = '4.0'
 # The full version, including alpha/beta/rc tags.
-release = 'trunk'
+release = '4.0.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation

@@ -1 @@
-^/utils/build/arch@HEAD       arch
-^/utils/build/makenemo@HEAD   makenemo
-^/utils/build/mk@HEAD         mk
-^/utils/tools@HEAD            tools
-^/vendors/AGRIF/dev@HEAD      ext/AGRIF
-^/vendors/FCM@HEAD            ext/FCM
-^/vendors/IOIPSL@HEAD         ext/IOIPSL
+^/utils/build/arch@12130      arch
+^/utils/build/makenemo@12191  makenemo
+^/utils/build/mk@11662        mk
+^/utils/tools@12273           tools
+^/vendors/AGRIF/dev@10586     ext/AGRIF
+^/vendors/FCM@10134           ext/FCM
+^/vendors/IOIPSL@9655         ext/IOIPSL