diff --git a/doc/src/fix_wall_gran.rst b/doc/src/fix_wall_gran.rst index bfe06bf7a0..02d52ef1a6 100644 --- a/doc/src/fix_wall_gran.rst +++ b/doc/src/fix_wall_gran.rst @@ -29,6 +29,7 @@ Syntax gamma_t = damping coefficient for collisions in tangential direction (1/time units or 1/time-distance units - see discussion below) xmu = static yield criterion (unitless value between 0.0 and 1.0e4) dampflag = 0 or 1 if tangential damping force is excluded or included + optional keyword = *limit_damping*, limit damping to prevent attractive interaction .. parsed-literal:: @@ -45,7 +46,7 @@ Syntax radius = cylinder radius (distance units) * zero or more keyword/value pairs may be appended to args -* keyword = *wiggle* or *shear* or *contacts* or *no_attraction* +* keyword = *wiggle* or *shear* or *contacts* .. parsed-literal:: @@ -58,8 +59,6 @@ Syntax vshear = magnitude of shear velocity (velocity units) *contacts* value = none generate contact information for each particle - *no_attraction* value = none - turn off possibility of attractive interactions Examples @@ -97,7 +96,8 @@ Specifically, delta = radius - r = overlap of particle with wall, m_eff = mass of particle, and the effective radius of contact = RiRj/Ri+Rj is set to the radius of the particle. -The parameters *Kn*\ , *Kt*\ , *gamma_n*, *gamma_t*, *xmu* and *dampflag* +The parameters *Kn*\ , *Kt*\ , *gamma_n*, *gamma_t*, *xmu*, *dampflag*, +and the optional keyword *limit_damping* have the same meaning and units as those specified with the :doc:`pair_style gran/\* ` commands. This means a NULL can be used for either *Kt* or *gamma_t* as described on that page. If a @@ -177,12 +177,6 @@ the clockwise direction for *vshear* > 0 or counter-clockwise for *vshear* < 0. In this case, *vshear* is the tangential velocity of the wall at whatever *radius* has been defined. -If a particle is moving away from the wall while in contact, there -is a possibility that the particle could experience an effective attractive -force due to damping. If the *no_attraction* keyword is used, this fix -will zero out the normal component of the force if there is an effective -attractive force. This keyword cannot be used with the JKR or DMT models. - """"""""""""""""""""""""""""""""""""""""""""""""""""""""""" This fix writes the shear friction state of atoms interacting with the diff --git a/doc/src/fix_wall_gran_region.rst b/doc/src/fix_wall_gran_region.rst index 00eb19ba1c..b7a9ff6bd7 100644 --- a/doc/src/fix_wall_gran_region.rst +++ b/doc/src/fix_wall_gran_region.rst @@ -183,7 +183,8 @@ radius - r = overlap of particle with wall, m_eff = mass of particle, and the effective radius of contact is just the radius of the particle. -The parameters *Kn*\ , *Kt*\ , *gamma_n*, *gamma_t*, *xmu* and *dampflag* +The parameters *Kn*\ , *Kt*\ , *gamma_n*, *gamma_t*, *xmu*, *dampflag*, +and the optional keyword *limit_damping* have the same meaning and units as those specified with the :doc:`pair_style gran/\* ` commands. This means a NULL can be used for either *Kt* or *gamma_t* as described on that page. If a @@ -201,12 +202,6 @@ values for the 6 wall/particle coefficients than for particle/particle interactions. E.g. if you wish to model the wall as a different material. -If a particle is moving away from the wall while in contact, there -is a possibility that the particle could experience an effective attractive -force due to damping. If the *no_attraction* keyword is used, this fix -will zero out the normal component of the force if there is an effective -attractive force. This keyword cannot be used with the JKR or DMT models. - Restart, fix_modify, output, run start/stop, minimize info """"""""""""""""""""""""""""""""""""""""""""""""""""""""""" diff --git a/doc/src/pair_gran.rst b/doc/src/pair_gran.rst index 8145f7fb7a..b918e38da6 100644 --- a/doc/src/pair_gran.rst +++ b/doc/src/pair_gran.rst @@ -40,8 +40,8 @@ Syntax .. parsed-literal:: - *no_attraction* value = none - turn off possibility of attractive interactions + *limit_damping* value = none + limit damping to prevent attractive interaction .. note:: @@ -217,7 +217,7 @@ potential. If two particles are moving away from each other while in contact, there is a possibility that the particles could experience an effective attractive -force due to damping. If the *no_attraction* keyword is used, this fix +force due to damping. If the *limit_damping* keyword is used, this fix will zero out the normal component of the force if there is an effective attractive force. diff --git a/doc/src/pair_granular.rst b/doc/src/pair_granular.rst index 0076994e25..04c9d45afd 100644 --- a/doc/src/pair_granular.rst +++ b/doc/src/pair_granular.rst @@ -625,7 +625,7 @@ Finally, the twisting torque on each particle is given by: If two particles are moving away from each other while in contact, there is a possibility that the particles could experience an effective attractive -force due to damping. If the optional *no_attraction* keyword is used, this fix +force due to damping. If the optional *limit_damping* keyword is used, this fix will zero out the normal component of the force if there is an effective attractive force. This keyword cannot be used with the JKR or DMT models. diff --git a/src/GRANULAR/pair_gran_hooke_history.cpp b/src/GRANULAR/pair_gran_hooke_history.cpp index d3c1cf7672..a86af2116e 100644 --- a/src/GRANULAR/pair_gran_hooke_history.cpp +++ b/src/GRANULAR/pair_gran_hooke_history.cpp @@ -373,10 +373,8 @@ void PairGranHookeHistory::settings(int narg, char **arg) limit_damping = 0; if(narg == 7) { - if(strcmp(arg[6], "limit_damping")) - limit_damping = 1; - else - error->all(FLERR,"Illegal pair_style command"); + if(strcmp(arg[6], "limit_damping") == 0) limit_damping = 1; + else error->all(FLERR,"Illegal pair_style command"); } if (kn < 0.0 || kt < 0.0 || gamman < 0.0 || gammat < 0.0 ||