New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 12377 for NEMO/trunk/doc/latex/global/document.tex – NEMO

Ignore:
Timestamp:
2020-02-12T15:39:06+01:00 (4 years 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/document.tex

    r11693 r12377  
    11 
    2 %% ================================================================================================= 
    3 %% Template structure for reference manuals 
    4 %% ================================================================================================= 
     2%% ============================================================================== 
     3%% Template structure for reference manual 
     4%% ============================================================================== 
    55 
    66%% NEMO release version 
    7 \def \version{trunk} 
     7\def \version{4.0rc~} 
    88 
    99%% Preamble 
    10 %% ================================================================================================= 
     10%% ============================================================================== 
    1111 
    1212%% Document layout 
    13 \documentclass[fontsize = 10pt, twoside, abstract]{scrreprt} 
     13\documentclass[draft]{scrreprt} 
    1414 
    15 %% Load manual configuration 
    16 \input{../../global/prologue} 
     15%% Load the configuration of the manual 
     16\input{../main/definitions} 
     17 
     18%% Load global *.tex files 
     19\input{../../global/preamble} 
     20 
     21\dominitoc 
     22 
     23%% Launch the creation of the indexes 
     24\input{../../global/indexes} 
     25 
    1726 
    1827%% End of common preamble between main and sub-files 
    1928%% Override custom cmds for full manual compilation 
    20 \newcommand{\subinc}[1]{#1} 
    21 \newcommand{\subexc}[1]{} 
     29\newcommand{\onlyinsubfile}[1]{#1} 
     30\newcommand{\notinsubfile}[1]{} 
    2231 
    2332\begin{document} 
    2433 
    25 \renewcommand{\subinc}[1]{} 
    26 \renewcommand{\subexc}[1]{#1} 
     34\renewcommand{\onlyinsubfile}[1]{} 
     35\renewcommand{\notinsubfile}[1]{#1} 
     36 
     37\renewcommand{\biblio}{} 
     38\renewcommand{\pindex}{} 
    2739 
    2840 
    2941%% Frontmatter 
    30 %% ================================================================================================= 
     42%% ============================================================================== 
    3143 
    32 \pagenumbering{gobble}   %% Disable page numbering temporarily 
     44\pagenumbering{gobble} 
    3345 
    3446%% Title page 
    3547\input{../../global/frontpage} 
    3648 
    37 %% Footer for introductory parts (no header by cleaning default) 
    38 \ofoot[]{\engine\ Reference Manual} \ifoot[]{\pagemark} 
     49\maketitle 
     50\emptythanks 
    3951 
    4052%% Information page (2nd page) 
    4153\input{../../global/info_page} 
    4254 
    43 \listoffigures 
    44 \listoflistings 
    45 \listoftables 
    46  
    47 \clearpage 
    48  
     55%% Foreword 
     56%\frontmatter   %% Chapter numbering off and Roman numerals for page numbers 
    4957\pagenumbering{roman} 
    50 \ofoot[]{\engine\ Reference Manual} \ifoot[]{\pagemark} 
    51  
    52 \input{introduction} 
     58\input{foreword} 
    5359 
    5460%% Table of Contents 
    5561\tableofcontents 
     62\listoffigures 
     63\listoftables 
     64\listoflistings 
    5665 
    5766\clearpage 
     67%\end{document} 
    5868 
    5969 
    6070%% Mainmatter 
    61 %% ================================================================================================= 
     71%% ============================================================================== 
    6272 
    63 %% Headings for document body 
     73%\mainmatter   %% Chapter numbering on, page numbering is reset with Arabic numerals 
    6474\pagenumbering{arabic} 
    65 \lohead{Chap.\ \thechapter\ \leftmark} \rehead{Sect.\ \thesection\ \rightmark} 
    66 \ifoot[]{Page\ \pagemark\ of \pageref*{LastPage}} 
    6775 
    6876\include{chapters} 
    … …  
    7078 
    7179%% Appendix 
    72 %% ================================================================================================= 
     80%% ============================================================================== 
    7381 
    74 \appendix   %% Chapter numbering with letters by now 
    75 \lohead{Apdx\ \thechapter\ \leftmark} 
     82%% Chapter numbering is reset with letters now 
     83\appendix    
     84 
    7685\include{appendices} 
    77  
    78 %% Append coding rules for every manual 
    79 \input{../../global/coding_rules} 
    8086 
    8187 
    8288%% Backmatter 
    83 %% ================================================================================================= 
     89%% ============================================================================== 
    8490 
    85 %% Bibliography and indexes 
    86 \input{../../global/epilogue} 
     91%\backmatter   %% Chapter numbering off 
     92 
     93%% Bibliography 
     94\phantomsection 
     95\addcontentsline{toc}{chapter}{Bibliography} 
     96\bibliography{../main/bibliography} 
     97 
     98%% Index 
     99\clearpage 
     100\phantomsection 
     101\addcontentsline{toc}{chapter}{Indexes} 
     102\printindex[keys] 
     103\printindex[modules] 
     104\printindex[blocks] 
     105\printindex[parameters] 
     106\printindex[subroutines] 
    87107 
    88108\end{document} 
     109 
Note: See TracChangeset for help on using the changeset viewer.