jianmu
/
lammps
forked from lijiext/lammps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "avoid undesired negative forces for high particle velocities in granular models" 

This reverts commit 066123007c.
This commit is contained in:
Axel Kohlmeyer 2017-06-15 11:01:36 -04:00
parent cfeb9b5ba5
commit b62d526cc9
3 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/GRANULAR/pair_gran_hertz_history.cpp
View File

@ -183,7 +183,6 @@ void PairGranHertzHistory::compute(int eflag, int vflag)
ccel = kn*(radsum-r)*rinv - damp;
polyhertz = sqrt((radsum-r)*radi*radj / radsum);
ccel *= polyhertz;
if (ccel < 0.0) ccel = 0.0;
// relative velocities
@ -391,7 +390,6 @@ double PairGranHertzHistory::single(int i, int j, int itype, int jtype,
ccel = kn*(radsum-r)*rinv - damp;
polyhertz = sqrt((radsum-r)*radi*radj / radsum);
ccel *= polyhertz;
if (ccel < 0.0) ccel = 0.0;
// relative velocities

2
src/GRANULAR/pair_gran_hooke.cpp
View File

@ -161,7 +161,6 @@ void PairGranHooke::compute(int eflag, int vflag)
damp = meff*gamman*vnnr*rsqinv;
ccel = kn*(radsum-r)*rinv - damp;
if (ccel < 0.0) ccel = 0.0;
// relative velocities
@ -303,7 +302,6 @@ double PairGranHooke::single(int i, int j, int itype, int jtype, double rsq,
damp = meff*gamman*vnnr*rsqinv;
ccel = kn*(radsum-r)*rinv - damp;
if (ccel < 0.0) ccel = 0.0;
// relative velocities

2
src/GRANULAR/pair_gran_hooke_history.cpp
View File

@ -223,7 +223,6 @@ void PairGranHookeHistory::compute(int eflag, int vflag)
damp = meff*gamman*vnnr*rsqinv;
ccel = kn*(radsum-r)*rinv - damp;
if (ccel < 0.0) ccel = 0.0;
// relative velocities
@ -688,7 +687,6 @@ double PairGranHookeHistory::single(int i, int j, int itype, int jtype,
damp = meff*gamman*vnnr*rsqinv;
ccel = kn*(radsum-r)*rinv - damp;
if (ccel < 0.0) ccel = 0.0;
// relative velocities