Skip to content
This repository was archived by the owner on Aug 28, 2024. It is now read-only.

Commit

Permalink
Fixed up encounter loop wall time logging to sve to the correct log f…
Browse files Browse the repository at this point in the history
…iles
  • Loading branch information
daminton committed Oct 5, 2021
1 parent bfc379a commit a3dd420
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/encounter/encounter_check.f90
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
10 changes: 8 additions & 2 deletions src/walltime/walltime.f90
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit a3dd420

Please sign in to comment.