diff --git a/src/rmvs/rmvs_discard.f90 b/src/rmvs/rmvs_discard.f90 index 06086444c..0c7e6230e 100644 --- a/src/rmvs/rmvs_discard.f90 +++ b/src/rmvs/rmvs_discard.f90 @@ -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 diff --git a/src/swiftest/swiftest_discard.f90 b/src/swiftest/swiftest_discard.f90 index 35a8cb755..a3d5d861d 100644 --- a/src/swiftest/swiftest_discard.f90 +++ b/src/swiftest/swiftest_discard.f90 @@ -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.) @@ -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. diff --git a/src/swiftest/swiftest_io.f90 b/src/swiftest/swiftest_io.f90 index 07dfb4182..ac56c5714 100644 --- a/src/swiftest/swiftest_io.f90 +++ b/src/swiftest/swiftest_io.f90 @@ -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. & @@ -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. @@ -2121,7 +2121,7 @@ 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 @@ -2129,7 +2129,7 @@ module subroutine swiftest_io_param_reader(self, unit, iotype, v_list, iostat, i 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. @@ -2144,7 +2144,7 @@ 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 @@ -2152,7 +2152,7 @@ module subroutine swiftest_io_param_reader(self, unit, iotype, v_list, iostat, i 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. @@ -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