From 52fd48ed01dbb47074ce362db2393c9efda1a110 Mon Sep 17 00:00:00 2001 From: David A Minton Date: Thu, 19 Aug 2021 10:16:02 -0400 Subject: [PATCH] Added back the firstkick logical to manage restarted kicks --- src/setup/setup.f90 | 2 ++ src/symba/symba_step.f90 | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/setup/setup.f90 b/src/setup/setup.f90 index d56f2becb..7ee72fd3b 100644 --- a/src/setup/setup.f90 +++ b/src/setup/setup.f90 @@ -143,6 +143,8 @@ module subroutine setup_initialize_system(self, param) call self%tp%set_mu(self%cb) call self%pl%eucl_index() if (.not.param%lrhill_present) call self%pl%set_rhill(self%cb) + self%pl%lfirst = param%lfirstkick + self%tp%lfirst = param%lfirstkick return end subroutine setup_initialize_system diff --git a/src/symba/symba_step.f90 b/src/symba/symba_step.f90 index ed5985c0b..fe2d74b1a 100644 --- a/src/symba/symba_step.f90 +++ b/src/symba/symba_step.f90 @@ -28,10 +28,8 @@ module subroutine symba_step_system(self, param, t, dt) call self%reset(param) lencounter = pl%encounter_check(self, dt, 0) .or. tp%encounter_check(self, dt, 0) if (lencounter) then - tp%lfirst = pl%lfirst call self%interp(param, t, dt) - pl%lfirst = .true. - tp%lfirst = .true. + param%lfirstkick = .true. else self%irec = -1 call helio_step_system(self, param, t, dt) @@ -266,6 +264,9 @@ module subroutine symba_step_reset_system(self, param) call system%pl_adds%setup(0, param) call system%pl_discards%setup(0, param) + + tp%lfirst = param%lfirstkick + pl%lfirst = param%lfirstkick end associate end select end select