Changeset 13846

Timestamp:

2020-11-20T19:23:21+01:00 (4 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:

• bibliography.bib (modified) (2 diffs)
• chapters.tex (modified) (2 diffs)

NEMO/branches/2020/dev_r13787_doc_latex_recovery/doc/latex/NEMO/main/bibliography.bib

@@ -3134 +3134 @@
   doi           = "10.1029/92jc00911"
 }
-<<<<<<< .working
 
 @article{large.yeager_CD09,
@@ -3205 +3204 @@
   doi = "10.1029/2005gl023030"
 }
-
-=======
->>>>>>> .merge-right.r12376

NEMO/branches/2020/dev_r13787_doc_latex_recovery/doc/latex/NEMO/main/chapters.tex

@@ -1 @@
-<<<<<<< .working
-<<<<<<< .working
-\subfile{../subfiles/introduction}        %% Introduction
-\subfile{../subfiles/chap_model_basics}
-\subfile{../subfiles/chap_time_domain}    %% Time discretisation (time stepping strategy)
-\subfile{../subfiles/chap_DOM}            %% Space discretisation
-\subfile{../subfiles/chap_TRA}            %% Tracer advection/diffusion equation
-\subfile{../subfiles/chap_DYN}            %% Dynamics : momentum equation
-\subfile{../subfiles/chap_SBC}            %% Surface Boundary Conditions
-\subfile{../subfiles/chap_LBC}            %% Lateral Boundary Conditions
-\subfile{../subfiles/chap_LDF}            %% Lateral diffusion
-\subfile{../subfiles/chap_ZDF}            %% Vertical diffusion
-\subfile{../subfiles/chap_DIA}            %% Outputs and Diagnostics
-\subfile{../subfiles/chap_OBS}            %% Observation operator
-\subfile{../subfiles/chap_ASM}            %% Assimilation increments
-\subfile{../subfiles/chap_STO}            %% Stochastic param.
-\subfile{../subfiles/chap_misc}           %% Miscellaneous topics
-\subfile{../subfiles/chap_cfgs}         %% Predefined configurations
-=======
 \subfile{../subfiles/chap_model_basics}   %% 1.
 \subfile{../subfiles/chap_time_domain}    %% 2.  Time discretisation (time stepping strategy)
@@ -38 +19 @@
 %\subfile{../subfiles/chap_DIU}
 %\subfile{../subfiles/chap_conservation}
->>>>>>> .merge-right.r12376
-=======
-\subfile{../subfiles/chap_model_basics}   %% 1.
-\subfile{../subfiles/chap_time_domain}    %% 2.  Time discretisation (time stepping strategy)
-\subfile{../subfiles/chap_DOM}            %% 3.  Space discretisation
-\subfile{../subfiles/chap_TRA}            %% 4.  Tracer advection/diffusion equation
-\subfile{../subfiles/chap_DYN}            %% 5.  Dynamics : momentum equation
-\subfile{../subfiles/chap_SBC}            %% 6.  Surface Boundary Conditions
-\subfile{../subfiles/chap_LBC}            %% 7.  Lateral Boundary Conditions
-\subfile{../subfiles/chap_LDF}            %% 8.  Lateral diffusion
-\subfile{../subfiles/chap_ZDF}            %% 9.  Vertical diffusion
-\subfile{../subfiles/chap_DIA}            %% 10. Outputs and Diagnostics
-\subfile{../subfiles/chap_OBS}            %% 11. Observation operator
-\subfile{../subfiles/chap_ASM}            %% 12. Assimilation increments
-\subfile{../subfiles/chap_STO}            %% 13. Stochastic param.
-\subfile{../subfiles/chap_misc}           %% 14. Miscellaneous topics
-\subfile{../subfiles/chap_cfgs}           %% 15. Predefined configurations
-
-%% Not included
-%\subfile{../subfiles/chap_model_basics_zstar}
-%\subfile{../subfiles/chap_DIU}
-%\subfile{../subfiles/chap_conservation}
->>>>>>> .merge-right.r12376