Index: /branches/2015/nemo_v3_6_STABLE/DOC/NEMO_book.tex
===================================================================
--- /branches/2015/nemo_v3_6_STABLE/DOC/NEMO_book.tex	(revision 6274)
+++ /branches/2015/nemo_v3_6_STABLE/DOC/NEMO_book.tex	(revision 6275)
@@ -215,5 +215,5 @@
 %\date{\today}
 \date{
-November 2015  \\
+January 2016  \\
 {\small  -- version 3.6 stable --} \\
 ~  \\
@@ -316,6 +316,6 @@
 \include{./TexFiles/Chapters/Annex_B}			% diffusive operator
 \include{./TexFiles/Chapters/Annex_C}			% Discrete invariants of the eqs.
+\include{./TexFiles/Chapters/Annex_ISO}	                  % Isoneutral diffusion using triads
 \include{./TexFiles/Chapters/Annex_D}			% Coding rules
-\include{./TexFiles/Chapters/Annex_ISO}	                  % Isoneutral diffusion using triads
 %\include{./TexFiles/Chapters/Annex_E}	                  % Notes on some on going staff (no included in the DOC)
 %\include{./TexFiles/Chapters/Annex_Fox-Kemper}   % Notes on Fox-Kemper (no included in the DOC)
Index: /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Biblio/Biblio.bib
===================================================================
--- /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Biblio/Biblio.bib	(revision 6274)
+++ /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Biblio/Biblio.bib	(revision 6275)
@@ -149,4 +149,17 @@
   volume = {36},
   pages = {1502--1522}
+}
+
+@ARTICLE{Artale_al_JGR02,
+  author={V. Artale and D. Iudicone and R. Santoleri and V. Rupolo and S. Marullo
+          and F. {D'O}rtenzio},
+  title={Role of surface fluxes in ocean general circulation models using satellite
+          sea surface temperature: Validation of and sensitivity to the forcing
+          frequency of the Mediterranean thermohaline circulation},
+  journal=JGR,
+  year={2002},
+  volume={107},
+  pages={1978-2012},
+  doi = {10.1029/2000JC000452},
 }
 
@@ -491,4 +504,27 @@
 }
 
+@article{Brankart_OM2013,
+author = "J.-M. Brankart",
+title = "Impact of uncertainties in the horizontal density gradient upon low resolution global ocean modelling ",
+journal = OM,
+year = "2013",
+volume = "66", pages = "64--76",
+issn = "1463-5003",
+doi = "http://dx.doi.org/10.1016/j.ocemod.2013.02.004",
+url = "http://www.sciencedirect.com/science/article/pii/S1463500313000309",
+}
+
+@Article{Brankart_al_GMD2015,
+AUTHOR = {Brankart, J.-M. and Candille, G. and Garnier, F. and Calone, C. and Melet, A. and Bouttier, P.-A. and Brasseur, P. and Verron, J.},
+TITLE = {A generic approach to explicit simulation of uncertainty in the NEMO ocean model},
+JOURNAL = {Geoscientific Model Development},
+VOLUME = {8},
+YEAR = {2015},
+NUMBER = {5},
+PAGES = {1285--1297},
+URL = {http://www.geosci-model-dev.net/8/1285/2015/},
+DOI = {10.5194/gmd-8-1285-2015}
+}
+
 @ARTICLE{Brodeau_al_OM09,
   author = {L. Brodeau and B. Barnier and A.-M. Tr\'{e}guier and T. Penduff and S. Gulev},
@@ -763,4 +799,12 @@
 }
 
+@PHDTHESIS{Demange_PhD2014,
+  author = {J. Demange},
+  title = {Sch\'{e}́mas num\'{e}́riques d'advection et de propagation d’ondes de gravit\'{e}́ 
+           dans les mod\`{e}les de circulation oc\'{e}́anique.},
+  school = {Doctorat es Applied Mathematiques, Grenoble University, France},
+  year = {2014},
+  pages = {138pp}
+}
 
 @ARTICLE{Dobricic_al_OS07,
@@ -983,5 +1027,5 @@
   author = {M. Farge},
   title = {Dynamique non lineaire des ondes et des tourbillons dans les equations de Saint Venant},
-  school = {Doctorat es Mathematiques, Paris VI University},
+  school = {Doctorat es Mathematiques, Paris VI University, France},
   year = {1987},
   pages = {401pp}
@@ -1059,4 +1103,16 @@
   volume = {20},  number = {1},
   pages = {150--155},
+}
+
+@Article{Gentemann_al_JGR09,
+  author = 	 {C. L. Gentemann  and P. J. Minnett and B. Ward},
+  title =        {Profiles of Ocean Surface heating ({POSH}): A new model 
+                  of upper ocean diurnal warming},
+  journal = 	 JGR,
+  year = 	 {2009},
+  Volume = 	 {114},
+  Pages = 	 {C07017},
+  doi = 	 {10.1029/2008JC004825},
+  OPTannote = 	 {}
 }
 
@@ -1357,4 +1413,13 @@
 }
 
+@ARTICLE{Holland1999, 
+  author = {D. Holland and A. Jenkins},
+  title = {Modeling Thermodynamic Ice-Ocean Interactions at the Base of an Ice Shelf},
+  journal = JPO,
+  year = {1999},
+  volume = {29},  
+  pages = {1787--1800},
+}
+
 @ARTICLE{HollowayOM86,
   author = {Greg Holloway},
@@ -1513,4 +1578,22 @@
 }
 
+@ARTICLE{Jenkins1991,
+  author = {A. Jenkins},
+  title = {A one-dimensional model of ice shelf-ocean interaction},
+  journal = JGR,
+  year = {1991},
+  volume = {96},  number = {C11},
+  pages = {2298--2312}
+}
+
+@ARTICLE{Jenkins2010,
+  author = {A. Jenkins},
+  title = {observation and parameterization of ablation at the base of Ronne Ice Shelf, Antarctica},
+  journal = JPO,
+  year = {2010},
+  volume = {40},  number = {10},
+  pages = {2298--2312}
+}
+
 @BOOK{Jerlov_Bk68,
   title = {Optical Oceanography},
@@ -1663,4 +1746,28 @@
 }
 
+@article{Lemarie_OM2012,
+author = "F. Lemari\'{e} and L. Debreu and A.F. Shchepetkin and J.C. McWilliams",
+title = "On the stability and accuracy of the harmonic and biharmonic isoneutral mixing operators in ocean models ",
+journal = OM,
+year = "2012",
+volume = "52–53", pages = "9--35",
+issn = "1463-5003",
+doi = "http://dx.doi.org/10.1016/j.ocemod.2012.04.007",
+url = "http://www.sciencedirect.com/science/article/pii/S1463500312000674",
+}
+
+
+@ARTICLE{Lemarie_OM2015,
+  author = {F. Lemari\'{e} and L. Debreu and J. Demange and  G. Madec and J.M. Molines and M. Honnorat},
+  title = {Stability Constraints for Oceanic Numerical Models: 
+           Implications for the Formulation of time and space Discretizations},
+  journal = OM,
+  year = {2015},
+  volume = {92}, 
+  pages = {124--148},
+  doi = {10.1016/j.ocemod.2015.06.006},
+  url = {http://dx.doi.org/10.1016/j.ocemod.2015.06.006}
+}
+
 @ARTICLE{Lermusiaux2001,
   author = {P. F. J. Lermusiaux},
@@ -1675,5 +1782,5 @@
   author = {M. L\'{e}vy},
   title = {Mod\'{e}lisation des processus biog\'{e}ochimiques en M\'{e}diterran\'{e}e
-	nord-occidentale. Cycle saisonnier et variabilit\'{e} m\'{e}so\'{e}chelle},
+	        nord-occidentale. Cycle saisonnier et variabilit\'{e} m\'{e}so\'{e}chelle},
   school = {Universit\'{e} Pierre et Marie Curie, Paris, France, 207pp},
   year = {1996}
@@ -1816,4 +1923,12 @@
 }
 
+@ARTICLE{Lele_JCP1992,
+  author = {S.K. Lele},
+  title = {Compact finite difference schemes with spectral-like resolution},
+  journal = JCP,
+  year = {1992},
+  volume = {103}, pages = {16--42}
+}
+
 @ARTICLE{Lengaigne_al_JC03,
   author = {M. Lengaigne and J.-P. Boulanger and C. Menkes and G. Madec and P.
@@ -1823,6 +1938,5 @@
   journal = JC,
   year = {2003},
-  volume = {16},  number = {20},
-  pages = {3330--3343}
+  volume = {16},  number = {20}, pages = {3330--3343}
 }
 
@@ -1920,4 +2034,12 @@
 }
 
+@ARTICLE{Losch2008,
+  author = {M. Losch},
+  title = {Modeling ice shelf cavities in a z coordinate ocean general circulation model},
+  journal = JGR,
+  year = {2008},
+  volume = {113},  number = {C13},
+}
+
 @TECHREPORT{Lott1989,
   author = {F. Lott and G. Madec},
@@ -2094,17 +2216,4 @@
   volume = {3},
   pages = {1--20}
-}
-
-
-@article{Martin_Adcroft_OM10,
-author = {T. Martin and A. Adcroft},
-title = {Parameterizing the fresh-water flux from land ice to ocean with interactive icebergs in a coupled climate model},
-journal = OM,
-year = {2010},
-volume = {34}, number = {3--4},
-pages = {111--124},
-issn = {1463-5003},
-doi = {10.1016/j.ocemod.2010.05.001},
-url = {http://dx.doi.org/10.1016/j.ocemod.2010.05.001}
 }
 
@@ -2120,4 +2229,28 @@
   doi = {10.1016/j.ocemod.2007.07.005},
   url = {http://dx.doi.org/10.1016/j.ocemod.2007.07.005}
+}
+
+@Article{Marsh_GMD2015,
+AUTHOR = {R. Marsh and V. O. Ivchenko and N. Skliris and S. Alderson and G. R. Bigg and G. Madec and A. T. Blaker and Y. Aksenov and B. Sinha and A. C. Coward and J. Le Sommer and N. Merino and V. B. Zalesny},
+TITLE = {NEMO-ICB (v1.0): interactive icebergs in the NEMO ocean model globally configured at eddy-permitting resolution},
+JOURNAL = {Geoscientific Model Development},
+VOLUME = {8},
+YEAR = {2015},
+NUMBER = {5},
+PAGES = {1547--1562},
+url = {HTTP://www.geosci-model-dev.net/8/1547/2015/},
+DOI = {10.5194/gmd-8-1547-2015}
+}
+
+@article{Martin_Adcroft_OM10,
+author = {T. Martin and A. Adcroft},
+title = {Parameterizing the fresh-water flux from land ice to ocean with interactive icebergs in a coupled climate model},
+journal = OM,
+year = {2010},
+volume = {34}, number = {3--4},
+pages = {111--124},
+issn = {1463-5003},
+doi = {10.1016/j.ocemod.2010.05.001},
+url = {http://dx.doi.org/10.1016/j.ocemod.2010.05.001}
 }
 
@@ -2490,4 +2623,16 @@
 }
 
+@Article{Rodgers_2014,
+AUTHOR = {Rodgers, K. B. and Aumont, O. and Mikaloff Fletcher, S. E. and Plancherel, Y. and Bopp, L. and de Boyer Mont\'egut, C. and Iudicone, D. and Keeling, R. F. and Madec, G. and Wanninkhof, R.},
+TITLE = {Strong sensitivity of Southern Ocean carbon uptake and nutrient cycling to wind stirring},
+JOURNAL = {Biogeosciences},
+VOLUME = {11},
+YEAR = {2014},
+NUMBER = {15},
+PAGES = {4077--4098},
+URL = {HTTP://www.biogeosciences.net/11/4077/2014/},
+DOI = {10.5194/bg-11-4077-2014}
+}
+
 @ARTICLE{Rodi_1987,
   author = {W. Rodi},
@@ -2559,4 +2704,14 @@
 }
 
+@ARTICLE{Saunders_JAS82,
+  author={P. M. Saunders},
+  title={{The Temperature at the Ocean-air Interface}},
+  journal=JAS,
+  year={1967},
+  volume={24},
+  pages={269-273},
+  doi = {10.1175/1520-0469(1967)024<0269:TTATOA>2.0.CO;2},
+}
+
 @BOOK{Shchepetkin_McWilliams_Bk08,
   author = {A. F. Shchepetkin and J. C. McWilliams},
@@ -2731,4 +2886,15 @@
   volume = {359},
   pages = {123--129}
+}
+
+@ARTICLE{Takaya_al_JGR10,
+  author = {Y. Takaya and J-R. Bidlot and A. C. M. Beljaars and 
+                  P. A. E. M. Janssen},
+  title = {Refinements to a prognostic scheme of sea surface skin temperature},
+  journal = JGR,
+  year   = 	 {2010},
+  Volume = 	 {115},
+  Pages  = 	 {C06009},
+  doi    = {10.1029/2009JC005985},
 }
 
@@ -2834,4 +3000,14 @@
   volume = {27},  number = {4},
   pages = {567--580}
+}
+
+@ARTICLE{Tu_Tsuang_GRL05,
+  title={{Cool-skin simulation by a one-column ocean model}},
+  author={{C-Y}. Tu  and {B-J}. Tsuang},
+  journal=GRL,
+  year={2005},
+  volume={32},
+  pages={L22602},
+  doi = {10.1029/2005GL024252},
 }
 
Index: /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Abstracts_Foreword.tex
===================================================================
--- /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Abstracts_Foreword.tex	(revision 6274)
+++ /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Abstracts_Foreword.tex	(revision 6275)
@@ -13,13 +13,13 @@
 be a flexible tool for studying the ocean and its interactions with the others components of 
 the earth climate system over a wide range of space and time scales. 
-Prognostic variables are the three-dimensional velocity field, a linear 
-or non-linear sea surface height, the temperature and the salinity. In the horizontal direction, 
-the model uses a curvilinear orthogonal grid and in the vertical direction, a full or partial step 
-$z$-coordinate, or $s$-coordinate, or a mixture of the two. The distribution of variables is a 
-three-dimensional Arakawa C-type grid. Various physical choices are available to describe 
-ocean physics, including TKE, GLS and KPP vertical physics. Within NEMO, the ocean is 
-interfaced with a sea-ice model (LIM v2 and v3), passive tracer and biogeochemical models (TOP) 
-and, via the OASIS coupler, with several atmospheric general circulation models. It also 
-support two-way grid embedding via the AGRIF software.
+Prognostic variables are the three-dimensional velocity field, a non-linear sea surface height, 
+the \textit{Conservative} Temperature and the \textit{Absolute} Salinity. 
+In the horizontal direction, the model uses a curvilinear orthogonal grid and in the vertical direction, 
+a full or partial step $z$-coordinate, or $s$-coordinate, or a mixture of the two. 
+The distribution of variables is a three-dimensional Arakawa C-type grid. 
+Various physical choices are available to describe ocean physics, including TKE, and GLS vertical physics. 
+Within NEMO, the ocean is interfaced with a sea-ice model (LIM or CICE), passive tracer and 
+biogeochemical models (TOP) and, via the OASIS coupler, with several atmospheric general circulation models. 
+It also support two-way grid embedding via the AGRIF software.
 
 % ================================================================
@@ -31,13 +31,13 @@
 interactions avec les autres composantes du syst\`{e}me climatique terrestre. 
 Les variables pronostiques sont le champ tridimensionnel de vitesse, une hauteur de la mer 
-lin\'{e}aire ou non, la temperature et la salinit\'{e}. 
+lin\'{e}aire, la Temp\'{e}rature Conservative et la Salinit\'{e} Absolue. 
 La distribution des variables se fait sur une grille C d'Arakawa tridimensionnelle utilisant une 
 coordonn\'{e}e verticale $z$ \`{a} niveaux entiers ou partiels, ou une coordonn\'{e}e s, ou encore 
 une combinaison des deux. Diff\'{e}rents choix sont propos\'{e}s pour d\'{e}crire la physique 
-oc\'{e}anique, incluant notamment des physiques verticales TKE, GLS et KPP. A travers l'infrastructure 
-NEMO, l'oc\'{e}an est interfac\'{e} avec des mod\`{e}les de glace de mer, de biog\'{e}ochimie 
-et de traceurs passifs, et, via le coupleur OASIS, \`{a} plusieurs mod\`{e}les de circulation 
-g\'{e}n\'{e}rale atmosph\'{e}rique. Il supporte \'{e}galement l'embo\^{i}tement interactif de 
-maillages via le logiciel AGRIF.
+oc\'{e}anique, incluant notamment des physiques verticales TKE et GLS. A travers l'infrastructure 
+NEMO, l'oc\'{e}an est interfac\'{e} avec des mod\`{e}les de glace de mer (LIM ou CICE), 
+de biog\'{e}ochimie marine et de traceurs passifs, et, via le coupleur OASIS, \`{a} plusieurs 
+mod\`{e}les de circulation g\'{e}n\'{e}rale atmosph\'{e}rique. 
+Il supporte \'{e}galement l'embo\^{i}tement interactif de maillages via le logiciel AGRIF.
 } 
 
Index: /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Annex_C.tex
===================================================================
--- /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Annex_C.tex	(revision 6274)
+++ /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Annex_C.tex	(revision 6275)
@@ -410,5 +410,5 @@
 \end{aligned}   } \right.
 \end{equation} 
-where the indices $i_p$ and $k_p$ take the following value: 
+where the indices $i_p$ and $j_p$ take the following value: 
 $i_p = -1/2$ or $1/2$ and $j_p = -1/2$ or $1/2$,
 and the vorticity triads, ${^i_j}\mathbb{Q}^{i_p}_{j_p}$, defined at $T$-point, are given by: 
@@ -1103,5 +1103,5 @@
 The discrete formulation of the horizontal diffusion of momentum ensures the 
 conservation of potential vorticity and the horizontal divergence, and the 
-dissipation of the square of these quantities (i.e. enstrophy and the 
+dissipation of the square of these quantities ($i.e.$ enstrophy and the 
 variance of the horizontal divergence) as well as the dissipation of the 
 horizontal kinetic energy. In particular, when the eddy coefficients are 
@@ -1127,26 +1127,17 @@
 &\int \limits_D \frac{1} {e_3 } \textbf{k} \cdot \nabla \times 
 	\Bigl[    \nabla_h  \left( A^{\,lm}\;\chi  \right)
-	          - \nabla_h \times \left( A^{\,lm}\;\zeta \; \textbf{k} \right)    \Bigr]\;dv  = 0
-\end{flalign*}
+	        - \nabla_h \times \left( A^{\,lm}\;\zeta \; \textbf{k} \right)    \Bigr]\;dv   \\ 
+%\end{flalign*}
 %%%%%%%%%%  recheck here....  (gm)
-\begin{flalign*}
-= \int \limits_D  -\frac{1} {e_3 } \textbf{k} \cdot \nabla \times 
-	\Bigl[ \nabla_h \times \left( A^{\,lm}\;\zeta \; \textbf{k} \right)  \Bigr]\;dv &&& \\ 
-\end{flalign*}
-\begin{flalign*}
+%\begin{flalign*}
+=& \int \limits_D  -\frac{1} {e_3 } \textbf{k} \cdot \nabla \times 
+	\Bigl[ \nabla_h \times \left( A^{\,lm}\;\zeta \; \textbf{k} \right)  \Bigr]\;dv  \\ 
+%\end{flalign*}
+%\begin{flalign*}
 \equiv& \sum\limits_{i,j}
 	\left\{
-	\delta_{i+1/2} 
-	\left[ 
-	\frac {e_{2v}} {e_{1v}\,e_{3v}}  \delta_i
-		\left[ A_f^{\,lm} e_{3f} \zeta  \right]
-	 \right]
- 	+ \delta_{j+1/2} 
-	\left[ 
-	\frac {e_{1u}} {e_{2u}\,e_{3u}} \delta_j 
-		\left[ A_f^{\,lm} e_{3f} \zeta  \right]
-	\right]
-	\right\} 
-	&& \\ 
+	  \delta_{i+1/2} \left[  \frac {e_{2v}} {e_{1v}\,e_{3v}}  \delta_i \left[ A_f^{\,lm} e_{3f} \zeta  \right]  \right]
+ 	+ \delta_{j+1/2} \left[  \frac {e_{1u}} {e_{2u}\,e_{3u}}  \delta_j \left[ A_f^{\,lm} e_{3f} \zeta  \right]  \right]
+	\right\} 	 \\ 
 %
 \intertext{Using \eqref{DOM_di_adj}, it follows:}
@@ -1154,10 +1145,8 @@
 \equiv& \sum\limits_{i,j,k} 
 	-\,\left\{
-	   \frac{e_{2v}} {e_{1v}\,e_{3v}}  \delta_i
-		\left[ A_f^{\,lm} e_{3f} \zeta  \right]\;\delta_i \left[ 1\right]
-	+ \frac{e_{1u}} {e_{2u}\,e_{3u}} \delta_j 
-		\left[ A_f^{\,lm} e_{3f} \zeta  \right]\;\delta_j \left[ 1\right]
+	   \frac{e_{2v}} {e_{1v}\,e_{3v}}  \delta_i	\left[ A_f^{\,lm} e_{3f} \zeta  \right]\;\delta_i \left[ 1\right]
+	 + \frac{e_{1u}} {e_{2u}\,e_{3u}}  \delta_j 	\left[ A_f^{\,lm} e_{3f} \zeta  \right]\;\delta_j \left[ 1\right]
 	\right\} \quad \equiv 0 
-	&& \\ 
+	 \\ 
 \end{flalign*}
 
@@ -1167,5 +1156,4 @@
 \subsection{Dissipation of Horizontal Kinetic Energy}
 \label{Apdx_C.3.2}
-
 
 The lateral momentum diffusion term dissipates the horizontal kinetic energy:
@@ -1221,5 +1209,4 @@
 \label{Apdx_C.3.3}
 
-
 The lateral momentum diffusion term dissipates the enstrophy when the eddy 
 coefficients are horizontally uniform:
@@ -1228,7 +1215,7 @@
 	\left[   \nabla_h \left( A^{\,lm}\;\chi  \right)
 	       - \nabla_h \times \left( A^{\,lm}\;\zeta \; \textbf{k} \right)   \right]\;dv &&&\\
-&= A^{\,lm} \int \limits_D \zeta \textbf{k} \cdot \nabla \times 
+&\quad = A^{\,lm} \int \limits_D \zeta \textbf{k} \cdot \nabla \times 
  	\left[    \nabla_h \times \left( \zeta \; \textbf{k} \right)   \right]\;dv &&&\\
-&\equiv A^{\,lm} \sum\limits_{i,j,k}  \zeta \;e_{3f} 
+&\quad \equiv A^{\,lm} \sum\limits_{i,j,k}  \zeta \;e_{3f} 
 	\left\{     \delta_{i+1/2} \left[  \frac{e_{2v}} {e_{1v}\,e_{3v}} \delta_i \left[ e_{3f} \zeta  \right]   \right]
 	          + \delta_{j+1/2} \left[  \frac{e_{1u}} {e_{2u}\,e_{3u}} \delta_j \left[ e_{3f} \zeta  \right]   \right]      \right\}   &&&\\ 
@@ -1236,8 +1223,7 @@
 \intertext{Using \eqref{DOM_di_adj}, it follows:}
 %
-&\equiv  - A^{\,lm} \sum\limits_{i,j,k} 
+&\quad \equiv  - A^{\,lm} \sum\limits_{i,j,k} 
 	\left\{    \left(  \frac{1} {e_{1v}\,e_{3v}}  \delta_i \left[ e_{3f} \zeta  \right]  \right)^2   b_v
-	         + \left(  \frac{1} {e_{2u}\,e_{3u}}  \delta_j \left[ e_{3f} \zeta  \right] \right)^2   b_u  \right\}      &&&\\
-& \leq \;0       &&&\\ 
+	         + \left(  \frac{1} {e_{2u}\,e_{3u}}  \delta_j \left[ e_{3f} \zeta  \right] \right)^2   b_u  \right\}  \quad \leq \;0    &&&\\
 \end{flalign*}
 
@@ -1250,16 +1236,16 @@
 When the horizontal divergence of the horizontal diffusion of momentum 
 (discrete sense) is taken, the term associated with the vertical curl of the 
-vorticity is zero locally, due to (!!! II.1.8  !!!!!). The resulting term conserves the 
-$\chi$ and dissipates $\chi^2$ when the eddy coefficients are 
-horizontally uniform.
+vorticity is zero locally, due to \eqref{Eq_DOM_div_curl}. 
+The resulting term conserves the $\chi$ and dissipates $\chi^2$ 
+when the eddy coefficients are horizontally uniform.
 \begin{flalign*}
 & \int\limits_D  \nabla_h \cdot 
 	\Bigl[     \nabla_h \left( A^{\,lm}\;\chi \right)
 	          - \nabla_h \times \left( A^{\,lm}\;\zeta \;\textbf{k} \right)    \Bigr]  dv
-= \int\limits_D  \nabla_h \cdot \nabla_h \left( A^{\,lm}\;\chi  \right)   dv   &&&\\
+= \int\limits_D  \nabla_h \cdot \nabla_h \left( A^{\,lm}\;\chi  \right)   dv   \\
 %
 &\equiv \sum\limits_{i,j,k} 
 	\left\{   \delta_i \left[ A_u^{\,lm} \frac{e_{2u}\,e_{3u}} {e_{1u}}  \delta_{i+1/2} \left[ \chi \right]  \right]
-	        + \delta_j \left[ A_v^{\,lm} \frac{e_{1v}\,e_{3v}} {e_{2v}}  \delta_{j+1/2} \left[ \chi \right]  \right]    \right\}    &&&\\ 
+	        + \delta_j \left[ A_v^{\,lm} \frac{e_{1v}\,e_{3v}} {e_{2v}}  \delta_{j+1/2} \left[ \chi \right]  \right]    \right\}    \\ 
 %
 \intertext{Using \eqref{DOM_di_adj}, it follows:}
@@ -1267,6 +1253,6 @@
 &\equiv \sum\limits_{i,j,k} 
 	- \left\{   \frac{e_{2u}\,e_{3u}} {e_{1u}}  A_u^{\,lm} \delta_{i+1/2} \left[ \chi \right] \delta_{i+1/2} \left[ 1 \right] 
-	          + \frac{e_{1v}\,e_{3v}}  {e_{2v}}  A_v^{\,lm} \delta_{j+1/2} \left[ \chi \right] \delta_{j+1/2} \left[ 1 \right]    \right\} 
-	\qquad \equiv 0     &&& \\ 
+	          + \frac{e_{1v}\,e_{3v}} {e_{2v}}  A_v^{\,lm} \delta_{j+1/2} \left[ \chi \right] \delta_{j+1/2} \left[ 1 \right]    \right\} 
+	\quad \equiv 0      \\ 
 \end{flalign*}
 
@@ -1281,5 +1267,5 @@
 	\left[    \nabla_h              \left( A^{\,lm}\;\chi                    \right)
 	        - \nabla_h   \times  \left( A^{\,lm}\;\zeta \;\textbf{k} \right)    \right]\;  dv
- = A^{\,lm}   \int\limits_D \chi \;\nabla_h \cdot \nabla_h \left( \chi \right)\;  dv    &&&\\ 
+ = A^{\,lm}   \int\limits_D \chi \;\nabla_h \cdot \nabla_h \left( \chi \right)\;  dv    \\ 
 %
 &\equiv A^{\,lm}  \sum\limits_{i,j,k}  \frac{1} {e_{1t}\,e_{2t}\,e_{3t}}  \chi 
@@ -1287,5 +1273,5 @@
 	   \delta_i  \left[   \frac{e_{2u}\,e_{3u}} {e_{1u}}  \delta_{i+1/2} \left[ \chi \right]   \right]
 	+ \delta_j  \left[   \frac{e_{1v}\,e_{3v}} {e_{2v}}   \delta_{j+1/2} \left[ \chi \right]   \right]
-	\right\} \;   e_{1t}\,e_{2t}\,e_{3t}    &&&\\ 
+	\right\} \;   e_{1t}\,e_{2t}\,e_{3t}    \\ 
 %
 \intertext{Using \eqref{DOM_di_adj}, it turns out to be:}
@@ -1293,7 +1279,6 @@
 &\equiv - A^{\,lm} \sum\limits_{i,j,k}
 	\left\{    \left(  \frac{1} {e_{1u}}  \delta_{i+1/2}  \left[ \chi \right]  \right)^2  b_u
-                 + \left(  \frac{1} {e_{2v}}  \delta_{j+1/2}  \left[ \chi \right]  \right)^2  b_v    \right\} \;    &&&\\
-%
-&\leq 0              &&&\\
+            + \left(  \frac{1} {e_{2v}}  \delta_{j+1/2}  \left[ \chi \right]  \right)^2  b_v    \right\}    
+\quad \leq 0             \\
 \end{flalign*}
 
@@ -1303,5 +1288,4 @@
 \section{Conservation Properties on Vertical Momentum Physics}
 \label{Apdx_C_4}
-
 
 As for the lateral momentum physics, the continuous form of the vertical diffusion 
@@ -1319,6 +1303,6 @@
 	\left(   \frac{A^{\,vm}} {e_3 }\; \frac{\partial \textbf{U}_h } {\partial k}   \right)\; dv    \quad &\leq 0     \\
 \end{align*}
+
 The first property is obvious. The second results from:
-
 \begin{flalign*}
 \int\limits_D 
@@ -1359,4 +1343,5 @@
 	e_{1f}\,e_{2f}\,e_{3f} \; \equiv 0   && \\
 \end{flalign*}
+
 If the vertical diffusion coefficient is uniform over the whole domain, the 
 enstrophy is dissipated, $i.e.$
@@ -1366,6 +1351,6 @@
 		\left( \frac{A^{\,vm}} {e_3 }\; \frac{\partial \textbf{U}_h } {\partial k}   \right)   \right)\; dv = 0   &&&\\
 \end{flalign*}
+
 This property is only satisfied in $z$-coordinates:
-
 \begin{flalign*}
 \int\limits_D \zeta \, \textbf{k} \cdot \nabla \times 
@@ -1477,10 +1462,8 @@
 
 The numerical schemes used for tracer subgridscale physics are written such 
-that the heat and salt contents are conserved (equations in flux form, second 
-order centered finite differences). Since a flux form is used to compute the 
-temperature and salinity, the quadratic form of these quantities (i.e. their variance) 
-globally tends to diminish. As for the advection term, there is generally no strict 
-conservation of mass, even if in practice the mass is conserved to a very high 
-accuracy. 
+that the heat and salt contents are conserved (equations in flux form). 
+Since a flux form is used to compute the temperature and salinity, 
+the quadratic form of these quantities ($i.e.$ their variance) globally tends to diminish. 
+As for the advection term, there is conservation of mass only if the Equation Of Seawater is linear. 
 
 % -------------------------------------------------------------------------------------------------------------
Index: /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Annex_D.tex
===================================================================
--- /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Annex_D.tex	(revision 6274)
+++ /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Annex_D.tex	(revision 6275)
@@ -120,5 +120,5 @@
 \hline
 public  \par or  \par module variable& 
-\textbf{m n} \par \textit{but not} \par \textbf{nn\_}& 
+\textbf{m n} \par \textit{but not} \par \textbf{nn\_ np\_}& 
 \textbf{a b e f g h o q r} \par \textbf{t} \textit{to} \textbf{x} \par but not \par \textbf{fs rn\_}& 
 \textbf{l} \par \textit{but not} \par \textbf{lp ld} \par \textbf{ ll ln\_}& 
@@ -156,5 +156,5 @@
 \hline
 parameter& 
-\textbf{jp}& 
+\textbf{jp np\_}& 
 \textbf{pp}& 
 \textbf{lp}& 
@@ -190,4 +190,8 @@
 %--------------------------------------------------------------------------------------------------------------
 
+N.B.   Parameter here, in not only parameter in the \textsc{Fortran} acceptation, it is also used for code variables 
+that are read in namelist and should never been modified during a simulation. 
+It is the case, for example, for the size of a domain (jpi,jpj,jpk).
+
 \newpage
 % ================================================================
Index: /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Chap_DIA.tex
===================================================================
--- /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Chap_DIA.tex	(revision 6274)
+++ /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Chap_DIA.tex	(revision 6275)
@@ -2,10 +2,10 @@
 % Chapter I/O & Diagnostics
 % ================================================================
-\chapter{Ouput and Diagnostics (IOM, DIA, TRD, FLO)}
+\chapter{Output and Diagnostics (IOM, DIA, TRD, FLO)}
 \label{DIA}
 \minitoc
 
 \newpage
-$\ $\newline    % force a new ligne
+$\ $\newline    % force a new line
 
 % ================================================================
@@ -48,5 +48,7 @@
 
 
-Since version 3.2, iomput is the NEMO output interface of choice. It has been designed to be simple to use, flexible and efficient. The two main purposes of iomput are: 
+Since version 3.2, iomput is the NEMO output interface of choice. 
+It has been designed to be simple to use, flexible and efficient. 
+The two main purposes of iomput are: 
 \begin{enumerate}
 \item The complete and flexible control of the output files through external XML files adapted by the user from standard templates. 
@@ -1116,6 +1118,5 @@
 % -------------------------------------------------------------------------------------------------------------
 \section[Tracer/Dynamics Trends (TRD)]
-                  {Tracer/Dynamics Trends  (\key{trdtra}, \key{trddyn},    \\ 
-                                                             \key{trddvor}, \key{trdmld})}
+                  {Tracer/Dynamics Trends  (\ngn{namtrd})}
 \label{DIA_trd}
 
@@ -1124,40 +1125,33 @@
 %-------------------------------------------------------------------------------------------------------------
 
-When \key{trddyn} and/or \key{trddyn} CPP variables are defined, each 
-trend of the dynamics and/or temperature and salinity time evolution equations 
-is stored in three-dimensional arrays just after their computation ($i.e.$ at the end 
-of each $dyn\cdots.F90$ and/or $tra\cdots.F90$ routines). Options are defined by
-\ngn{namtrd} namelist variables. These trends are then 
-used in \mdl{trdmod} (see TRD directory) every \textit{nn\_trd } time-steps.
-
-What is done depends on the CPP keys defined:
+Each trend of the dynamics and/or temperature and salinity time evolution equations 
+can be send to \mdl{trddyn} and/or \mdl{trdtra} modules (see TRD directory) just after their computation 
+($i.e.$ at the end of each $dyn\cdots.F90$ and/or $tra\cdots.F90$ routines). 
+This capability is controlled by options offered in \ngn{namtrd} namelist. 
+Note that the output are done with xIOS, and therefore the \key{IOM} is required.
+
+What is done depends on the \ngn{namtrd} logical set to \textit{true}:
 \begin{description}
-\item[\key{trddyn}, \key{trdtra}] : a check of the basin averaged properties of the momentum 
-and/or tracer equations is performed ; 
-\item[\key{trdvor}] : a vertical summation of the moment tendencies is performed, 
-then the curl is computed to obtain the barotropic vorticity tendencies which are output ;
-\item[\key{trdmld}] : output of the tracer tendencies averaged vertically  
-either over the mixed layer (\np{nn\_ctls}=0), 
-or       over a fixed number of model levels (\np{nn\_ctls}$>$1 provides the number of level), 
-or       over a spatially varying but temporally fixed number of levels (typically the base 
-of the winter mixed layer) read in \ifile{ctlsurf\_idx} (\np{nn\_ctls}=1) ;
+\item[\np{ln\_glo\_trd}] : at each \np{nn\_trd} time-step a check of the basin averaged properties 
+of the momentum and tracer equations is performed. This also includes a check of $T^2$, $S^2$, 
+$\tfrac{1}{2} (u^2+v2)$, and potential energy time evolution equations properties ; 
+\item[\np{ln\_dyn\_trd}] : each 3D trend of the evolution of the two momentum components is output ; 
+\item[\np{ln\_dyn\_mxl}] : each 3D trend of the evolution of the two momentum components averaged 
+                           over the mixed layer is output  ; 
+\item[\np{ln\_vor\_trd}] : a vertical summation of the moment tendencies is performed, 
+                           then the curl is computed to obtain the barotropic vorticity tendencies which are output ;
+\item[\np{ln\_KE\_trd}]  : each 3D trend of the Kinetic Energy equation is output ;
+\item[\np{ln\_tra\_trd}] : each 3D trend of the evolution of temperature and salinity is output ;
+\item[\np{ln\_tra\_mxl}] : each 2D trend of the evolution of temperature and salinity averaged 
+                           over the mixed layer is output ;
 \end{description}
-
-The units in the output file can be changed using the \np{nn\_ucf} namelist parameter. 
-For example, in case of salinity tendency the units are given by PSU/s/\np{nn\_ucf}.
-Setting \np{nn\_ucf}=86400 ($i.e.$ the number of second in a day) provides the tendencies in PSU/d.
-
-When \key{trdmld} is defined, two time averaging procedure are proposed.
-Setting \np{ln\_trdmld\_instant} to \textit{true}, a simple time averaging is performed, 
-so that the resulting tendency is the contribution to the change of a quantity between 
-the two instantaneous values taken at the extremities of the time averaging period.
-Setting \np{ln\_trdmld\_instant} to \textit{false}, a double time averaging is performed, 
-so that the resulting tendency is the contribution to the change of a quantity between 
-two \textit{time mean} values. The later option requires the use of an extra file, \ifile{restart\_mld}  
-(\np{ln\_trdmld\_restart}=true), to restart a run.
-
 
 Note that the mixed layer tendency diagnostic can also be used on biogeochemical models 
 via the \key{trdtrc} and \key{trdmld\_trc} CPP keys.
+
+\textbf{Note that} in the current version (v3.6), many changes has been introduced but not fully tested. 
+In particular, options associated with \np{ln\_dyn\_mxl}, \np{ln\_vor\_trd}, and \np{ln\_tra\_mxl} 
+are not working, and none of the option have been tested with variable volume ($i.e.$ \key{vvl} defined).
+
 
 % -------------------------------------------------------------------------------------------------------------
@@ -1280,28 +1274,26 @@
 \label{DIA_diag_harm}
 
-A module is available to compute the amplitude and phase for tidal waves. 
-This diagnostic is actived with \key{diaharm}.
-
 %------------------------------------------namdia_harm----------------------------------------------------
 \namdisplay{namdia_harm}
 %----------------------------------------------------------------------------------------------------------
 
-Concerning the on-line Harmonic analysis, some parameters are available in namelist
-\ngn{namdia\_harm} :
-
-- \texttt{nit000\_han} is the first time step used for harmonic analysis
-
-- \texttt{nitend\_han} is the last time step used for harmonic analysis
-
-- \texttt{nstep\_han} is the time step frequency for harmonic analysis
-
-- \texttt{nb\_ana} is the number of harmonics to analyse
-
-- \texttt{tname} is an array with names of tidal constituents to analyse
-
-\texttt{nit000\_han} and \texttt{nitend\_han} must be between \texttt{nit000} and \texttt{nitend} of the simulation.
+A module is available to compute the amplitude and phase of tidal waves. 
+This on-line Harmonic analysis is actived with \key{diaharm}.
+Some parameters are available in namelist \ngn{namdia\_harm} :
+
+- \np{nit000\_han} is the first time step used for harmonic analysis
+
+- \np{nitend\_han} is the last time step used for harmonic analysis
+
+- \np{nstep\_han} is the time step frequency for harmonic analysis
+
+- \np{nb\_ana} is the number of harmonics to analyse
+
+- \np{tname} is an array with names of tidal constituents to analyse
+
+\np{nit000\_han} and \np{nitend\_han} must be between \np{nit000} and \np{nitend} of the simulation.
 The restart capability is not implemented.
 
-The Harmonic analysis solve this equation:
+The Harmonic analysis solve the following equation:
 \begin{equation}
 h_{i} - A_{0} + \sum^{nb\_ana}_{j=1}[A_{j}cos(\nu_{j}t_{j}-\phi_{j})] = e_{i}
@@ -1324,6 +1316,6 @@
 \label{DIA_diag_dct}
 
-A module is available to compute the transport of volume, heat and salt through sections. This diagnostic
-is actived with \key{diadct}.
+A module is available to compute the transport of volume, heat and salt through sections. 
+This diagnostic is actived with \key{diadct}.
 
 Each section is defined by the coordinates of its 2 extremities. The pathways between them are contructed
@@ -1347,9 +1339,9 @@
 %-------------------------------------------------------------------------------------------------------------
 
-\texttt{nn\_dct}: frequency of instantaneous transports computing
-
-\texttt{nn\_dctwri}: frequency of writing ( mean of instantaneous transports )
-
-\texttt{nn\_debug}: debugging of the section
+\np{nn\_dct}: frequency of instantaneous transports computing
+
+\np{nn\_dctwri}: frequency of writing ( mean of instantaneous transports )
+
+\np{nn\_debug}: debugging of the section
 
 \subsubsection{ To create a binary file containing the pathway of each section }
@@ -1482,5 +1474,5 @@
 the \key{diahth} CPP key: 
 
-- the mixed layer depth (based on a density criterion, \citet{de_Boyer_Montegut_al_JGR04}) (\mdl{diahth})
+- the mixed layer depth (based on a density criterion \citep{de_Boyer_Montegut_al_JGR04}) (\mdl{diahth})
 
 - the turbocline depth (based on a turbulent mixing coefficient criterion) (\mdl{diahth})
Index: /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Chap_DOM.tex
===================================================================
--- /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Chap_DOM.tex	(revision 6274)
+++ /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Chap_DOM.tex	(revision 6275)
@@ -1,4 +1,4 @@
 % ================================================================
-% Chapter 2 � Space and Time Domain (DOM)
+% Chapter 2 ——— Space and Time Domain (DOM)
 % ================================================================
 \chapter{Space Domain (DOM) }
@@ -138,5 +138,5 @@
 and $f$-points, and its divergence defined at $t$-points:
 \begin{eqnarray}  \label{Eq_DOM_curl}
- \nabla \times {\rm {\bf A}}\equiv &
+ \nabla \times {\rm{\bf A}}\equiv &
       \frac{1}{e_{2v}\,e_{3vw} } \ \left( \delta_{j +1/2} \left[e_{3w}\,a_3 \right] -\delta_{k+1/2} \left[e_{2v} \,a_2 \right] \right)  &\ \mathbf{i} \\ 
  +& \frac{1}{e_{2u}\,e_{3uw}} \ \left( \delta_{k+1/2} \left[e_{1u}\,a_1  \right] -\delta_{i +1/2} \left[e_{3w}\,a_3 \right] \right)  &\ \mathbf{j} \\
@@ -183,6 +183,6 @@
 Let $a$ and $b$ be two fields defined on the mesh, with value zero inside 
 continental area. Using integration by parts it can be shown that the differencing 
-operators ($\delta_i$, $\delta_j$ and $\delta_k$) are anti-symmetric linear 
-operators, and further that the averaging operators $\overline{\,\cdot\,}^{\,i}$, 
+operators ($\delta_i$, $\delta_j$ and $\delta_k$) are skew-symmetric linear operators, 
+and further that the averaging operators $\overline{\,\cdot\,}^{\,i}$, 
 $\overline{\,\cdot\,}^{\,k}$ and $\overline{\,\cdot\,}^{\,k}$) are symmetric linear 
 operators, $i.e.$
@@ -364,5 +364,5 @@
 For both grids here,  the same $w$-point depth has been chosen but in (a) the 
 $t$-points are set half way between $w$-points while in (b) they are defined from 
-an analytical function: $z(k)=5\,(i-1/2)^3 - 45\,(i-1/2)^2 + 140\,(i-1/2) - 150$. 
+an analytical function: $z(k)=5\,(k-1/2)^3 - 45\,(k-1/2)^2 + 140\,(k-1/2) - 150$. 
 Note the resulting difference between the value of the grid-size $\Delta_k$ and 
 those of the scale factor $e_k$. }
@@ -425,5 +425,5 @@
 
 The choice of the grid must be consistent with the boundary conditions specified 
-by the parameter \np{jperio} (see {\S\ref{LBC}).
+by \np{jperio}, a parameter found in \ngn{namcfg} namelist (see {\S\ref{LBC}).
 
 % -------------------------------------------------------------------------------------------------------------
@@ -481,5 +481,5 @@
 %>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
-The choice of a vertical coordinate, even if it is made through a namelist parameter, 
+The choice of a vertical coordinate, even if it is made through \ngn{namzgr} namelist parameters, 
 must be done once of all at the beginning of an experiment. It is not intended as an 
 option which can be enabled or disabled in the middle of an experiment. Three main 
@@ -498,5 +498,5 @@
 Contrary to the horizontal grid, the vertical grid is computed in the code and no 
 provision is made for reading it from a file. The only input file is the bathymetry 
-(in meters) (\ifile{bathy\_meter}) 
+(in meters) (\ifile{bathy\_meter}). 
 \footnote{N.B. in full step $z$-coordinate, a \ifile{bathy\_level} file can replace the 
 \ifile{bathy\_meter} file, so that the computation of the number of wet ocean point 
@@ -540,5 +540,5 @@
 
 Three options are possible for defining the bathymetry, according to the 
-namelist variable \np{nn\_bathy}: 
+namelist variable \np{nn\_bathy} (found in \ngn{namdom} namelist): 
 \begin{description}
 \item[\np{nn\_bathy} = 0] a flat-bottom domain is defined. The total depth $z_w (jpk)$ 
@@ -721,5 +721,5 @@
 usually 10\%, of the default thickness $e_{3t}(jk)$).
 
- \colorbox{yellow}{Add a figure here of pstep especially at last ocean level }
+\gmcomment{ \colorbox{yellow}{Add a figure here of pstep especially at last ocean level }  }
 
 % -------------------------------------------------------------------------------------------------------------
Index: /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Chap_DYN.tex
===================================================================
--- /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Chap_DYN.tex	(revision 6274)
+++ /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Chap_DYN.tex	(revision 6275)
@@ -1,10 +1,8 @@
 % ================================================================
-% Chapter � Ocean Dynamics (DYN)
+% Chapter ——— Ocean Dynamics (DYN)
 % ================================================================
 \chapter{Ocean Dynamics (DYN)}
 \label{DYN}
 \minitoc
-
-% add a figure for  dynvor ens, ene latices
 
 %\vspace{2.cm}
@@ -165,11 +163,10 @@
 %-------------------------------------------------------------------------------------------------------------
 
-The vector invariant form of the momentum equations is the one most 
-often used in applications of the \NEMO ocean model. The flux form option 
-(see next section) has been present since version $2$. Options are defined
-through the \ngn{namdyn\_adv} namelist variables
-Coriolis and momentum advection terms are evaluated using a leapfrog 
-scheme, $i.e.$ the velocity appearing in these expressions is centred in 
-time (\textit{now} velocity). 
+The vector invariant form of the momentum equations (\np{ln\_dynhpg\_vec}~=~true) is the one most 
+often used in applications of the \NEMO ocean model. The flux form option (\np{ln\_dynhpg\_vec}~=false)
+(see next section) has been present since version $2$. 
+Options are defined through the \ngn{namdyn\_adv} namelist variables.
+Coriolis and momentum advection terms are evaluated using a leapfrog scheme, 
+$i.e.$ the velocity appearing in these expressions is centred in time (\textit{now} velocity). 
 At the lateral boundaries either free slip, no slip or partial slip boundary 
 conditions are applied following Chap.\ref{LBC}.
@@ -303,10 +300,13 @@
 %>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
-Note that a key point in \eqref{Eq_een_e3f} is that the averaging in the \textbf{i}- and 
-\textbf{j}- directions uses the masked vertical scale factor but is always divided by 
-$4$, not by the sum of the masks at the four $T$-points. This preserves the continuity of 
-$e_{3f}$ when one or more of the neighbouring $e_{3t}$ tends to zero and 
-extends by continuity the value of $e_{3f}$ into the land areas. This feature is essential for 
-the $z$-coordinate with partial steps.
+A key point in \eqref{Eq_een_e3f} is how the averaging in the \textbf{i}- and \textbf{j}- directions is made. 
+It uses the sum of masked t-point vertical scale factor divided either 
+by the sum of the four t-point masks (\np{ln\_dynvor\_een\_old}~=~false), 
+or  just by $4$ (\np{ln\_dynvor\_een\_old}~=~true).
+The latter case preserves the continuity of $e_{3f}$ when one or more of the neighbouring $e_{3t}$ 
+tends to zero and extends by continuity the value of $e_{3f}$ into the land areas. 
+This case introduces a sub-grid-scale topography at f-points (with a systematic reduction of $e_{3f}$ 
+when a model level intercept the bathymetry) that tends to reinforce the topostrophy of the flow 
+($i.e.$ the tendency of the flow to follow the isobaths) \citep{Penduff_al_OS07}. 
 
 Next, the vorticity triads, $ {^i_j}\mathbb{Q}^{i_p}_{j_p}$ can be defined at a $T$-point as 
@@ -374,4 +374,11 @@
 \end{aligned}         \right.
 \end{equation} 
+When \np{ln\_dynzad\_zts}~=~\textit{true}, a split-explicit time stepping with 5 sub-timesteps is used 
+on the vertical advection term.
+This option can be useful when the value of the timestep is limited by vertical advection \citep{Lemarie_OM2015}. 
+Note that in this case, a similar split-explicit time stepping should be used on 
+vertical advection of tracer to ensure a better stability, 
+an option which is only available with a TVD scheme (see \np{ln\_traadv\_tvd\_zts} in \S\ref{TRA_adv_tvd}).
+
 
 % ================================================================
@@ -491,5 +498,6 @@
 those in the centred second order method. As the scheme already includes 
 a diffusion component, it can be used without explicit  lateral diffusion on momentum 
-($i.e.$ \np{ln\_dynldf\_lap}=\np{ln\_dynldf\_bilap}=false), and it is recommended to do so.
+($i.e.$ setting both \np{ln\_dynldf\_lap} and \np{ln\_dynldf\_bilap} to \textit{false}), 
+and it is recommended to do so.
 
 The UBS scheme is not used in all directions. In the vertical, the centred $2^{nd}$ 
@@ -629,5 +637,5 @@
 ($e_{3w}$).
  
-$\bullet$ Traditional coding with adaptation for ice shelf cavities (\np{ln\_dynhpg\_isf}=true).
+$\bullet$ Traditional coding with adaptation for ice shelf cavities (\np{ln\_hpg\_isf}=true).
 This scheme need the activation of ice shelf cavities (\np{ln\_isfcav}=true).
 
@@ -718,9 +726,17 @@
 $\ $\newline      %force an empty line
 
-%%%
 Options are defined through the \ngn{namdyn\_spg} namelist variables.
-The surface pressure gradient term is related to the representation of the free surface (\S\ref{PE_hor_pg}). The main distinction is between the fixed volume case (linear free surface) and the variable volume case (nonlinear free surface, \key{vvl} is defined). In the linear free surface case (\S\ref{PE_free_surface}) the vertical scale factors $e_{3}$ are fixed in time, while they are time-dependent in the nonlinear case (\S\ref{PE_free_surface}). With both linear and nonlinear free surface, external gravity waves are allowed in the equations, which imposes a very small time step when an explicit time stepping is used. Two methods are proposed to allow a longer time step for the three-dimensional equations: the filtered free surface, which is a modification of the continuous equations (see \eqref{Eq_PE_flt}), and the split-explicit free surface described below. The extra term introduced in the filtered method is calculated implicitly, so that the update of the next velocities is done in module \mdl{dynspg\_flt} and not in \mdl{dynnxt}.
-
-%%%
+The surface pressure gradient term is related to the representation of the free surface (\S\ref{PE_hor_pg}). 
+The main distinction is between the fixed volume case (linear free surface) and the variable volume case 
+(nonlinear free surface, \key{vvl} is defined). In the linear free surface case (\S\ref{PE_free_surface}) 
+the vertical scale factors $e_{3}$ are fixed in time, while they are time-dependent in the nonlinear case 
+(\S\ref{PE_free_surface}). 
+With both linear and nonlinear free surface, external gravity waves are allowed in the equations, 
+which imposes a very small time step when an explicit time stepping is used. 
+Two methods are proposed to allow a longer time step for the three-dimensional equations: 
+the filtered free surface, which is a modification of the continuous equations (see \eqref{Eq_PE_flt}), 
+and the split-explicit free surface described below. 
+The extra term introduced in the filtered method is calculated implicitly, 
+so that the update of the next velocities is done in module \mdl{dynspg\_flt} and not in \mdl{dynnxt}.
 
 
@@ -736,5 +752,4 @@
 implicitly, so that a solver is used to compute it. As a consequence the update of the $next$ 
 velocities is done in module \mdl{dynspg\_flt} and not in \mdl{dynnxt}.
-
 
 
@@ -779,5 +794,6 @@
 $\rdt_e = \rdt / nn\_baro$. This parameter can be optionally defined automatically (\np{ln\_bt\_nn\_auto}=true) 
 considering that the stability of the barotropic system is essentially controled by external waves propagation. 
-Maximum allowed Courant number is in that case time independent, and easily computed online from the input bathymetry.
+Maximum Courant number is in that case time independent, and easily computed online from the input bathymetry.
+Therefore, $\rdt_e$ is adjusted so that the Maximum allowed Courant number is smaller than \np{rn\_bt\_cmax}.
 
 %%%
@@ -802,5 +818,5 @@
 Schematic of the split-explicit time stepping scheme for the external 
 and internal modes. Time increases to the right. In this particular exemple, 
-a boxcar averaging window over $nn\_baro$ barotropic time steps is used ($nn\_bt\_filt=1$) and $nn\_baro=5$.
+a boxcar averaging window over $nn\_baro$ barotropic time steps is used ($nn\_bt\_flt=1$) and $nn\_baro=5$.
 Internal mode time steps (which are also the model time steps) are denoted 
 by $t-\rdt$, $t$ and $t+\rdt$. Variables with $k$ superscript refer to instantaneous barotropic variables, 
@@ -808,7 +824,7 @@
 The former are used to obtain time filtered quantities at $t+\rdt$ while the latter are used to obtain time averaged 
 transports to advect tracers.
-a) Forward time integration: \np{ln\_bt\_fw}=true, \np{ln\_bt\_ave}=true. 
-b) Centred time integration: \np{ln\_bt\_fw}=false, \np{ln\_bt\_ave}=true. 
-c) Forward time integration with no time filtering (POM-like scheme): \np{ln\_bt\_fw}=true, \np{ln\_bt\_ave}=false. }
+a) Forward time integration: \np{ln\_bt\_fw}=true, \np{ln\_bt\_av}=true. 
+b) Centred time integration: \np{ln\_bt\_fw}=false, \np{ln\_bt\_av}=true. 
+c) Forward time integration with no time filtering (POM-like scheme): \np{ln\_bt\_fw}=true, \np{ln\_bt\_av}=false. }
 \end{center}    \end{figure}
 %>   >   >   >   >   >   >   >   >   >   >   >   >   >   >   >   >   >   >   >   >   >   >   >   >   >   >   >
@@ -816,5 +832,5 @@
 In the default case (\np{ln\_bt\_fw}=true), the external mode is integrated 
 between \textit{now} and  \textit{after} baroclinic time-steps (Fig.~\ref{Fig_DYN_dynspg_ts}a). To avoid aliasing of fast barotropic motions into three dimensional equations, time filtering is eventually applied on barotropic 
-quantities (\np{ln\_bt\_ave}=true). In that case, the integration is extended slightly beyond  \textit{after} time step to provide time filtered quantities. 
+quantities (\np{ln\_bt\_av}=true). In that case, the integration is extended slightly beyond  \textit{after} time step to provide time filtered quantities. 
 These are used for the subsequent initialization of the barotropic mode in the following baroclinic step. 
 Since external mode equations written at baroclinic time steps finally follow a forward time stepping scheme, 
@@ -837,5 +853,5 @@
 %%%
 
-One can eventually choose to feedback instantaneous values by not using any time filter (\np{ln\_bt\_ave}=false). 
+One can eventually choose to feedback instantaneous values by not using any time filter (\np{ln\_bt\_av}=false). 
 In that case, external mode equations are continuous in time, ie they are not re-initialized when starting a new 
 sub-stepping sequence. This is the method used so far in the POM model, the stability being maintained by refreshing at (almost) 
@@ -1158,12 +1174,19 @@
 
 Besides the surface and bottom stresses (see the above section) which are 
-introduced as boundary conditions on the vertical mixing, two other forcings 
-enter the dynamical equations. 
-
-One is the effect of atmospheric pressure on the ocean dynamics.
-Another forcing term is the tidal potential.
-Both of which will be introduced into the reference version soon. 
-
-\gmcomment{atmospheric pressure is there!!!!    include its description }
+introduced as boundary conditions on the vertical mixing, three other forcings 
+may enter the dynamical equations by affecting the surface pressure gradient. 
+
+(1) When \np{ln\_apr\_dyn}~=~true (see \S\ref{SBC_apr}), the atmospheric pressure is taken 
+into account when computing the surface pressure gradient.
+
+(2) When \np{ln\_tide\_pot}~=~true and \key{tide} is defined (see \S\ref{SBC_tide}), 
+the tidal potential is taken into account when computing the surface pressure gradient.
+
+(3) When \np{nn\_ice\_embd}~=~2 and LIM or CICE is used ($i.e.$ when the sea-ice is embedded in the ocean), 
+the snow-ice mass is taken into account when computing the surface pressure gradient.
+
+
+\gmcomment{ missing : the lateral boundary condition !!!   another external forcing
+ }
 
 % ================================================================
Index: /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Chap_LBC.tex
===================================================================
--- /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Chap_LBC.tex	(revision 6274)
+++ /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Chap_LBC.tex	(revision 6275)
@@ -1,4 +1,4 @@
 % ================================================================
-% Chapter � Lateral Boundary Condition (LBC) 
+% Chapter — Lateral Boundary Condition (LBC) 
 % ================================================================
 \chapter{Lateral Boundary Condition (LBC) }
@@ -204,10 +204,11 @@
 %        North fold (\textit{jperio = 3 }to $6)$ 
 % -------------------------------------------------------------------------------------------------------------
-\subsection{North-fold (\textit{jperio = 3 }to $6)$ }
+\subsection{North-fold (\textit{jperio = 3 }to $6$) }
 \label{LBC_north_fold}
 
 The north fold boundary condition has been introduced in order to handle the north 
-boundary of a three-polar ORCA grid. Such a grid has two poles in the northern hemisphere. 
-\colorbox{yellow}{to be completed...}
+boundary of a three-polar ORCA grid. Such a grid has two poles in the northern hemisphere 
+(Fig.\ref{Fig_MISC_ORCA_msh}, and thus requires a specific treatment illustrated in Fig.\ref{Fig_North_Fold_T}. 
+Further information can be found in \mdl{lbcnfd} module which applies the north fold boundary condition.
 
 %>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -250,10 +251,9 @@
 ocean model. Second order finite difference schemes lead to local discrete 
 operators that depend at the very most on one neighbouring point. The only 
-non-local computations concern the vertical physics (implicit diffusion, 1.5 
+non-local computations concern the vertical physics (implicit diffusion, 
 turbulent closure scheme, ...) (delocalization over the whole water column), 
 and the solving of the elliptic equation associated with the surface pressure 
 gradient computation (delocalization over the whole horizontal domain). 
 Therefore, a pencil strategy is used for the data sub-structuration 
-\gmcomment{no idea what this means!}
 : the 3D initial domain is laid out on local processor 
 memories following a 2D horizontal topological splitting. Each sub-domain 
@@ -264,16 +264,14 @@
 phase starts: each processor sends to its neighbouring processors the update 
 values of the points corresponding to the interior overlapping area to its 
-neighbouring sub-domain (i.e. the innermost of the two overlapping rows). 
-The communication is done through message passing. Usually the parallel virtual 
-language, PVM, is used as it is a standard language available on  nearly  all 
-MPP computers. More specific languages (i.e. computer dependant languages) 
-can be easily used to speed up the communication, such as SHEM on a T3E 
-computer. The data exchanges between processors are required at the very 
+neighbouring sub-domain ($i.e.$ the innermost of the two overlapping rows). 
+The communication is done through the Message Passing Interface (MPI). 
+The data exchanges between processors are required at the very 
 place where lateral domain boundary conditions are set in the mono-domain 
-computation (\S III.10-c): the lbc\_lnk routine which manages such conditions 
-is substituted by mpplnk.F or mpplnk2.F routine when running on an MPP 
-computer (\key{mpp\_mpi} defined). It has to be pointed out that when using 
-the MPP version of the model, the east-west cyclic boundary condition is done 
-implicitly, whilst the south-symmetric boundary condition option is not available.
+computation : the \rou{lbc\_lnk} routine (found in \mdl{lbclnk} module) 
+which manages such conditions is interfaced with routines found in \mdl{lib\_mpp} module 
+when running on an MPP computer ($i.e.$ when \key{mpp\_mpi} defined). 
+It has to be pointed out that when using the MPP version of the model, 
+the east-west cyclic boundary condition is done implicitly, 
+whilst the south-symmetric boundary condition option is not available.
 
 %>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -285,12 +283,10 @@
 %>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
-In the standard version of the OPA model, the splitting is regular and arithmetic.
- the i-axis is divided by \jp{jpni} and the j-axis by \jp{jpnj} for a number of processors 
- \jp{jpnij} most often equal to $jpni \times jpnj$ (model parameters set in 
- \mdl{par\_oce}). Each processor is independent and without message passing 
- or synchronous process 
- \gmcomment{how does a synchronous process relate to this?}, 
- programs run alone and access just its own local memory. For this reason, the 
- main model dimensions are now the local dimensions of the subdomain (pencil) 
+In the standard version of \NEMO, the splitting is regular and arithmetic.
+The i-axis is divided by \jp{jpni} and the j-axis by \jp{jpnj} for a number of processors 
+\jp{jpnij} most often equal to $jpni \times jpnj$ (parameters set in 
+ \ngn{nammpp} namelist). Each processor is independent and without message passing 
+ or synchronous process, programs run alone and access just its own local memory. 
+ For this reason, the main model dimensions are now the local dimensions of the subdomain (pencil) 
  that are named \jp{jpi}, \jp{jpj}, \jp{jpk}. These dimensions include the internal 
  domain and the overlapping rows. The number of rows to exchange (known as 
@@ -304,12 +300,8 @@
 where \jp{jpni}, \jp{jpnj} are the number of processors following the i- and j-axis.
 
-\colorbox{yellow}{Figure IV.3: example of a domain splitting with 9 processors and 
-no east-west cyclic boundary conditions.}
-
-One also defines variables nldi and nlei which correspond to the internal 
-domain bounds, and the variables nimpp and njmpp which are the position 
-of the (1,1) grid-point in the global domain. An element of $T_{l}$, a local array 
-(subdomain) corresponds to an element of $T_{g}$, a global array 
-(whole domain) by the relationship: 
+One also defines variables nldi and nlei which correspond to the internal domain bounds, 
+and the variables nimpp and njmpp which are the position of the (1,1) grid-point in the global domain. 
+An element of $T_{l}$, a local array (subdomain) corresponds to an element of $T_{g}$, 
+a global array (whole domain) by the relationship: 
 \begin{equation} \label{Eq_lbc_nimpp}
 T_{g} (i+nimpp-1,j+njmpp-1,k) = T_{l} (i,j,k),
@@ -320,6 +312,5 @@
 nproc. In the standard version, a processor has no more than four neighbouring 
 processors named nono (for north), noea (east), noso (south) and nowe (west) 
-and two variables, nbondi and nbondj, indicate the relative position of the processor 
-\colorbox{yellow}{(see Fig.IV.3)}:
+and two variables, nbondi and nbondj, indicate the relative position of the processor :
 \begin{itemize}
 \item 		nbondi = -1 	an east neighbour, no west processor,
@@ -332,6 +323,4 @@
 processor on its overlapping row, and sends the data issued from internal 
 domain corresponding to the overlapping row of the other processor.
-		 
-\colorbox{yellow}{Figure IV.4: pencil splitting with the additional outer halos }
 
 
@@ -343,27 +332,20 @@
 global ocean where more than 50 \% of points are land points. For this reason, a 
 pre-processing tool can be used to choose the mpp domain decomposition with a 
-maximum number of only land points processors, which can then be eliminated. 
-(For example, the mpp\_optimiz tools, available from the DRAKKAR web site.) 
+maximum number of only land points processors, which can then be eliminated (Fig. \ref{Fig_mppini2})
+(For example, the mpp\_optimiz tools, available from the DRAKKAR web site). 
 This optimisation is dependent on the specific bathymetry employed. The user 
 then chooses optimal parameters \jp{jpni}, \jp{jpnj} and \jp{jpnij} with 
 $jpnij < jpni \times jpnj$, leading to the elimination of $jpni \times jpnj - jpnij$ 
-land processors. When those parameters are specified in module \mdl{par\_oce}, 
+land processors. When those parameters are specified in \ngn{nammpp} namelist, 
 the algorithm in the \rou{inimpp2} routine sets each processor's parameters (nbound, 
 nono, noea,...) so that the land-only processors are not taken into account. 
 
-\colorbox{yellow}{Note that the inimpp2 routine is general so that the original inimpp 
+\gmcomment{Note that the inimpp2 routine is general so that the original inimpp 
 routine should be suppressed from the code.}
 
 When land processors are eliminated, the value corresponding to these locations in 
-the model output files is zero. Note that this is a problem for a mesh output file written 
-by such a model configuration, because model users often divide by the scale factors 
-($e1t$, $e2t$, etc) and do not expect the grid size to be zero, even on land. It may be 
-best not to eliminate land processors when running the model especially to write the 
-mesh files as outputs (when \np{nn\_msh} namelist parameter differs from 0).
-%%
-\gmcomment{Steven : dont understand this, no land processor means no output file 
-covering this part of globe; its only when files are stitched together into one that you 
-can leave a hole}
-%%
+the model output files is undefined. Note that this is a problem for the meshmask file 
+which requires to be defined over the whole domain. Therefore, user should not eliminate 
+land processors when creating a meshmask file ($i.e.$ when setting a non-zero value to \np{nn\_msh}).
 
 %>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -380,360 +362,4 @@
 %>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
-
-% ================================================================
-% Open Boundary Conditions 
-% ================================================================
-\section{Open Boundary Conditions (\key{obc}) (OBC)}
-\label{LBC_obc}
-%-----------------------------------------nam_obc  -------------------------------------------
-%-    nobc_dta    =    0     !  = 0 the obc data are equal to the initial state
-%-                           !  = 1 the obc data are read in 'obc   .dta' files
-%-    rn_dpein      =    1.    !  ???
-%-    rn_dpwin      =    1.    !  ???
-%-    rn_dpnin      =   30.    !  ???
-%-    rn_dpsin      =    1.    !  ???
-%-    rn_dpeob      = 1500.    !  time relaxation (days) for the east  open boundary
-%-    rn_dpwob      =   15.    !    "        "           for the west  open boundary
-%-    rn_dpnob      =  150.    !    "        "           for the north open boundary
-%-    rn_dpsob      =   15.    !    "        "           for the south open boundary
-%-    ln_obc_clim = .true.   !  climatological obc data files (default T)
-%-    ln_vol_cst  = .true.   !  total volume conserved
-\namdisplay{namobc} 
-
-It is often necessary to implement a model configuration limited to an oceanic 
-region or a basin, which communicates with the rest of the global ocean through 
-''open boundaries''. As stated by \citet{Roed1986}, an open boundary is a 
-computational border where the aim of the calculations is to allow the perturbations 
-generated inside the computational domain to leave it without deterioration of the 
-inner model solution. However, an open boundary also has to let information from 
-the outer ocean enter the model and should support inflow and outflow conditions. 
-
-The open boundary package OBC is the first open boundary option developed in 
-NEMO (originally in OPA8.2). It allows the user to 
-\begin{itemize}
-\item tell the model that a boundary is ''open'' and not closed by a wall, for example 
-by modifying the calculation of the divergence of velocity there;
-\item impose values of tracers and velocities at that boundary (values which may 
-be taken from a climatology): this is the``fixed OBC'' option. 
-\item calculate boundary values by a sophisticated algorithm combining radiation 
-and relaxation (``radiative OBC'' option)
-\end{itemize}
-
-Options are defined through the \ngn{namobc} namelist variables.
-The package resides in the OBC directory. It is described here in four parts: the 
-boundary geometry (parameters to be set in \mdl{obc\_par}), the forcing data at 
-the boundaries (module \mdl{obcdta}),  the radiation algorithm involving the 
-namelist and module \mdl{obcrad}, and a brief presentation of boundary update 
-and restart files.
-
-%----------------------------------------------
-\subsection{Boundary geometry}
-\label{OBC_geom}
-%
-First one has to realize that open boundaries may not necessarily be located 
-at the extremities of the computational domain. They may exist in the middle 
-of the domain, for example at Gibraltar Straits if one wants to avoid including 
-the Mediterranean in an Atlantic domain. This flexibility has been found necessary 
-for the CLIPPER project \citep{Treguier_al_JGR01}. Because of the complexity of the 
-geometry of ocean basins, it may even be necessary to have more than one 
-''west'' open boundary, more than one ''north'', etc. This is not possible with 
-the OBC option: only one open boundary of each kind, west, east, south and 
-north is allowed; these names refer to the grid geometry (not to the direction 
-of the geographical ''west'', ''east'', etc).
-
-The open boundary geometry is set by a series of parameters in the module 
-\mdl{obc\_par}. For an eastern open boundary, parameters are \jp{lp\_obc\_east} 
-(true if an east open boundary exists), \jp{jpieob} the $i$-index along which 
-the eastern open boundary (eob) is located, \jp{jpjed} the $j$-index at which 
-it starts, and \jp{jpjef} the $j$-index where it ends (note $d$ is for ''d\'{e}but'' 
-and $f$ for ''fin'' in French). Similar parameters exist for the west, south and 
-north cases (Table~\ref{Tab_obc_param}).
-
-
-%--------------------------------------------------TABLE--------------------------------------------------
-\begin{table}[htbp]     \begin{center}    \begin{tabular}{|l|c|c|c|}
-\hline
-Boundary and  & Constant index  & Starting index (d\'{e}but) & Ending index (fin) \\
-Logical flag  &                 &                            &                     \\
-\hline
-West          & \jp{jpiwob} $>= 2$         &  \jp{jpjwd}$>= 2$          &  \jp{jpjwf}<= \np{jpjglo}-1 \\
-lp\_obc\_west & $i$-index of a $u$ point   & $j$ of a $T$ point   &$j$ of a $T$ point \\
-\hline
-East            & \jp{jpieob}$<=$\np{jpiglo}-2&\jp{jpjed} $>= 2$         & \jp{jpjef}$<=$ \np{jpjglo}-1 \\
- lp\_obc\_east  & $i$-index of a $u$ point    & $j$ of a $T$ point & $j$ of a $T$ point \\
-\hline
-South           & \jp{jpjsob} $>= 2$         & \jp{jpisd} $>= 2$          & \jp{jpisf}$<=$\np{jpiglo}-1 \\
-lp\_obc\_south  & $j$-index of a $v$ point   & $i$ of a $T$ point   & $i$ of a $T$ point \\
-\hline
-North           & \jp{jpjnob} $<=$ \np{jpjglo}-2& \jp{jpind} $>= 2$        & \jp{jpinf}$<=$\np{jpiglo}-1 \\
-lp\_obc\_north  & $j$-index of a $v$ point      & $i$  of a $T$ point & $i$ of a $T$ point \\
-\hline
-\end{tabular}    \end{center}
-\caption{     \label{Tab_obc_param}
-Names of different indices relating to the open boundaries. In the case 
-of a completely open ocean domain with four ocean boundaries, the parameters 
-take exactly the values indicated.}
-\end{table}
-%------------------------------------------------------------------------------------------------------------
-
-The open boundaries must be along coordinate lines. On the C-grid, the boundary 
-itself is along a line of normal velocity points: $v$ points for a zonal open boundary 
-(the south or north one), and $u$ points for a meridional open boundary (the west 
-or east one). Another constraint is that there still must be a row of masked points 
-all around the domain, as if the domain were a closed basin (unless periodic conditions 
-are used together with open boundary conditions). Therefore, an open boundary 
-cannot be located at the first/last index, namely, 1, \jp{jpiglo} or \jp{jpjglo}. Also, 
-the open boundary algorithm involves calculating the normal velocity points situated 
-just on the boundary, as well as the tangential velocity and temperature and salinity 
-just outside the boundary. This means that for a west/south boundary, normal 
-velocities and temperature are calculated at the same index \jp{jpiwob} and 
-\jp{jpjsob}, respectively. For an east/north boundary, the normal velocity is 
-calculated at index \jp{jpieob} and \jp{jpjnob}, but the ``outside'' temperature is 
-at index \jp{jpieob}+1 and \jp{jpjnob}+1. This means that \jp{jpieob}, \jp{jpjnob} 
-cannot be bigger than \jp{jpiglo}-2, \jp{jpjglo}-2. 
-
-
-The starting and ending indices are to be thought of as $T$ point indices: in many 
-cases they indicate the first land $T$-point, at the extremity of an open boundary 
-(the coast line follows the $f$ grid points, see Fig.~\ref{Fig_obc_north} for an example 
-of a northern open boundary). All indices are relative to the global domain. In the 
-free surface case it is possible to have ``ocean corners'', that is, an open boundary 
-starting and ending in the ocean.
-
-%>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-\begin{figure}[!t]     \begin{center}
-\includegraphics[width=0.70\textwidth]{./TexFiles/Figures/Fig_obc_north.pdf}
-\caption{    \label{Fig_obc_north}
-Localization of the North open boundary points.}
-\end{center}     \end{figure}
-%>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-
-Although not compulsory, it is highly recommended that the bathymetry in the 
-vicinity of an open boundary follows the following rule: in the direction perpendicular 
-to the open line, the water depth should be constant for 4 grid points. This is in 
-order to ensure that the radiation condition, which involves model variables next 
-to the boundary, is calculated in a consistent way. On Fig.\ref{Fig_obc_north} we 
-indicate by an $=$ symbol, the points which should have the same depth. It means 
-that at the 4 points near the boundary, the bathymetry is cylindrical \gmcomment{not sure 
-why cylindrical}. The line behind the open $T$-line must be 0 in the bathymetry file 
-(as shown on Fig.\ref{Fig_obc_north} for example).
-
-%----------------------------------------------
-\subsection{Boundary data}
-\label{OBC_data}
-
-It is necessary to provide information at the boundaries. The simplest case is 
-when this information does not change in time and is equal to the initial conditions 
-(namelist variable \np{nn\_obcdta}=0). This is the case for the standard configuration 
-EEL5 with open boundaries. When (\np{nn\_obcdta}=1), open boundary information 
-is read from netcdf files. For convenience the input files are supposed to be similar 
-to the ''history'' NEMO output files, for dimension names and variable names. 
-Open boundary arrays must be dimensioned according to the parameters of table~
-\ref{Tab_obc_param}: for example, at the western boundary, arrays have a 
-dimension of \jp{jpwf}-\jp{jpwd}+1 in the horizontal and \jp{jpk} in the vertical. 
-
-When ocean observations are used to generate the boundary data (a hydrographic 
-section for example, as in \citet{Treguier_al_JGR01}) it happens often that only the velocity 
-normal to the boundary is known, which is the reason why the initial OBC code 
-assumes that only $T$, $S$, and the normal velocity ($u$ or $v$) needs to be 
-specified. As more and more global model solutions and ocean analysis products 
-become available, it will be possible to provide information about all the variables 
-(including the tangential velocity) so that the specification of four variables at each 
-boundaries will become standard. For the sea surface height, one must distinguish 
-between the filtered free surface case and the time-splitting or explicit treatment of 
-the free surface.
- In the first case, it is assumed that the user does not wish to represent high 
- frequency motions such as tides. The boundary condition is thus one of zero 
- normal gradient of sea surface height at the open boundaries, following \citet{Marchesiello2001}. 
-No information other than the total velocity needs to be provided at the open 
-boundaries in that case. In the other two cases (time splitting or explicit free surface), 
-the user must provide barotropic information (sea surface height and barotropic 
-velocities) and the use of the Flather algorithm for barotropic variables is 
-recommanded. However, this algorithm has not yet been fully tested and bugs 
-remain in NEMO v2.3. Users should read the code carefully before using it. Finally, 
-in the case of the rigid lid approximation the barotropic streamfunction must be 
-provided, as documented in \citet{Treguier_al_JGR01}). This option is no longer 
-recommended but remains in NEMO V2.3.
-
-One frequently encountered case is when an open boundary domain is constructed 
-from a global or larger scale NEMO configuration. Assuming the domain corresponds 
-to indices $ib:ie$, $jb:je$ of the global domain, the bathymetry and forcing of the 
-small domain can be created by using the following netcdf utility on the global files: 
-ncks -F $-d\;x,ib,ie$ $-d\;y,jb,je$ (part of the nco series of utilities, 
-see their \href{http://nco.sourceforge.net}{website}). 
-The open boundary files can be constructed using ncks 
-commands, following table~\ref{Tab_obc_ind}. 
-
-%--------------------------------------------------TABLE--------------------------------------------------
-\begin{table}[htbp]     \begin{center}      \begin{tabular}{|l|c|c|c|c|c|}
-\hline
-OBC  & Variable   & file name      & Index  & Start  & end  \\
-West &  T,S       &   obcwest\_TS.nc &  $ib$+1     &   $jb$+1 &  $je-1$  \\
-     &    U       &   obcwest\_U.nc  &  $ib$+1     &   $jb$+1 &  $je-1$  \\ 
-     &    V       &   obcwest\_V.nc  &  $ib$+1     &   $jb$+1 &  $je-1$  \\       
-\hline
-East &  T,S       &   obceast\_TS.nc &  $ie$-1     &   $jb$+1 &  $je-1$  \\
-     &    U       &   obceast\_U.nc  &  $ie$-2     &   $jb$+1 &  $je-1$  \\ 
-     &    V       &   obceast\_V.nc  &  $ie$-1     &   $jb$+1 &  $je-1$  \\       
-\hline         
-South &  T,S      &   obcsouth\_TS.nc &  $jb$+1     &  $ib$+1 &  $ie-1$  \\
-      &    U      &   obcsouth\_U.nc  &  $jb$+1     &  $ib$+1 &  $ie-1$  \\ 
-      &    V      &   obcsouth\_V.nc  &  $jb$+1     &  $ib$+1 &  $ie-1$  \\    
-\hline
-North &  T,S      &   obcnorth\_TS.nc &  $je$-1     &  $ib$+1 &  $ie-1$  \\
-      &    U      &   obcnorth\_U.nc  &  $je$-1     &  $ib$+1 &  $ie-1$  \\ 
-      &    V      &   obcnorth\_V.nc  &  $je$-2     &  $ib$+1 &  $ie-1$  \\  
-\hline
-\end{tabular}     \end{center}
-\caption{    \label{Tab_obc_ind}
-Requirements for creating open boundary files from a global configuration, 
-appropriate for the subdomain of indices $ib:ie$, $jb:je$. ``Index'' designates the 
-$i$ or $j$ index along which the $u$ of $v$ boundary point is situated in the global 
-configuration, starting and ending with the $j$ or $i$ indices indicated. 
-For example, to generate file obcnorth\_V.nc, use the command ncks 
-$-F$ $-d\;y,je-2$  $-d\;x,ib+1,ie-1$ } 
-\end{table}
-%-----------------------------------------------------------------------------------------------------------
-
-It is assumed that the open boundary files contain the variables for the period of 
-the model integration. If the boundary files contain one time frame, the boundary 
-data is held fixed in time. If the files contain 12 values, it is assumed that the input 
-is a climatology for a repeated annual cycle (corresponding to the case \np{ln\_obc\_clim} 
-=true). The case of an arbitrary number of time frames is not yet implemented 
-correctly; the user is required to write his own code in the module \mdl{obc\_dta} 
-to deal with this situation. 
-
-\subsection{Radiation algorithm}
-\label{OBC_rad}
-
-The art of open boundary management consists in applying a constraint strong 
-enough that the inner domain "feels" the rest of the ocean, but weak enough
-that perturbations are allowed to leave the domain with minimum false reflections 
-of energy. The constraints are specified separately at each boundary as time 
-scales for ''inflow'' and ''outflow'' as defined below. The time scales are set (in days) 
-by namelist parameters such as \np{rn\_dpein}, \np{rn\_dpeob} for the eastern open 
-boundary for example. When both time scales are zero for a given boundary 
-($e.g.$ for the western boundary, \jp{lp\_obc\_west}=true, \np{rn\_dpwob}=0 and 
-\np{rn\_dpwin}=0) this means that the boundary in question is a ''fixed '' boundary 
-where the solution is set exactly by the boundary data. This is not recommended, 
-except in combination with increased viscosity in a ''sponge'' layer next to the 
-boundary in order to avoid spurious reflections.  
-
-
-The radiation\/relaxation \gmcomment{the / doesnt seem to appear in the output} 
-algorithm is applied when either relaxation time (for ''inflow'' or ''outflow'') is 
-non-zero. It has been developed and tested in the SPEM model and its 
-successor ROMS \citep{Barnier1996, Marchesiello2001}, which is an 
-$s$-coordinate model on an Arakawa C-grid. Although the algorithm has 
-been numerically successful in the CLIPPER Atlantic models, the physics 
-do not work as expected \citep{Treguier_al_JGR01}. Users are invited to consider 
-open boundary conditions (OBC hereafter) with some scepticism 
-\citep{Durran2001, Blayo2005}.
-
-The first part of the algorithm calculates a phase velocity to determine 
-whether perturbations tend to propagate toward, or away from, the 
-boundary. Let us consider a model variable $\phi$. 
-The phase velocities ($C_{\phi x}$,$C_{\phi y}$) for the variable $\phi$, 
-in the directions normal and tangential to the boundary are
-\begin{equation} \label{Eq_obc_cphi}
-C_{\phi x} = \frac{ -\phi_{t} }{ ( \phi_{x}^{2} + \phi_{y}^{2}) } \phi_{x} 
-\;\;\;\;\; \;\;\; 
-C_{\phi y} = \frac{ -\phi_{t} }{ ( \phi_{x}^{2} + \phi_{y}^{2}) } \phi_{y}. 
-\end{equation}
-Following \citet{Treguier_al_JGR01} and \citet{Marchesiello2001} we retain only 
-the normal component of the velocity, $C_{\phi x}$, setting $C_{\phi y} =0$ 
-(but unlike the original Orlanski radiation algorithm we retain $\phi_{y}$ in 
-the expression for $C_{\phi x}$).  
-
-The discrete form of (\ref{Eq_obc_cphi}), described by \citet{Barnier1998},
-takes into account the two rows of grid points situated inside the domain 
-next to the boundary, and the three previous time steps ($n$, $n-1$,
-and $n-2$). The same equation can then be discretized at the boundary at
-time steps $n-1$, $n$ and $n+1$ \gmcomment{since the original was three time-level} 
-in order to extrapolate for the new boundary value $\phi^{n+1}$. 
-
-In the open boundary algorithm as implemented in NEMO v2.3, the new boundary 
-values are updated differently depending on the sign of $C_{\phi x}$. Let us take 
-an eastern boundary as an example. The solution for variable $\phi$ at the 
-boundary is given by a generalized wave equation with phase velocity $C_{\phi}$, 
-with the addition of a relaxation term, as:
-\begin{eqnarray}
-\phi_{t} &  =  & -C_{\phi x} \phi_{x} + \frac{1}{\tau_{o}} (\phi_{c}-\phi) 
-                        \;\;\; \;\;\; \;\;\; (C_{\phi x} > 0), \label{Eq_obc_rado} \\
-\phi_{t} &  =  & \frac{1}{\tau_{i}} (\phi_{c}-\phi) 
-\;\;\; \;\;\; \;\;\;\;\;\; (C_{\phi x} < 0), \label{Eq_obc_radi}
-\end{eqnarray}
-where $\phi_{c}$ is the estimate of $\phi$ at the boundary, provided as boundary 
-data. Note that in (\ref{Eq_obc_rado}), $C_{\phi x}$ is bounded by the ratio 
-$\delta x/\delta t$ for stability reasons. When $C_{\phi x}$ is eastward (outward 
-propagation), the radiation condition (\ref{Eq_obc_rado}) is used. 
-When  $C_{\phi x}$ is westward (inward propagation), (\ref{Eq_obc_radi}) is 
-used with a strong relaxation to climatology (usually $\tau_{i}=\np{rn\_dpein}=$1~day).
-Equation (\ref{Eq_obc_radi}) is solved with a Euler time-stepping scheme. As a 
-consequence, setting $\tau_{i}$ smaller than, or equal to the time step is equivalent 
-to a fixed boundary condition. A time scale of one day is usually a good compromise 
-which guarantees that the inflow conditions remain close to climatology while ensuring 
-numerical stability. 
-
-In  the case of a western boundary located in the Eastern Atlantic, \citet{Penduff_al_JGR00} 
-have been able to implement the radiation algorithm without any boundary data, 
-using persistence from the previous time step instead. This solution has not worked 
-in other cases \citep{Treguier_al_JGR01}, so that the use of boundary data is recommended. 
-Even in the outflow condition (\ref{Eq_obc_rado}), we have found it desirable to 
-maintain a weak relaxation to climatology. The time step is usually chosen so as to 
-be larger than typical turbulent scales (of order 1000~days \gmcomment{or maybe seconds?}).
-
-The radiation condition is applied to the model variables: temperature, salinity, 
-tangential and normal velocities. For normal and tangential velocities, $u$ and $v$, 
-radiation is applied with phase velocities calculated from $u$ and $v$ respectively.  
-For the radiation of tracers, we use the phase velocity calculated from the tangential 
-velocity in order to avoid calculating too many independent radiation velocities and 
-because tangential velocities and tracers have the same position along the boundary 
-on a C-grid.  
-
-\subsection{Domain decomposition (\key{mpp\_mpi})}
-\label{OBC_mpp}
-When \key{mpp\_mpi} is active in the code, the computational domain is divided 
-into rectangles that are attributed each to a different processor. The open boundary 
-code is ``mpp-compatible'' up to a certain point. The radiation algorithm will not 
-work if there is an mpp subdomain boundary parallel to the open boundary at the 
-index of the boundary, or the grid point after (outside), or three grid points before 
-(inside). On the other hand, there is no problem if an mpp subdomain boundary 
-cuts the open boundary perpendicularly. These geometrical limitations must be 
-checked for by the user (there is no safeguard in the code).  
-The general principle for the open boundary mpp code is that loops over the open 
-boundaries {not sure what this means} are performed on local indices (nie0, 
-nie1, nje0, nje1 for an eastern boundary for instance) that are initialized in module 
-\mdl{obc\_ini}. Those indices have relevant values on the processors that contain 
-a segment of an open boundary. For processors that do not include an open 
-boundary segment, the indices are such that the calculations within the loops are 
-not performed.
-\gmcomment{I dont understand most of the last few sentences}
- 
-Arrays of climatological data that are read from files are seen by all processors 
-and have the same dimensions for all (for instance, for the eastern boundary, 
-uedta(jpjglo,jpk,2)). On the other hand, the arrays for the calculation of radiation 
-are local to each processor (uebnd(jpj,jpk,3,3) for instance).  This allowed the 
-CLIPPER model for example, to save on memory where the eastern boundary 
-crossed 8 processors so that \jp{jpj} was much smaller than (\jp{jpjef}-\jp{jpjed}+1). 
-
-\subsection{Volume conservation}
-\label{OBC_vol}
-
-It is necessary to control the volume inside a domain when using open boundaries. 
-With fixed boundaries, it is enough to ensure that the total inflow/outflow has 
-reasonable values (either zero or a value compatible with an observed volume 
-balance). When using radiative boundary conditions it is necessary to have a 
-volume constraint because each open boundary works independently from the 
-others. The methodology used to control this volume is identical to the one 
-coded in the ROMS model \citep{Marchesiello2001}.
-
-
-%---------------------------------------- EXTRAS
-\colorbox{yellow}{Explain obc\_vol{\ldots}}
-
-\colorbox{yellow}{OBC algorithm for update, OBC restart, list of routines where obc key appears{\ldots}}
-
-\colorbox{yellow}{OBC rigid lid? {\ldots}}
 
 % ====================================================================
Index: /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Chap_LDF.tex
===================================================================
--- /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Chap_LDF.tex	(revision 6274)
+++ /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Chap_LDF.tex	(revision 6275)
@@ -1,5 +1,5 @@
 
 % ================================================================
-% Chapter � Lateral Ocean Physics (LDF)
+% Chapter ———  Lateral Ocean Physics (LDF)
 % ================================================================
 \chapter{Lateral Ocean Physics (LDF)}
Index: /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Chap_MISC.tex
===================================================================
--- /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Chap_MISC.tex	(revision 6274)
+++ /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Chap_MISC.tex	(revision 6275)
@@ -34,12 +34,6 @@
 has been made to set them in a generic way. However, examples of how 
 they can be set up is given in the ORCA 2\deg and 0.5\deg configurations. For example, 
-for details of implementation in ORCA2, search:
-\vspace{-10pt}  
-\begin{alltt}  
-\tiny    
-\begin{verbatim}
-IF( cp_cfg == "orca" .AND. jp_cfg == 2 )
-\end{verbatim}  
-\end{alltt}
+for details of implementation in ORCA2, search: 
+\texttt{ IF( cp\_cfg == "orca" .AND. jp\_cfg == 2 ) }
 
 % -------------------------------------------------------------------------------------------------------------
@@ -89,6 +83,6 @@
 %--------------------------------------------------------------------------------------------------------------
 
-\colorbox{yellow}{Add a short description of CLA staff here or in lateral boundary condition chapter?}
 Options are defined through the  \ngn{namcla} namelist variables.
+This option is an obsolescent feature that will be removed in version 3.7 and followings. 
 
 %The problem is resolved here by allowing the mixing of tracers and mass/volume between non-adjacent water columns at nominated regions within the model. Momentum is not mixed. The scheme conserves total tracer content, and total volume (the latter in $z*$- or $s*$-coordinate), and maintains compatibility between the tracer and mass/volume budgets.  
Index: /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Chap_Model_Basics.tex
===================================================================
--- /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Chap_Model_Basics.tex	(revision 6274)
+++ /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Chap_Model_Basics.tex	(revision 6275)
@@ -247,75 +247,15 @@
 sufficient to solve a linearized version of (\ref{Eq_PE_ssh}), which still allows 
 to take into account freshwater fluxes applied at the ocean surface \citep{Roullet_Madec_JGR00}.
+Nevertheless, with the linearization, an exact conservation of heat and salt contents is lost.
 
 The filtering of EGWs in models with a free surface is usually a matter of discretisation 
-of the temporal derivatives, using the time splitting method \citep{Killworth_al_JPO91, Zhang_Endoh_JGR92} 
-or the implicit scheme \citep{Dukowicz1994}. In \NEMO, we use a slightly different approach 
-developed by \citet{Roullet_Madec_JGR00}: the damping of EGWs is ensured by introducing an 
-additional force in the momentum equation. \eqref{Eq_PE_dyn} becomes: 
-\begin{equation} \label{Eq_PE_flt}
-\frac{\partial {\rm {\bf U}}_h }{\partial t}= {\rm {\bf M}}
-- g \nabla \left( \tilde{\rho} \ \eta \right) 
-- g \ T_c \nabla \left( \widetilde{\rho} \ \partial_t \eta \right) 
-\end{equation}
-where $T_c$, is a parameter with dimensions of time which characterizes the force, 
-$\widetilde{\rho} = \rho / \rho_o$ is the dimensionless density, and $\rm {\bf M}$ 
-represents the collected contributions of the Coriolis, hydrostatic pressure gradient, 
-non-linear and viscous terms in \eqref{Eq_PE_dyn}.
-
-The new force can be interpreted as a diffusion of vertically integrated volume flux divergence. 
-The time evolution of $D$ is thus governed by a balance of two terms, $-g$ \textbf{A} $\eta$ 
-and $g \, T_c \,$ \textbf{A} $D$, associated with a propagative regime and a diffusive regime 
-in the temporal spectrum, respectively. In the diffusive regime, the EGWs no longer propagate, 
-$i.e.$ they are stationary and damped. The diffusion regime applies to the modes shorter than 
-$T_c$. For longer ones, the diffusion term vanishes. Hence, the temporally unresolved EGWs 
-can be damped by choosing $T_c > \rdt$. \citet{Roullet_Madec_JGR00} demonstrate that 
-(\ref{Eq_PE_flt}) can be integrated with a leap frog scheme except the additional term which 
-has to be computed implicitly. This is not surprising since the use of a large time step has a 
-necessarily numerical cost. Two gains arise in comparison with the previous formulations. 
-Firstly, the damping of EGWs can be quantified through the magnitude of the additional term. 
-Secondly, the numerical scheme does not need any tuning. Numerical stability is ensured as 
-soon as $T_c > \rdt$.
-
-When the variations of free surface elevation are small compared to the thickness of the first 
-model layer, the free surface equation (\ref{Eq_PE_ssh}) can be linearized. As emphasized 
-by \citet{Roullet_Madec_JGR00} the linearization of (\ref{Eq_PE_ssh}) has consequences on the 
-conservation of salt in the model. With the nonlinear free surface equation, the time evolution 
-of the total salt content is 
-\begin{equation} \label{Eq_PE_salt_content}
-    \frac{\partial }{\partial t}\int\limits_{D\eta } {S\;dv} 
-                        =\int\limits_S {S\;(-\frac{\partial \eta }{\partial t}-D+P-E)\;ds}
-\end{equation}
-where $S$ is the salinity, and the total salt is integrated over the whole ocean volume 
-$D_\eta$ bounded by the time-dependent free surface. The right hand side (which is an 
-integral over the free surface) vanishes when the nonlinear equation (\ref{Eq_PE_ssh}) 
-is satisfied, so that the salt is perfectly conserved. When the free surface equation is 
-linearized, \citet{Roullet_Madec_JGR00} show that the total salt content integrated in the fixed 
-volume $D$ (bounded by the surface $z=0$) is no longer conserved:
-\begin{equation} \label{Eq_PE_salt_content_linear}
-         \frac{\partial }{\partial t}\int\limits_D {S\;dv} 
-         		= - \int\limits_S {S\;\frac{\partial \eta }{\partial t}ds} 
-\end{equation}
-
-The right hand side of (\ref{Eq_PE_salt_content_linear}) is small in equilibrium solutions 
-\citep{Roullet_Madec_JGR00}. It can be significant when the freshwater forcing is not balanced and 
-the globally averaged free surface is drifting. An increase in sea surface height \textit{$\eta $} 
-results in a decrease of the salinity in the fixed volume $D$. Even in that case though, 
-the total salt integrated in the variable volume $D_{\eta}$ varies much less, since 
-(\ref{Eq_PE_salt_content_linear}) can be rewritten as 
-\begin{equation} \label{Eq_PE_salt_content_corrected}
-\frac{\partial }{\partial t}\int\limits_{D\eta } {S\;dv} 
-=\frac{\partial}{\partial t} \left[ \;{\int\limits_D {S\;dv} +\int\limits_S {S\eta \;ds} } \right]
-=\int\limits_S {\eta \;\frac{\partial S}{\partial t}ds}
-\end{equation}
-
-Although the total salt content is not exactly conserved with the linearized free surface, 
-its variations are driven by correlations of the time variation of surface salinity with the 
-sea surface height, which is a negligible term. This situation contrasts with the case of 
-the rigid lid approximation in which case freshwater forcing is represented by a virtual 
-salt flux, leading to a spurious source of salt at the ocean surface 
-\citep{Huang_JPO93, Roullet_Madec_JGR00}.
-
-\newpage
-$\ $\newline    % force a new ligne
+of the temporal derivatives, using a split-explicit method \citep{Killworth_al_JPO91, Zhang_Endoh_JGR92} 
+or the implicit scheme \citep{Dukowicz1994} or the addition of a filtering force in the momentum equation 
+\citep{Roullet_Madec_JGR00}. With the present release, \NEMO offers the choice between 
+an explicit free surface (see \S\ref{DYN_spg_exp}) or a split-explicit scheme strongly 
+inspired the one proposed by \citet{Shchepetkin_McWilliams_OM05} (see \S\ref{DYN_spg_ts}).
+
+%\newpage
+%$\ $\newline    % force a new line
 
 % ================================================================
@@ -773,10 +713,10 @@
 \end{equation}
 
-The equations solved by the ocean model \eqref{Eq_PE} in $s-$coordinate can be written as follows:
+The equations solved by the ocean model \eqref{Eq_PE} in $s-$coordinate can be written as follows (see Appendix~\ref{Apdx_A_momentum}):
 
  \vspace{0.5cm}
-* momentum equation:
+$\bullet$ Vector invariant form of the momentum equation :
 \begin{multline} \label{Eq_PE_sco_u}
-\frac{1}{e_3} \frac{\partial \left(  e_3\,u  \right) }{\partial t}=
+\frac{\partial  u   }{\partial t}=
 	+   \left( {\zeta +f} \right)\,v                                    
 	-   \frac{1}{2\,e_1} \frac{\partial}{\partial i} \left(  u^2+v^2   \right) 
@@ -787,5 +727,5 @@
 \end{multline}
 \begin{multline} \label{Eq_PE_sco_v}
-\frac{1}{e_3} \frac{\partial \left(  e_3\,v  \right) }{\partial t}=
+\frac{\partial v }{\partial t}=
 	-   \left( {\zeta +f} \right)\,u   
 	-   \frac{1}{2\,e_2 }\frac{\partial }{\partial j}\left(  u^2+v^2  \right)     	
@@ -795,9 +735,38 @@
 	+  D_v^{\vect{U}}  +   F_v^{\vect{U}} \quad
 \end{multline}
+
+ \vspace{0.5cm}
+$\bullet$ Vector invariant form of the momentum equation :
+\begin{multline} \label{Eq_PE_sco_u}
+\frac{1}{e_3} \frac{\partial \left(  e_3\,u  \right) }{\partial t}=
+   +   \left( { f + \frac{1}{e_1 \; e_2 }
+					\left( 	 v \frac{\partial e_2}{\partial i}
+						-u \frac{\partial e_1}{\partial j} 	\right)} 	\right) \, v    \\
+   - \frac{1}{e_1 \; e_2 \; e_3 } 	\left( 
+					\frac{\partial \left( {e_2 \, e_3 \, u\,u} \right)}{\partial i}
+		+			\frac{\partial \left( {e_1 \, e_3 \, v\,u} \right)}{\partial j}	\right)
+   - \frac{1}{e_3 }\frac{\partial \left( { \omega\,u} \right)}{\partial k}    \\
+	- \frac{1}{e_1} \frac{\partial}{\partial i} \left( \frac{p_s + p_h}{\rho _o}    \right)    
+	+  g\frac{\rho }{\rho _o}\sigma _1 
+	+   D_u^{\vect{U}}  +   F_u^{\vect{U}} \quad
+\end{multline}
+\begin{multline} \label{Eq_PE_sco_v}
+\frac{1}{e_3} \frac{\partial \left(  e_3\,v  \right) }{\partial t}=
+   -   \left( { f + \frac{1}{e_1 \; e_2}
+					\left( 	 v \frac{\partial e_2}{\partial i}
+						-u \frac{\partial e_1}{\partial j} 	\right)} 	\right) \, u   \\
+   - \frac{1}{e_1 \; e_2 \; e_3 } 	\left( 
+					\frac{\partial \left( {e_2 \; e_3  \,u\,v} \right)}{\partial i}
+		+			\frac{\partial \left( {e_1 \; e_3  \,v\,v} \right)}{\partial j}	\right)
+                 - \frac{1}{e_3 } \frac{\partial \left( { \omega\,v} \right)}{\partial k}    \\
+	-   \frac{1}{e_2 }\frac{\partial }{\partial j}\left( \frac{p_s+p_h }{\rho _o}  \right) 
+	 +  g\frac{\rho }{\rho _o }\sigma _2   
+	+  D_v^{\vect{U}}  +   F_v^{\vect{U}} \quad
+\end{multline}
+
 where the relative vorticity, \textit{$\zeta $}, the surface pressure gradient, and the hydrostatic 
 pressure have the same expressions as in $z$-coordinates although they do not represent 
 exactly the same quantities. $\omega$ is provided by the continuity equation 
 (see Appendix~\ref{Apdx_A}):
-
 \begin{equation} \label{Eq_PE_sco_continuity}
 \frac{\partial e_3}{\partial t} + e_3 \; \chi + \frac{\partial \omega }{\partial s} = 0   
@@ -809,5 +778,5 @@
 
  \vspace{0.5cm}
-* tracer equations:
+$\bullet$ tracer equations:
 \begin{multline} \label{Eq_PE_sco_t}
 \frac{1}{e_3} \frac{\partial \left(  e_3\,T  \right) }{\partial t}=
@@ -1024,5 +993,7 @@
 
 The $\tilde{z}$-coordinate has been developed by \citet{Leclair_Madec_OM10s}.
-It is not available in the current version of \NEMO.
+It is available in \NEMO since the version 3.4. Nevertheless, it is currently not robust enough 
+to be used in all possible configurations. Its use is therefore not recommended.
+
 
 \newpage 
@@ -1157,7 +1128,7 @@
 operator acting along $s-$surfaces (see \S\ref{LDF}).
 
-\subsubsection{Lateral second order tracer diffusive operator}
-
-The lateral second order tracer diffusive operator is defined by (see Appendix~\ref{Apdx_B}):
+\subsubsection{Lateral Laplacian tracer diffusive operator}
+
+The lateral Laplacian tracer diffusive operator is defined by (see Appendix~\ref{Apdx_B}):
 \begin{equation} \label{Eq_PE_iso_tensor}
 D^{lT}=\nabla {\rm {\bf .}}\left( {A^{lT}\;\Re \;\nabla T} \right) \qquad 
@@ -1180,8 +1151,10 @@
 ocean (see Appendix~\ref{Apdx_B}).
 
+For \textit{iso-level} diffusion, $r_1$ and $r_2 $ are zero. $\Re $ reduces to the identity 
+in the horizontal direction, no rotation is applied. 
+
 For \textit{geopotential} diffusion, $r_1$ and $r_2 $ are the slopes between the 
-geopotential and computational surfaces: in $z$-coordinates they are zero 
-($r_1 = r_2 = 0$) while in $s$-coordinate (including $\textit{z*}$ case) they are 
-equal to $\sigma _1$ and $\sigma _2$, respectively (see \eqref{Eq_PE_sco_slope} ).
+geopotential and computational surfaces: they are equal to $\sigma _1$ and $\sigma _2$, 
+respectively (see \eqref{Eq_PE_sco_slope} ).
 
 For \textit{isoneutral} diffusion $r_1$ and $r_2$ are the slopes between the isoneutral 
@@ -1231,19 +1204,17 @@
 to zero in the vicinity of the boundaries. The latter strategy is used in \NEMO (cf. Chap.~\ref{LDF}).
 
-\subsubsection{Lateral fourth order tracer diffusive operator}
-
-The lateral fourth order tracer diffusive operator is defined by:
+\subsubsection{Lateral bilaplacian tracer diffusive operator}
+
+The lateral bilaplacian tracer diffusive operator is defined by:
 \begin{equation} \label{Eq_PE_bilapT}
 D^{lT}=\Delta \left( {A^{lT}\;\Delta T} \right) 
 \qquad \text{where} \  D^{lT}=\Delta \left( {A^{lT}\;\Delta T} \right)
  \end{equation}
-
 It is the second order operator given by \eqref{Eq_PE_iso_tensor} applied twice with 
 the eddy diffusion coefficient correctly placed. 
 
-
-\subsubsection{Lateral second order momentum diffusive operator}
-
-The second order momentum diffusive operator along $z$- or $s$-surfaces is found by 
+\subsubsection{Lateral Laplacian momentum diffusive operator}
+
+The Laplacian momentum diffusive operator along $z$- or $s$-surfaces is found by 
 applying \eqref{Eq_PE_lap_vector} to the horizontal velocity vector (see Appendix~\ref{Apdx_B}):
 \begin{equation} \label{Eq_PE_lapU}
@@ -1279,5 +1250,5 @@
 of the Equator in a geographical coordinate system \citep{Lengaigne_al_JGR03}.
 
-\subsubsection{lateral fourth order momentum diffusive operator}
+\subsubsection{lateral bilaplacian momentum diffusive operator}
 
 As for tracers, the fourth order momentum diffusive operator along $z$ or $s$-surfaces 
Index: /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Chap_Model_Basics_zstar.tex
===================================================================
--- /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Chap_Model_Basics_zstar.tex	(revision 6274)
+++ /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Chap_Model_Basics_zstar.tex	(revision 6275)
@@ -1,4 +1,4 @@
 % ================================================================
-% Chapter 1 � Model Basics
+% Chapter 1 ——— Model Basics
 % ================================================================
 % ================================================================
Index: /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Chap_SBC.tex
===================================================================
--- /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Chap_SBC.tex	(revision 6274)
+++ /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Chap_SBC.tex	(revision 6275)
@@ -1,4 +1,4 @@
 % ================================================================
-% Chapter � Surface Boundary Condition (SBC, ISF, ICB) 
+% Chapter —— Surface Boundary Condition (SBC, ISF, ICB) 
 % ================================================================
 \chapter{Surface Boundary Condition (SBC, ISF, ICB) }
@@ -17,5 +17,6 @@
 	\item the two components of the surface ocean stress $\left( {\tau _u \;,\;\tau _v} \right)$
 	\item the incoming solar and non solar heat fluxes $\left( {Q_{ns} \;,\;Q_{sr} } \right)$
-	\item the surface freshwater budget $\left( {\textit{emp},\;\textit{emp}_S } \right)$
+	\item the surface freshwater budget $\left( {\textit{emp}} \right)$
+	\item the surface salt flux associated with freezing/melting of seawater $\left( {\textit{sfx}} \right)$
 \end{itemize}
 plus an optional field:
@@ -27,14 +28,13 @@
 are controlled by namelist \ngn{namsbc} variables: an analytical formulation (\np{ln\_ana}~=~true), 
 a flux formulation (\np{ln\_flx}~=~true), a bulk formulae formulation (CORE 
-(\np{ln\_core}~=~true), CLIO (\np{ln\_clio}~=~true) or MFS
+(\np{ln\_blk\_core}~=~true), CLIO (\np{ln\_blk\_clio}~=~true) or MFS
 \footnote { Note that MFS bulk formulae compute fluxes only for the ocean component}
-(\np{ln\_mfs}~=~true) bulk formulae) and a coupled 
-formulation (exchanges with a atmospheric model via the OASIS coupler) 
-(\np{ln\_cpl}~=~true). When used, the atmospheric pressure forces both 
-ocean and ice dynamics (\np{ln\_apr\_dyn}~=~true).
-The frequency at which the six or seven fields have to be updated is the \np{nn\_fsbc} 
-namelist parameter. 
+(\np{ln\_blk\_mfs}~=~true) bulk formulae) and a coupled or mixed forced/coupled formulation 
+(exchanges with a atmospheric model via the OASIS coupler) (\np{ln\_cpl} or \np{ln\_mixcpl}~=~true). 
+When used ($i.e.$ \np{ln\_apr\_dyn}~=~true), the atmospheric pressure forces both ocean and ice dynamics.
+
+The frequency at which the forcing fields have to be updated is given by the \np{nn\_fsbc} namelist parameter. 
 When the fields are supplied from data files (flux and bulk formulations), the input fields 
-need not be supplied on the model grid.  Instead a file of coordinates and weights can 
+need not be supplied on the model grid. Instead a file of coordinates and weights can 
 be supplied which maps the data from the supplied grid to the model points 
 (so called "Interpolation on the Fly", see \S\ref{SBC_iof}).
@@ -42,17 +42,20 @@
 can be masked to avoid spurious results in proximity of the coasts  as large sea-land gradients characterize
 most of the atmospheric variables.
+
 In addition, the resulting fields can be further modified using several namelist options. 
-These options control  the rotation of vector components supplied relative to an east-north 
-coordinate system onto the local grid directions in the model; the addition of a surface 
-restoring term to observed SST and/or SSS (\np{ln\_ssr}~=~true); the modification of fluxes 
-below ice-covered areas (using observed ice-cover or a sea-ice model) 
-(\np{nn\_ice}~=~0,1, 2 or 3); the addition of river runoffs as surface freshwater 
-fluxes or lateral inflow (\np{ln\_rnf}~=~true); the addition of isf melting as lateral inflow (parameterisation) 
-(\np{nn\_isf}~=~2 or 3 and \np{ln\_isfcav}~=~false) or as surface flux at the land-ice ocean interface
-(\np{nn\_isf}~=~1 or 4 and \np{ln\_isfcav}~=~true); 
-the addition of a freshwater flux adjustment in order to avoid a mean sea-level drift (\np{nn\_fwb}~=~0,~1~or~2); the 
-transformation of the solar radiation (if provided as daily mean) into a diurnal 
-cycle (\np{ln\_dm2dc}~=~true); and a neutral drag coefficient can be read from an external wave 
-model (\np{ln\_cdgw}~=~true). The latter option is possible only in case core or mfs bulk formulas are selected.
+These options control 
+\begin{itemize}
+\item the rotation of vector components supplied relative to an east-north 
+coordinate system onto the local grid directions in the model ; 
+\item the addition of a surface restoring term to observed SST and/or SSS (\np{ln\_ssr}~=~true) ; 
+\item the modification of fluxes below ice-covered areas (using observed ice-cover or a sea-ice model) (\np{nn\_ice}~=~0,1, 2 or 3) ; 
+\item the addition of river runoffs as surface freshwater fluxes or lateral inflow (\np{ln\_rnf}~=~true) ; 
+\item the addition of isf melting as lateral inflow (parameterisation) (\np{nn\_isf}~=~2 or 3 and \np{ln\_isfcav}~=~false) 
+or as fluxes applied at the land-ice ocean interface (\np{nn\_isf}~=~1 or 4 and \np{ln\_isfcav}~=~true) ; 
+\item the addition of a freshwater flux adjustment in order to avoid a mean sea-level drift (\np{nn\_fwb}~=~0,~1~or~2) ; 
+\item the transformation of the solar radiation (if provided as daily mean) into a diurnal cycle (\np{ln\_dm2dc}~=~true) ; 
+and a neutral drag coefficient can be read from an external wave model (\np{ln\_cdgw}~=~true). 
+\end{itemize}
+The latter option is possible only in case core or mfs bulk formulas are selected.
 
 In this chapter, we first discuss where the surface boundary condition appears in the
@@ -73,69 +76,31 @@
 
 The surface ocean stress is the stress exerted by the wind and the sea-ice 
-on the ocean. The two components of stress are assumed to be interpolated 
-onto the ocean mesh, $i.e.$ resolved onto the model (\textbf{i},\textbf{j}) direction 
-at $u$- and $v$-points They are applied as a surface boundary condition of the 
-computation of the momentum vertical mixing trend (\mdl{dynzdf} module) :
-\begin{equation} \label{Eq_sbc_dynzdf}
-\left.{\left( {\frac{A^{vm} }{e_3 }\ \frac{\partial \textbf{U}_h}{\partial k}} \right)} \right|_{z=1}
-	 = \frac{1}{\rho _o} \binom{\tau _u}{\tau _v }
-\end{equation}
-where $(\tau _u ,\;\tau _v )=(utau,vtau)$ are the two components of the wind 
-stress vector in the $(\textbf{i},\textbf{j})$ coordinate system.
+on the ocean. It is applied in \mdl{dynzdf} module as a surface boundary condition of the 
+computation of the momentum vertical mixing trend (see \eqref{Eq_dynzdf_sbc} in \S\ref{DYN_zdf}).
+As such, it has to be provided as a 2D vector interpolated 
+onto the horizontal velocity ocean mesh, $i.e.$ resolved onto the model 
+(\textbf{i},\textbf{j}) direction at $u$- and $v$-points.
 
 The surface heat flux is decomposed into two parts, a non solar and a solar heat 
 flux, $Q_{ns}$ and $Q_{sr}$, respectively. The former is the non penetrative part 
-of the heat flux ($i.e.$ the sum of sensible, latent and long wave heat fluxes). 
-It is applied as a surface boundary condition trend of the first level temperature 
-time evolution equation (\mdl{trasbc} module). 
-\begin{equation} \label{Eq_sbc_trasbc_q}
-\frac{\partial T}{\partial t}\equiv \cdots \;+\;\left. {\frac{Q_{ns} }{\rho 
-_o \;C_p \;e_{3t} }} \right|_{k=1} \quad
-\end{equation}
-$Q_{sr}$ is the penetrative part of the heat flux. It is applied as a 3D 
-trends of the temperature equation (\mdl{traqsr} module) when \np{ln\_traqsr}=True.
-
-\begin{equation} \label{Eq_sbc_traqsr}
-\frac{\partial T}{\partial t}\equiv \cdots \;+\frac{Q_{sr} }{\rho_o C_p \,e_{3t} }\delta _k \left[ {I_w } \right]
-\end{equation}
-where $I_w$ is a non-dimensional function that describes the way the light 
-penetrates inside the water column. It is generally a sum of decreasing 
-exponentials (see \S\ref{TRA_qsr}).
-
-The surface freshwater budget is provided by fields: \textit{emp} and $\textit{emp}_S$ which 
-may or may not be identical. Indeed, a surface freshwater flux has two effects: 
-it changes the volume of the ocean and it changes the surface concentration of 
-salt (and other tracers). Therefore it appears in the sea surface height as a volume 
-flux, \textit{emp} (\textit{dynspg\_xxx} modules), and in the salinity time evolution equations 
-as a concentration/dilution effect, 
-$\textit{emp}_{S}$ (\mdl{trasbc} module). 
-\begin{equation} \label{Eq_trasbc_emp}
-\begin{aligned}
-&\frac{\partial \eta }{\partial t}\equiv \cdots \;+\;\textit{emp}\quad  \\ 
-\\
- &\frac{\partial S}{\partial t}\equiv \cdots \;+\left. {\frac{\textit{emp}_S \;S}{e_{3t} }} \right|_{k=1} \\ 
- \end{aligned}
-\end{equation} 
-
-In the real ocean, $\textit{emp}=\textit{emp}_S$ and the ocean salt content is conserved, 
-but it exist several numerical reasons why this equality should be broken. 
-For example, when the ocean is coupled to a sea-ice model, the water exchanged between 
-ice and ocean is slightly salty (mean sea-ice salinity is $\sim $\textit{4 psu}). In this case, 
-$\textit{emp}_{S}$ take into account both concentration/dilution effect associated with 
-freezing/melting and the salt flux between ice and ocean, while \textit{emp} is 
-only the volume flux. In addition, in the current version of \NEMO, the sea-ice is 
-assumed to be above the ocean (the so-called levitating sea-ice). Freezing/melting does 
-not change the ocean volume (no impact on \textit{emp}) but it modifies the SSS.
-%gm  \colorbox{yellow}{(see {\S} on LIM sea-ice model)}.
-
-Note that SST can also be modified by a freshwater flux. Precipitation (in 
-particular solid precipitation) may have a temperature significantly different from 
-the SST. Due to the lack of information about the temperature of 
-precipitation, we assume it is equal to the SST. Therefore, no 
-concentration/dilution term appears in the temperature equation. It has to 
-be emphasised that this absence does not mean that there is no heat flux 
-associated with precipitation! Precipitation can change the ocean volume and thus the
-ocean heat content. It is therefore associated with a heat flux (not yet  
-diagnosed in the model) \citep{Roullet_Madec_JGR00}).
+of the heat flux ($i.e.$ the sum of sensible, latent and long wave heat fluxes 
+plus the heat content of the mass exchange with the atmosphere and sea-ice). 
+It is applied in \mdl{trasbc} module as a surface boundary condition trend of 
+the first level temperature time evolution equation (see \eqref{Eq_tra_sbc} 
+and \eqref{Eq_tra_sbc_lin} in \S\ref{TRA_sbc}). 
+The latter is the penetrative part of the heat flux. It is applied as a 3D 
+trends of the temperature equation (\mdl{traqsr} module) when \np{ln\_traqsr}=\textit{true}.
+The way the light penetrates inside the water column is generally a sum of decreasing 
+exponentials (see \S\ref{TRA_qsr}). 
+
+The surface freshwater budget is provided by the \textit{emp} field.
+It represents the mass flux exchanged with the atmosphere (evaporation minus precipitation) 
+and possibly with the sea-ice and ice shelves (freezing minus melting of ice). 
+It affects both the ocean in two different ways: 
+$(i)$   it changes the volume of the ocean and therefore appears in the sea surface height 
+equation as a volume flux, and 
+$(ii)$  it changes the surface temperature and salinity through the heat and salt contents 
+of the mass exchanged with the atmosphere, the sea-ice and the ice shelves. 
+
 
 %\colorbox{yellow}{Miss: }
@@ -157,10 +122,15 @@
 %
 %Explain here all the namlist namsbc variable{\ldots}.
+% 
+% explain : use or not of surface currents
 %
 %\colorbox{yellow}{End Miss }
 
-The ocean model provides the surface currents, temperature and salinity 
-averaged over \np{nf\_sbc} time-step (\ref{Tab_ssm}).The computation of the 
-mean is done in \mdl{sbcmod} module.
+The ocean model provides, at each time step, to the surface module (\mdl{sbcmod}) 
+the surface currents, temperature and salinity.  
+These variables are averaged over \np{nf\_sbc} time-step (\ref{Tab_ssm}), 
+and it is these averaged fields which are used to computes the surface fluxes 
+at a frequency of \np{nf\_sbc} time-step.
+
 
 %-------------------------------------------------TABLE---------------------------------------------------
@@ -459,15 +429,19 @@
 %--------------------------------------------------------------------------------------------------------------
 
-In some circumstances it may be useful to avoid calculating the 3D temperature, salinity and velocity fields and simply read them in from  a previous run.  
-Options are defined through the  \ngn{namsbc\_sas} namelist variables.
+In some circumstances it may be useful to avoid calculating the 3D temperature, salinity and velocity fields 
+and simply read them in from a previous run or receive them from OASIS.  
 For example:
 
-\begin{enumerate}
-\item  Multiple runs of the model are required in code development to see the affect of different algorithms in
+\begin{itemize}
+\item  Multiple runs of the model are required in code development to see the effect of different algorithms in
        the bulk formulae.
 \item  The effect of different parameter sets in the ice model is to be examined.
-\end{enumerate}
+\item  Development of sea-ice algorithms or parameterizations.
+\item  spinup of the iceberg floats
+\item  ocean/sea-ice simulation with both media running in parallel (\np{ln\_mixcpl}~=~\textit{true})
+\end{itemize}
 
 The StandAlone Surface scheme provides this utility.
+Its options are defined through the \ngn{namsbc\_sas} namelist variables.
 A new copy of the model has to be compiled with a configuration based on ORCA2\_SAS\_LIM.
 However no namelist parameters need be changed from the settings of the previous run (except perhaps nn{\_}date0)
@@ -475,39 +449,33 @@
 Routines replaced are:
 
-\begin{enumerate}
-\item  \mdl{nemogcm}
-
-       This routine initialises the rest of the model and repeatedly calls the stp time stepping routine (step.F90)
+\begin{itemize}
+\item \mdl{nemogcm} : This routine initialises the rest of the model and repeatedly calls the stp time stepping routine (step.F90)
        Since the ocean state is not calculated all associated initialisations have been removed.
-\item  \mdl{step}
-
-       The main time stepping routine now only needs to call the sbc routine (and a few utility functions).
-\item  \mdl{sbcmod}
-
-       This has been cut down and now only calculates surface forcing and the ice model required.  New surface modules
+\item  \mdl{step} : The main time stepping routine now only needs to call the sbc routine (and a few utility functions).
+\item  \mdl{sbcmod} : This has been cut down and now only calculates surface forcing and the ice model required.  New surface modules
        that can function when only the surface level of the ocean state is defined can also be added (e.g. icebergs).
-\item  \mdl{daymod}
-
-       No ocean restarts are read or written (though the ice model restarts are retained), so calls to restart functions
+\item  \mdl{daymod} : No ocean restarts are read or written (though the ice model restarts are retained), so calls to restart functions
        have been removed.  This also means that the calendar cannot be controlled by time in a restart file, so the user
        must make sure that nn{\_}date0 in the model namelist is correct for his or her purposes.
-\item  \mdl{stpctl}
-
-       Since there is no free surface solver, references to it have been removed from \rou{stp\_ctl} module.
-\item  \mdl{diawri}
-
-       All 3D data have been removed from the output.  The surface temperature, salinity and velocity components (which
+\item  \mdl{stpctl} : Since there is no free surface solver, references to it have been removed from \rou{stp\_ctl} module.
+\item  \mdl{diawri} : All 3D data have been removed from the output.  The surface temperature, salinity and velocity components (which
        have been read in) are written along with relevant forcing and ice data.
-\end{enumerate}
+\end{itemize}
 
 One new routine has been added:
 
-\begin{enumerate}
-\item  \mdl{sbcsas}
-       This module initialises the input files needed for reading temperature, salinity and velocity arrays at the surface.
+\begin{itemize}
+\item  \mdl{sbcsas} : This module initialises the input files needed for reading temperature, salinity and velocity arrays at the surface.
        These filenames are supplied in namelist namsbc{\_}sas.  Unfortunately because of limitations with the \mdl{iom} module,
        the full 3D fields from the mean files have to be read in and interpolated in time, before using just the top level.
        Since fldread is used to read in the data, Interpolation on the Fly may be used to change input data resolution.
-\end{enumerate}
+\end{itemize}
+
+
+% Missing the description of the 2 following variables:
+%   ln_3d_uve   = .true.    !  specify whether we are supplying a 3D u,v and e3 field
+%   ln_read_frq = .false.    !  specify whether we must read frq or not
+
+
 
 % ================================================================
@@ -720,7 +688,6 @@
 are sent to the atmospheric component.
 
-A generalised coupled interface has been developed. It is currently interfaced with OASIS 3
-(\key{oasis3}) and does not support OASIS 4
-\footnote{The \key{oasis4} exist. It activates portion of the code that are still under development.}. 
+A generalised coupled interface has been developed. 
+It is currently interfaced with OASIS-3-MCT (\key{oasis3}). 
 It has been successfully used to interface \NEMO to most of the European atmospheric 
 GCM (ARPEGE, ECHAM, ECMWF, HadAM, HadGAM, LMDz), 
@@ -787,12 +754,12 @@
 \label{SBC_tide}
 
-A module is available to use the tidal potential forcing and is activated with with \key{tide}.
-
-
-%------------------------------------------nam_tide----------------------------------------------------
+%------------------------------------------nam_tide---------------------------------------
 \namdisplay{nam_tide}
-%-------------------------------------------------------------------------------------------------------------
-
-Concerning the tidal potential, some parameters are available in namelist \ngn{nam\_tide}:
+%-----------------------------------------------------------------------------------------
+
+A module is available to compute the tidal potential and use it in the momentum equation.
+This option is activated when \key{tide} is defined.
+
+Some parameters are available in namelist \ngn{nam\_tide}:
 
 - \np{ln\_tide\_pot} activate the tidal potential forcing
@@ -801,5 +768,4 @@
 
 - \np{clname} is the name of constituent
-
 
 The tide is generated by the forces of gravity ot the Earth-Moon and Earth-Sun sytem;
@@ -958,5 +924,5 @@
 \namdisplay{namsbc_isf}
 %--------------------------------------------------------------------------------------------------------
-Namelist variable in \ngn{namsbc}, \np{nn\_isf},  control the kind of ice shelf representation used. 
+Namelist variable in \ngn{namsbc}, \np{nn\_isf}, control the kind of ice shelf representation used. 
 \begin{description}
 \item[\np{nn\_isf}~=~1]
@@ -987,5 +953,5 @@
 \np{nn\_isf}~=~3 and \np{nn\_isf}~=~4 read the melt rate and heat flux from a file. You have total control of the fwf scenario.
 
- This can be usefull if the water masses on the shelf are not realistic or the resolution (horizontal/vertical) are too 
+This can be usefull if the water masses on the shelf are not realistic or the resolution (horizontal/vertical) are too 
 coarse to have realistic melting or for sensitivity studies where you want to control your input. 
 Full description, sensitivity and validation in preparation. 
@@ -1000,5 +966,5 @@
 %        Handling of icebergs
 % ================================================================
-\section{ Handling of icebergs (ICB) }
+\section{Handling of icebergs (ICB)}
 \label{ICB_icebergs}
 %------------------------------------------namberg----------------------------------------------------
@@ -1006,8 +972,9 @@
 %-------------------------------------------------------------------------------------------------------------
 
-Icebergs are modelled as lagrangian particles in NEMO.
-Their physical behaviour is controlled by equations as described in  \citet{Martin_Adcroft_OM10} ).
-(Note that the authors kindly provided a copy of their code to act as a basis for implementation in NEMO.)
-Icebergs are initially spawned into one of ten classes which have specific mass and thickness as described in the \ngn{namberg} namelist: 
+Icebergs are modelled as lagrangian particles in NEMO \citep{Marsh_GMD2015}.
+Their physical behaviour is controlled by equations as described in \citet{Martin_Adcroft_OM10} ).
+(Note that the authors kindly provided a copy of their code to act as a basis for implementation in NEMO).
+Icebergs are initially spawned into one of ten classes which have specific mass and thickness as described 
+in the \ngn{namberg} namelist: 
 \np{rn\_initial\_mass} and \np{rn\_initial\_thickness}.
 Each class has an associated scaling (\np{rn\_mass\_scaling}), which is an integer representing how many icebergs 
@@ -1193,5 +1160,5 @@
 The presence at the sea surface of an ice covered area modifies all the fluxes 
 transmitted to the ocean. There are several way to handle sea-ice in the system 
-depending on the value of the \np{nn{\_}ice} namelist parameter.  
+depending on the value of the \np{nn\_ice} namelist parameter found in \ngn{namsbc} namelist.  
 \begin{description}
 \item[nn{\_}ice = 0]  there will never be sea-ice in the computational domain. 
@@ -1268,27 +1235,41 @@
 % -------------------------------------------------------------------------------------------------------------
 \subsection   [Neutral drag coefficient from external wave model (\textit{sbcwave})]
-                        {Neutral drag coefficient from external wave model (\mdl{sbcwave})}
+              {Neutral drag coefficient from external wave model (\mdl{sbcwave})}
 \label{SBC_wave}
 %------------------------------------------namwave----------------------------------------------------
 \namdisplay{namsbc_wave}
 %-------------------------------------------------------------------------------------------------------------
-\begin{description}
-
-\item [??] In order to read a neutral drag coeff, from an external data source (i.e. a wave model), the 
-logical variable \np{ln\_cdgw}
- in $namsbc$ namelist must be defined ${.true.}$. 
+
+In order to read a neutral drag coeff, from an external data source ($i.e.$ a wave model), the 
+logical variable \np{ln\_cdgw} in \ngn{namsbc} namelist must be set to \textit{true}. 
 The \mdl{sbcwave} module containing the routine \np{sbc\_wave} reads the
 namelist \ngn{namsbc\_wave} (for external data names, locations, frequency, interpolation and all 
 the miscellanous options allowed by Input Data generic Interface see \S\ref{SBC_input}) 
-and a 2D field of neutral drag coefficient. Then using the routine 
-TURB\_CORE\_1Z or TURB\_CORE\_2Z, and starting from the neutral drag coefficent provided, the drag coefficient is computed according 
-to stable/unstable conditions of the air-sea interface following \citet{Large_Yeager_Rep04}.
-
-\end{description}
+and a 2D field of neutral drag coefficient. 
+Then using the routine TURB\_CORE\_1Z or TURB\_CORE\_2Z, and starting from the neutral drag coefficent provided, 
+the drag coefficient is computed according to stable/unstable conditions of the air-sea interface following \citet{Large_Yeager_Rep04}.
+
 
 % Griffies doc:
-% When running ocean-ice simulations, we are not explicitly representing land processes, such as rivers, catchment areas, snow accumulation, etc. However, to reduce model drift, it is important to balance the hydrological cycle in ocean-ice models. We thus need to prescribe some form of global normalization to the precipitation minus evaporation plus river runoff. The result of the normalization should be a global integrated zero net water input to the ocean-ice system over a chosen time scale. 
-%How often the normalization is done is a matter of choice. In mom4p1, we choose to do so at each model time step, so that there is always a zero net input of water to the ocean-ice system. Others choose to normalize over an annual cycle, in which case the net imbalance over an annual cycle is used to alter the subsequent year�s water budget in an attempt to damp the annual water imbalance. Note that the annual budget approach may be inappropriate with interannually varying precipitation forcing. 
-%When running ocean-ice coupled models, it is incorrect to include the water transport between the ocean and ice models when aiming to balance the hydrological cycle. The reason is that it is the sum of the water in the ocean plus ice that should be balanced when running ocean-ice models, not the water in any one sub-component. As an extreme example to illustrate the issue, consider an ocean-ice model with zero initial sea ice. As the ocean-ice model spins up, there should be a net accumulation of water in the growing sea ice, and thus a net loss of water from the ocean. The total water contained in the ocean plus ice system is constant, but there is an exchange of water between the subcomponents. This exchange should not be part of the normalization used to balance the hydrological cycle in ocean-ice models. 
-
-
+% When running ocean-ice simulations, we are not explicitly representing land processes, 
+% such as rivers, catchment areas, snow accumulation, etc. However, to reduce model drift, 
+% it is important to balance the hydrological cycle in ocean-ice models. 
+% We thus need to prescribe some form of global normalization to the precipitation minus evaporation plus river runoff. 
+% The result of the normalization should be a global integrated zero net water input to the ocean-ice system over 
+% a chosen time scale. 
+%How often the normalization is done is a matter of choice. In mom4p1, we choose to do so at each model time step, 
+% so that there is always a zero net input of water to the ocean-ice system. 
+% Others choose to normalize over an annual cycle, in which case the net imbalance over an annual cycle is used 
+% to alter the subsequent year�s water budget in an attempt to damp the annual water imbalance. 
+% Note that the annual budget approach may be inappropriate with interannually varying precipitation forcing. 
+% When running ocean-ice coupled models, it is incorrect to include the water transport between the ocean 
+% and ice models when aiming to balance the hydrological cycle. 
+% The reason is that it is the sum of the water in the ocean plus ice that should be balanced when running ocean-ice models, 
+% not the water in any one sub-component. As an extreme example to illustrate the issue, 
+% consider an ocean-ice model with zero initial sea ice. As the ocean-ice model spins up, 
+% there should be a net accumulation of water in the growing sea ice, and thus a net loss of water from the ocean. 
+% The total water contained in the ocean plus ice system is constant, but there is an exchange of water between 
+% the subcomponents. This exchange should not be part of the normalization used to balance the hydrological cycle 
+% in ocean-ice models. 
+
+
Index: /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Chap_TRA.tex
===================================================================
--- /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Chap_TRA.tex	(revision 6274)
+++ /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Chap_TRA.tex	(revision 6275)
@@ -36,16 +36,14 @@
 (BBL) parametrisation, and an internal damping (DMP) term. The terms QSR, 
 BBC, BBL and DMP are optional. The external forcings and parameterisations 
-require complex inputs and complex calculations (e.g. bulk formulae, estimation 
+require complex inputs and complex calculations ($e.g.$ bulk formulae, estimation 
 of mixing coefficients) that are carried out in the SBC, LDF and ZDF modules and 
 described in chapters \S\ref{SBC}, \S\ref{LDF} and  \S\ref{ZDF}, respectively. 
-Note that \mdl{tranpc}, the non-penetrative convection module,  although 
-(temporarily) located in the NEMO/OPA/TRA directory, is described with the 
-model vertical physics (ZDF).
-%%%
-\gmcomment{change the position of eosbn2 in the reference code}
-%%%
+Note that \mdl{tranpc}, the non-penetrative convection module, although 
+located in the NEMO/OPA/TRA directory as it directly modifies the tracer fields, 
+is described with the model vertical physics (ZDF) together with other available 
+parameterization of convection.
 
 In the present chapter we also describe the diagnostic equations used to compute 
-the sea-water properties (density, Brunt-Vais\"{a}l\"{a} frequency, specific heat and 
+the sea-water properties (density, Brunt-V\"{a}is\"{a}l\"{a} frequency, specific heat and 
 freezing point with associated modules \mdl{eosbn2} and \mdl{phycst}).
 
@@ -56,6 +54,6 @@
 found in the \textit{trattt} or \textit{trattt\_xxx} module, in the NEMO/OPA/TRA directory.
 
-The user has the option of extracting each tendency term on the rhs of the tracer 
-equation for output (\key{trdtra} is defined), as described in Chap.~\ref{MISC}.
+The user has the option of extracting each tendency term on the RHS of the tracer 
+equation for output (\np{ln\_tra\_trd} or \np{ln\_tra\_mxl}~=~true), as described in Chap.~\ref{DIA}.
 
 $\ $\newline    % force a new ligne
@@ -125,7 +123,7 @@
 \end{description}
 In all cases, this boundary condition retains local conservation of tracer. 
-Global conservation is obtained in both rigid-lid and non-linear free surface 
-cases, but not in the linear free surface case. Nevertheless, in the latter
-case, it is achieved to a good approximation since the non-conservative 
+Global conservation is obtained in non-linear free surface case, 
+but \textit{not} in the linear free surface case. Nevertheless, in the latter case, 
+it is achieved to a good approximation since the non-conservative 
 term is the product of the time derivative of the tracer and the free surface 
 height, two quantities that are not correlated (see \S\ref{PE_free_surface}, 
@@ -133,7 +131,8 @@
 
 The velocity field that appears in (\ref{Eq_tra_adv}) and (\ref{Eq_tra_adv_zco}) 
-is the centred (\textit{now}) \textit{eulerian} ocean velocity (see Chap.~\ref{DYN}). 
-When eddy induced velocity (\textit{eiv}) parameterisation is used it is the \textit{now} 
-\textit{effective} velocity ($i.e.$ the sum of the eulerian and eiv velocities) which is used.
+is the centred (\textit{now}) \textit{effective} ocean velocity, $i.e.$ the \textit{eulerian} velocity
+(see Chap.~\ref{DYN}) plus the eddy induced velocity (\textit{eiv}) 
+and/or the mixed layer eddy induced velocity (\textit{eiv})
+when those parameterisations are used (see Chap.~\ref{LDF}).
 
 The choice of an advection scheme is made in the \textit{\ngn{nam\_traadv}} namelist, by 
@@ -146,8 +145,8 @@
 
 Note that 
-(1) cen2, cen4 and TVD schemes require an explicit diffusion 
+(1) cen2 and TVD schemes require an explicit diffusion 
 operator while the other schemes are diffusive enough so that they do not 
 require additional diffusion ; 
-(2) cen2, cen4, MUSCL2, and UBS are not \textit{positive} schemes
+(2) cen2, MUSCL2, and UBS are not \textit{positive} schemes
 \footnote{negative values can appear in an initially strictly positive tracer field 
 which is advected}
@@ -189,5 +188,5 @@
 temperature is close to the freezing point).
 This combined scheme has been included for specific grid points in the ORCA2 
-and ORCA4 configurations only. This is an obsolescent feature as the recommended 
+configuration only. This is an obsolescent feature as the recommended 
 advection scheme for the ORCA configuration is TVD (see  \S\ref{TRA_adv_tvd}).
 
@@ -196,41 +195,4 @@
 have this order of accuracy. \gmcomment{Note also that ... blah, blah}
 
-% -------------------------------------------------------------------------------------------------------------
-%        4nd order centred scheme  
-% -------------------------------------------------------------------------------------------------------------
-\subsection   [$4^{nd}$ order centred scheme (cen4) (\np{ln\_traadv\_cen4})]
-		     {$4^{nd}$ order centred scheme (cen4) (\np{ln\_traadv\_cen4}=true)}
-\label{TRA_adv_cen4}
-
-In the $4^{th}$ order formulation (to be implemented), tracer values are 
-evaluated at velocity points as a $4^{th}$ order interpolation, and thus depend on 
-the four neighbouring $T$-points. For example, in the $i$-direction:
-\begin{equation} \label{Eq_tra_adv_cen4}
-\tau _u^{cen4} 
-=\overline{   T - \frac{1}{6}\,\delta _i \left[ \delta_{i+1/2}[T] \,\right]   }^{\,i+1/2}
-\end{equation}
-
-Strictly speaking, the cen4 scheme is not a $4^{th}$ order advection scheme 
-but a $4^{th}$ order evaluation of advective fluxes, since the divergence of 
-advective fluxes \eqref{Eq_tra_adv} is kept at $2^{nd}$ order. The phrase ``$4^{th}$ 
-order scheme'' used in oceanographic literature is usually associated 
-with the scheme presented here. Introducing a \textit{true} $4^{th}$ order advection 
-scheme is feasible but, for consistency reasons, it requires changes in the 
-discretisation of the tracer advection together with changes in both the 
-continuity equation and the momentum advection terms.  
-
-A direct consequence of the pseudo-fourth order nature of the scheme is that 
-it is not non-diffusive, i.e. the global variance of a tracer is not preserved using 
-\textit{cen4}. Furthermore, it must be used in conjunction with an explicit 
-diffusion operator to produce a sensible solution. The time-stepping is also 
-performed using a leapfrog scheme in conjunction with an Asselin time-filter, 
-so $T$ in (\ref{Eq_tra_adv_cen4}) is the \textit{now} tracer.
-
-At a $T$-grid cell adjacent to a boundary (coastline, bottom and surface), an 
-additional hypothesis must be made to evaluate $\tau _u^{cen4}$. This 
-hypothesis usually reduces the order of the scheme. Here we choose to set 
-the gradient of $T$ across the boundary to zero. Alternative conditions can be 
-specified, such as a reduction to a second order scheme for these near boundary 
-grid points.
 
 % -------------------------------------------------------------------------------------------------------------
@@ -270,4 +232,12 @@
 used for the diffusive part. 
 
+An additional option has been added controlled by \np{ln\_traadv\_tvd\_zts}. 
+By setting this logical to true, a TVD scheme is used on both horizontal and vertical direction, 
+but on the latter, a split-explicit time stepping is used, with 5 sub-timesteps. 
+This option can be useful when the value of the timestep is limited by vertical advection \citep{Lemarie_OM2015}. 
+Note that in this case, a similar split-explicit time stepping should be used on 
+vertical advection of momentum to ensure a better stability (see \np{ln\_dynzad\_zts} in \S\ref{DYN_zad}).
+
+
 % -------------------------------------------------------------------------------------------------------------
 %        MUSCL scheme  
@@ -296,10 +266,12 @@
 
 For an ocean grid point adjacent to land and where the ocean velocity is 
-directed toward land, two choices are available: an upstream flux 
-(\np{ln\_traadv\_muscl}=true) or a second order flux 
-(\np{ln\_traadv\_muscl2}=true). Note that the latter choice does not ensure 
-the \textit{positive} character of the scheme. Only the former can be used 
-on both active and passive tracers. The two MUSCL schemes are implemented 
-in the \mdl{traadv\_tvd} and \mdl{traadv\_tvd2} modules.
+directed toward land, two choices are available: an upstream flux (\np{ln\_traadv\_muscl}=true) 
+or a second order flux (\np{ln\_traadv\_muscl2}=true). 
+Note that the latter choice does not ensure the \textit{positive} character of the scheme. 
+Only the former can be used on both active and passive tracers. 
+The two MUSCL schemes are implemented in the \mdl{traadv\_tvd} and \mdl{traadv\_tvd2} modules.
+
+Note that when using np{ln\_traadv\_msc\_ups}~=~true in addition to \np{ln\_traadv\_muscl}=true, 
+the MUSCL fluxes are replaced by upstream fluxes in vicinity of river mouths.
 
 % -------------------------------------------------------------------------------------------------------------
@@ -416,18 +388,4 @@
 direction (as for the UBS case) should be implemented to restore this property.
 
-
-% -------------------------------------------------------------------------------------------------------------
-%        PPM scheme  
-% -------------------------------------------------------------------------------------------------------------
-\subsection   [Piecewise Parabolic Method (PPM) (\np{ln\_traadv\_ppm})]
-			{Piecewise Parabolic Method (PPM) (\np{ln\_traadv\_ppm}=true)}
-\label{TRA_adv_ppm}
-
-The Piecewise Parabolic Method (PPM) proposed by Colella and Woodward (1984) 
-\sgacomment{reference?}
-is based on a quadradic piecewise construction. Like the QCK scheme, it is associated 
-with the ULTIMATE QUICKEST limiter \citep{Leonard1991}. It has been implemented 
-in \NEMO by G. Reffray (MERCATOR-ocean) but is not yet offered in the reference 
-version 3.3.
 
 % ================================================================
@@ -464,5 +422,5 @@
 surfaces is given by: 
 \begin{equation} \label{Eq_tra_ldf_lap}
-D_T^{lT} =\frac{1}{b_tT} \left( \;
+D_T^{lT} =\frac{1}{b_t} \left( \;
    \delta _{i}\left[ A_u^{lT} \; \frac{e_{2u}\,e_{3u}}{e_{1u}} \;\delta _{i+1/2} [T] \right] 
 + \delta _{j}\left[ A_v^{lT} \;  \frac{e_{1v}\,e_{3v}}{e_{2v}} \;\delta _{j+1/2} [T] \right]  \;\right)
@@ -661,16 +619,10 @@
 the thickness of the top model layer. 
 
-Due to interactions and mass exchange of water ($F_{mass}$) with other Earth system components ($i.e.$ atmosphere, sea-ice, land),
-the change in the heat and salt content of the surface layer of the ocean is due both 
-to the heat and salt fluxes crossing the sea surface (not linked with $F_{mass}$)
- and to the heat and salt content of the mass exchange.
-\sgacomment{ the following does not apply to the release to which this documentation is 
-attached and so should not be included ....
-In a forthcoming release, these two parts, computed in the surface module (SBC), will be included directly
-in $Q_{ns}$, the surface heat flux and $F_{salt}$, the surface salt flux.
-The specification of these fluxes is further detailed in the SBC chapter (see \S\ref{SBC}). 
-This change will provide a forcing formulation which is the same for any tracer (including temperature and salinity).
- 
-In the current version, the situation is a little bit more complicated. }
+Due to interactions and mass exchange of water ($F_{mass}$) with other Earth system components 
+($i.e.$ atmosphere, sea-ice, land), the change in the heat and salt content of the surface layer 
+of the ocean is due both to the heat and salt fluxes crossing the sea surface (not linked with $F_{mass}$) 
+and to the heat and salt content of the mass exchange. They are both included directly in $Q_{ns}$, 
+the surface heat flux, and $F_{salt}$, the surface salt flux (see \S\ref{SBC} for further details).
+By doing this, the forcing formulation is the same for any tracer (including temperature and salinity).
 
 The surface module (\mdl{sbcmod}, see \S\ref{SBC}) provides the following 
@@ -679,22 +631,34 @@
 $\bullet$ $Q_{ns}$, the non-solar part of the net surface heat flux that crosses the sea surface 
 (i.e. the difference between the total surface heat flux and the fraction of the short wave flux that 
-penetrates into the water column, see \S\ref{TRA_qsr})
-
-$\bullet$ \textit{emp}, the mass flux exchanged with the atmosphere (evaporation minus precipitation)
-
-$\bullet$ $\textit{emp}_S$, an equivalent mass flux taking into account the effect of ice-ocean mass exchange
-
-$\bullet$ \textit{rnf}, the mass flux associated with runoff (see \S\ref{SBC_rnf} for further detail of how it acts on temperature and salinity tendencies)
-
-The $\textit{emp}_S$ field is not simply the budget of evaporation-precipitation+freezing-melting because 
-the sea-ice is not currently embedded in the ocean but levitates above it. There is no mass
-exchanged between the sea-ice and the ocean. Instead we only take into account the salt
-flux associated with the non-zero salinity of sea-ice, and the concentration/dilution effect
-due to the freezing/melting (F/M) process. These two parts of the forcing are then converted into 
-an equivalent mass flux given by $\textit{emp}_S - \textit{emp}$. As a result of this mess, 
-the surface boundary condition on temperature and salinity is applied as follows:
-
-In the nonlinear free surface case (\key{vvl} is defined):
+penetrates into the water column, see \S\ref{TRA_qsr}) plus the heat content associated with 
+of the mass exchange with the atmosphere and lands.
+
+$\bullet$ $\textit{sfx}$, the salt flux resulting from ice-ocean mass exchange (freezing, melting, ridging...)
+
+$\bullet$ \textit{emp}, the mass flux exchanged with the atmosphere (evaporation minus precipitation) 
+ and possibly with the sea-ice and ice-shelves.
+
+$\bullet$ \textit{rnf}, the mass flux associated with runoff 
+(see \S\ref{SBC_rnf} for further detail of how it acts on temperature and salinity tendencies)
+
+In the non-linear free surface case (\key{vvl} is defined), the surface boundary condition 
+on temperature and salinity is applied as follows:
 \begin{equation} \label{Eq_tra_sbc}
+\begin{aligned}
+ &F^T = \frac{ 1 }{\rho _o \;C_p \,\left. e_{3t} \right|_{k=1} }  &\overline{ Q_{ns}       }^t  & \\ 
+& F^S =\frac{ 1 }{\rho _o  \,      \left. e_{3t} \right|_{k=1} }  &\overline{ \textit{sfx} }^t   & \\   
+ \end{aligned}
+\end{equation} 
+where $\overline{x }^t$ means that $x$ is averaged over two consecutive time steps 
+($t-\rdt/2$ and $t+\rdt/2$). Such time averaging prevents the 
+divergence of odd and even time step (see \S\ref{STP}).
+
+In the linear free surface case (\key{vvl} is \textit{not} defined), 
+an additional term has to be added on both temperature and salinity. 
+On temperature, this term remove the heat content associated with mass exchange
+that has been added to $Q_{ns}$. On salinity, this term mimics the concentration/dilution effect that
+would have resulted from a change in the volume of the first level.
+The resulting surface boundary condition is applied as follows:
+\begin{equation} \label{Eq_tra_sbc_lin}
 \begin{aligned}
  &F^T = \frac{ 1 }{\rho _o \;C_p \,\left. e_{3t} \right|_{k=1} }   
@@ -702,50 +666,11 @@
 %
 & F^S =\frac{ 1 }{\rho _o \,\left. e_{3t} \right|_{k=1} } 
-           &\overline{ \left( (\textit{emp}_S - \textit{emp})\;\left. S \right|_{k=1}  \right) }^t   & \\   
+           &\overline{ \left( \;\textit{sfx} - \textit{emp} \;\left. S \right|_{k=1}  \right) }^t   & \\   
  \end{aligned}
 \end{equation} 
-
-In the linear free surface case (\key{vvl} not defined):
-\begin{equation} \label{Eq_tra_sbc_lin}
-\begin{aligned}
- &F^T = \frac{ 1 }{\rho _o \;C_p \,\left. e_{3t} \right|_{k=1} }  &\overline{ Q_{ns} }^t  & \\ 
-%
-& F^S =\frac{ 1 }{\rho _o \,\left. e_{3t} \right|_{k=1} } 
-           &\overline{ \left( \textit{emp}_S\;\left. S \right|_{k=1}  \right) }^t   & \\   
- \end{aligned}
-\end{equation} 
-where $\overline{x }^t$ means that $x$ is averaged over two consecutive time steps 
-($t-\rdt/2$ and $t+\rdt/2$). Such time averaging prevents the 
-divergence of odd and even time step (see \S\ref{STP}).
-
-The two set of equations, \eqref{Eq_tra_sbc} and \eqref{Eq_tra_sbc_lin}, are obtained 
-by assuming that the temperature of precipitation and evaporation are equal to
-the ocean surface temperature and that their salinity is zero. Therefore, the heat content
-of the \textit{emp} budget must be added to the temperature equation in the variable volume case, 
-while it does not appear in the constant volume case. Similarly, the \textit{emp} budget affects 
-the ocean surface salinity in the constant volume case (through the concentration dilution effect)
-while it does not appears explicitly in the variable volume case since salinity change will be
-induced by volume change. In both constant and variable volume cases, surface salinity 
-will change with ice-ocean salt flux and F/M flux (both contained in $\textit{emp}_S - \textit{emp}$) without mass exchanges.
-
-Note that the concentration/dilution effect due to F/M is computed using
-a constant ice salinity as well as a constant ocean salinity. 
-This approximation suppresses the correlation between \textit{SSS} 
-and F/M flux, allowing the ice-ocean salt exchanges to be conservative.
-Indeed, if this approximation is not made, even if the F/M budget is zero 
-on average over the whole ocean domain and over the seasonal cycle, 
-the associated salt flux is not zero, since sea-surface salinity and F/M flux are 
-intrinsically correlated (high \textit{SSS} are found where freezing is 
-strong whilst low \textit{SSS} is usually associated with high melting areas).
-
-Even using this approximation, an exact conservation of heat and salt content 
-is only achieved in the variable volume case. In the constant volume case, 
-there is a small imbalance associated with the product $(\partial_t\eta - \textit{emp}) * \textit{SSS}$.
-Nevertheless, the salt content variation is quite small and will not induce
-a long term drift as there is no physical reason for $(\partial_t\eta - \textit{emp})$ 
-and \textit{SSS} to be correlated \citep{Roullet_Madec_JGR00}. 
-Note that, while quite small, the imbalance in the constant volume case is larger 
+Note that an exact conservation of heat and salt content is only achieved with non-linear free surface. 
+In the linear free surface case, there is a small imbalance. The imbalance is larger 
 than the imbalance associated with the Asselin time filter \citep{Leclair_Madec_OM09}. 
-This is the reason why the modified filter is not applied in the constant volume case.
+This is the reason why the modified filter is not applied in the linear free surface case (see \S\ref{STP}).
 
 % -------------------------------------------------------------------------------------------------------------
@@ -1103,5 +1028,10 @@
 \subsection[DMP\_TOOLS]{Generating resto.nc using DMP\_TOOLS}
 
-DMP\_TOOLS can be used to generate a netcdf file containing the restoration coefficient $\gamma$. Note that in order to maintain bit comparison with previous NEMO versions DMP\_TOOLS must be compiled and run on the same machine as the NEMO model. A mesh\_mask.nc file for the model configuration is required as an input. This can be generated by carrying out a short model run with the namelist parameter \np{nn\_msh} set to 1. The namelist parameter \np{ln\_tradmp} will also need to be set to .false. for this to work. The \nl{nam\_dmp\_create} namelist in the DMP\_TOOLS directory is used to specify options for the restoration coefficient.
+DMP\_TOOLS can be used to generate a netcdf file containing the restoration coefficient $\gamma$. 
+Note that in order to maintain bit comparison with previous NEMO versions DMP\_TOOLS must be compiled 
+and run on the same machine as the NEMO model. A mesh\_mask.nc file for the model configuration is required as an input. 
+This can be generated by carrying out a short model run with the namelist parameter \np{nn\_msh} set to 1. 
+The namelist parameter \np{ln\_tradmp} will also need to be set to .false. for this to work. 
+The \nl{nam\_dmp\_create} namelist in the DMP\_TOOLS directory is used to specify options for the restoration coefficient.
 
 %--------------------------------------------nam_dmp_create-------------------------------------------------
@@ -1111,7 +1041,23 @@
 \np{cp\_cfg}, \np{cp\_cpz}, \np{jp\_cfg} and \np{jperio} specify the model configuration being used and should be the same as specified in \nl{namcfg}. The variable \nl{lzoom} is used to specify that the damping is being used as in case \textit{a} above to provide boundary conditions to a zoom configuration. In the case of the arctic or antarctic zoom configurations this includes some specific treatment. Otherwise damping is applied to the 6 grid points along the ocean boundaries. The open boundaries are specified by the variables \np{lzoom\_n}, \np{lzoom\_e}, \np{lzoom\_s}, \np{lzoom\_w} in the \nl{nam\_zoom\_dmp} name list.
 
-The remaining switch namelist variables determine the spatial variation of the restoration coefficient in non-zoom configurations. \np{ln\_full\_field} specifies that newtonian damping should be applied to the whole model domain. \np{ln\_med\_red\_seas} specifies grid specific restoration coefficients in the Mediterranean Sea for the ORCA4, ORCA2 and ORCA05 configurations. If \np{ln\_old\_31\_lev\_code} is set then the depth variation of the coeffients will be specified as a function of the model number. This option is included to allow backwards compatability of the ORCA2 reference configurations with previous model versions. \np{ln\_coast} specifies that the restoration coefficient should be reduced near to coastlines. This option only has an effect if \np{ln\_full\_field} is true. \np{ln\_zero\_top\_layer} specifies that the restoration coefficient should be zero in the surface layer. Finally \np{ln\_custom} specifies that the custom module will be called. This module is contained in the file custom.F90 and can be edited by users. For example damping could be applied in a specific region.
-
-The restoration coefficient can be set to zero in equatorial regions by specifying a positive value of \np{nn\_hdmp}. Equatorward of this latitude the restoration coefficient will be zero with a smooth transition to the full values of a 10$^{\circ}$ latitud band. This is often used because of the short adjustment time scale in the equatorial region \citep{Reverdin1991, Fujio1991, Marti_PhD92}. The time scale associated with the damping depends on the depth as a hyperbolic tangent, with \np{rn\_surf} as surface value, \np{rn\_bot} as bottom value and a transition depth of \np{rn\_dep}.  
+The remaining switch namelist variables determine the spatial variation of the restoration coefficient in non-zoom configurations. 
+\np{ln\_full\_field} specifies that newtonian damping should be applied to the whole model domain. 
+\np{ln\_med\_red\_seas} specifies grid specific restoration coefficients in the Mediterranean Sea 
+for the ORCA4, ORCA2 and ORCA05 configurations. 
+If \np{ln\_old\_31\_lev\_code} is set then the depth variation of the coeffients will be specified as 
+a function of the model number. This option is included to allow backwards compatability of the ORCA2 reference 
+configurations with previous model versions. 
+\np{ln\_coast} specifies that the restoration coefficient should be reduced near to coastlines. 
+This option only has an effect if \np{ln\_full\_field} is true. 
+\np{ln\_zero\_top\_layer} specifies that the restoration coefficient should be zero in the surface layer. 
+Finally \np{ln\_custom} specifies that the custom module will be called. 
+This module is contained in the file custom.F90 and can be edited by users. For example damping could be applied in a specific region.
+
+The restoration coefficient can be set to zero in equatorial regions by specifying a positive value of \np{nn\_hdmp}. 
+Equatorward of this latitude the restoration coefficient will be zero with a smooth transition to 
+the full values of a 10$^{\circ}$ latitud band. 
+This is often used because of the short adjustment time scale in the equatorial region 
+\citep{Reverdin1991, Fujio1991, Marti_PhD92}. The time scale associated with the damping depends on the depth as a 
+hyperbolic tangent, with \np{rn\_surf} as surface value, \np{rn\_bot} as bottom value and a transition depth of \np{rn\_dep}.  
 
 % ================================================================
@@ -1265,11 +1211,11 @@
 \hline
 coeff.	& computer name   & S-EOS		&  description		                  \\ \hline
-$a_0$       & \np{nn\_a0}     & 1.6550 $10^{-1}$ &  linear thermal expansion coeff. 	\\ \hline
-$b_0$	      & \np{nn\_b0} 	   & 7.6554 $10^{-1}$ &  linear haline  expansion coeff. 	\\ \hline
-$\lambda_1$	& \np{nn\_lambda1}& 5.9520 $10^{-2}$ &  cabbeling coeff. in $T^2$ 	      \\ \hline
-$\lambda_2$	& \np{nn\_lambda2}& 5.4914 $10^{-4}$ &  cabbeling coeff. in $S^2$	 	   \\ \hline
-$\nu$       & \np{nn\_nu}     & 2.4341 $10^{-3}$ &  cabbeling coeff. in $T \, S$ 	   \\ \hline
-$\mu_1$     & \np{nn\_mu1} 	& 1.4970 $10^{-4}$ &  thermobaric coeff. in T    	   \\ \hline
-$\mu_2$     & \np{nn\_mu2} 	& 1.1090 $10^{-5}$ &  thermobaric coeff. in S   	      \\ \hline
+$a_0$       & \np{rn\_a0}     & 1.6550 $10^{-1}$ &  linear thermal expansion coeff. 	\\ \hline
+$b_0$	      & \np{rn\_b0} 	   & 7.6554 $10^{-1}$ &  linear haline  expansion coeff. 	\\ \hline
+$\lambda_1$	& \np{rn\_lambda1}& 5.9520 $10^{-2}$ &  cabbeling coeff. in $T^2$ 	      \\ \hline
+$\lambda_2$	& \np{rn\_lambda2}& 5.4914 $10^{-4}$ &  cabbeling coeff. in $S^2$	 	   \\ \hline
+$\nu$       & \np{rn\_nu}     & 2.4341 $10^{-3}$ &  cabbeling coeff. in $T \, S$ 	   \\ \hline
+$\mu_1$     & \np{rn\_mu1} 	& 1.4970 $10^{-4}$ &  thermobaric coeff. in T    	   \\ \hline
+$\mu_2$     & \np{rn\_mu2} 	& 1.1090 $10^{-5}$ &  thermobaric coeff. in S   	      \\ \hline
 \end{tabular}
 \caption{ \label{Tab_SEOS}
@@ -1281,10 +1227,10 @@
 
 % -------------------------------------------------------------------------------------------------------------
-%        Brunt-Vais\"{a}l\"{a} Frequency
-% -------------------------------------------------------------------------------------------------------------
-\subsection{Brunt-Vais\"{a}l\"{a} Frequency (\np{nn\_eos} = 0, 1 or 2)}
+%        Brunt-V\"{a}is\"{a}l\"{a} Frequency
+% -------------------------------------------------------------------------------------------------------------
+\subsection{Brunt-V\"{a}is\"{a}l\"{a} Frequency (\np{nn\_eos} = 0, 1 or 2)}
 \label{TRA_bn2}
 
-An accurate computation of the ocean stability (i.e. of $N$, the brunt-Vais\"{a}l\"{a}
+An accurate computation of the ocean stability (i.e. of $N$, the brunt-V\"{a}is\"{a}l\"{a}
  frequency) is of paramount importance as determine the ocean stratification and 
  is used in several ocean parameterisations (namely TKE, GLS, Richardson number dependent 
@@ -1302,14 +1248,4 @@
 function that can be found in \mdl{eosbn2}.
 
-
-% -------------------------------------------------------------------------------------------------------------
-%        Potential Energy     
-% -------------------------------------------------------------------------------------------------------------
-%\subsection{Potential Energy anomalies}
-%\label{TRA_bn2}
-
-%    =====>>>>> TO BE written
-%
-
 % -------------------------------------------------------------------------------------------------------------
 %        Freezing Point of Seawater
@@ -1341,5 +1277,6 @@
 \label{TRA_zpshde}
 
-\gmcomment{STEVEN: to be consistent with earlier discussion of differencing and averaging operators, I've changed "derivative" to "difference" and "mean" to "average"}
+\gmcomment{STEVEN: to be consistent with earlier discussion of differencing and averaging operators, 
+                   I've changed "derivative" to "difference" and "mean" to "average"}
 
 With partial bottom cells (\np{ln\_zps}=true), in general, tracers in horizontally 
Index: /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Chap_ZDF.tex
===================================================================
--- /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Chap_ZDF.tex	(revision 6274)
+++ /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Chap_ZDF.tex	(revision 6275)
@@ -33,10 +33,9 @@
 points, respectively (see \S\ref{TRA_zdf} and \S\ref{DYN_zdf}). These 
 coefficients can be assumed to be either constant, or a function of the local 
-Richardson number, or computed from a turbulent closure model (either 
-TKE or KPP formulation). The computation of these coefficients is initialized 
-in the \mdl{zdfini} module and performed in the \mdl{zdfric}, \mdl{zdftke} or 
-\mdl{zdfkpp} modules. The trends due to the vertical momentum and tracer 
-diffusion, including the surface forcing, are computed and added to the 
-general trend in the \mdl{dynzdf} and \mdl{trazdf} modules, respectively. 
+Richardson number, or computed from a turbulent closure model (TKE, GLS or KPP formulation). 
+The computation of these coefficients is initialized in the \mdl{zdfini} module 
+and performed in the \mdl{zdfric}, \mdl{zdftke}, \mdl{zdfgls} or \mdl{zdfkpp} modules. 
+The trends due to the vertical momentum and tracer diffusion, including the surface forcing, 
+are computed and added to the general trend in the \mdl{dynzdf} and \mdl{trazdf} modules, respectively. 
 These trends can be computed using either a forward time stepping scheme 
 (namelist parameter \np{ln\_zdfexp}=true) or a backward time stepping 
@@ -355,9 +354,46 @@
 %--------------------------------------------------------------%
 
-To be add here a description of "penetration of TKE" and the associated namelist parameters
- \np{nn\_etau}, \np{rn\_efr} and \np{nn\_htau}.
+Vertical mixing parameterizations commonly used in ocean general circulation models 
+tend to produce mixed-layer depths that are too shallow during summer months and windy conditions.
+This bias is particularly acute over the Southern Ocean. 
+To overcome this systematic bias, an ad hoc parameterization is introduced into the TKE scheme  \cite{Rodgers_2014}. 
+The parameterization is an empirical one, $i.e.$ not derived from theoretical considerations, 
+but rather is meant to account for observed processes that affect the density structure of 
+the ocean’s planetary boundary layer that are not explicitly captured by default in the TKE scheme 
+($i.e.$ near-inertial oscillations and ocean swells and waves).
+
+When using this parameterization ($i.e.$ when \np{nn\_etau}~=~1), the TKE input to the ocean ($S$) 
+imposed by the winds in the form of near-inertial oscillations, swell and waves is parameterized 
+by \eqref{ZDF_Esbc} the standard TKE surface boundary condition, plus a depth depend one given by:
+\begin{equation}  \label{ZDF_Ehtau}
+S = (1-f_i) \; f_r \; e_s \; e^{-z / h_\tau} 
+\end{equation}
+where 
+$z$ is the depth,  
+$e_s$ is TKE surface boundary condition, 
+$f_r$ is the fraction of the surface TKE that penetrate in the ocean, 
+$h_\tau$ is a vertical mixing length scale that controls exponential shape of the penetration, 
+and $f_i$ is the ice concentration (no penetration if $f_i=1$, that is if the ocean is entirely 
+covered by sea-ice).
+The value of $f_r$, usually a few percents, is specified through \np{rn\_efr} namelist parameter. 
+The vertical mixing length scale, $h_\tau$, can be set as a 10~m uniform value (\np{nn\_etau}~=~0) 
+or a latitude dependent value (varying from 0.5~m at the Equator to a maximum value of 30~m 
+at high latitudes (\np{nn\_etau}~=~1). 
+
+Note that two other option existe, \np{nn\_etau}~=~2, or 3. They correspond to applying 
+\eqref{ZDF_Ehtau} only at the base of the mixed layer, or to using the high frequency part 
+of the stress to evaluate the fraction of TKE that penetrate the ocean. 
+Those two options are obsolescent features introduced for test purposes.
+They will be removed in the next release. 
+
+
 
 % from Burchard et al OM 2008 : 
-% the most critical process not reproduced by statistical turbulence models is the activity of internal waves and their interaction with turbulence. After the Reynolds decomposition, internal waves are in principle included in the RANS equations, but later partially excluded by the hydrostatic assumption and the model resolution. Thus far, the representation of internal wave mixing in ocean models has been relatively crude (e.g. Mellor, 1989; Large et al., 1994; Meier, 2001; Axell, 2002; St. Laurent and Garrett, 2002).
+% the most critical process not reproduced by statistical turbulence models is the activity of 
+% internal waves and their interaction with turbulence. After the Reynolds decomposition, 
+% internal waves are in principle included in the RANS equations, but later partially 
+% excluded by the hydrostatic assumption and the model resolution. 
+% Thus far, the representation of internal wave mixing in ocean models has been relatively crude 
+% (e.g. Mellor, 1989; Large et al., 1994; Meier, 2001; Axell, 2002; St. Laurent and Garrett, 2002).
 
 
@@ -586,5 +622,6 @@
 Options are defined through the  \ngn{namzdf\_kpp} namelist variables.
 
-\colorbox{yellow}{Add a description of KPP here.}
+Note that KPP is an obsolescent feature of the \NEMO system. 
+It will be removed in the next release (v3.7 and followings).
 
 
@@ -636,5 +673,5 @@
 
 Options are defined through the  \ngn{namzdf} namelist variables.
-The non-penetrative convective adjustment is used when \np{ln\_zdfnpc}=true. 
+The non-penetrative convective adjustment is used when \np{ln\_zdfnpc}~=~\textit{true}. 
 It is applied at each \np{nn\_npc} time step and mixes downwards instantaneously 
 the statically unstable portion of the water column, but only until the density 
@@ -644,5 +681,5 @@
 (Fig. \ref{Fig_npc}): starting from the top of the ocean, the first instability is 
 found. Assume in the following that the instability is located between levels 
-$k$ and $k+1$. The potential temperature and salinity in the two levels are 
+$k$ and $k+1$. The temperature and salinity in the two levels are 
 vertically mixed, conserving the heat and salt contents of the water column. 
 The new density is then computed by a linear approximation. If the new 
@@ -664,24 +701,14 @@
 \citep{Madec_al_JPO91, Madec_al_DAO91, Madec_Crepon_Bk91}.
 
-Note that in the current implementation of this algorithm presents several 
-limitations. First, potential density referenced to the sea surface is used to 
-check whether the density profile is stable or not. This is a strong 
-simplification which leads to large errors for realistic ocean simulations. 
-Indeed, many water masses of the world ocean, especially Antarctic Bottom
-Water, are unstable when represented in surface-referenced potential density. 
-The scheme will erroneously mix them up. Second, the mixing of potential 
-density is assumed to be linear. This assures the convergence of the algorithm 
-even when the equation of state is non-linear. Small static instabilities can thus 
-persist due to cabbeling: they will be treated at the next time step. 
-Third, temperature and salinity, and thus density, are mixed, but the 
-corresponding velocity fields remain unchanged. When using a Richardson 
-Number dependent eddy viscosity, the mixing of momentum is done through 
-the vertical diffusion: after a static adjustment, the Richardson Number is zero 
-and thus the eddy viscosity coefficient is at a maximum. When this convective 
-adjustment algorithm is used with constant vertical eddy viscosity, spurious 
-solutions can occur since the vertical momentum diffusion remains small even 
-after a static adjustment. In that case, we recommend the addition of momentum 
-mixing in a manner that mimics the mixing in temperature and salinity 
-\citep{Speich_PhD92, Speich_al_JPO96}.
+The current implementation has been modified in order to deal with any non linear 
+equation of seawater (L. Brodeau, personnal communication). 
+Two main differences have been introduced compared to the original algorithm: 
+$(i)$ the stability is now checked using the Brunt-V\"{a}is\"{a}l\"{a} frequency 
+(not the the difference in potential density) ; 
+$(ii)$ when two levels are found unstable, their thermal and haline expansion coefficients 
+are vertically mixed in the same way their temperature and salinity has been mixed.
+These two modifications allow the algorithm to perform properly and accurately 
+with TEOS10 or EOS-80 without having to recompute the expansion coefficients at each 
+mixing iteration.
 
 % -------------------------------------------------------------------------------------------------------------
@@ -689,5 +716,5 @@
 % -------------------------------------------------------------------------------------------------------------
 \subsection   [Enhanced Vertical Diffusion (\np{ln\_zdfevd})]
-			{Enhanced Vertical Diffusion (\np{ln\_zdfevd}=true)}
+		     	  {Enhanced Vertical Diffusion (\np{ln\_zdfevd}=true)}
 \label{ZDF_evd}
 
Index: /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Introduction.tex
===================================================================
--- /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Introduction.tex	(revision 6274)
+++ /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Chapters/Introduction.tex	(revision 6275)
@@ -24,11 +24,10 @@
 release 8.2, described in \citet{Madec1998}. This model has been used for a wide 
 range of applications, both regional or global, as a forced ocean model and as a 
-model coupled with the atmosphere. A complete list of references is found on the 
-\NEMO web site. 
+model coupled with the sea-ice and/or the atmosphere.  
 
 This manual is organised in as follows. Chapter~\ref{PE} presents the model basics, 
 $i.e.$ the equations and their assumptions, the vertical coordinates used, and the 
 subgrid scale physics. This part deals with the continuous equations of the model 
-(primitive equations, with potential temperature, salinity and an equation of state). 
+(primitive equations, with temperature, salinity and an equation of seawater). 
 The equations are written in a curvilinear coordinate system, with a choice of vertical 
 coordinates ($z$ or $s$, with the rescaled height coordinate formulation \textit{z*}, or  
@@ -79,9 +78,10 @@
 space and time variable coefficient \citet{Treguier1997}. The model has vertical harmonic 
 viscosity and diffusion with a space and time variable coefficient, with options to compute 
-the coefficients with \citet{Blanke1993}, \citet{Large_al_RG94}, \citet{Pacanowski_Philander_JPO81}, 
+the coefficients with \citet{Blanke1993}, \citet{Pacanowski_Philander_JPO81}, 
 or \citet{Umlauf_Burchard_JMS03} mixing schemes.
  \vspace{1cm}
  
- 
+%%gm    To be put somewhere else ....
+
 \noindent CPP keys and namelists are used for inputs to the code.  \newline
 
@@ -112,4 +112,5 @@
  \vspace{1cm}
 
+%%gm  end
 
 Model outputs management and specific online diagnostics are described in chapters~\ref{DIA}.
@@ -249,2 +250,9 @@
 
 
+ \vspace{1cm}
+$\bullet$ The main modifications from NEMO/OPA v3.4 and  v3.6 are :\\
+\begin{enumerate}
+\item ... ; 
+\end{enumerate}
+
+
Index: /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Namelist/nam_dmp_create
===================================================================
--- /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Namelist/nam_dmp_create	(revision 6275)
+++ /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Namelist/nam_dmp_create	(revision 6275)
@@ -0,0 +1,23 @@
+&nam_dmp_create
+    cp_cfg = 'orca'            ! Name of model grid (orca and C1D have special options 
+                               ! otherwise ignored)
+    cp_cfz = 'antarctic'       ! Name of zoom configuration (arctic and antarctic have 
+                               ! some special treatment if lzoom=.true.)
+    jp_cfg = 2                 ! Resolution of the model (used for med_red_seas damping)
+    lzoom = .false.            ! Zoom configuration or not
+    ln_full_field = .false.    ! Calculate coefficient over whole of domain
+    ln_med_red_seas = .true.   ! Damping in Med/Red Seas 
+                               ! (or local modifications here if ln_full_field=.true.)
+    ln_old_31_lev_code = .true.   ! Replicate behaviour of old online code for 31 level model 
+                                  ! (Med/Red seas damping based on level number instead of depth)
+    ln_coast = .true.          ! Reduce near to coastlines
+    ln_zero_top_layer = .true. ! No damping in top layer
+    ln_custom = .false.        ! Call "custom" module to apply user modifications to the 
+                               ! damping coefficient field
+    pn_surf = 0.25             ! Surface Relaxation timescale (days)
+    pn_bot = 0.25              ! Bottom relaxation timescale (days)
+    pn_dep = 1000              ! Transition depth from upper to deep ocean
+    nn_hdmp = 10               ! Damp poleward of this latitude (smooth transition up to maximum damping)
+    jperio = 2                 ! Lateral boundary condition (as specified in namelist_cfg for model run).
+/
+
Index: /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Namelist/namtrd
===================================================================
--- /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Namelist/namtrd	(revision 6274)
+++ /branches/2015/nemo_v3_6_STABLE/DOC/TexFiles/Namelist/namtrd	(revision 6275)
