Changeset 11799 for NEMO/branches/2019/dev_r11470_HPC_12_mpi3/doc/latex/NEMO/main

Timestamp:

2019-10-25T16:27:34+02:00 (5 years ago)

Author:

mocavero

Message:

Update the branch to v4.0.1 of the trunk

Location:

NEMO/branches/2019/dev_r11470_HPC_12_mpi3/doc

Files:

• . (modified) (1 prop)
• latex (modified) (1 prop)
• latex/NEMO (modified) (1 prop)
• latex/NEMO/main/NEMO_manual.ist (deleted)
• latex/NEMO/main/abstract.tex (copied) (copied from NEMO/trunk/doc/latex/NEMO/main/abstract.tex)
• latex/NEMO/main/appendices.tex (modified) (2 diffs)
• latex/NEMO/main/authors.tex (copied) (copied from NEMO/trunk/doc/latex/NEMO/main/authors.tex)
• latex/NEMO/main/bibliography.bib (modified) (2 diffs)
• latex/NEMO/main/chapters.tex (modified) (1 diff)
• latex/NEMO/main/definitions.tex (deleted)
• latex/NEMO/main/foreword.tex (deleted)
• latex/NEMO/main/introduction.tex (copied) (copied from NEMO/trunk/doc/latex/NEMO/main/introduction.tex)
• latex/NEMO/main/settings.tex (copied) (copied from NEMO/trunk/doc/latex/NEMO/main/settings.tex)
• latex/NEMO/main/thanks.tex (deleted)

NEMO/branches/2019/dev_r11470_HPC_12_mpi3/doc/latex/NEMO/main/appendices.tex

@@ -1 +1 @@
 
-\subfile{../subfiles/annex_A}             %% Generalised vertical coordinate
-\subfile{../subfiles/annex_B}             %% Diffusive operator
-\subfile{../subfiles/annex_C}             %% Discrete invariants of the eqs.
-\subfile{../subfiles/annex_iso}            %% Isoneutral diffusion using triads
-\subfile{../subfiles/annex_DOMAINcfg}     %% Brief notes on DOMAINcfg
+\subfile{../subfiles/apdx_s_coord}      %% A. Generalised vertical coordinate
+\subfile{../subfiles/apdx_diff_opers}   %% B. Diffusive operators
+\subfile{../subfiles/apdx_invariants}   %% C. Discrete invariants of the eqs.
+\subfile{../subfiles/apdx_triads}       %% D. Isoneutral diffusion using triads
+\subfile{../subfiles/apdx_DOMAINcfg}    %% E. Brief notes on DOMAINcfg
 
 %% Not included
@@ -10 +10 @@
 %\subfile{../subfiles/chap_DIU}
 %\subfile{../subfiles/chap_conservation}
-%\subfile{../subfiles/annex_E}            %% Notes on some on going staff
-
+%\subfile{../subfiles/apdx_algos}   %% Notes on some on going staff

NEMO/branches/2019/dev_r11470_HPC_12_mpi3/doc/latex/NEMO/main/bibliography.bib

@@ -1614 +1614 @@
 }
 
+@article{         kraus.turner_tellus67,
+  author = {Kraus, E.B. and Turner, J.},
+  journal = {Tellus},
+  pages = {98--106},
+  title = {A one dimensional model of the seasonal thermocline {II}. {T}he general theory and its consequences},
+  volume = {19},
+  year = {1967}
+}
+
+@article{        large.ea_RG97,
+  author        = "Large, W. G. and McWilliams, J. C. and Doney, S. C.",
+  doi           = "10.1029/94RG01872",
+  journal       = "Reviews of Geophysics",
+  number        = {4},
+  pages         = {363--403},
+  publisher     = {AGU},
+  title         = "Oceanic vertical mixing: {A} review and a model with a nonlocal boundary layer parameterization",
+  year          = "1994"
+}
+
 @techreport{      large.yeager_rpt04,
   title         = "Diurnal to decadal global forcing for ocean and sea-ice
@@ -2184 +2204 @@
 }
 
+@article{mcwilliams.ea_JFM97,
+   author = {McWilliams, James C. and Sullivan, Peter P. and Moeng, Chin-Hoh},
+   doi = {10.1017/S0022112096004375},
+   journal = {Journal of Fluid Mechanics},
+   pages = {1--30},
+   title = {Langmuir turbulence in the ocean},
+   volume = {334},
+   year = {1997},
+}
 @article{         mellor.blumberg_JPO04,
   title         = "Wave Breaking and Ocean Surface Layer Thermal Response",

NEMO/branches/2019/dev_r11470_HPC_12_mpi3/doc/latex/NEMO/main/chapters.tex

@@ -1 @@
-\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_CONFIG}         %% Predefined configurations
+\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}