diff --git a/doc/Eqs/eff_ECP1.jpg b/doc/Eqs/eff_ECP1.jpg new file mode 100644 index 0000000000..3b8a3f8ff3 Binary files /dev/null and b/doc/Eqs/eff_ECP1.jpg differ diff --git a/doc/Eqs/eff_ECP1.tex b/doc/Eqs/eff_ECP1.tex new file mode 100644 index 0000000000..7eecad0b8d --- /dev/null +++ b/doc/Eqs/eff_ECP1.tex @@ -0,0 +1,9 @@ +\documentstyle[12pt]{article} + +\begin{document} + +$$ +E_{Pauli(ECP_s)}=p_1\exp\left(-\frac{p_2r^2}{p_3+s^2} \right) +$$ + +\end{document} \ No newline at end of file diff --git a/doc/Eqs/eff_ECP2.jpg b/doc/Eqs/eff_ECP2.jpg new file mode 100644 index 0000000000..195ed55e43 Binary files /dev/null and b/doc/Eqs/eff_ECP2.jpg differ diff --git a/doc/Eqs/eff_ECP2.tex b/doc/Eqs/eff_ECP2.tex new file mode 100644 index 0000000000..238fe2f4f0 --- /dev/null +++ b/doc/Eqs/eff_ECP2.tex @@ -0,0 +1,8 @@ +\documentstyle[12pt]{article} + +\begin{document} + +$$ +E_{Pauli(ECP_p)}=p_1\left( \frac{2}{p_2/s+s/p_2} \right)\left( r-p_3s\right)^2\exp \left[ -\frac{p_4\left( r-p_3s \right)^2}{p_5+s^2} \right] +$$ + \end{document} \ No newline at end of file diff --git a/doc/Eqs/pair_gromacs.jpg b/doc/Eqs/pair_gromacs.jpg index 675b399c67..885c059e65 100644 Binary files a/doc/Eqs/pair_gromacs.jpg and b/doc/Eqs/pair_gromacs.jpg differ diff --git a/doc/Eqs/pair_gromacs.tex b/doc/Eqs/pair_gromacs.tex index e51ca09578..88dbe15909 100644 --- a/doc/Eqs/pair_gromacs.tex +++ b/doc/Eqs/pair_gromacs.tex @@ -8,7 +8,10 @@ E_{LJ} & = & 4 \epsilon \left[ \left(\frac{\sigma}{r}\right)^{12} - \qquad r < r_c \\ E_C & = & \frac{C q_i q_j}{\epsilon r} + S_C(r) \qquad r < r_c \\ S(r) & = & C \qquad r < r_1 \\ -S(r) & = & \frac{A}{3} (r - r_1)^3 + \frac{B}{4} (r - r_1)^4 + C \qquad r_1 < r < r_c +S(r) & = & \frac{A}{3} (r - r_1)^3 + \frac{B}{4} (r - r_1)^4 + C \qquad r_1 < r < r_c \\ +A & = & (-3 E'(r_c) + (r_c - r_1) E''(r_c))/(r_c - r_1)^2 \\ +B & = & (2 E'(r_c) - (r_c - r_1) E''(r_c))/(r_c - r_1)^3 \\ +C & = & -E(r_c) + \frac{1}{2} (r_c - r_1) E'(r_c) - \frac{1}{12} (r_c - r_1)^2 E''(r_c)) \\ \end{eqnarray*} \end{document} diff --git a/doc/fix_adapt.html b/doc/fix_adapt.html index 3d6c1a3430..cfbf36373b 100644 --- a/doc/fix_adapt.html +++ b/doc/fix_adapt.html @@ -79,10 +79,6 @@ the end of a simulation. Even if reset is specified as yes, a restart file written during a simulation will contain the modified settings.

-

IMPORTANT NOTE: Currently, only the pair and kspace params -are resettable. Atom attributes are not. This will be -added at some point. -

If the scale keyword is set to no, then the value the parameter is set to will be whatever the variable generates. If the scale keyword is set to yes, then the value of the altered parameter will @@ -116,8 +112,8 @@ styles and their energy formulas for the meaning of these parameters: coul/cut scale type pairs coul/debye scale type pairs coul/long scale type pairs -lj/cut epsilon type pairs -lj/cut/opt epsilon type pairs +lj/cut epsilon,sigma type pairs +lj/expand epsilon,sigma,delta type pairs lubricate mu global gauss a type pairs soft a type pairs @@ -205,7 +201,8 @@ is set to no or yes. aparam argument is the name of the parameter to change. This is the current list of atom parameters that can be varied by this fix:

-