From 1f793cb89c97bed2ef967aa75935139b0005e04b Mon Sep 17 00:00:00 2001 From: David A Minton Date: Thu, 12 Aug 2021 12:06:03 -0400 Subject: [PATCH] Re-enabled sorting of particles after testing --- src/symba/symba_step.f90 | 3 +++ src/whm/whm_setup.f90 | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/symba/symba_step.f90 b/src/symba/symba_step.f90 index 3bc542c1d..69d7e2cbd 100644 --- a/src/symba/symba_step.f90 +++ b/src/symba/symba_step.f90 @@ -211,6 +211,9 @@ module recursive subroutine symba_step_recur_system(self, param, t, ireci) if (param%lclose) then lplpl_collision = plplenc_list%collision_check(system, param, t+dtl, dtl, ireci) lpltp_collision = pltpenc_list%collision_check(system, param, t+dtl, dtl, ireci) + + if (lplpl_collision) call pl%discard(system, param) + if (lpltp_collision) call tp%discard(system, param) end if call self%set_recur_levels(ireci) diff --git a/src/whm/whm_setup.f90 b/src/whm/whm_setup.f90 index 4f9bc6bcf..eaed16c14 100644 --- a/src/whm/whm_setup.f90 +++ b/src/whm/whm_setup.f90 @@ -79,7 +79,7 @@ module subroutine whm_setup_initialize_system(self, param) call setup_initialize_system(self, param) ! First we need to make sure that the massive bodies are sorted by heliocentric distance before computing jacobies call util_set_ir3h(self%pl) - !call self%pl%sort("ir3h", ascending=.false.) + call self%pl%sort("ir3h", ascending=.false.) ! Make sure that the discard list gets allocated initially call self%tp_discards%setup(0, param)