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:
The v_name argument of the atom keyword is the name of an equal-style variable which will be evaluated each time @@ -228,6 +225,8 @@ over the course of a 1000-step simulation:
variable size equal ramp(1.0,0.1) fix 1 center adapt 10 atom diameter v_size+
Restart, fix_modify, output, run start/stop, minimize info:
No information about this fix is written to binary restart diff --git a/doc/fix_adapt.txt b/doc/fix_adapt.txt index 04e383f2cf..6c7b6ef356 100644 --- a/doc/fix_adapt.txt +++ b/doc/fix_adapt.txt @@ -66,10 +66,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 @@ -102,8 +98,8 @@ styles and their energy formulas for the meaning of these parameters: "coul/cut"_pair_coul.html: scale: type pairs: "coul/debye"_pair_coul.html: scale: type pairs: "coul/long"_pair_coul.html: scale: type pairs: -"lj/cut"_pair_lj.html: epsilon: type pairs: -"lj/cut/opt"_pair_lj.html: epsilon: type pairs: +"lj/cut"_pair_lj.html: epsilon,sigma: type pairs: +"lj/expand"_pair_lj_expand.html: epsilon,sigma,delta: type pairs: "lubricate"_pair_lubricate.html: mu: global: "gauss"_pair_gauss.html: a: type pairs: "soft"_pair_soft.html: a: type pairs :tb(c=3,s=:) @@ -190,6 +186,7 @@ The {atom} keyword enables various atom properties to be changed. The {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: +charge = charge on particle diameter = diameter of particle :ul The {v_name} argument of the {atom} keyword is the name of an @@ -213,6 +210,8 @@ over the course of a 1000-step simulation: variable size equal ramp(1.0,0.1) fix 1 center adapt 10 atom diameter v_size :pre +:line + [Restart, fix_modify, output, run start/stop, minimize info:] No information about this fix is written to "binary restart diff --git a/doc/fix_addforce.html b/doc/fix_addforce.html index c97756d813..60ab3ef538 100644 --- a/doc/fix_addforce.html +++ b/doc/fix_addforce.html @@ -53,8 +53,8 @@ a channel. as an equal-style or atom-style variable, namely fx, fy, fz. If the value is a variable, it should be specified as v_name, where name is the variable name. In this case, the variable -will be evaluated each timestep, and its value used to determine the -force component. +will be evaluated each timestep, and its value(s) used to determine +the force component.
Equal-style variables can specify formulas with various mathematical functions, and include thermo_style command diff --git a/doc/fix_addforce.txt b/doc/fix_addforce.txt index 3ce5a5d3e0..37fd62fd9e 100644 --- a/doc/fix_addforce.txt +++ b/doc/fix_addforce.txt @@ -42,8 +42,8 @@ Any of the 3 quantities defining the force components can be specified as an equal-style or atom-style "variable"_variable.html, namely {fx}, {fy}, {fz}. If the value is a variable, it should be specified as v_name, where name is the variable name. In this case, the variable -will be evaluated each timestep, and its value used to determine the -force component. +will be evaluated each timestep, and its value(s) used to determine +the force component. Equal-style variables can specify formulas with various mathematical functions, and include "thermo_style"_thermo_style.html command diff --git a/doc/fix_append_atoms.html b/doc/fix_append_atoms.html index 26a69b86a5..00799936c4 100644 --- a/doc/fix_append_atoms.html +++ b/doc/fix_append_atoms.html @@ -23,9 +23,12 @@
size args = Lz
+ basis values = M itype
+ M = which basis atom
+ itype = atom type (1-N) to assign to this basis atom
+ size args = Lz
Lz = z size of lattice region appended in a single event(distance units)
freq args = freq
freq = the number of timesteps between append events
@@ -62,6 +65,12 @@ Before using this command, a lattice must also be defined using the
This fix will automatically freeze atoms on the zhi edge of the
system, so that overlaps are avoided when new atoms are appended.
+The basis keyword specifies an atom type that will be assigned to
+specific basis atoms as they are created. See the
+lattice command for specifics on how basis atoms are
+defined for the unit cell of the lattice. By default, all created
+atoms are assigned type = 1 unless this keyword specifies differently.
+
The size keyword defines the size in z of the chunk of material to
be added.
@@ -108,6 +117,7 @@ than periodic.
Default:
-The keyword defaults are size = 0.0, freq = 0, units = lattice.
+
The keyword defaults are size = 0.0, freq = 0, units = lattice. All
+added atoms are of type 1 unless the basis keyword is used.