From a3dd420661d5df5855ddc1494a585e38513c3c61 Mon Sep 17 00:00:00 2001 From: David A Minton Date: Tue, 5 Oct 2021 14:44:49 -0400 Subject: [PATCH] Fixed up encounter loop wall time logging to sve to the correct log files --- src/encounter/encounter_check.f90 | 2 +- src/walltime/walltime.f90 | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/encounter/encounter_check.f90 b/src/encounter/encounter_check.f90 index de2f9d8d3..4b0e91e13 100644 --- a/src/encounter/encounter_check.f90 +++ b/src/encounter/encounter_check.f90 @@ -959,7 +959,7 @@ module subroutine encounter_check_sweep_aabb_double_list(self, n1, n2, ind_arr, ! Sweep the intervals for each of the massive bodies along one dimension ! This will build a ragged pair of index lists inside of the lenc data structure !$omp parallel do default(private) schedule(static)& - !$omp shared(self, lenc, ind_arr2) & + !$omp shared(self, lenc, ind_arr) & !$omp firstprivate(ntot, n1, n2) do i = 1, ntot call encounter_check_sweep_aabb_one_double_list(i, n1, n2, self%aabb(1)%ind(:), self%aabb(1)%ibeg(:), self%aabb(1)%iend(:), self%aabb(2)%ibeg(:), self%aabb(2)%iend(:), ind_arr, lenc(i)) diff --git a/src/walltime/walltime.f90 b/src/walltime/walltime.f90 index 88d791489..118ecd09b 100644 --- a/src/walltime/walltime.f90 +++ b/src/walltime/walltime.f90 @@ -152,10 +152,14 @@ module subroutine walltime_interaction_adapt(self, param, ninteractions, pl) write(advancedstyle, *) "FLAT " write(standardstyle, *) "TRIANGULAR" write(logfile,*) INTERACTION_TIMER_LOG_OUT - case("ENCOUNTER") + case("ENCOUNTER_PLPL") write(advancedstyle, *) "SORTSWEEP " write(standardstyle, *) "TRIANGULAR" write(logfile,*) ENCOUNTER_PLPL_TIMER_LOG_OUT + case("ENCOUNTER_PLTP") + write(advancedstyle, *) "SORTSWEEP " + write(standardstyle, *) "TRIANGULAR" + write(logfile,*) ENCOUNTER_PLTP_TIMER_LOG_OUT case default write(logfile,*) "unknown_looptimer.log" end select @@ -287,8 +291,10 @@ module subroutine walltime_interaction_time_this_loop(self, param, ninteractions select case(trim(adjustl(self%looptype))) case("INTERACTION") write(logfile,*) INTERACTION_TIMER_LOG_OUT - case("ENCOUNTER") + case("ENCOUNTER_PLPL") write(logfile,*) ENCOUNTER_PLPL_TIMER_LOG_OUT + case("ENCOUNTER_PLTP") + write(logfile,*) ENCOUNTER_PLTP_TIMER_LOG_OUT case default write(logfile,*) "unknown_looptimer.log" end select