Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
lammps
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
multiscale
lammps
Commits
941b7373
Commit
941b7373
authored
7 years ago
by
sjplimp
Committed by
GitHub
7 years ago
Browse files
Options
Downloads
Plain Diff
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
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
doc/src/pair_python.txt
+3
-3
3 additions, 3 deletions
doc/src/pair_python.txt
examples/ASPHERE/poly/in.poly
+1
-0
1 addition, 0 deletions
examples/ASPHERE/poly/in.poly
examples/ASPHERE/poly/in.poly.mp
+1
-0
1 addition, 0 deletions
examples/ASPHERE/poly/in.poly.mp
with
5 additions
and
3 deletions
doc/src/pair_python.txt
+
3
−
3
View file @
941b7373
...
@@ -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) :l
i
rsq = the square of the distance between a pair of atoms (float) :l
itype = the (numerical) type of the first atom :l
i
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,
...
...
This diff is collapsed.
Click to expand it.
examples/ASPHERE/poly/in.poly
+
1
−
0
View file @
941b7373
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
examples/ASPHERE/poly/in.poly.mp
+
1
−
0
View file @
941b7373
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment