interface interaction changes

johnaparker · Apr 24, 2020 · b50f407 · b50f407
1 parent 178e731
commit b50f407
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/stoked/collisions.py b/stoked/collisions.py
@@ -43,8 +43,9 @@ def force(self):
         F = np.zeros_like(self.position)
 
         dz = self.position[:,2] - self.zpos
-        idx = np.abs(dz) < rad
-        F[idx,2] = np.sign(dz[idx])*self.kn*np.sqrt((dz[idx] - rad[idx])**3)
+        overlap = dz - rad
+        idx = overlap < 0
+        F[idx,2] = np.sign(dz[idx])*self.kn*np.sqrt(-overlap[idx])**3
 
         return F
 

diff --git a/stoked/van_der_waals.py b/stoked/van_der_waals.py
@@ -42,6 +42,9 @@ def force(self):
 
         F = np.zeros_like(self.position)
         F[:,2] = -np.sign(dz)*factor*Q
+        idx = (dz - radius < 3e-9)
+        F[idx] = 0
+
         return F
 
     def torque(self):