From 1d0ac61f86dd53298c1bb0e3748569bc6797846b Mon Sep 17 00:00:00 2001 From: David A Minton Date: Fri, 2 Jul 2021 17:40:46 -0400 Subject: [PATCH] Fixed comments and a couple of bad interfaces --- src/modules/helio_classes.f90 | 30 ++++++++++++++---------------- src/modules/whm_classes.f90 | 18 +++++++++--------- 2 files changed, 23 insertions(+), 25 deletions(-) diff --git a/src/modules/helio_classes.f90 b/src/modules/helio_classes.f90 index dd2e08d63..751e94fed 100644 --- a/src/modules/helio_classes.f90 +++ b/src/modules/helio_classes.f90 @@ -183,26 +183,24 @@ module subroutine helio_step_system(self, param) real(DP), intent(in) :: dt !! Current stepsize end subroutine helio_step_system - module subroutine helio_step_pl(self, cb, param, t, dt) - use swiftest_classes, only : swiftest_cb, swiftest_parameters - implicit none - class(helio_pl), intent(inout) :: self !! WHM 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 - real(DP), intent(in) :: t !! Current time - real(DP), intent(in) :: dt !! Stepsize + module subroutine helio_step_pl(self, system, param, t, dt) + use swiftest_classes, only : swiftest_nbody_system, swiftest_parameters + implicit none + class(helio_pl), intent(inout) :: self !! WHM massive body particle data structure + class(swiftest_nbody_system), intent(inout) :: system !! Swiftest nboody system + class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters + real(DP), intent(in) :: t !! Current simulation time + real(DP), intent(in) :: dt !! Stepsize end subroutine helio_step_pl - module subroutine helio_step_tp(self, cb, pl, param, t, dt) + module subroutine helio_step_tp(self, system, param, t, dt) use swiftest_classes, only : swiftest_cb, swiftest_parameters - use whm_classes, only : whm_pl implicit none - class(helio_tp), intent(inout) :: self !! Helio test particle data structure - class(swiftest_cb), intent(inout) :: cb !! Swiftest central body particle data structure - class(whm_pl), intent(inout) :: pl !! WHM massive body data structure - class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters of - real(DP), intent(in) :: t !! Current time - real(DP), intent(in) :: dt !! Stepsize + class(helio_tp), intent(inout) :: self !! Helio test particle data structure + class(swiftest_nbody_system), intent(inout) :: system !! Swiftest nbody system object + class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters + real(DP), intent(in) :: t !! Current simulation time + real(DP), intent(in) :: dt !! Stepsizee end subroutine helio_step_tp end interface end module helio_classes diff --git a/src/modules/whm_classes.f90 b/src/modules/whm_classes.f90 index c0e95ccb4..e411201ae 100644 --- a/src/modules/whm_classes.f90 +++ b/src/modules/whm_classes.f90 @@ -224,8 +224,8 @@ module subroutine whm_step_tp(self, system, param, t, dt) use swiftest_classes, only : swiftest_nbody_system, swiftest_parameters implicit none class(whm_tp), intent(inout) :: self !! WHM test particle data structure - class(swiftest_nbody_system), intent(inout) :: system !! Swiftest central body particle data structure - class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters of + class(swiftest_nbody_system), intent(inout) :: system !! Swiftest nbody system object + class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters real(DP), intent(in) :: t !! Current simulation time real(DP), intent(in) :: dt !! Stepsize end subroutine whm_step_tp @@ -240,36 +240,36 @@ end subroutine whm_setup_set_beg_end module subroutine whm_gr_getacch_tp(self, param) use swiftest_classes, only : swiftest_cb, swiftest_parameters implicit none - class(whm_tp), intent(inout) :: self !! WHM massive body particle data structure - class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters of + class(whm_tp), intent(inout) :: self !! WHM test particle data structure + class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters end subroutine whm_gr_getacch_tp module pure subroutine whm_gr_p4_tp(self, param, dt) use swiftest_classes, only : swiftest_parameters implicit none - class(whm_tp), intent(inout) :: self !! Swiftest particle object + class(whm_tp), intent(inout) :: self !! WHM test particle object class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters of on parameters - real(DP), intent(in) :: dt !! Step size + real(DP), intent(in) :: dt !! Step size end subroutine whm_gr_p4_tp module pure subroutine whm_gr_vh2pv_tp(self, param) use swiftest_classes, only : swiftest_parameters implicit none - class(whm_tp), intent(inout) :: self !! Swiftest particle object + class(whm_tp), intent(inout) :: self !! WHM test particle object class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters of on parameters end subroutine whm_gr_vh2pv_tp module pure subroutine whm_gr_pv2vh_tp(self, param) use swiftest_classes, only : swiftest_parameters implicit none - class(whm_tp), intent(inout) :: self !! Swiftest particle object + class(whm_tp), intent(inout) :: self !! WHM test particle object class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters of on parameters end subroutine whm_gr_pv2vh_tp module subroutine whm_setup_system(self, param) use swiftest_classes, only : swiftest_parameters implicit none - class(whm_nbody_system), intent(inout) :: self !! Swiftest system object + class(whm_nbody_system), intent(inout) :: self !! WHM nbody system object class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters of on parameters end subroutine whm_setup_system