Skip to content
Snippets Groups Projects
Commit 3dfe4505 authored by Steve Plimpton's avatar Steve Plimpton
Browse files

24Mar17 patch sync with SVN

parent 394e9b42
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
doc/src/Manual.txt
+ 2
− 2
View file @ 3dfe4505
<!-- HTML_ONLY --> <!-- HTML_ONLY -->
<HEAD> <HEAD>
<TITLE>LAMMPS Users Manual</TITLE> <TITLE>LAMMPS Users Manual</TITLE>
<META NAME="docnumber" CONTENT="17 Mar 2017 version"> <META NAME="docnumber" CONTENT="24 Mar 2017 version">
<META NAME="author" CONTENT="http://lammps.sandia.gov - Sandia National Laboratories"> <META NAME="author" CONTENT="http://lammps.sandia.gov - Sandia National Laboratories">
<META NAME="copyright" CONTENT="Copyright (2003) Sandia Corporation. This software and manual is distributed under the GNU General Public License."> <META NAME="copyright" CONTENT="Copyright (2003) Sandia Corporation. This software and manual is distributed under the GNU General Public License.">
</HEAD> </HEAD>
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<H1></H1> <H1></H1>
LAMMPS Documentation :c,h3 LAMMPS Documentation :c,h3
17 Mar 2017 version :c,h4 24 Mar 2017 version :c,h4
Version info: :h4 Version info: :h4
......
doc/src/pair_charmm.txt
+ 11
− 9
View file @ 3dfe4505
...@@ -82,13 +82,13 @@ others). See "(MacKerell)"_#pair-MacKerell for a description of the ...@@ -82,13 +82,13 @@ others). See "(MacKerell)"_#pair-MacKerell for a description of the
CHARMM force field. CHARMM force field.
The styles with {charmm} (not {charmmfsw} or {charmmfsh}) in their The styles with {charmm} (not {charmmfsw} or {charmmfsh}) in their
name are the older, original LAMMPS implemetations. They compute the name are the older, original LAMMPS implementations. They compute the
LJ and Coulombic interactions with an energy switching function (esw, LJ and Coulombic interactions with an energy switching function (esw,
a cubic polynomial), which ramps the energy smoothly to zero between a cubic polynomial, shown in the formula below), which ramps the
the inner and outer cutoff. This can cause irregularities in energy smoothly to zero between the inner and outer cutoff. This can
pair-wise forces (due to the discontinuous 2nd derivative of energy at cause irregularities in pair-wise forces (due to the discontinuous 2nd
the boundaries of the switching region), which in some cases can derivative of energy at the boundaries of the switching region), which
result in substantial artifacts in an MD simulation. in some cases can result in detectable artifacts in an MD simulation.
The newer styles with {charmmfsw} or {charmmfsh} in their name replace The newer styles with {charmmfsw} or {charmmfsh} in their name replace
the energy switching with force switching (fsw) and force shifting the energy switching with force switching (fsw) and force shifting
...@@ -107,8 +107,10 @@ The general CHARMM formulas are as follows ...@@ -107,8 +107,10 @@ The general CHARMM formulas are as follows
:c,image(Eqs/pair_charmm.jpg) :c,image(Eqs/pair_charmm.jpg)
where the specific form of the switching or shifting function S(r) is where S(r) is the energy switching function mentioned above for the
given in the "(Steinbach)"_#Steinbach paper. {charmm} styles. See the "(Steinbach)"_#Steinbach paper for the
functional forms of the force switching and force shifting functions
used in the {charmmfsw} and {charmmfsh} styles.
When using the {lj/charmm/coul/charmm styles}, both the LJ and When using the {lj/charmm/coul/charmm styles}, both the LJ and
Coulombic terms require an inner and outer cutoff. They can be the Coulombic terms require an inner and outer cutoff. They can be the
...@@ -253,6 +255,6 @@ the MOLECULE and KSPACE packages are installed by default. ...@@ -253,6 +255,6 @@ the MOLECULE and KSPACE packages are installed by default.
[(MacKerell)] MacKerell, Bashford, Bellott, Dunbrack, Evanseck, Field, [(MacKerell)] MacKerell, Bashford, Bellott, Dunbrack, Evanseck, Field,
Fischer, Gao, Guo, Ha, et al, J Phys Chem, 102, 3586 (1998). Fischer, Gao, Guo, Ha, et al, J Phys Chem, 102, 3586 (1998).
:link(Stenibach) :link(Steinbach)
[(Steinbach)] Steinbach, Brooks, J Comput Chem, 15, 667 (1994). [(Steinbach)] Steinbach, Brooks, J Comput Chem, 15, 667 (1994).
src/version.h
+ 1
− 1
View file @ 3dfe4505
#define LAMMPS_VERSION "17 Mar 2017" #define LAMMPS_VERSION "24 Mar 2017"
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment