Re-enabled sorting of particles after testing

MintonGroup · Aug 12, 2021 · 1f793cb · 1f793cb
1 parent 3861157
commit 1f793cb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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)