lijiext
/
lammps
mirror of https://github.com/lammps/lammps.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

remove trailing whitespace

This commit is contained in:
Axel Kohlmeyer 2020-08-21 00:42:57 -04:00
parent e742ae7475
commit ee6ef98b9b
No known key found for this signature in database
GPG Key ID: D9B44E93BF0C375A
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/src/pair_granular.rst
View File

@ -410,7 +410,7 @@ discussion above. To match the Mindlin solution, one should set
.. math:: .. math::
G_{eff} = \left(\frac{2-\nu_i}{G_i} + \frac{2-\nu_j}{G_j}\right)^{-1} G_{eff} = \left(\frac{2-\nu_i}{G_i} + \frac{2-\nu_j}{G_j}\right)^{-1}
where :math:`G` is the shear modulus, related to Young's modulus :math:`E` where :math:`G` is the shear modulus, related to Young's modulus :math:`E`
and Poisson's ratio :math:`\nu` by :math:`G = E/(2(1+\nu))`. This can also be and Poisson's ratio :math:`\nu` by :math:`G = E/(2(1+\nu))`. This can also be
achieved by specifying *NULL* for :math:`k_t`, in which case a achieved by specifying *NULL* for :math:`k_t`, in which case a
@ -476,8 +476,8 @@ created without the rescaling above (:ref:`Walton <WaltonPC>` ).
force described above. By re-scaling :math:`\xi`, *mindlin_rescale* force described above. By re-scaling :math:`\xi`, *mindlin_rescale*
effectively re-scales the tangential force twice, i.e., proportionally to effectively re-scales the tangential force twice, i.e., proportionally to
:math:`a^2`. This peculiar behavior results from use of the accumulated :math:`a^2`. This peculiar behavior results from use of the accumulated
tangential displacement to characterize the contact history. Although tangential displacement to characterize the contact history. Although
*mindlin_rescale* remains available for historic reasons and backward *mindlin_rescale* remains available for historic reasons and backward
compatibility purposes, it should be avoided in favor of *mindlin_rescale/force*. compatibility purposes, it should be avoided in favor of *mindlin_rescale/force*.
The *mindlin_rescale/force* option uses the same form as *mindlin/force*, The *mindlin_rescale/force* option uses the same form as *mindlin/force*,

4
src/GRANULAR/pair_granular.cpp
View File

@ -447,7 +447,7 @@ void PairGranular::compute(int eflag, int vflag)
history[0] -= rsht*nx; history[0] -= rsht*nx;
history[1] -= rsht*ny; history[1] -= rsht*ny;
history[2] -= rsht*nz; history[2] -= rsht*nz;
// also rescale to preserve magnitude // also rescale to preserve magnitude
prjmag = sqrt(history[0]*history[0] + history[1]*history[1] + prjmag = sqrt(history[0]*history[0] + history[1]*history[1] +
history[2]*history[2]); history[2]*history[2]);
@ -572,7 +572,7 @@ void PairGranular::compute(int eflag, int vflag)
history[rhist0] *= scalefac; history[rhist0] *= scalefac;
history[rhist1] *= scalefac; history[rhist1] *= scalefac;
history[rhist2] *= scalefac; history[rhist2] *= scalefac;
history[rhist0] += vrl1*dt; history[rhist0] += vrl1*dt;
history[rhist1] += vrl2*dt; history[rhist1] += vrl2*dt;
history[rhist2] += vrl3*dt; history[rhist2] += vrl3*dt;