Recompute Hill's sphere when calling rearray

MintonGroup · Jan 30, 2023 · 268d8a6 · 268d8a6
1 parent af9be87
commit 268d8a6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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)])