Converted another while loop to a do

MintonGroup · Sep 28, 2023 · 4a6b2f8 · 4a6b2f8
1 parent f859be1
commit 4a6b2f8
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/src/swiftest/swiftest_sph.f90 b/src/swiftest/swiftest_sph.f90
@@ -101,17 +101,16 @@ module subroutine swiftest_sph_g_acc_pl_all(self, nbody_system)
         associate(pl => self, npl => self%nbody, cb => nbody_system%cb, rh => self%rh)
             cb%aobl(:) = 0.0_DP
 
-            ! do i = 1, npl, pl%lmask(i)
-            do while ((i .lt. npl) .and. pl%lmask(i))
-                r_mag = .mag. rh(1:3,i)
-                theta = atan2(sqrt(rh(1,i)**2 + rh(2,i)**2), rh(3,i))
-                phi = atan2(rh(2,i), rh(1,i)) - cb%rotphase ! CALCULATE CB PHASE VALUE FOR PHI
-
-                call swiftest_sph_g_acc_one(cb%Gmass, r_mag, phi, theta, rh(:,i), cb%c_lm, g_sph, pl%Gmass, cb%aobl)
-                pl%ah(:, i) = pl%ah(:, i) + g_sph(:) - cb%aobl(:)
-                pl%aobl(:, i) = g_sph(:)
-
-                i = i + 1
+            do i = 1, npl
+                if (pl%lmask(i)) then
+                    r_mag = .mag. rh(:,i)
+                    theta = atan2(sqrt(rh(1,i)**2 + rh(2,i)**2), rh(3,i))
+                    phi = atan2(rh(2,i), rh(1,i)) - cb%rotphase ! CALCULATE CB PHASE VALUE FOR PHI
+
+                    call swiftest_sph_g_acc_one(cb%Gmass, r_mag, phi, theta, rh(:,i), cb%c_lm, g_sph, pl%Gmass, cb%aobl)
+                    pl%ah(:, i) = pl%ah(:, i) + g_sph(:) - cb%aobl(:)
+                    pl%aobl(:, i) = g_sph(:)
+                end if
             end do
         end associate
         return