From b62d526cc98d53c5c81d9839977dd8fc2dd1ffda Mon Sep 17 00:00:00 2001
From: Axel Kohlmeyer <akohlmey@gmail.com>
Date: Thu, 15 Jun 2017 11:01:36 -0400
Subject: [PATCH] Revert "avoid undesired negative forces for high particle
velocities in granular models"
This reverts commit 066123007cd9277d4c03669707cf34ab6c05bc06.
---
src/GRANULAR/pair_gran_hertz_history.cpp | 2 --
src/GRANULAR/pair_gran_hooke.cpp | 2 --
src/GRANULAR/pair_gran_hooke_history.cpp | 2 --
3 files changed, 6 deletions(-)
diff --git a/src/GRANULAR/pair_gran_hertz_history.cpp b/src/GRANULAR/pair_gran_hertz_history.cpp
index 14cbc8eb0a..e52aac10db 100644
--- a/src/GRANULAR/pair_gran_hertz_history.cpp
+++ b/src/GRANULAR/pair_gran_hertz_history.cpp
@@ -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
diff --git a/src/GRANULAR/pair_gran_hooke.cpp b/src/GRANULAR/pair_gran_hooke.cpp
index 2d6d113ab7..66e1c3dd7a 100644
--- a/src/GRANULAR/pair_gran_hooke.cpp
+++ b/src/GRANULAR/pair_gran_hooke.cpp
@@ -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
diff --git a/src/GRANULAR/pair_gran_hooke_history.cpp b/src/GRANULAR/pair_gran_hooke_history.cpp
index 1378709cb5..e9662c9e73 100644
--- a/src/GRANULAR/pair_gran_hooke_history.cpp
+++ b/src/GRANULAR/pair_gran_hooke_history.cpp
@@ -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
--
GitLab