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 13846 – NEMO

Changeset 13846


Ignore:
Timestamp:
2020-11-20T19:23:21+01:00 (3 years ago)
Author:
nicolasmartin
Message:

#2414 Cleaning of few residuals of the resolving process

Location:
NEMO/branches/2020/dev_r13787_doc_latex_recovery/doc/latex/NEMO/main
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2020/dev_r13787_doc_latex_recovery/doc/latex/NEMO/main/bibliography.bib

    r13845 r13846  
    31343134  doi           = "10.1029/92jc00911" 
    31353135} 
    3136 <<<<<<< .working 
    31373136 
    31383137@article{large.yeager_CD09, 
     
    32053204  doi = "10.1029/2005gl023030" 
    32063205} 
    3207  
    3208 ======= 
    3209 >>>>>>> .merge-right.r12376 
  • NEMO/branches/2020/dev_r13787_doc_latex_recovery/doc/latex/NEMO/main/chapters.tex

    r13845 r13846  
    1 <<<<<<< .working 
    2 <<<<<<< .working 
    3 \subfile{../subfiles/introduction}        %% Introduction 
    4 \subfile{../subfiles/chap_model_basics} 
    5 \subfile{../subfiles/chap_time_domain}    %% Time discretisation (time stepping strategy) 
    6 \subfile{../subfiles/chap_DOM}            %% Space discretisation 
    7 \subfile{../subfiles/chap_TRA}            %% Tracer advection/diffusion equation 
    8 \subfile{../subfiles/chap_DYN}            %% Dynamics : momentum equation 
    9 \subfile{../subfiles/chap_SBC}            %% Surface Boundary Conditions 
    10 \subfile{../subfiles/chap_LBC}            %% Lateral Boundary Conditions 
    11 \subfile{../subfiles/chap_LDF}            %% Lateral diffusion 
    12 \subfile{../subfiles/chap_ZDF}            %% Vertical diffusion 
    13 \subfile{../subfiles/chap_DIA}            %% Outputs and Diagnostics 
    14 \subfile{../subfiles/chap_OBS}            %% Observation operator 
    15 \subfile{../subfiles/chap_ASM}            %% Assimilation increments 
    16 \subfile{../subfiles/chap_STO}            %% Stochastic param. 
    17 \subfile{../subfiles/chap_misc}           %% Miscellaneous topics 
    18 \subfile{../subfiles/chap_cfgs}         %% Predefined configurations 
    19 ======= 
    201\subfile{../subfiles/chap_model_basics}   %% 1. 
    212\subfile{../subfiles/chap_time_domain}    %% 2.  Time discretisation (time stepping strategy) 
     
    3819%\subfile{../subfiles/chap_DIU} 
    3920%\subfile{../subfiles/chap_conservation} 
    40 >>>>>>> .merge-right.r12376 
    41 ======= 
    42 \subfile{../subfiles/chap_model_basics}   %% 1. 
    43 \subfile{../subfiles/chap_time_domain}    %% 2.  Time discretisation (time stepping strategy) 
    44 \subfile{../subfiles/chap_DOM}            %% 3.  Space discretisation 
    45 \subfile{../subfiles/chap_TRA}            %% 4.  Tracer advection/diffusion equation 
    46 \subfile{../subfiles/chap_DYN}            %% 5.  Dynamics : momentum equation 
    47 \subfile{../subfiles/chap_SBC}            %% 6.  Surface Boundary Conditions 
    48 \subfile{../subfiles/chap_LBC}            %% 7.  Lateral Boundary Conditions 
    49 \subfile{../subfiles/chap_LDF}            %% 8.  Lateral diffusion 
    50 \subfile{../subfiles/chap_ZDF}            %% 9.  Vertical diffusion 
    51 \subfile{../subfiles/chap_DIA}            %% 10. Outputs and Diagnostics 
    52 \subfile{../subfiles/chap_OBS}            %% 11. Observation operator 
    53 \subfile{../subfiles/chap_ASM}            %% 12. Assimilation increments 
    54 \subfile{../subfiles/chap_STO}            %% 13. Stochastic param. 
    55 \subfile{../subfiles/chap_misc}           %% 14. Miscellaneous topics 
    56 \subfile{../subfiles/chap_cfgs}           %% 15. Predefined configurations 
    57  
    58 %% Not included 
    59 %\subfile{../subfiles/chap_model_basics_zstar} 
    60 %\subfile{../subfiles/chap_DIU} 
    61 %\subfile{../subfiles/chap_conservation} 
    62 >>>>>>> .merge-right.r12376 
Note: See TracChangeset for help on using the changeset viewer.