Merge branch 'debug' into IntelAdvisor

MintonGroup · Dec 11, 2021 · 3ceb452 · 3ceb452
2 parents bb65e38 + 9175800
commit 3ceb452
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/src/helio/helio_step.f90 b/src/helio/helio_step.f90
@@ -56,8 +56,8 @@ module subroutine helio_step_pl(self, system, param, t, dt)
             call pl%kick(system, param, t, dth, lbeg=.true.)
             if (param%lgr) call pl%gr_pos_kick(system, param, dth)
             call pl%drift(system, param, dt)
-            call pl%kick(system, param, t + dt, dth, lbeg=.false.)
             if (param%lgr) call pl%gr_pos_kick(system, param, dth)
+            call pl%kick(system, param, t + dt, dth, lbeg=.false.)
             call pl%lindrift(cb, dth, lbeg=.false.)
             call pl%vb2vh(cb)
          end select
@@ -99,8 +99,8 @@ module subroutine helio_step_tp(self, system, param, t, dt)
             call tp%kick(system, param, t, dth, lbeg=.true.)
             if (param%lgr) call tp%gr_pos_kick(system, param, dth)
             call tp%drift(system, param, dt)
-            call tp%kick(system, param, t + dt, dth, lbeg=.false.)
             if (param%lgr) call tp%gr_pos_kick(system, param, dth)
+            call tp%kick(system, param, t + dt, dth, lbeg=.false.)
             call tp%lindrift(cb, dth, lbeg=.false.)
             call tp%vb2vh(vbcb = -cb%ptend)
          end select

diff --git a/src/symba/symba_gr.f90 b/src/symba/symba_gr.f90
@@ -23,7 +23,7 @@ module pure subroutine symba_gr_p4_pl(self, system, param, dt)
       associate(pl => self, npl => self%nbody)
          select type(system)
          class is (symba_nbody_system)
-            do concurrent(i = 1:npl, pl%lmask(i) .and. pl%levelg(i) == system%irec )
+            do concurrent(i = 1:npl, pl%lmask(i) .and. (pl%levelg(i) == system%irec) )
                call gr_p4_pos_kick(param, pl%xh(:, i), pl%vb(:, i), dt)
             end do
          end select
@@ -54,7 +54,7 @@ module pure subroutine symba_gr_p4_tp(self, system, param, dt)
       associate(tp => self, ntp => self%nbody)
          select type(system)
          class is (symba_nbody_system)
-            do concurrent(i = 1:ntp, tp%lmask(i) .and. tp%levelg(i) == system%irec)
+            do concurrent(i = 1:ntp, tp%lmask(i) .and. (tp%levelg(i) == system%irec))
                call gr_p4_pos_kick(param, tp%xh(:, i), tp%vb(:, i), dt)
             end do
          end select

diff --git a/src/symba/symba_step.f90 b/src/symba/symba_step.f90
@@ -83,13 +83,13 @@ module subroutine symba_step_interp_system(self, param, t, dt)
 
                   call system%recursive_step(param, t, 0)
 
-                  call pl%kick(system, param, t, dth, lbeg=.false.)
                   if (param%lgr) call pl%gr_pos_kick(system, param, dth)
+                  call pl%kick(system, param, t, dth, lbeg=.false.)
                   call pl%lindrift(cb, dth, lbeg=.false.)
                   call pl%vb2vh(cb)
 
-                  call tp%kick(system, param, t, dth, lbeg=.false.)
                   if (param%lgr) call tp%gr_pos_kick(system, param, dth)
+                  call tp%kick(system, param, t, dth, lbeg=.false.)
                   call tp%lindrift(cb, dth, lbeg=.false.)
                   call tp%vb2vh(vbcb = -cb%ptend)
                end select
@@ -196,26 +196,29 @@ module recursive subroutine symba_step_recur_system(self, param, t, ireci)
                      call plplenc_list%kick(system, dth, irecp, -1)
                      call pltpenc_list%kick(system, dth, irecp, -1)
                   end if
+
                   if (param%lgr) then
                      call pl%gr_pos_kick(system, param, dth)
                      call tp%gr_pos_kick(system, param, dth)
                   end if
+
                   call pl%drift(system, param, dtl)
                   call tp%drift(system, param, dtl)
 
                   if (lencounter) call system%recursive_step(param, t+dth,irecp)
                   system%irec = ireci
 
+                  if (param%lgr) then
+                     call pl%gr_pos_kick(system, param, dth)
+                     call tp%gr_pos_kick(system, param, dth)
+                  end if
+
                   call plplenc_list%kick(system, dth, irecp, 1)
                   call pltpenc_list%kick(system, dth, irecp, 1)
                   if (ireci /= 0) then
                      call plplenc_list%kick(system, dth, irecp, -1)
                      call pltpenc_list%kick(system, dth, irecp, -1)
                   end if
-                  if (param%lgr) then
-                     call pl%gr_pos_kick(system, param, dth)
-                     call tp%gr_pos_kick(system, param, dth)
-                  end if
 
                   if (param%lclose) then
                      lplpl_collision = plplenc_list%collision_check(system, param, t+dtl, dtl, ireci)