From 98b79fc8ea99837907bdccc1dda07fc697dd192a Mon Sep 17 00:00:00 2001 From: David A Minton Date: Fri, 2 Jul 2021 17:37:34 -0400 Subject: [PATCH] Fixed bad comment --- src/discard/discard.f90 | 2 +- src/io/io.f90 | 24 ++++++++++----------- src/modules/helio_classes.f90 | 14 +++++++------ src/modules/rmvs_classes.f90 | 4 ++-- src/modules/swiftest_classes.f90 | 36 ++++++++++++++++---------------- src/modules/whm_classes.f90 | 4 ++-- src/rmvs/rmvs_setup.f90 | 2 +- src/rmvs/rmvs_step.f90 | 10 ++++----- src/whm/whm_gr.f90 | 4 ++-- src/whm/whm_step.f90 | 4 ++-- 10 files changed, 53 insertions(+), 51 deletions(-) diff --git a/src/discard/discard.f90 b/src/discard/discard.f90 index 754cb468c..1e69639be 100644 --- a/src/discard/discard.f90 +++ b/src/discard/discard.f90 @@ -10,7 +10,7 @@ module subroutine discard_system(self, param) !! Adapted from Hal Levison's Swift routine discard.f implicit none class(swiftest_nbody_system), intent(inout) :: self !! Swiftest system object - class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters if (self%tp%nbody == 0) return select type(self) diff --git a/src/io/io.f90 b/src/io/io.f90 index 6f40423c9..6f930cdf2 100644 --- a/src/io/io.f90 +++ b/src/io/io.f90 @@ -444,7 +444,7 @@ module subroutine io_dump_swiftest(self, param, t, dt, msg) implicit none ! Arguments class(swiftest_base), intent(inout) :: self !! Swiftest base object - class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters real(DP), intent(in) :: t !! Current simulation time real(DP), intent(in) :: dt !! Stepsize character(*), optional, intent(in) :: msg !! Message to display with dump operation @@ -483,7 +483,7 @@ module subroutine io_dump_system(self, param, t, dt, msg) implicit none ! Arguments class(swiftest_nbody_system), intent(inout) :: self !! Swiftest system object - class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters real(DP), intent(in) :: t !! Current simulation time real(DP), intent(in) :: dt !! Stepsize character(*), optional, intent(in) :: msg !! Message to display with dump operation @@ -636,7 +636,7 @@ module subroutine io_read_body_in(self, param) implicit none ! Arguments class(swiftest_body), intent(inout) :: self !! Swiftest particle object - class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters ! Internals integer(I4B), parameter :: LUN = 7 !! Unit number of input file integer(I4B) :: iu = LUN @@ -776,7 +776,7 @@ module subroutine io_read_param_in(self, param_file_name) !! Adapted from Martin Duncan's Swift routine io_init_param.f implicit none ! Arguments - class(swiftest_parameters),intent(out) :: self !! Current run configuration parameters of parameters + class(swiftest_parameters),intent(out) :: self !! Current run configuration parameters character(len=*), intent(in) :: param_file_name !! Parameter input file name (i.e. param.in) ! Internals integer(I4B), parameter :: LUN = 7 !! Unit number of input file @@ -870,7 +870,7 @@ module subroutine io_read_frame_body(self, iu, param, form, t, ierr) ! Arguments class(swiftest_body), intent(inout) :: self !! Swiftest particle object integer(I4B), intent(inout) :: iu !! Unit number for the output file to write frame to - class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters character(*), intent(in) :: form !! Input format code ("XV" or "EL") real(DP), intent(out) :: t !! Simulation time integer(I4B), intent(out) :: ierr !! Error code @@ -932,7 +932,7 @@ module subroutine io_read_frame_cb(self, iu, param, form, t, ierr) ! Arguments class(swiftest_cb), intent(inout) :: self !! Swiftest central body object integer(I4B), intent(inout) :: iu !! Unit number for the output file to write frame to - class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters character(*), intent(in) :: form !! Input format code ("XV" or "EL") real(DP), intent(out) :: t !! Simulation time integer(I4B), intent(out) :: ierr !! Error cod @@ -966,7 +966,7 @@ module subroutine io_read_frame_system(self, iu, param, form, t, ierr) ! Arguments class(swiftest_nbody_system), intent(inout) :: self !! Swiftest system object integer(I4B), intent(inout) :: iu !! Unit number for the output file to write frame to - class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters character(*), intent(in) :: form !! Input format code ("XV" or "EL") real(DP), intent(out) :: t !! Current simulation time integer(I4B), intent(out) :: ierr !! Error code @@ -1042,7 +1042,7 @@ module subroutine io_read_initialize_system(self, param) implicit none ! Arguments class(swiftest_nbody_system), intent(inout) :: self !! Swiftest system object - class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters call self%cb%initialize(param) call self%pl%initialize(param) @@ -1063,7 +1063,7 @@ module subroutine io_write_discard(self, param, discards) implicit none ! Arguments class(swiftest_nbody_system), intent(inout) :: self !! Swiftest system object - class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters class(swiftest_body), intent(inout) :: discards !! Swiftest discard object ! Internals integer(I4B), parameter :: LUN = 40 @@ -1196,7 +1196,7 @@ module subroutine io_write_frame_body(self, iu, param, t, dt) ! Arguments class(swiftest_body), intent(in) :: self !! Swiftest particle object integer(I4B), intent(inout) :: iu !! Unit number for the output file to write frame to - class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters real(DP), intent(in) :: t !! Current simulation time real(DP), intent(in) :: dt !! Step size @@ -1252,7 +1252,7 @@ module subroutine io_write_frame_cb(self, iu, param, t, dt) ! Arguments class(swiftest_cb), intent(in) :: self !! Swiftest central body object integer(I4B), intent(inout) :: iu !! Unit number for the output file to write frame to - class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters real(DP), intent(in) :: t !! Current simulation time real(DP), intent(in) :: dt !! Step size @@ -1288,7 +1288,7 @@ module subroutine io_write_frame_system(self, iu, param, t, dt) ! Arguments class(swiftest_nbody_system), intent(in) :: self !! Swiftest system object integer(I4B), intent(inout) :: iu !! Unit number for the output file to write frame to - class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters real(DP), intent(in) :: t !! Current simulation time real(DP), intent(in) :: dt !! Step size ! Internals diff --git a/src/modules/helio_classes.f90 b/src/modules/helio_classes.f90 index 3d12882b2..dd2e08d63 100644 --- a/src/modules/helio_classes.f90 +++ b/src/modules/helio_classes.f90 @@ -97,7 +97,7 @@ module subroutine helio_drift_pl(self, cb, param, dt) implicit none class(helio_pl), intent(inout) :: self !! Helio massive body object class(swiftest_cb), intent(inout) :: cb !! Helio central body object - class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters real(DP), intent(in) :: dt !! Stepsize end subroutine helio_drift_pl @@ -106,7 +106,7 @@ module subroutine helio_drift_tp(self, cb, param, dt) implicit none class(helio_tp), intent(inout) :: self !! Helio test particle object class(swiftest_cb), intent(inout) :: cb !! Helio central body object - class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters real(DP), intent(in) :: dt !! Stepsize end subroutine helio_drift_tp @@ -131,7 +131,7 @@ module subroutine helio_getacch_pl(self, cb, param, t) implicit none class(helio_pl), intent(inout) :: self !! Helio massive body particle data structure class(swiftest_cb), intent(inout) :: cb !! Swiftest central body particle data structure - class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters real(DP), intent(in) :: t !! Current time end subroutine helio_getacch_pl @@ -142,7 +142,7 @@ module subroutine helio_getacch_tp(self, cb, pl, param, t, xh) class(helio_tp), intent(inout) :: self !! Helio test particle data structure class(swiftest_cb), intent(inout) :: cb !! Swiftest central body particle data structuree class(whm_pl), intent(inout) :: pl !! Swiftest massive body particle data structure. - class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters real(DP), intent(in) :: t !! Current time real(DP), dimension(:,:), intent(in) :: xh !! Heliocentric positions of planets end subroutine helio_getacch_tp @@ -177,8 +177,10 @@ end subroutine helio_setup_tp module subroutine helio_step_system(self, param) use swiftest_classes, only : swiftest_parameters implicit none - class(helio_nbody_system), intent(inout) :: self !! Helio nbody system object - class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters of parameters + class(helio_nbody_system), intent(inout) :: self !! Helio nbody system object + class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters + real(DP), intent(in) :: t !! Simulation time + real(DP), intent(in) :: dt !! Current stepsize end subroutine helio_step_system module subroutine helio_step_pl(self, cb, param, t, dt) diff --git a/src/modules/rmvs_classes.f90 b/src/modules/rmvs_classes.f90 index b67c354b0..8a1f94a8e 100644 --- a/src/modules/rmvs_classes.f90 +++ b/src/modules/rmvs_classes.f90 @@ -132,7 +132,7 @@ module subroutine rmvs_setup_system(self, param) use swiftest_classes, only : swiftest_parameters implicit none class(rmvs_nbody_system), intent(inout) :: self !! RMVS system object - class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters end subroutine rmvs_setup_system module subroutine rmvs_setup_pl(self,n) @@ -151,7 +151,7 @@ module subroutine rmvs_step_system(self, param, t, dt) use swiftest_classes, only : swiftest_parameters implicit none class(rmvs_nbody_system), intent(inout) :: self !! RMVS nbody system object - class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters real(DP), intent(in) :: t !! Simulation time real(DP), intent(in) :: dt !! Current stepsize end subroutine rmvs_step_system diff --git a/src/modules/swiftest_classes.f90 b/src/modules/swiftest_classes.f90 index 62ea97d6f..905044f17 100644 --- a/src/modules/swiftest_classes.f90 +++ b/src/modules/swiftest_classes.f90 @@ -270,14 +270,14 @@ end subroutine abstract_copy subroutine abstract_initialize(self, param) import swiftest_base, swiftest_parameters class(swiftest_base), intent(inout) :: self !! Swiftest base object - class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters end subroutine abstract_initialize subroutine abstract_read_frame(self, iu, param, form, t, ierr) import DP, I4B, swiftest_base, swiftest_parameters class(swiftest_base), intent(inout) :: self !! Swiftest base object integer(I4B), intent(inout) :: iu !! Unit number for the output file to write frame to - class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters character(*), intent(in) :: form !! Input format code ("XV" or "EL") real(DP), intent(out) :: t !! Simulation time integer(I4B), intent(out) :: ierr !! Error code @@ -294,7 +294,7 @@ subroutine abstract_step_body(self, system, param, t, dt) implicit none class(swiftest_body), intent(inout) :: self !! Swiftest particle object class(swiftest_nbody_system), intent(inout) :: system !! Swiftest system object - class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters real(DP), intent(in) :: t !! Simulation time real(DP), intent(in) :: dt !! Current stepsize end subroutine abstract_step_body @@ -303,7 +303,7 @@ subroutine abstract_step_system(self, param, t, dt) import DP, swiftest_nbody_system, swiftest_parameters implicit none class(swiftest_nbody_system), intent(inout) :: self !! Swiftest system object - class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters real(DP), intent(in) :: t !! Simulation time real(DP), intent(in) :: dt !! Current stepsize end subroutine abstract_step_system @@ -312,7 +312,7 @@ subroutine abstract_write_frame(self, iu, param) import DP, I4B, swiftest_base, swiftest_parameters class(swiftest_base), intent(in) :: self !! Swiftest base object integer(I4B), intent(inout) :: iu !! Unit number for the output file to write frame to - class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters end subroutine abstract_write_frame end interface @@ -354,7 +354,7 @@ end subroutine discard_sun_tp module subroutine discard_system(self, param) implicit none class(swiftest_nbody_system), intent(inout) :: self !! Swiftest system object - class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters end subroutine discard_system module pure elemental subroutine drift_one(mu, px, py, pz, vx, vy, vz, dt, iflag) @@ -424,14 +424,14 @@ end subroutine io_dump_param module subroutine io_dump_swiftest(self, param, msg) implicit none class(swiftest_base), intent(inout) :: self !! Swiftest base object - class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters character(*), optional, intent(in) :: msg !! Message to display with dump operation end subroutine io_dump_swiftest module subroutine io_dump_system(self, param, msg) implicit none class(swiftest_nbody_system), intent(inout) :: self !! Swiftest system object - class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters character(*), optional, intent(in) :: msg !! Message to display with dump operation end subroutine io_dump_system @@ -453,7 +453,7 @@ end function io_get_token module subroutine io_read_body_in(self, param) implicit none class(swiftest_body), intent(inout) :: self !! Swiftest particle object - class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters end subroutine io_read_body_in module subroutine io_read_cb_in(self, param) @@ -464,7 +464,7 @@ end subroutine io_read_cb_in module subroutine io_read_param_in(self, param_file_name) implicit none - class(swiftest_parameters), intent(out) :: self !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(out) :: self !! Current run configuration parameters character(len=*), intent(in) :: param_file_name !! Parameter input file name (i.e. param.in) end subroutine io_read_param_in @@ -482,7 +482,7 @@ module subroutine io_read_frame_body(self, iu, param, form, t, ierr) implicit none class(swiftest_body), intent(inout) :: self !! Swiftest particle object integer(I4B), intent(inout) :: iu !! Unit number for the output file to write frame to - class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters character(*), intent(in) :: form !! Input format code ("XV" or "EL") real(DP), intent(out) :: t !! Simulation time integer(I4B), intent(out) :: ierr !! Error code @@ -492,7 +492,7 @@ module subroutine io_read_frame_cb(self, iu, param, form, t, ierr) implicit none class(swiftest_cb), intent(inout) :: self !! Swiftest central body object integer(I4B), intent(inout) :: iu !! Unit number for the output file to write frame to - class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters character(*), intent(in) :: form !! Input format code ("XV" or "EL") real(DP), intent(out) :: t !! Simulation time integer(I4B), intent(out) :: ierr !! Error code @@ -502,7 +502,7 @@ module subroutine io_read_frame_system(self, iu, param, form, t, ierr) implicit none class(swiftest_nbody_system),intent(inout) :: self !! Swiftest system object integer(I4B), intent(inout) :: iu !! Unit number for the output file to write frame to - class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters character(*), intent(in) :: form !! Input format code ("XV" or "EL") real(DP), intent(out) :: t !! Current simulation time integer(I4B), intent(out) :: ierr !! Error code @@ -521,13 +521,13 @@ end function io_read_hdr module subroutine io_read_initialize_system(self, param) implicit none class(swiftest_nbody_system), intent(inout) :: self !! Swiftest system object - class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters end subroutine io_read_initialize_system module subroutine io_write_discard(self, param, discards) implicit none class(swiftest_nbody_system), intent(inout) :: self !! Swiftest system object - class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters class(swiftest_body), intent(inout) :: discards !! Swiftest discard object end subroutine io_write_discard @@ -544,21 +544,21 @@ module subroutine io_write_frame_body(self, iu, param) implicit none class(swiftest_body), intent(in) :: self !! Swiftest particle object integer(I4B), intent(inout) :: iu !! Unit number for the output file to write frame to - class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters end subroutine io_write_frame_body module subroutine io_write_frame_cb(self, iu, param) implicit none class(swiftest_cb), intent(in) :: self !! Swiftest central body object integer(I4B), intent(inout) :: iu !! Unit number for the output file to write frame to - class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters end subroutine io_write_frame_cb module subroutine io_write_frame_system(self, iu, param) implicit none class(swiftest_nbody_system), intent(in) :: self !! Swiftest system object integer(I4B), intent(inout) :: iu !! Unit number for the output file to write frame to - class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters end subroutine io_write_frame_system module subroutine io_write_hdr(iu, t, npl, ntp, out_form, out_type) diff --git a/src/modules/whm_classes.f90 b/src/modules/whm_classes.f90 index 282ced72a..c0e95ccb4 100644 --- a/src/modules/whm_classes.f90 +++ b/src/modules/whm_classes.f90 @@ -112,7 +112,7 @@ module subroutine whm_step_pl(self, system, param, t, dt) implicit none class(whm_pl), intent(inout) :: self !! WHM massive body object class(swiftest_nbody_system), intent(inout) :: system !! Swiftest system object - class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters real(DP), intent(in) :: t !! Simulation time real(DP), intent(in) :: dt !! Current stepsize end subroutine whm_step_pl @@ -294,7 +294,7 @@ module subroutine whm_step_system(self, param, t, dt) use swiftest_classes, only : swiftest_parameters implicit none class(whm_nbody_system), intent(inout) :: self !! WHM system object - class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters real(DP), intent(in) :: t !! Simulation time real(DP), intent(in) :: dt !! Current stepsize end subroutine whm_step_system diff --git a/src/rmvs/rmvs_setup.f90 b/src/rmvs/rmvs_setup.f90 index 845f8d5b0..b3bcf8f28 100644 --- a/src/rmvs/rmvs_setup.f90 +++ b/src/rmvs/rmvs_setup.f90 @@ -86,7 +86,7 @@ module subroutine rmvs_setup_system(self, param) implicit none ! Arguments class(rmvs_nbody_system), intent(inout) :: self !! RMVS system object - class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters ! Internals integer(I4B) :: i, j diff --git a/src/rmvs/rmvs_step.f90 b/src/rmvs/rmvs_step.f90 index 82c6d28c4..7995efdd8 100644 --- a/src/rmvs/rmvs_step.f90 +++ b/src/rmvs/rmvs_step.f90 @@ -11,7 +11,7 @@ module subroutine rmvs_step_system(self, param, dt) implicit none ! Arguments class(rmvs_nbody_system), intent(inout) :: self !! RMVS nbody system object - class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters integer(I4B), intent(in) :: dt !! Current stepsize ! Internals logical :: lencounter, lfirstpl, lfirsttp @@ -76,7 +76,7 @@ subroutine rmvs_step_out(system, param, dt) implicit none ! Arguments class(rmvs_nbody_system), intent(inout) :: system !! Swiftest system object - class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters integer(I4B), intent(in) :: dt !! Current stepsize ! Internals integer(I4B) :: outer_index, j, k @@ -131,7 +131,7 @@ subroutine rmvs_step_in(pl, cb, tp, param, outer_time, dto) class(rmvs_pl), intent(inout) :: pl !! RMVS massive body object class(rmvs_cb), intent(inout) :: cb !! RMVS central body object class(rmvs_tp), intent(inout) :: tp !! RMVS test particle object - class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters real(DP), intent(in) :: outer_time !! Current time real(DP), intent(in) :: dto !! Step size ! Internals @@ -386,7 +386,7 @@ subroutine rmvs_peri_tp(tp, pl, t, dt, lfirst, inner_index, ipleP, param) logical, intent(in) :: lfirst !! Logical flag indicating whether current invocation is the first integer(I4B), intent(in) :: inner_index !! Outer substep number within current set integer(I4B), intent(in) :: ipleP !! index of RMVS planet being closely encountered - class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters ! Internals integer(I4B) :: i, id1, id2 real(DP) :: r2, mu, rhill2, vdotr, a, peri, capm, tperi, rpl @@ -465,7 +465,7 @@ subroutine rmvs_make_planetocentric(pl, cb, tp, param) class(rmvs_pl), intent(inout) :: pl !! RMVS test particle object class(rmvs_cb), intent(inout) :: cb !! RMVS central body particle type class(rmvs_tp), intent(inout) :: tp !! RMVS test particle object - class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters ! Internals integer(I4B) :: i, j, inner_index, ipc2hc logical, dimension(:), allocatable :: encmask diff --git a/src/whm/whm_gr.f90 b/src/whm/whm_gr.f90 index 47f4bd449..363ce5ad4 100644 --- a/src/whm/whm_gr.f90 +++ b/src/whm/whm_gr.f90 @@ -228,7 +228,7 @@ pure subroutine gr_vel2pseudovel(param, mu, xh, vh, pv) !! Adapted from David A. Minton's Swifter routine gr_vel2pseudovel.f90 implicit none - class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters real(DP), intent(in) :: mu !! G * (Mcb + m), G = gravitational constant, Mcb = mass of central body, m = mass of body real(DP), dimension(:), intent(in) :: xh !! Heliocentric position vector real(DP), dimension(:), intent(in) :: vh !! Heliocentric velocity vector @@ -300,7 +300,7 @@ pure subroutine gr_pseudovel2vel(param, mu, xh, pv, vh) !! !! Adapted from David A. Minton's Swifter routine gr_pseudovel2vel.f90 implicit none - class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters real(DP), intent(in) :: mu !! G * (Mcb + m), G = gravitational constant, Mcb = mass of central body, m = mass of body real(DP), dimension(:), intent(in) :: xh !! Heliocentric position vector real(DP), dimension(:), intent(in) :: pv !! Pseudovelocity velocity vector - see Saha & Tremain (1994), eq. (32) diff --git a/src/whm/whm_step.f90 b/src/whm/whm_step.f90 index 41d3394fa..c3c7a098f 100644 --- a/src/whm/whm_step.f90 +++ b/src/whm/whm_step.f90 @@ -51,7 +51,7 @@ module subroutine whm_step_pl(self, system, param, dt) ! Arguments class(whm_pl), intent(inout) :: self !! WHM massive body particle data structure class(swiftest_nbody_system), intent(inout) :: system !! Swiftest system object - class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters integer(I4B), intent(in) :: dt !! Current stepsize ! Internals real(DP) :: dth @@ -88,7 +88,7 @@ module subroutine whm_step_tp(self, system, param, dt) ! Arguments class(whm_tp), intent(inout) :: self !! WHM test particle data structure class(swiftest_nbody_system), intent(inout) :: system !! Swiftest system object - class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters of parameters + class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters integer(I4B), intent(in) :: dt !! Current stepsize ! Internals real(DP) :: dth