Merge branch release-5-1

[alexxy/gromacs.git] / docs / manual / forcefield.tex

diff --git a/docs/manual/forcefield.tex b/docs/manual/forcefield.tex
index 169c13d4f94572fc785e1ce0424ea67ade1a2f5c..063849ef2cf35789b480146a13ad93181062307b 100644 (file)
--- a/docs/manual/forcefield.tex
+++ b/docs/manual/forcefield.tex
@@ -162,7 +162,7 @@ V_c(\rij) = f \frac{q_i q_j}{\epsr \rij}
 \label{eqn:vcoul}
 \eeq
 See also \figref{coul}, where $f = \frac{1}{4\pi \varepsilon_0} =
-138.935\,485$ (see \chref{defunits})
+\electricConvFactorValue$ (see \chref{defunits})
 
 \begin{figure}
 \centerline{\includegraphics[width=8cm]{plots/vcrf}}
@@ -854,7 +854,7 @@ or four~\cite{Jorgensen2005a} cosine terms of a Fourier series.
 In {\gromacs} the four term function is implemented:
 \beq
 V_{F} (\phi_{ijkl}) ~=~ \frac{1}{2} \left[C_1(1+\cos(\phi)) + C_2(
-1-\cos(2\phi)) + C_3(1+\cos(3\phi)) + C_4(1+\cos(4\phi))\right],
+1-\cos(2\phi)) + C_3(1+\cos(3\phi)) + C_4(1-\cos(4\phi))\right],
 \eeq
 %\ifthenelse{\equal{\gmxlite}{1}}{}{
 Internally, {\gromacs}
@@ -1755,7 +1755,7 @@ of which the charge varies with $\LAM$ is:
 V_c &=& \frac{f}{\epsrf \rij}\left[\LL q_i^A q_j^A + \LAM\, q_i^B q_j^B\right] \\
 \dvdl{V_c}&=& \frac{f}{\epsrf \rij}\left[- q_i^A q_j^A + q_i^B q_j^B\right]
 \eea
-where $f = \frac{1}{4\pi \varepsilon_0} = 138.935\,485$ (see \chref{defunits}).
+where $f = \frac{1}{4\pi \varepsilon_0} = \electricConvFactorValue$ (see \chref{defunits}).
 
 \subsubsection{Coulomb interaction with \normindex{reaction field}}
 The Coulomb interaction including a reaction field, between two particles