Merge branch 'debug'

MintonGroup · Feb 17, 2022 · 06d8e30 · 06d8e30
2 parents d53700d + 858003f
commit 06d8e30
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 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
@@ -1,5 +1,5 @@
 Sun
 0.00029591220819207774
 0.004650467260962157
-0.0
-0.0
+4.7535806948127355e-12
+-2.2473967953572827e-18
diff --git 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
diff --git 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