Commit b62d526c authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

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

This reverts commit 06612300.
parent cfeb9b5b

src/GRANULAR/pair_gran_hertz_history.cpp

+0 −2
Original line number Diff line number Diff line
@@ -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

src/GRANULAR/pair_gran_hooke.cpp

+0 −2
Original line number Diff line number Diff line
@@ -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

src/GRANULAR/pair_gran_hooke_history.cpp

+0 −2
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE