Changeset 3268

Timestamp:

2012-01-18T16:36:41+01:00 (12 years ago)

Author:

agn

Message:

dev_NEMO_MERGE_2011:(DOC) Corrected Griffies namelist & refs

Location:

branches/2011/dev_NEMO_MERGE_2011/DOC

Files:

• NEMO_book.tex (modified) (1 diff)
• TexFiles/Chapters/Annex_ISO.tex (modified) (3 diffs)
• TexFiles/Namelist/namtra_ldf (modified) (1 diff)

branches/2011/dev_NEMO_MERGE_2011/DOC/NEMO_book.tex

@@ -5 +5 @@
 
 \documentclass[a4paper,11pt]{book}
+%\documentclass[a4paper,11pt,makeidx]{book} <== may need this to generate index
 
 %  makeindex NEMO_book     <== to regenerate the index

branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Chapters/Annex_ISO.tex

@@ -44 +44 @@
   eddy-advective (GM) velocities are output for diagnostic purposes, even
   though the eddy advection is accomplished by means of the skew
-  fluxes. 
+  fluxes.
 \item[\np{ln\_traldf\_iso}] See \S\ref{sec:triad:taper}. If this is set false (the default), then
   `iso-neutral' mixing is accomplished within the surface mixed-layer
@@ -1168 +1168 @@
 
 \subsection{Streamfunction diagnostics}\label{sec:triad:sfdiag}
-Where the namelist parameter \np{ln\_botmix\_grif}=true, diagnosed
+Where the namelist parameter \np{ln\_traldf\_gdia}=true, diagnosed
 mean eddy-induced velocities are output. Each time step,
 streamfunctions are calculated in the $i$-$k$ and $j$-$k$ planes at
@@ -1184 +1184 @@
 The eddy-induced velocities are then calculated from the
 straightforward discretisation of \eqref{eq:triad:eiv_v}:
-\begin{equation}\label{eq:triad:eiv_v}
+\begin{equation}\label{eq:triad:eiv_v_discrete}
 \begin{split}
  {u^*}_{i+1/2}^{k} & = - \frac{1}{{e_{3u}}_{i}^{k}}\left({\psi_1}_{i+1/2}^{k+1/2}-{\psi_1}_{i+1/2}^{k+1/2}\right),   \\

branches/2011/dev_NEMO_MERGE_2011/DOC/TexFiles/Namelist/namtra_ldf

@@ -1 @@
-!-----------------------------------------------------------------------
-&namtra_ldf    !   lateral diffusion scheme for tracer
-!-----------------------------------------------------------------------
-   !                       !  Type of the operator :
+!----------------------------------------------------------------------------------
+&namtra_ldf    !   lateral diffusion scheme for tracers
+!----------------------------------------------------------------------------------
+   !                       !  Operator type:
    ln_traldf_lap    =  .true.   !  laplacian operator
    ln_traldf_bilap  =  .false.  !  bilaplacian operator
    !                       !  Direction of action  :
    ln_traldf_level  =  .false.  !  iso-level
-   ln_traldf_hor    =  .false.  !  horizontal (geopotential)            (requires "key_ldfslp" when ln_sco=T)
-   ln_traldf_iso    =  .true.   !  iso-neutral                          (requires "key_ldfslp")
+   ln_traldf_hor    =  .false.  !  horizontal (geopotential)
+   !                                             (needs "key_ldfslp" when ln_sco=T)
+   ln_traldf_iso    =  .true.   !  iso-neutral                 (needs "key_ldfslp")
    !                 !  Griffies parameters
-   ln_traldf_grif   =  .false.  !  use griffies triad formulation       (requires "key_ldfslp")
-   ln_traldf_gdia   =  .false.  !  output griffies strfn diagnostics    (requires "key_ldfslp")
-   ln_triad_iso     =  .false.  !  isoneutral diff'n triads => pure lateral mixing in ML (requires "key_ldfslp")
-   ln_botmix_grif   =  .false.  !  griffies operator with lateral mixing on bottom (requires "key_ldfslp")
+   ln_traldf_grif   =  .false.  !  use griffies triads         (needs "key_ldfslp")
+   ln_traldf_gdia   =  .false.  !  output griffies strfn       (needs "key_ldfslp")
+   ln_triad_iso     =  .false.  !  pure lateral mixing in ML   (needs "key_ldfslp")
+   ln_botmix_grif   =  .false.  !  lateral mixing on bottom    (needs "key_ldfslp")
    !                       !  Coefficients
-   ! rn_aeiv_0 is ignored with Held-Larichev spatially varying aeiv (key_traldf_c2d & key_orca_r2, _r1 or _r05)
-   rn_aeiv_0        =  2000.    !  eddy induced velocity coefficient [m2/s]    (requires "key_traldf_eiv")
+   ! rn_aeiv_0 is ignored with Held-Larichev spatially varying aeiv
+   !                   (key_traldf_c2d & key_traldf_eiv & key_orca_r2, _r1 or _r05)
+   rn_aeiv_0        =  2000.    !  eddy induced velocity coefficient [m2/s]
+   !                  (always used with Griffies; otherwise needs "key_traldf_eiv")
    rn_aht_0         =  2000.    !  horizontal eddy diffusivity for tracers [m2/s]
-   rn_ahtb_0        =     0.    !  background eddy diffusivity for ldf_iso [m2/s] (normally=0; not used with Griffies)
+   rn_ahtb_0        =     0.    !  background eddy diffusivity for ldf_iso [m2/s]
+   !                                           (normally=0; not used with Griffies)
 /