From aa96f8ea97bf39c5a7f77999d5402a234a6c111c Mon Sep 17 00:00:00 2001 From: David A Minton Date: Thu, 8 Dec 2022 19:35:40 -0500 Subject: [PATCH] Removed unecessary fraggle_storage type definition --- src/fraggle/fraggle_io.f90 | 6 ------ src/fraggle/fraggle_util.f90 | 13 ------------- src/modules/fraggle_classes.f90 | 18 ------------------ 3 files changed, 37 deletions(-) diff --git a/src/fraggle/fraggle_io.f90 b/src/fraggle/fraggle_io.f90 index 9d00bfb0f..6d912a5fb 100644 --- a/src/fraggle/fraggle_io.f90 +++ b/src/fraggle/fraggle_io.f90 @@ -13,12 +13,6 @@ contains - module subroutine fraggle_io_encounter_dump(self, param) - implicit none - class(fraggle_storage(*)), intent(inout) :: self !! Encounter storage object - class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters - end subroutine fraggle_io_encounter_dump - module subroutine fraggle_io_encounter_initialize_output(self, param) implicit none class(fraggle_io_encounter_parameters), intent(inout) :: self !! Parameters used to identify a particular NetCDF dataset diff --git a/src/fraggle/fraggle_util.f90 b/src/fraggle/fraggle_util.f90 index 8688ec2d9..c65b96282 100644 --- a/src/fraggle/fraggle_util.f90 +++ b/src/fraggle/fraggle_util.f90 @@ -168,19 +168,6 @@ module subroutine fraggle_util_final_fragments(self) end subroutine fraggle_util_final_fragments - module subroutine fraggle_util_final_storage(self) - !! author: David A. Minton - !! - !! Finalizer will deallocate all allocatables - implicit none - ! Arguments - type(fraggle_storage(*)), intent(inout) :: self !! Fraggle encountar storage object - - call util_final_storage(self%swiftest_storage) - - return - end subroutine fraggle_util_final_storage - module subroutine fraggle_util_final_snapshot(self) !! author: David A. Minton !! diff --git a/src/modules/fraggle_classes.f90 b/src/modules/fraggle_classes.f90 index 581eb1a65..a7dcfedc8 100644 --- a/src/modules/fraggle_classes.f90 +++ b/src/modules/fraggle_classes.f90 @@ -115,13 +115,6 @@ module fraggle_classes procedure :: initialize => fraggle_io_encounter_initialize_output !! Initialize a set of parameters used to identify a NetCDF output object end type fraggle_io_encounter_parameters - !> A class that that is used to store fragmentation data between file output - type, extends(swiftest_storage) :: fraggle_storage - contains - procedure :: dump => fraggle_io_encounter_dump !! Dumps contents of encounter history to file - final :: fraggle_util_final_storage - end type fraggle_storage - type, extends(encounter_snapshot) :: fraggle_encounter_snapshot logical :: lcollision !! Indicates that this snapshot contains at least one collision class(fraggle_colliders), allocatable :: colliders !! Colliders object at this snapshot @@ -142,12 +135,6 @@ module subroutine fraggle_generate_fragments(self, colliders, system, param, lfa logical, intent(out) :: lfailure !! Answers the question: Should this have been a merger instead? end subroutine fraggle_generate_fragments - module subroutine fraggle_io_encounter_dump(self, param) - implicit none - class(fraggle_storage(*)), intent(inout) :: self !! Encounter storage object - class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters - end subroutine fraggle_io_encounter_dump - module subroutine fraggle_io_encounter_initialize_output(self, param) implicit none class(fraggle_io_encounter_parameters), intent(inout) :: self !! Parameters used to identify a particular NetCDF dataset @@ -294,11 +281,6 @@ module subroutine fraggle_util_final_fragments(self) type(fraggle_fragments), intent(inout) :: self !! Fraggle encountar storage object end subroutine fraggle_util_final_fragments - module subroutine fraggle_util_final_storage(self) - implicit none - type(fraggle_storage(*)), intent(inout) :: self !! Fraggle encountar storage object - end subroutine fraggle_util_final_storage - module subroutine fraggle_util_final_snapshot(self) implicit none type(fraggle_encounter_snapshot), intent(inout) :: self !! Fraggle encountar storage object