forked from lijiext/lammps
Adding user-omp support
This commit is contained in:
parent
c44b8f18ee
commit
da56b9de56
|
@ -224,6 +224,7 @@ void PairGranHertzHistoryOMP::eval(int iifrom, int iito, ThrData * const thr)
|
|||
ccel = kn*(radsum-r)*rinv - damp;
|
||||
polyhertz = sqrt((radsum-r)*radi*radj / radsum);
|
||||
ccel *= polyhertz;
|
||||
if (limit_damping && (ccel < 0.0)) ccel = 0.0;
|
||||
|
||||
// relative velocities
|
||||
|
||||
|
|
|
@ -223,6 +223,7 @@ void PairGranHookeHistoryOMP::eval(int iifrom, int iito, ThrData * const thr)
|
|||
|
||||
damp = meff*gamman*vnnr*rsqinv;
|
||||
ccel = kn*(radsum-r)*rinv - damp;
|
||||
if (limit_damping && (ccel < 0.0)) ccel = 0.0;
|
||||
|
||||
// relative velocities
|
||||
|
||||
|
|
|
@ -197,6 +197,7 @@ void PairGranHookeOMP::eval(int iifrom, int iito, ThrData * const thr)
|
|||
|
||||
damp = meff*gamman*vnnr*rsqinv;
|
||||
ccel = kn*(radsum-r)*rinv - damp;
|
||||
if (limit_damping && (ccel < 0.0)) ccel = 0.0;
|
||||
|
||||
// relative velocities
|
||||
|
||||
|
|
Loading…
Reference in New Issue