From 0b4c7493cc4ce6cf33af5e09896ff651a5c924b7 Mon Sep 17 00:00:00 2001 From: David A Minton Date: Thu, 3 Feb 2022 14:58:02 -0500 Subject: [PATCH 1/3] Turned GR off to do comparison --- .../8pl_16tp_encounters/param.swiftest.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/symba_swifter_comparison/8pl_16tp_encounters/param.swiftest.in b/examples/symba_swifter_comparison/8pl_16tp_encounters/param.swiftest.in index 7f4d21c9b..6df5f67ec 100644 --- a/examples/symba_swifter_comparison/8pl_16tp_encounters/param.swiftest.in +++ b/examples/symba_swifter_comparison/8pl_16tp_encounters/param.swiftest.in @@ -31,8 +31,8 @@ RHILL_PRESENT YES FRAGMENTATION NO ROTATION NO TIDES NO -ENERGY NO -GR YES +ENERGY YES +GR NO GMTINY 1e-12 ENCOUNTER_CHECK TRIANGULAR INTERACTION_LOOPS TRIANGULAR From af6c59b4870a565e3ecef81afa4d819feb60dc25 Mon Sep 17 00:00:00 2001 From: David A Minton Date: Fri, 4 Feb 2022 10:15:46 -0500 Subject: [PATCH 2/3] Turned the oblatenest terms back on for the Swiftest inputs. --- .../8pl_16tp_encounters/cb.swiftest.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/symba_swifter_comparison/8pl_16tp_encounters/cb.swiftest.in b/examples/symba_swifter_comparison/8pl_16tp_encounters/cb.swiftest.in index e3318aec0..2df47f957 100644 --- a/examples/symba_swifter_comparison/8pl_16tp_encounters/cb.swiftest.in +++ b/examples/symba_swifter_comparison/8pl_16tp_encounters/cb.swiftest.in @@ -1,5 +1,5 @@ Sun 0.00029591220819207774 0.004650467260962157 -0.0 -0.0 +4.7535806948127355e-12 +-2.2473967953572827e-18 From 858003fd9c31f0430a57683c94a8296997151c7c Mon Sep 17 00:00:00 2001 From: David A Minton Date: Thu, 17 Feb 2022 16:34:49 -0500 Subject: [PATCH 3/3] Made relative velocity in symba_encounter_check to be heliocentric instead of barycentric to stay consistent with Swifter --- src/symba/symba_encounter_check.f90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/symba/symba_encounter_check.f90 b/src/symba/symba_encounter_check.f90 index 7281916b2..702bd09bd 100644 --- a/src/symba/symba_encounter_check.f90 +++ b/src/symba/symba_encounter_check.f90 @@ -131,7 +131,7 @@ module function symba_encounter_check(self, param, system, dt, irec) result(lany i = self%index1(k) j = self%index2(k) xr(:) = pl%xh(:,j) - pl%xh(:,i) - vr(:) = pl%vb(:,j) - pl%vb(:,i) + vr(:) = pl%vh(:,j) - pl%vh(:,i) rcrit12 = pl%renc(i) + pl%renc(j) call encounter_check_one(xr(1), xr(2), xr(3), vr(1), vr(2), vr(3), rcrit12, dt, lencounter(lidx), self%lvdotr(k)) if (lencounter(lidx)) then @@ -146,7 +146,7 @@ module function symba_encounter_check(self, param, system, dt, irec) result(lany i = self%index1(k) j = self%index2(k) xr(:) = tp%xh(:,j) - pl%xh(:,i) - vr(:) = tp%vb(:,j) - pl%vb(:,i) + vr(:) = tp%vh(:,j) - pl%vh(:,i) call encounter_check_one(xr(1), xr(2), xr(3), vr(1), vr(2), vr(3), pl%renc(i), dt, & lencounter(lidx), self%lvdotr(k)) if (lencounter(lidx)) then