From 777491163fc920f4512481ef8d2bbe2766bfc3fb Mon Sep 17 00:00:00 2001 From: David A Minton Date: Fri, 23 Dec 2022 06:40:30 -0500 Subject: [PATCH] Cleaned up submodule names --- src/collision/collision_io.f90 | 7 ++----- src/encounter/encounter_io.f90 | 4 ++-- src/rmvs/rmvs_encounter_check.f90 | 4 ++-- src/swiftest/swiftest_discard.f90 | 4 ++-- src/swiftest/swiftest_drift.f90 | 4 ++-- src/swiftest/swiftest_gr.f90 | 4 ++-- src/swiftest/swiftest_io.f90 | 4 ++-- src/swiftest/swiftest_kick.f90 | 4 ++-- src/swiftest/swiftest_obl.f90 | 10 +++++----- src/swiftest/swiftest_orbel.f90 | 4 ++-- src/swiftest/swiftest_user.f90 | 4 ++-- src/swiftest/swiftest_util.f90 | 4 ++-- 12 files changed, 27 insertions(+), 30 deletions(-) diff --git a/src/collision/collision_io.f90 b/src/collision/collision_io.f90 index 048653068..d5eaa3f8a 100644 --- a/src/collision/collision_io.f90 +++ b/src/collision/collision_io.f90 @@ -7,7 +7,7 @@ !! You should have received a copy of the GNU General Public License along with Swiftest. !! If not, see: https://www.gnu.org/licenses. -submodule(collision) s_collision_io_netcdf +submodule(collision) s_collision_io use swiftest contains @@ -342,7 +342,4 @@ module subroutine collision_io_netcdf_write_frame_snapshot(self, history, param) return end subroutine collision_io_netcdf_write_frame_snapshot - - - -end submodule s_collision_io_netcdf \ No newline at end of file +end submodule s_collision_io \ No newline at end of file diff --git a/src/encounter/encounter_io.f90 b/src/encounter/encounter_io.f90 index b26516ef5..ce49e0cbd 100644 --- a/src/encounter/encounter_io.f90 +++ b/src/encounter/encounter_io.f90 @@ -7,7 +7,7 @@ !! You should have received a copy of the GNU General Public License along with Swiftest. !! If not, see: https://www.gnu.org/licenses. -submodule (encounter) s_encounter_io_netcdf +submodule (encounter) s_encounter_io use swiftest contains @@ -226,4 +226,4 @@ module subroutine encounter_io_netcdf_write_frame_snapshot(self, history, param) return end subroutine encounter_io_netcdf_write_frame_snapshot -end submodule s_encounter_io_netcdf \ No newline at end of file +end submodule s_encounter_io \ No newline at end of file diff --git a/src/rmvs/rmvs_encounter_check.f90 b/src/rmvs/rmvs_encounter_check.f90 index 68e052a6f..00aafd1fb 100644 --- a/src/rmvs/rmvs_encounter_check.f90 +++ b/src/rmvs/rmvs_encounter_check.f90 @@ -7,7 +7,7 @@ !! You should have received a copy of the GNU General Public License along with Swiftest. !! If not, see: https://www.gnu.org/licenses. -submodule (rmvs) s_rmvs_chk +submodule (rmvs) s_rmvs_encounter_check use swiftest contains @@ -59,4 +59,4 @@ module function rmvs_encounter_check_tp(self, param, nbody_system, dt) result(le end function rmvs_encounter_check_tp -end submodule s_rmvs_chk +end submodule s_rmvs_encounter_check diff --git a/src/swiftest/swiftest_discard.f90 b/src/swiftest/swiftest_discard.f90 index 5f2f5d331..c9c6df340 100644 --- a/src/swiftest/swiftest_discard.f90 +++ b/src/swiftest/swiftest_discard.f90 @@ -7,7 +7,7 @@ !! You should have received a copy of the GNU General Public License along with Swiftest. !! If not, see: https://www.gnu.org/licenses. -submodule (swiftest) s_discard +submodule (swiftest) s_swiftest_discard contains module subroutine swiftest_discard_system(self, param) @@ -321,4 +321,4 @@ subroutine swiftest_discard_pl_close(dx, dv, dt, r2crit, iflag, r2min) return end subroutine swiftest_discard_pl_close -end submodule s_discard +end submodule s_swiftest_discard diff --git a/src/swiftest/swiftest_drift.f90 b/src/swiftest/swiftest_drift.f90 index 8e2273435..89f8afa16 100644 --- a/src/swiftest/swiftest_drift.f90 +++ b/src/swiftest/swiftest_drift.f90 @@ -7,7 +7,7 @@ !! You should have received a copy of the GNU General Public License along with Swiftest. !! If not, see: https://www.gnu.org/licenses. -submodule (swiftest) s_drift +submodule (swiftest) s_swiftest_drift !> Integration control parameters: real(DP), parameter :: E2MAX = 0.36_DP real(DP), parameter :: DM2MAX = 0.16_DP @@ -556,4 +556,4 @@ pure subroutine swiftest_drift_kepu_stumpff(x, c0, c1, c2, c3) end subroutine swiftest_drift_kepu_stumpff -end submodule s_drift +end submodule s_swiftest_drift diff --git a/src/swiftest/swiftest_gr.f90 b/src/swiftest/swiftest_gr.f90 index b4cc17c2b..3274f218e 100644 --- a/src/swiftest/swiftest_gr.f90 +++ b/src/swiftest/swiftest_gr.f90 @@ -7,7 +7,7 @@ !! You should have received a copy of the GNU General Public License along with Swiftest. !! If not, see: https://www.gnu.org/licenses. -submodule(swiftest) s_gr +submodule(swiftest) s_swiftest_gr contains pure module subroutine swiftest_gr_kick_getaccb_ns_body(self, nbody_system, param) @@ -270,4 +270,4 @@ pure module subroutine swiftest_gr_vh2pv_body(self, param) return end subroutine swiftest_gr_vh2pv_body -end submodule s_gr \ No newline at end of file +end submodule s_swiftest_gr \ No newline at end of file diff --git a/src/swiftest/swiftest_io.f90 b/src/swiftest/swiftest_io.f90 index 343da3be6..37f684071 100644 --- a/src/swiftest/swiftest_io.f90 +++ b/src/swiftest/swiftest_io.f90 @@ -7,7 +7,7 @@ !! You should have received a copy of the GNU General Public License along with Swiftest. !! If not, see: https://www.gnu.org/licenses. -submodule (swiftest) s_io +submodule (swiftest) s_swiftest_io use symba use netcdf contains @@ -2903,4 +2903,4 @@ module subroutine swiftest_io_write_frame_system(self, param) call util_exit(FAILURE) end subroutine swiftest_io_write_frame_system -end submodule s_io +end submodule s_swiftest_io diff --git a/src/swiftest/swiftest_kick.f90 b/src/swiftest/swiftest_kick.f90 index 9e9576321..922fd50c7 100644 --- a/src/swiftest/swiftest_kick.f90 +++ b/src/swiftest/swiftest_kick.f90 @@ -7,7 +7,7 @@ !! You should have received a copy of the GNU General Public License along with Swiftest. !! If not, see: https://www.gnu.org/licenses. -submodule(swiftest) s_kick +submodule(swiftest) s_swiftest_kick contains module subroutine swiftest_kick_getacch_int_pl(self, param) !! author: David A. Minton @@ -316,4 +316,4 @@ pure module subroutine swiftest_kick_getacch_int_one_tp(rji2, xr, yr, zr, GMpl, return end subroutine swiftest_kick_getacch_int_one_tp -end submodule s_kick +end submodule s_swiftest_kick diff --git a/src/swiftest/swiftest_obl.f90 b/src/swiftest/swiftest_obl.f90 index 3864c9f2d..2b87b7264 100644 --- a/src/swiftest/swiftest_obl.f90 +++ b/src/swiftest/swiftest_obl.f90 @@ -7,7 +7,7 @@ !! You should have received a copy of the GNU General Public License along with Swiftest. !! If not, see: https://www.gnu.org/licenses. -submodule (swiftest) s_obl +submodule (swiftest) s_swiftest_obl contains module subroutine swiftest_obl_acc_body(self, nbody_system) !! author: David A. Minton @@ -136,7 +136,7 @@ module subroutine swiftest_obl_pot_system(self) associate(nbody_system => self, pl => self%pl, npl => self%pl%nbody, cb => self%cb) if (.not. any(pl%lmask(1:npl))) return do concurrent (i = 1:npl, pl%lmask(i)) - oblpot_arr(i) = obl_pot_one(cb%Gmass, pl%Gmass(i), cb%j2rp2, cb%j4rp4, pl%rh(3,i), 1.0_DP / norm2(pl%rh(:,i))) + oblpot_arr(i) = swiftest_obl_pot_one(cb%Gmass, pl%Gmass(i), cb%j2rp2, cb%j4rp4, pl%rh(3,i), 1.0_DP / norm2(pl%rh(:,i))) end do nbody_system%oblpot = sum(oblpot_arr, pl%lmask(1:npl)) end associate @@ -145,7 +145,7 @@ module subroutine swiftest_obl_pot_system(self) end subroutine swiftest_obl_pot_system - elemental function obl_pot_one(GMcb, GMpl, j2rp2, j4rp4, zh, irh) result(oblpot) + elemental function swiftest_obl_pot_one(GMcb, GMpl, j2rp2, j4rp4, zh, irh) result(oblpot) !! author: David A. Minton !! !! Compute the contribution to the total gravitational potential due solely to the oblateness of the central body from a single massive body @@ -179,6 +179,6 @@ elemental function obl_pot_one(GMcb, GMpl, j2rp2, j4rp4, zh, irh) result(oblpot) oblpot = t0 * (t1 * p2 + t3 * p4) return - end function obl_pot_one + end function swiftest_obl_pot_one -end submodule s_obl +end submodule s_swiftest_obl diff --git a/src/swiftest/swiftest_orbel.f90 b/src/swiftest/swiftest_orbel.f90 index 097034111..d383f0eed 100644 --- a/src/swiftest/swiftest_orbel.f90 +++ b/src/swiftest/swiftest_orbel.f90 @@ -7,7 +7,7 @@ !! You should have received a copy of the GNU General Public License along with Swiftest. !! If not, see: https://www.gnu.org/licenses. -submodule (swiftest) s_orbel +submodule (swiftest) s_swiftest_orbel contains module subroutine swiftest_orbel_el2xv_vec(self, cb) @@ -1046,4 +1046,4 @@ pure module subroutine swiftest_orbel_xv2el(mu, px, py, pz, vx, vy, vz, a, e, in end subroutine swiftest_orbel_xv2el -end submodule s_orbel +end submodule s_swiftest_orbel diff --git a/src/swiftest/swiftest_user.f90 b/src/swiftest/swiftest_user.f90 index 927455729..805a500ef 100644 --- a/src/swiftest/swiftest_user.f90 +++ b/src/swiftest/swiftest_user.f90 @@ -7,7 +7,7 @@ !! You should have received a copy of the GNU General Public License along with Swiftest. !! If not, see: https://www.gnu.org/licenses. -submodule(swiftest) s_user_kick_getacch +submodule(swiftest) s_swiftest_user use swiftest contains module subroutine swiftest_user_kick_getacch_body(self, nbody_system, param, t, lbeg) @@ -27,4 +27,4 @@ module subroutine swiftest_user_kick_getacch_body(self, nbody_system, param, t, return end subroutine swiftest_user_kick_getacch_body -end submodule s_user_kick_getacch +end submodule s_swiftest_user diff --git a/src/swiftest/swiftest_util.f90 b/src/swiftest/swiftest_util.f90 index 56f2259f6..3cd3793e1 100644 --- a/src/swiftest/swiftest_util.f90 +++ b/src/swiftest/swiftest_util.f90 @@ -7,7 +7,7 @@ !! You should have received a copy of the GNU General Public License along with Swiftest. !! If not, see: https://www.gnu.org/licenses. -submodule (swiftest) s_util +submodule (swiftest) s_swiftest_util use whm use rmvs use helio @@ -4601,4 +4601,4 @@ module subroutine swiftest_util_version() return end subroutine swiftest_util_version -end submodule s_util \ No newline at end of file +end submodule s_swiftest_util \ No newline at end of file