Changeset 12928 for NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/subfiles/chap_model_basics.tex

Timestamp:

2020-05-14T21:46:00+02:00 (4 years ago)

Author:

smueller

Message:

Synchronizing with ^{/NEMO/trunk@12925 (ticket #2170)}

Location:

NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser

Files:

• . (modified) (1 prop)
• doc/latex/NEMO/subfiles/chap_model_basics.tex (modified) (6 diffs)

NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser

@@ -6 +6 @@
 ^/vendors/FCM@HEAD            ext/FCM
 ^/vendors/IOIPSL@HEAD         ext/IOIPSL
+
+# SETTE
+^/utils/CI/sette@HEAD         sette

@@ -6 +6 @@
 ^/vendors/FCM@HEAD            ext/FCM
 ^/vendors/IOIPSL@HEAD         ext/IOIPSL
+
+# SETTE
+^/utils/CI/sette@HEAD         sette

NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/doc/latex/NEMO/subfiles/chap_model_basics.tex

@@ -130 +130 @@
 \begin{figure}
   \centering
-  \includegraphics[width=0.66\textwidth]{Fig_I_ocean_bc}
+  \includegraphics[width=0.66\textwidth]{MB_ocean_bc}
   \caption[Ocean boundary conditions]{
     The ocean is bounded by two surfaces, $z = - H(i,j)$ and $z = \eta(i,j,t)$,
@@ -327 +327 @@
 \begin{figure}
   \centering
-  \includegraphics[width=0.33\textwidth]{Fig_I_earth_referential}
+  \includegraphics[width=0.33\textwidth]{MB_earth_referential}
   \caption[Geographical and curvilinear coordinate systems]{
     the geographical coordinate system $(\lambda,\varphi,z)$ and the curvilinear
@@ -579 +579 @@
 an explicit computation of vertical advection relative to the moving s-surfaces.
 
-%\gmcomment{
-%A key point here is that the $s$-coordinate depends on $(i,j)$ ==> horizontal pressure gradient...
+\cmtgm{A key point here is that the $s$-coordinate depends on $(i,j)$
+  ==> horizontal pressure gradient...}
 The generalized vertical coordinates used in ocean modelling are not orthogonal,
 which contrasts with many other applications in mathematical physics.
@@ -680 +680 @@
 and similar expressions are used for mixing and forcing terms.
 
-\gmcomment{
+\cmtgm{
   \colorbox{yellow}{ to be updated $= = >$}
   Add a few works on z and zps and s and underlies the differences between all of them
@@ -692 +692 @@
 \begin{figure}
   \centering
-  \includegraphics[width=0.66\textwidth]{Fig_z_zstar}
+  \includegraphics[width=0.66\textwidth]{MB_z_zstar}
   \caption[Curvilinear z-coordinate systems (\{non-\}linear free-surface cases and re-scaled \zstar)]{
     \begin{enumerate*}[label=(\textit{\alph*})]
@@ -1150 +1150 @@
 Nevertheless it is currently not available in the iso-neutral case.
 
-\onlyinsubfile{\input{../../global/epilogue}}
+\subinc{\input{../../global/epilogue}}
 
 \end{document}

@@ -6 +6 @@
 ^/vendors/FCM@HEAD            ext/FCM
 ^/vendors/IOIPSL@HEAD         ext/IOIPSL
+
+# SETTE
+^/utils/CI/sette@HEAD         sette