From 3f35f81356c6e42d65ff6b50ec69c4a88bf1f86c Mon Sep 17 00:00:00 2001 From: David A Minton Date: Thu, 22 Dec 2022 11:03:16 -0500 Subject: [PATCH] cleanup --- src/CMakeLists.txt | 1 - src/fraggle/fraggle_io.f90 | 16 ---------------- src/fraggle/fraggle_module.f90 | 12 ++++-------- 3 files changed, 4 insertions(+), 25 deletions(-) delete mode 100644 src/fraggle/fraggle_io.f90 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7d3eded2a..ddeb2b357 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -51,7 +51,6 @@ SET(FAST_MATH_FILES ${SRC}/encounter/encounter_setup.f90 ${SRC}/encounter/encounter_util.f90 ${SRC}/fraggle/fraggle_generate.f90 - ${SRC}/fraggle/fraggle_io.f90 ${SRC}/fraggle/fraggle_resolve.f90 ${SRC}/fraggle/fraggle_set.f90 ${SRC}/fraggle/fraggle_setup.f90 diff --git a/src/fraggle/fraggle_io.f90 b/src/fraggle/fraggle_io.f90 deleted file mode 100644 index c2e479dbb..000000000 --- a/src/fraggle/fraggle_io.f90 +++ /dev/null @@ -1,16 +0,0 @@ -!! Copyright 2022 - David Minton, Carlisle Wishard, Jennifer Pouplin, Jake Elliott, & Dana Singh -!! This file is part of Swiftest. -!! Swiftest is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License -!! as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -!! Swiftest is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty -!! of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -!! You should have received a copy of the GNU General Public License along with Swiftest. -!! If not, see: https://www.gnu.org/licenses. - -submodule(fraggle) s_fraggle_io - use swiftest - -contains - - -end submodule s_fraggle_io \ No newline at end of file diff --git a/src/fraggle/fraggle_module.f90 b/src/fraggle/fraggle_module.f90 index fe0b8fda0..d3bd3c9af 100644 --- a/src/fraggle/fraggle_module.f90 +++ b/src/fraggle/fraggle_module.f90 @@ -60,9 +60,9 @@ module fraggle interface - module subroutine fraggle_generate_fragments(collision_system, nbody_system, param, lfailure) + module subroutine fraggle_generate_fragments(collider, nbody_system, param, lfailure) implicit none - class(fraggle_system), intent(inout) :: collision_system !! Fraggle system object the outputs will be the fragmentation + class(fraggle_system), intent(inout) :: collider !! Fraggle system object the outputs will be the fragmentation class(swiftest_nbody_system), intent(inout) :: nbody_system !! Swiftest nbody system object class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters logical, intent(out) :: lfailure !! Answers the question: Should this have been a merger instead? @@ -70,16 +70,12 @@ end subroutine fraggle_generate_fragments module subroutine fraggle_generate_system(self, nbody_system, param, t) implicit none - class(fraggle_system), intent(inout) :: self !! Fraggle fragment system object + class(fraggle_system), intent(inout) :: self !! Fraggle fragment system object class(base_nbody_system), intent(inout) :: nbody_system !! Swiftest nbody system object class(base_parameters), intent(inout) :: param !! Current run configuration parameters - real(DP), intent(in) :: t !! Time of collision + real(DP), intent(in) :: t !! Time of collision end subroutine fraggle_generate_system - module subroutine fraggle_io_log_regime(collision_system) - implicit none - class(fraggle_system), intent(inout) :: collision_system !! Fraggle collision system object - end subroutine fraggle_io_log_regime module subroutine fraggle_set_budgets(self) implicit none