Ignore:
Timestamp:
2018-12-19T20:46:30+01:00 (21 months ago)
Author:
smasson
Message:

dev_r10164_HPC09_ESIWACE_PREP_MERGE: merge with trunk@10418, see #2133

Location:
NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/doc/latex
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/doc/latex

    • Property svn:ignore set to
      *.aux
      *.bbl
      *.blg
      *.dvi
      *.fdb*
      *.fls
      *.idx
      *.ilg
      *.ind
      *.log
      *.maf
      *.mtc*
      *.out
      *.pdf
      *.toc
      _minted-*
  • NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/doc/latex/NEMO

    • Property svn:ignore set to
      *.aux
      *.bbl
      *.blg
      *.dvi
      *.fdb*
      *.fls
      *.idx
      *.ilg
      *.ind
      *.log
      *.maf
      *.mtc*
      *.out
      *.pdf
      *.toc
      _minted-*
  • NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/doc/latex/NEMO/main

    • Property svn:ignore
      •  

        old new  
        33*.blg 
        44*.dvi 
         5*.fdb* 
         6*.fls 
        57*.idx 
        68*.ilg 
  • NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/doc/latex/NEMO/main/NEMO_manual.tex

    r10146 r10419  
    2525%% ============================================================================== 
    2626 
     27%% Trick to include biblio in subfile compilation 
     28\newcommand{\biblio}{ 
     29  \bibliographystyle{../main/ametsoc} 
     30  \bibliography{../main/NEMO_manual} 
     31} 
     32 
    2733\begin{document} 
     34 
     35%% Trick to include biblio in subfile compilation 
     36\def\biblio{} 
    2837 
    2938 
     
    3443 
    3544\title{ 
    36 \vspace{-6.0cm}\includegraphics[width=1.1\textwidth]{logo_ALL}          \\ 
    37 \vspace{ 5.1cm}\includegraphics[width=0.9\textwidth]{NEMO_logo_Black}   \\ 
     45%\vspace{-6.0cm}\includegraphics[width=1.1\textwidth]{logo_ALL}            \\ 
     46%\vspace{ 5.1cm}\includegraphics[width=0.9\textwidth]{NEMO_logo_Black}  \\ 
    3847\vspace{ 1.4cm}\rule{345pt}{1.5pt}                                      \\ 
    3948\vspace{0.45cm}{\Huge NEMO ocean engine}                                \\ 
     
    7180 
    7281 
    73 %% Abstract - Foreword 
     82%% Foreword 
    7483 
    75 \subfile{../subfiles/abstract_foreword} 
     84\subfile{../subfiles/foreword} 
    7685 
    7786 
Note: See TracChangeset for help on using the changeset viewer.