From 56d151266e173dd4fc03ad5ed14616c606bfb80e Mon Sep 17 00:00:00 2001 From: David A Minton Date: Fri, 16 Dec 2022 13:26:25 -0500 Subject: [PATCH] Fixed some typos --- src/CMakeLists.txt | 8 ++++---- src/modules/encounter_classes.f90 | 18 +++++++++++++++++- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5aa3c4f8f..5ada15b9b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -26,10 +26,10 @@ SET(FAST_MATH_FILES ${SRC}/modules/symba_classes.f90 ${SRC}/modules/whm_classes.f90 ${SRC}/modules/swiftest.f90 - ${SRC}/fraggle/collision_io.f90 - ${SRC}/fraggle/collision_placeholder.f90 - ${SRC}/fraggle/collision_setup.f90 - ${SRC}/fraggle/collision_util.f90 + ${SRC}/collision/collision_io.f90 + ${SRC}/collision/collision_placeholder.f90 + ${SRC}/collision/collision_setup.f90 + ${SRC}/collision/collision_util.f90 ${SRC}/discard/discard.f90 ${SRC}/drift/drift.f90 ${SRC}/encounter/encounter_check.f90 diff --git a/src/modules/encounter_classes.f90 b/src/modules/encounter_classes.f90 index 0eb0dc3f7..84a7fdf4c 100644 --- a/src/modules/encounter_classes.f90 +++ b/src/modules/encounter_classes.f90 @@ -64,6 +64,17 @@ module encounter_classes final :: encounter_util_final_storage end type encounter_storage + !> NetCDF dimension and variable names for the enounter save object + type, extends(netcdf_parameters) :: encounter_io_parameters + character(NAMELEN) :: loop_varname = "loopnum" !! Loop number for encounter + integer(I4B) :: loop_varid !! ID for the recursion level variable + integer(I4B) :: time_dimsize = 0 !! Number of time values in snapshot + integer(I4B) :: name_dimsize = 0 !! Number of potential id values in snapshot + integer(I4B) :: file_number = 1 !! The number to append on the output file + contains + procedure :: initialize => encounter_io_initialize !! Initialize a set of parameters used to identify a NetCDF output object + end type encounter_io_parameters + type encounter_bounding_box_1D integer(I4B) :: n !! Number of bodies with extents integer(I4B), dimension(:), allocatable :: ind !! Sorted minimum/maximum extent indices (value > n indicates an ending index) @@ -202,6 +213,12 @@ module subroutine encounter_io_dump(self, param) class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters end subroutine encounter_io_dump + module subroutine encounter_io_initialize(self, param) + implicit none + class(encounter_io_parameters), intent(inout) :: self !! Parameters used to identify a particular NetCDF dataset + class(swiftest_parameters), intent(in) :: param + end subroutine encounter_io_initialize + module subroutine encounter_io_write_frame_snapshot(self, nc, param) implicit none class(encounter_snapshot), intent(in) :: self !! Swiftest encounter structure @@ -291,7 +308,6 @@ module subroutine encounter_util_snapshot(self, param, system, t, arg) character(*), intent(in), optional :: arg !! Optional argument (needed for extended storage type used in collision snapshots) end subroutine encounter_util_snapshot - module subroutine encounter_util_spill_list(self, discards, lspill_list, ldestructive) implicit none class(encounter_list), intent(inout) :: self !! Swiftest encounter list