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
dade6766
Commit
dade6766
authored
6 years ago
by
Axel Kohlmeyer
Browse files
Options
Downloads
Patches
Plain Diff
restore bugfix for refrences
parent
93d6510d
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
doc/src/fix_rigid.txt
+3
-3
3 additions, 3 deletions
doc/src/fix_rigid.txt
doc/src/fix_thermal_conductivity.txt
+2
-2
2 additions, 2 deletions
doc/src/fix_thermal_conductivity.txt
doc/src/pair_gran.txt
+3
-3
3 additions, 3 deletions
doc/src/pair_gran.txt
with
8 additions
and
8 deletions
doc/src/fix_rigid.txt
+
3
−
3
View file @
dade6766
...
...
@@ -118,8 +118,8 @@ Examples of large rigid bodies are a colloidal particle, or portions
of a biomolecule such as a protein.
Example of small rigid bodies are patchy nanoparticles, such as those
modeled in "this paper"_#Zhang
3
by Sharon Glotzer's group, clumps of
granular particles, lipid molecules consiting of one or more point
modeled in "this paper"_#Zhang
1
by Sharon Glotzer's group, clumps of
granular particles, lipid molecules consi
s
ting of one or more point
dipoles connected to other spheroids or ellipsoids, irregular
particles built from line segments (2d) or triangles (3d), and
coarse-grain models of nano or colloidal particles consisting of a
...
...
@@ -856,5 +856,5 @@ Martyna, Tuckerman, Tobias, Klein, Mol Phys, 87, 1117.
[(Miller)] Miller, Eleftheriou, Pattnaik, Ndirango, and Newns,
J Chem Phys, 116, 8649 (2002).
:link(Zhang
3
)
:link(Zhang
1
)
[(Zhang)] Zhang, Glotzer, Nanoletters, 4, 1407-1413 (2004).
This diff is collapsed.
Click to expand it.
doc/src/fix_thermal_conductivity.txt
+
2
−
2
View file @
dade6766
...
...
@@ -136,7 +136,7 @@ kinetic energy of atoms that are in constrained molecules, e.g. via
"fix shake"_fix_shake.html or "fix rigid"_fix_rigid.html. This is
because application of the constraints will alter the amount of
transferred momentum. You should, however, be able to use flexible
molecules. See the "Zhang paper"_#Zhang
1
for a discussion and results
molecules. See the "Zhang paper"_#Zhang
2
for a discussion and results
of this idea.
When running a simulation with large, massive particles or molecules
...
...
@@ -158,6 +158,6 @@ The option defaults are swap = 1.
:link(Muller-Plathe1)
[(Muller-Plathe)] Muller-Plathe, J Chem Phys, 106, 6082 (1997).
:link(Zhang
1
)
:link(Zhang
2
)
[(Zhang)] Zhang, Lussetti, de Souza, Muller-Plathe, J Phys Chem B,
109, 15060-15067 (2005).
This diff is collapsed.
Click to expand it.
doc/src/pair_gran.txt
+
3
−
3
View file @
dade6766
...
...
@@ -45,7 +45,7 @@ pair_style gran/hooke 200000.0 70000.0 50.0 30.0 0.5 0 :pre
The {gran} styles use the following formulas for the frictional force
between two granular particles, as described in
"(Brilliantov)"_#Brilliantov, "(Silbert)"_#Silbert, and
"(Zhang)"_#Zhang
4
, when the distance r between two particles of radii
"(Zhang)"_#Zhang
3
, when the distance r between two particles of radii
Ri and Rj is less than their contact distance d = Ri + Rj. There is
no force between the particles when r > d.
...
...
@@ -115,7 +115,7 @@ gamma_t is in units of (1/(time*distance)).
Note that in the Hookean case, Kn can be thought of as a linear spring
constant with units of force/distance. In the Hertzian case, Kn is
like a non-linear spring constant with units of force/area or
pressure, and as shown in the "(Zhang)"_#Zhang
4
paper, Kn = 4G /
pressure, and as shown in the "(Zhang)"_#Zhang
3
paper, Kn = 4G /
(3(1-nu)) where nu = the Poisson ratio, G = shear modulus = E /
(2(1+nu)), and E = Young's modulus. Similarly, Kt = 4G / (2-nu).
(NOTE: in an earlier version of the manual, we incorrectly stated that
...
...
@@ -267,5 +267,5 @@ p 5382-5392 (1996).
[(Silbert)] Silbert, Ertas, Grest, Halsey, Levine, Plimpton, Phys Rev
E, 64, p 051302 (2001).
:link(Zhang
4
)
:link(Zhang
3
)
[(Zhang)] Zhang and Makse, Phys Rev E, 72, p 011301 (2005).
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