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

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@daminton
daminton committed Dec 21, 2022
1 parent 82ff8b1 commit 530b1bd
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion src/rmvs/rmvs_discard.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ module subroutine rmvs_discard_tp(self, system, param)
end associate
end do
! Call the base method that this overrides
call discard_tp(tp, system, param)
call swiftest_discard_tp(tp, system, param)
end associate

end subroutine rmvs_discard_tp
Expand Down
8 changes: 4 additions & 4 deletions src/swiftest/swiftest_discard.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@ module subroutine swiftest_discard_tp(self, system, param)
call tp%h2b(cb)
end if

if ((param%rmin >= 0.0_DP) .or. (param%rmax >= 0.0_DP) .or. (param%rmaxu >= 0.0_DP)) call discard_cb_tp(tp, system, param)
if (param%qmin >= 0.0_DP) call discard_peri_tp(tp, system, param)
if (param%lclose) call discard_pl_tp(tp, system, param)
if ((param%rmin >= 0.0_DP) .or. (param%rmax >= 0.0_DP) .or. (param%rmaxu >= 0.0_DP)) call swiftest_discard_cb_tp(tp, system, param)
if (param%qmin >= 0.0_DP) call swiftest_discard_peri_tp(tp, system, param)
if (param%lclose) call swiftest_discard_pl_tp(tp, system, param)
if (any(tp%ldiscard(1:ntp))) then
allocate(ldiscard, source=tp%ldiscard)
call tp%spill(system%tp_discards, ldiscard(1:ntp), ldestructive=.true.)
Expand Down Expand Up @@ -252,7 +252,7 @@ subroutine swiftest_discard_pl_tp(tp, system, param)
dx(:) = tp%rh(:, i) - pl%rh(:, j)
dv(:) = tp%vh(:, i) - pl%vh(:, j)
radius = pl%radius(j)
call discard_pl_close(dx(:), dv(:), dt, radius**2, isp, r2min)
call swiftest_discard_pl_close(dx(:), dv(:), dt, radius**2, isp, r2min)
if (isp /= 0) then
tp%status(i) = DISCARDED_PLR
tp%lmask(i) = .false.
Expand Down
14 changes: 7 additions & 7 deletions src/swiftest/swiftest_io.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2046,7 +2046,7 @@ module subroutine swiftest_io_param_reader(self, unit, iotype, v_list, iostat, i


! All reporting of collision information in SyMBA (including mergers) is now recorded in the Fraggle logfile
call io_log_start(param, FRAGGLE_LOG_OUT, "Fraggle logfile")
call swiftest_io_log_start(param, FRAGGLE_LOG_OUT, "Fraggle logfile")

if ((param%encounter_save /= "NONE") .and. &
(param%encounter_save /= "TRAJECTORY") .and. &
Expand Down Expand Up @@ -2106,7 +2106,7 @@ module subroutine swiftest_io_param_reader(self, unit, iotype, v_list, iostat, i
case("ADAPTIVE")
param%ladaptive_interactions = .true.
param%lflatten_interactions = .true.
call io_log_start(param, INTERACTION_TIMER_LOG_OUT, "Interaction loop timer logfile")
call swiftest_io_log_start(param, INTERACTION_TIMER_LOG_OUT, "Interaction loop timer logfile")
call swiftest_io_log_one_message(INTERACTION_TIMER_LOG_OUT, "Diagnostic values: loop style, time count, nplpl, metric")
case("TRIANGULAR")
param%ladaptive_interactions = .false.
Expand All @@ -2121,15 +2121,15 @@ module subroutine swiftest_io_param_reader(self, unit, iotype, v_list, iostat, i
param%interaction_loops = "ADAPTIVE"
param%ladaptive_interactions = .true.
param%lflatten_interactions = .true.
call io_log_start(param, INTERACTION_TIMER_LOG_OUT, "Interaction loop timer logfile")
call swiftest_io_log_start(param, INTERACTION_TIMER_LOG_OUT, "Interaction loop timer logfile")
call swiftest_io_log_one_message(INTERACTION_TIMER_LOG_OUT, "Diagnostic values: loop style, time count, nplpl, metric")
end select

select case(trim(adjustl(param%encounter_check_plpl)))
case("ADAPTIVE")
param%ladaptive_encounters_plpl = .true.
param%lencounter_sas_plpl = .true.
call io_log_start(param, ENCOUNTER_PLPL_TIMER_LOG_OUT, "Encounter check loop timer logfile")
call swiftest_io_log_start(param, ENCOUNTER_PLPL_TIMER_LOG_OUT, "Encounter check loop timer logfile")
call swiftest_io_log_one_message(ENCOUNTER_PLPL_TIMER_LOG_OUT, "Diagnostic values: loop style, time count, nplpl, metric")
case("TRIANGULAR")
param%ladaptive_encounters_plpl = .false.
Expand All @@ -2144,15 +2144,15 @@ module subroutine swiftest_io_param_reader(self, unit, iotype, v_list, iostat, i
param%encounter_check_plpl = "ADAPTIVE"
param%ladaptive_encounters_plpl = .true.
param%lencounter_sas_plpl = .true.
call io_log_start(param, ENCOUNTER_PLPL_TIMER_LOG_OUT, "Encounter check loop timer logfile")
call swiftest_io_log_start(param, ENCOUNTER_PLPL_TIMER_LOG_OUT, "Encounter check loop timer logfile")
call swiftest_io_log_one_message(ENCOUNTER_PLPL_TIMER_LOG_OUT, "Diagnostic values: loop style, time count, nplpl, metric")
end select

select case(trim(adjustl(param%encounter_check_pltp)))
case("ADAPTIVE")
param%ladaptive_encounters_pltp = .true.
param%lencounter_sas_pltp = .true.
call io_log_start(param, ENCOUNTER_PLTP_TIMER_LOG_OUT, "Encounter check loop timer logfile")
call swiftest_io_log_start(param, ENCOUNTER_PLTP_TIMER_LOG_OUT, "Encounter check loop timer logfile")
call swiftest_io_log_one_message(ENCOUNTER_PLTP_TIMER_LOG_OUT, "Diagnostic values: loop style, time count, npltp, metric")
case("TRIANGULAR")
param%ladaptive_encounters_pltp = .false.
Expand All @@ -2167,7 +2167,7 @@ module subroutine swiftest_io_param_reader(self, unit, iotype, v_list, iostat, i
param%encounter_check_pltp = "ADAPTIVE"
param%ladaptive_encounters_pltp = .true.
param%lencounter_sas_pltp = .true.
call io_log_start(param, ENCOUNTER_PLTP_TIMER_LOG_OUT, "Encounter check loop timer logfile")
call swiftest_io_log_start(param, ENCOUNTER_PLTP_TIMER_LOG_OUT, "Encounter check loop timer logfile")
call swiftest_io_log_one_message(ENCOUNTER_PLTP_TIMER_LOG_OUT, "Diagnostic values: loop style, time count, npltp, metric")
end select

Expand Down

0 comments on commit 530b1bd

Please sign in to comment.