From 4bfcd591f1793bb404ba566d10800a9ad33434cc Mon Sep 17 00:00:00 2001 From: David A Minton Date: Tue, 14 Sep 2021 09:24:00 -0400 Subject: [PATCH] Consolidated loops in the potential energy calculation --- src/util/util_get_energy_momentum.f90 | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/util/util_get_energy_momentum.f90 b/src/util/util_get_energy_momentum.f90 index daea2e0e7..677de5646 100644 --- a/src/util/util_get_energy_momentum.f90 +++ b/src/util/util_get_energy_momentum.f90 @@ -139,19 +139,13 @@ subroutine util_get_energy_potential(npl, nplpl, k_plpl, lmask, GMcb, Gmass, mas pecb(i) = -GMcb * mass(i) / norm2(xb(:,i)) end do - ! Do the potential energy between pairs of massive bodies - do concurrent (k = 1:nplpl) + !$omp parallel do default(private) schedule(static)& + !$omp shared(nplpl, k_plpl, xb, mass, Gmass, pepl, lstatpl, lmask) + do k = 1, nplpl i = k_plpl(1,k) j = k_plpl(2,k) lstatpl(k) = (lmask(i) .and. lmask(j)) - end do - - !$omp parallel do default(private) schedule(static)& - !$omp shared(nplpl, k_plpl, xb, mass, Gmass, pepl, lstatpl) - do k = 1, nplpl if (lstatpl(k)) then - i = k_plpl(1,k) - j = k_plpl(2,k) pepl(k) = -(Gmass(i) * mass(j)) / norm2(xb(:, i) - xb(:, j)) else pepl(k) = 0.0_DP