diff --git a/doc/mass.html b/doc/mass.html index 1f5d7216ce..ee18fb6898 100644 --- a/doc/mass.html +++ b/doc/mass.html @@ -65,9 +65,9 @@ is normally not used.

If you define a hybrid atom style which includes one (or more) sub-styles which require per-type mass and one (or more) -sub-styles which require per-atom mass, then you must define both. In -this case the per-type mass will be ignored; only the per-atom mass -will be used by LAMMPS. +sub-styles which require per-atom mass, then you must define both. +However, in this case the per-type mass will be ignored; only the +per-atom mass will be used by LAMMPS.

Restrictions:

diff --git a/doc/mass.txt b/doc/mass.txt index 8f2682e55d..bb7d5ffb96 100644 --- a/doc/mass.txt +++ b/doc/mass.txt @@ -62,9 +62,9 @@ is normally not used. If you define a "hybrid atom style"_atom_style.html which includes one (or more) sub-styles which require per-type mass and one (or more) -sub-styles which require per-atom mass, then you must define both. In -this case the per-type mass will be ignored; only the per-atom mass -will be used by LAMMPS. +sub-styles which require per-atom mass, then you must define both. +However, in this case the per-type mass will be ignored; only the +per-atom mass will be used by LAMMPS. [Restrictions:] diff --git a/doc/min_modify.html b/doc/min_modify.html index ce70358a2a..f22c4dc5d5 100644 --- a/doc/min_modify.html +++ b/doc/min_modify.html @@ -32,30 +32,29 @@

Description:

This command sets parameters that affect the energy minimization -algorithms. The various settings may affect the convergence rate and -overall number of force evaluations required by a minimization, so -users can experiment with these parameters to tune their -minimizations. +algorithms selected by the min_style command. The +various settings may affect the convergence rate and overall number of +force evaluations required by a minimization, so users can experiment +with these parameters to tune their minimizations.

-

The minimization algorithms have an outer iteration (conjugate -gradient or steepest descent) and an inner iteration which is steps -along a one-dimensional line search in a particular search direction. -The dmax parameter is how far any atom can move in a single line -search in any dimension (x, y, or z). Thus a value of 0.1 in real -units means no atom will move further than 0.1 Angstroms -in a single outer iteration. This prevents highly overlapped atoms -from being moved long distances (e.g. through another atom) due to -large forces. +

The cg and sd minimization styles have an outer iteration and an +inner iteration which is steps along a one-dimensional line search in +a particular search direction. The dmax parameter is how far any +atom can move in a single line search in any dimension (x, y, or z). +Thus a value of 0.1 in real units means no atom will move +further than 0.1 Angstroms in a single outer iteration. This prevents +highly overlapped atoms from being moved long distances (e.g. through +another atom) due to large forces.

-

The choice of line search algorithm can be selected via the line -keyword. The default backtracking search is very robust and should -always find a local energy minimum. However, it will "converge" when -it can no longer reduce the energy of the system. Individual atom -forces may still be larger than desired at this point, because the -energy change is measured as the difference of two large values -(energy before and energy after) and that difference may be smaller -than machine epsilon even if atoms could move in the gradient -direction to reduce forces further. +

The choice of line search algorithm for the cg and sd minimization +styles can be selected via the line keyword. The default +backtracking search is robust and should always find a local energy +minimum. However, it will "converge" when it can no longer reduce the +energy of the system. Individual atom forces may still be larger than +desired at this point, because the energy change is measured as the +difference of two large values (energy before and energy after) and +that difference may be smaller than machine epsilon even if atoms +could move in the gradient direction to reduce forces further.

By contast, the quadratic line search algorithm is often able to reduce forces closer to 0.0. It may also be more efficient than the diff --git a/doc/min_modify.txt b/doc/min_modify.txt index fd6e134c87..7716c605cb 100644 --- a/doc/min_modify.txt +++ b/doc/min_modify.txt @@ -27,30 +27,29 @@ min_modify dmax 0.2 :pre [Description:] This command sets parameters that affect the energy minimization -algorithms. The various settings may affect the convergence rate and -overall number of force evaluations required by a minimization, so -users can experiment with these parameters to tune their -minimizations. +algorithms selected by the "min_style"_min_style.html command. The +various settings may affect the convergence rate and overall number of +force evaluations required by a minimization, so users can experiment +with these parameters to tune their minimizations. -The minimization algorithms have an outer iteration (conjugate -gradient or steepest descent) and an inner iteration which is steps -along a one-dimensional line search in a particular search direction. -The {dmax} parameter is how far any atom can move in a single line -search in any dimension (x, y, or z). Thus a value of 0.1 in real -"units"_units.html means no atom will move further than 0.1 Angstroms -in a single outer iteration. This prevents highly overlapped atoms -from being moved long distances (e.g. through another atom) due to -large forces. +The {cg} and {sd} minimization styles have an outer iteration and an +inner iteration which is steps along a one-dimensional line search in +a particular search direction. The {dmax} parameter is how far any +atom can move in a single line search in any dimension (x, y, or z). +Thus a value of 0.1 in real "units"_units.html means no atom will move +further than 0.1 Angstroms in a single outer iteration. This prevents +highly overlapped atoms from being moved long distances (e.g. through +another atom) due to large forces. -The choice of line search algorithm can be selected via the {line} -keyword. The default backtracking search is very robust and should -always find a local energy minimum. However, it will "converge" when -it can no longer reduce the energy of the system. Individual atom -forces may still be larger than desired at this point, because the -energy change is measured as the difference of two large values -(energy before and energy after) and that difference may be smaller -than machine epsilon even if atoms could move in the gradient -direction to reduce forces further. +The choice of line search algorithm for the {cg} and {sd} minimization +styles can be selected via the {line} keyword. The default +backtracking search is robust and should always find a local energy +minimum. However, it will "converge" when it can no longer reduce the +energy of the system. Individual atom forces may still be larger than +desired at this point, because the energy change is measured as the +difference of two large values (energy before and energy after) and +that difference may be smaller than machine epsilon even if atoms +could move in the gradient direction to reduce forces further. By contast, the {quadratic} line search algorithm is often able to reduce forces closer to 0.0. It may also be more efficient than the diff --git a/doc/min_style.html b/doc/min_style.html index 8530fb6d4c..149d7d0903 100644 --- a/doc/min_style.html +++ b/doc/min_style.html @@ -15,12 +15,12 @@

min_style style 
 
-