Ignore:
Timestamp:
2020-02-12T15:39:06+01:00 (10 months ago)
Author:
acc
Message:

The big one. Merging all 2019 developments from the option 1 branch back onto the trunk.

This changeset reproduces 2019/dev_r11943_MERGE_2019 on the trunk using a 2-URL merge
onto a working copy of the trunk. I.e.:

svn merge —ignore-ancestry \

svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/NEMO/trunk \
svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/NEMO/branches/2019/dev_r11943_MERGE_2019 ./

The —ignore-ancestry flag avoids problems that may otherwise arise from the fact that
the merge history been trunk and branch may have been applied in a different order but
care has been taken before this step to ensure that all applicable fixes and updates
are present in the merge branch.

The trunk state just before this step has been branched to releases/release-4.0-HEAD
and that branch has been immediately tagged as releases/release-4.0.2. Any fixes
or additions in response to tickets on 4.0, 4.0.1 or 4.0.2 should be done on
releases/release-4.0-HEAD. From now on future 'point' releases (e.g. 4.0.2) will
remain unchanged with periodic releases as needs demand. Note release-4.0-HEAD is a
transitional naming convention. Future full releases, say 4.2, will have a release-4.2
branch which fulfills this role and the first point release (e.g. 4.2.0) will be made
immediately following the release branch creation.

2020 developments can be started from any trunk revision later than this one.

Location:
NEMO/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • NEMO/trunk

    • Property svn:externals
      •  

        old new  
        33^/utils/build/mk@HEAD         mk 
        44^/utils/tools@HEAD            tools 
        5 ^/vendors/AGRIF/dev@HEAD      ext/AGRIF 
         5^/vendors/AGRIF/dev_r11615_ENHANCE-04_namelists_as_internalfiles_agrif@HEAD      ext/AGRIF 
        66^/vendors/FCM@HEAD            ext/FCM 
        77^/vendors/IOIPSL@HEAD         ext/IOIPSL 
  • NEMO/trunk/doc/latex/global

    • Property svn:ignore set to
      *.aux
  • NEMO/trunk/doc/latex/global/new_cmds.tex

    r11693 r12377  
    22%% ============================================================================== 
    33 
    4 %% Same slanted font for NEMO and its core engines 
    5 \newcommand{\NEMO  }{\textsl{NEMO}} 
    6 \newcommand{\OPA   }{\textsl{OPA}} 
    7 \newcommand{\SIcube}{\textsl{SI$^3$}} 
    8 \newcommand{\TOP   }{\textsl{TOP}} 
    9 \newcommand{\PISCES}{\textsl{PISCES}} 
    10 \newcommand{\NEMOVAR}{\textsl{NEMOVAR}} 
     4%% Include references and index for compilation of single subfile  
     5\newcommand{\mtoc}{\minitoc} 
     6\newcommand{\biblio}{\bibliography{../main/bibliography}} 
     7\newcommand{\pindex}{\printindex} 
    118 
    12 %% Links for external components 
    13 \newcommand{\AGRIF}{\href{http://agrif.imag.fr}{AGRIF}} 
    14 \newcommand{\CICE }{\href{http://github.com/CICE-Consortium/CICE}{CICE}} 
    15 \newcommand{\OASIS}{\href{http://portal.enes.org/oasis}{OASIS}} 
    16 \newcommand{\XIOS }{\href{http://forge.ipsl.jussieu.fr/ioserver}{XIOS}} 
    17  
    18 %% Fortran in small capitals 
    19 \newcommand{\fortran}{\textsc{Fortran}} 
    20 \newcommand{\fninety}{\textsc{Fortran 90}} 
     9%% NEMO and Fortran in small capitals 
     10\newcommand{\NEMO}{\textsc{nemo}~} 
     11\newcommand{\fortran}{\textsc{Fortran}~} 
     12\newcommand{\fninety}{\textsc{Fortran 90}~} 
    2113 
    2214%% Common aliases 
     
    2618\newcommand{\ztilde}{\ensuremath{\tilde z}} 
    2719\newcommand{\stilde}{\ensuremath{\tilde s}} 
    28 \newcommand{\ie}{\ensuremath{i.e.}} 
    29 \newcommand{\eg}{\ensuremath{e.g.}} 
     20\newcommand{\ie}{\ensuremath{i.e.}~} 
     21\newcommand{\eg}{\ensuremath{e.g.}~} 
    3022 
    3123%% Inline maths 
     
    3325\newcommand{\rdt}{\Delta t} 
    3426 
    35 %% Gurvan's comments 
    36 \newcommand{\cmtgm}[1]{} 
     27%% Text env. for Gurvan 
     28\newcommand{\gmcomment}[1]{} 
    3729 
    3830%% Maths 
    3931\newcommand{\lt}{\left} 
    4032\newcommand{\rt}{\right} 
    41 \newcommand{\vect}[1]{\ensuremath{ \mathbf{#1} }} 
     33\newcommand{\vect}[1]{\ensuremath{\mathbf{#1}}} 
    4234\newcommand{\pd}[2][]{\ensuremath{\frac{\partial #1}{\partial #2}}} 
    4335 
    44 %% Convert chapter/section headings to lowercase 
    45 \renewcommand{\chaptermark}[1]{\markboth{#1}{}} 
    46 \renewcommand{\sectionmark}[1]{\markright{#1}{}} 
    47  
    48 %% Retrieve month name 
    49 \renewcommand{\today}{ 
    50   \ifcase \month\or January\or February\or March\or 
    51                     April\or   May\or      June\or 
    52                     July\or    August\or   September\or 
    53                     October\or November\or December 
    54   \fi, \number \year 
    55 } 
    56  
    57 %% Link to orcid profile 
    58 \newcommand{\orcid}[1]{\href{http://orcid.org/#1}{\textcolor{orcidcolor}\aiOrcidSquare}} 
    59  
    60 %% Workaround for \listoffigures 
    61 \DeclareRobustCommand{\triad}[6][]{\ensuremath{ {}_{#2}^{#3} { \mathbb{#4}_{#1} }_{#5}^{\,#6} }} 
    62  
    63 %% New command for ToC 
    64 \newcommand{\chaptertoc}[1][Table of contents]{% 
    65   \thispagestyle{empty} 
    66   \etocsettocstyle{\addsec*{#1}}{}% 
    67   \localtableofcontents% 
    68   \vfill 
    69 } 
     36%% Workaround for issue with \listoffigures 
     37\DeclareRobustCommand{\triad}[6][]{\ensuremath{{}_{#2}^{#3}{\mathbb{#4}_{#1}}_{#5}^{\,#6}}} 
Note: See TracChangeset for help on using the changeset viewer.