From a0fc17ce1a8d488c89330fd27e2fac0ee906cc31 Mon Sep 17 00:00:00 2001 From: David A Minton Date: Mon, 16 Aug 2021 20:15:44 -0400 Subject: [PATCH] Put back overlap check in acceleration calculation --- src/symba/symba_kick.f90 | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/symba/symba_kick.f90 b/src/symba/symba_kick.f90 index c1de5a077..ccf56e039 100644 --- a/src/symba/symba_kick.f90 +++ b/src/symba/symba_kick.f90 @@ -31,11 +31,14 @@ module subroutine symba_kick_getacch_pl(self, system, param, t, lbeg) associate(i => plplenc_list%index1(k), j => plplenc_list%index2(k)) dx(:) = pl%xh(:, j) - pl%xh(:, i) rji2 = dot_product(dx(:), dx(:)) - irij3 = 1.0_DP / (rji2 * sqrt(rji2)) - faci = pl%Gmass(i) * irij3 - facj = pl%Gmass(j) * irij3 - pl%ah(:, i) = pl%ah(:, i) - facj * dx(:) - pl%ah(:, j) = pl%ah(:, j) + faci * dx(:) + rlim2 = (pl%radius(i) + pl%radius(j))**2 + if (rji2 > rlim2) then + irij3 = 1.0_DP / (rji2 * sqrt(rji2)) + faci = pl%Gmass(i) * irij3 + facj = pl%Gmass(j) * irij3 + pl%ah(:, i) = pl%ah(:, i) - facj * dx(:) + pl%ah(:, j) = pl%ah(:, j) + faci * dx(:) + end if end associate end do end associate