diff --git a/doc/src/pair_granular.rst b/doc/src/pair_granular.rst index d846e79e35..2fce2d24f1 100644 --- a/doc/src/pair_granular.rst +++ b/doc/src/pair_granular.rst @@ -410,7 +410,7 @@ discussion above. To match the Mindlin solution, one should set .. math:: 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` 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 @@ -476,8 +476,8 @@ created without the rescaling above (:ref:`Walton ` ). force described above. By re-scaling :math:`\xi`, *mindlin_rescale* effectively re-scales the tangential force twice, i.e., proportionally to :math:`a^2`. This peculiar behavior results from use of the accumulated - tangential displacement to characterize the contact history. Although - *mindlin_rescale* remains available for historic reasons and backward + tangential displacement to characterize the contact history. Although + *mindlin_rescale* remains available for historic reasons and backward compatibility purposes, it should be avoided in favor of *mindlin_rescale/force*. The *mindlin_rescale/force* option uses the same form as *mindlin/force*, diff --git a/src/GRANULAR/pair_granular.cpp b/src/GRANULAR/pair_granular.cpp index b16fd40236..1b92c2686d 100644 --- a/src/GRANULAR/pair_granular.cpp +++ b/src/GRANULAR/pair_granular.cpp @@ -447,7 +447,7 @@ void PairGranular::compute(int eflag, int vflag) history[0] -= rsht*nx; history[1] -= rsht*ny; history[2] -= rsht*nz; - + // also rescale to preserve magnitude prjmag = sqrt(history[0]*history[0] + history[1]*history[1] + history[2]*history[2]); @@ -572,7 +572,7 @@ void PairGranular::compute(int eflag, int vflag) history[rhist0] *= scalefac; history[rhist1] *= scalefac; history[rhist2] *= scalefac; - + history[rhist0] += vrl1*dt; history[rhist1] += vrl2*dt; history[rhist2] += vrl3*dt;