From 268d8a65e2d3a56da85d2fa972df3f0d1cf72b9b Mon Sep 17 00:00:00 2001 From: David A Minton Date: Mon, 30 Jan 2023 11:10:03 -0500 Subject: [PATCH] Recompute Hill's sphere when calling rearray --- src/collision/collision_resolve.f90 | 1 - src/swiftest/swiftest_util.f90 | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/collision/collision_resolve.f90 b/src/collision/collision_resolve.f90 index 5e0f2296a..6b3886224 100644 --- a/src/collision/collision_resolve.f90 +++ b/src/collision/collision_resolve.f90 @@ -369,7 +369,6 @@ module subroutine collision_resolve_mergeaddsub(nbody_system, param, t, status) volume = 4.0_DP/3.0_DP * PI * plnew%radius(i)**3 plnew%density(i) = fragments%mass(i) / volume end do - call plnew%set_rhill(cb) select case(status) case(SUPERCATASTROPHIC) diff --git a/src/swiftest/swiftest_util.f90 b/src/swiftest/swiftest_util.f90 index ba2ffe774..05f9383ee 100644 --- a/src/swiftest/swiftest_util.f90 +++ b/src/swiftest/swiftest_util.f90 @@ -1808,7 +1808,7 @@ module subroutine swiftest_util_rearray_pl(self, nbody_system, param) class(encounter_list), allocatable :: plplenc_old logical :: lencounter - associate(pl => self, tp => nbody_system%tp, pl_adds => nbody_system%pl_adds) + associate(pl => self, tp => nbody_system%tp, cb => nbody_system%cb, pl_adds => nbody_system%pl_adds) npl = pl%nbody nadd = pl_adds%nbody @@ -1858,6 +1858,8 @@ module subroutine swiftest_util_rearray_pl(self, nbody_system, param) call pl%sort("mass", ascending=.false.) call pl%flatten(param) + call pl%set_rhill(cb) + ! Reset the kinship trackers call pl%reset_kinship([(i, i=1, npl)])