Skip to content
Snippets Groups Projects
Commit 941b7373 authored by sjplimp's avatar sjplimp Committed by GitHub
Browse files

Merge pull request #493 from akohlmey/doc-and-example-fixes

Doc and example fixes
parents 0f883489 654e09e9
No related branches found
No related tags found
No related merge requests found
...@@ -107,15 +107,15 @@ class LJCutMelt(LAMMPSPairPotential): ...@@ -107,15 +107,15 @@ class LJCutMelt(LAMMPSPairPotential):
# set coeffs: 48*eps*sig**12, 24*eps*sig**6, # set coeffs: 48*eps*sig**12, 24*eps*sig**6,
# 4*eps*sig**12, 4*eps*sig**6 # 4*eps*sig**12, 4*eps*sig**6
self.units = 'lj' self.units = 'lj'
self.coeff = {'lj' : {'lj' : (48.0,24.0,4.0,4.0)}} self.coeff = \{'lj' : \{'lj' : (48.0,24.0,4.0,4.0)\}\}
:pre :pre
The class also has to provide two methods for the computation of the The class also has to provide two methods for the computation of the
potential energy and forces, which have be named {compute_force}, potential energy and forces, which have be named {compute_force},
and {compute_energy}, which both take 3 numerical arguments: and {compute_energy}, which both take 3 numerical arguments:
rsq = the square of the distance between a pair of atoms (float) :li rsq = the square of the distance between a pair of atoms (float) :l
itype = the (numerical) type of the first atom :li itype = the (numerical) type of the first atom :l
jtype = the (numerical) type of the second atom :ul jtype = the (numerical) type of the second atom :ul
This functions need to compute the force and the energy, respectively, This functions need to compute the force and the energy, respectively,
......
...@@ -62,6 +62,7 @@ pair_coeff 3 3 1.0 1.5 ...@@ -62,6 +62,7 @@ pair_coeff 3 3 1.0 1.5
pair_coeff 1 4 0.0 1.0 0.5 pair_coeff 1 4 0.0 1.0 0.5
pair_coeff 2 4 0.0 1.0 1.0 pair_coeff 2 4 0.0 1.0 1.0
pair_coeff 3 4 0.0 1.0 0.75 pair_coeff 3 4 0.0 1.0 0.75
pair_coeff 4 4 0.0 1.0 0.0
delete_atoms overlap 1.0 small big delete_atoms overlap 1.0 small big
......
...@@ -62,6 +62,7 @@ pair_coeff 3 3 1.0 1.5 ...@@ -62,6 +62,7 @@ pair_coeff 3 3 1.0 1.5
pair_coeff 1 4 0.0 1.0 0.5 pair_coeff 1 4 0.0 1.0 0.5
pair_coeff 2 4 0.0 1.0 1.0 pair_coeff 2 4 0.0 1.0 1.0
pair_coeff 3 4 0.0 1.0 0.75 pair_coeff 3 4 0.0 1.0 0.75
pair_coeff 4 4 0.0 1.0 0.0
delete_atoms overlap 1.0 small big delete_atoms overlap 1.0 small big
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment